ghost: use CompletionsFetchService

src/extension/completions-core/vscode-node/extension/src/copilotPanel/common.ts

@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Range, commands, window, type Disposable } from 'vscode';
+import { CopilotNamedAnnotationList } from '../../../../../../platform/completions-core/common/openai/copilotAnnotations';
 import { DisposableStore, IDisposable } from '../../../../../../util/vs/base/common/lifecycle';
 import { IInstantiationService, type ServicesAccessor } from '../../../../../../util/vs/platform/instantiation/common/instantiation';
-import { CopilotNamedAnnotationList } from '../../../lib/src/openai/stream';
 import * as constants from '../constants';
 import { registerCommand } from '../telemetry';
 import { wrapDoc } from '../textDocumentManager';

src/extension/completions-core/vscode-node/extension/src/ghostText/ghostTextProvider.ts

@@ -98,7 +98,7 @@ export class GhostTextProvider {
 		if (typeof info === 'number') {
 			return; // deprecated API
 		}
-		this.instantiationService.invokeFunction(handlePartialGhostTextPostInsert, item.copilotCompletion, info.acceptedLength, info.kind);
+		this.instantiationService.invokeFunction(handlePartialGhostTextPostInsert, item.copilotCompletion, info.acceptedLength);
 	}
 
 	async handleEndOfLifetime(completionItem: GhostTextCompletionItem, reason: InlineCompletionEndOfLifeReason) {

src/extension/completions-core/vscode-node/extension/src/lib/panelShared/panelTypes.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { RequestId } from '../../../../lib/src/openai/openai';
-import { CopilotNamedAnnotationList } from '../../../../lib/src/openai/stream';
+import { CopilotNamedAnnotationList } from '../../../../../../../platform/completions-core/common/openai/copilotAnnotations';
+import { RequestId } from '../../../../../../../platform/networking/common/fetch';
 import { TelemetryWithExp } from '../../../../lib/src/telemetry';
 import { IRange } from '../../../../lib/src/textDocument';
 

src/extension/completions-core/vscode-node/extension/src/panelShared/basePanelTypes.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { CancellationToken, Range } from 'vscode';
-import { CopilotNamedAnnotationList } from '../../../lib/src/openai/stream';
+import { CopilotNamedAnnotationList } from '../../../../../../platform/completions-core/common/openai/copilotAnnotations';
 
 // Base interface for a completion displayed in the panel.
 export interface BasePanelCompletion {
@@ -41,4 +41,4 @@ export interface PanelConfig {
 export interface WebviewConfig {
 	renderingMode: 'batch' | 'streaming';
 	shuffleSolutions: boolean;
-}
+}

src/extension/completions-core/vscode-node/lib/src/ghostText/copilotCompletion.ts

@@ -2,8 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+import { CopilotNamedAnnotationList } from '../../../../../../platform/completions-core/common/openai/copilotAnnotations';
 import { generateUuid } from '../../../../../../util/vs/base/common/uuid';
-import { CopilotNamedAnnotationList } from '../openai/stream';
 import { TelemetryWithExp } from '../telemetry';
 import { IPosition, IRange, LocationFactory, TextDocumentContents } from '../textDocument';
 import { CompletionResult, ResultType } from './ghostText';