@vscode/chat-lib 0.4.1-8 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/_internal/extension/byok/node/openAIEndpoint.d.ts +2 -1
- package/dist/src/_internal/extension/byok/node/openAIEndpoint.d.ts.map +1 -1
- package/dist/src/_internal/extension/byok/node/openAIEndpoint.js +6 -7
- package/dist/src/_internal/extension/byok/node/openAIEndpoint.js.map +1 -1
- package/dist/src/_internal/extension/common/constants.d.ts +0 -1
- package/dist/src/_internal/extension/common/constants.d.ts.map +1 -1
- package/dist/src/_internal/extension/common/constants.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/common/delay.d.ts +2 -1
- package/dist/src/_internal/extension/inlineEdits/common/delay.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/common/delay.js +3 -0
- package/dist/src/_internal/extension/inlineEdits/common/delay.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/common/userInteractionMonitor.d.ts +6 -0
- package/dist/src/_internal/extension/inlineEdits/common/userInteractionMonitor.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/common/userInteractionMonitor.js +9 -0
- package/dist/src/_internal/extension/inlineEdits/common/userInteractionMonitor.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.d.ts +9 -0
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.js +75 -13
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.js.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.d.ts +17 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.d.ts.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.js +345 -57
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.js.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcherTelemetry.d.ts +6 -3
- package/dist/src/_internal/extension/prompt/node/chatMLFetcherTelemetry.d.ts.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcherTelemetry.js +9 -3
- package/dist/src/_internal/extension/prompt/node/chatMLFetcherTelemetry.js.map +1 -1
- package/dist/src/_internal/extension/xtab/common/promptCrafting.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/common/promptCrafting.js +41 -4
- package/dist/src/_internal/extension/xtab/common/promptCrafting.js.map +1 -1
- package/dist/src/_internal/extension/xtab/common/tags.d.ts +1 -0
- package/dist/src/_internal/extension/xtab/common/tags.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/common/tags.js +1 -0
- package/dist/src/_internal/extension/xtab/common/tags.js.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabEndpoint.d.ts +2 -1
- package/dist/src/_internal/extension/xtab/node/xtabEndpoint.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabEndpoint.js +6 -3
- package/dist/src/_internal/extension/xtab/node/xtabEndpoint.js.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabNextCursorPredictor.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabNextCursorPredictor.js +1 -0
- package/dist/src/_internal/extension/xtab/node/xtabNextCursorPredictor.js.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.d.ts +3 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.js +56 -18
- package/dist/src/_internal/extension/xtab/node/xtabProvider.js.map +1 -1
- package/dist/src/_internal/platform/authentication/common/copilotToken.d.ts +4 -0
- package/dist/src/_internal/platform/authentication/common/copilotToken.d.ts.map +1 -1
- package/dist/src/_internal/platform/authentication/common/copilotToken.js +6 -0
- package/dist/src/_internal/platform/authentication/common/copilotToken.js.map +1 -1
- package/dist/src/_internal/platform/chat/common/commonTypes.d.ts +2 -1
- package/dist/src/_internal/platform/chat/common/commonTypes.d.ts.map +1 -1
- package/dist/src/_internal/platform/chat/common/commonTypes.js +61 -17
- package/dist/src/_internal/platform/chat/common/commonTypes.js.map +1 -1
- package/dist/src/_internal/platform/configuration/common/configurationService.d.ts +16 -4
- package/dist/src/_internal/platform/configuration/common/configurationService.d.ts.map +1 -1
- package/dist/src/_internal/platform/configuration/common/configurationService.js +32 -6
- package/dist/src/_internal/platform/configuration/common/configurationService.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/capiClient.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/capiClient.js +1 -0
- package/dist/src/_internal/platform/endpoint/common/capiClient.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.d.ts +1 -0
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.js +20 -4
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/endpointProvider.d.ts +3 -1
- package/dist/src/_internal/platform/endpoint/common/endpointProvider.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/endpointProvider.js +1 -0
- package/dist/src/_internal/platform/endpoint/common/endpointProvider.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/autoChatEndpoint.d.ts +2 -1
- package/dist/src/_internal/platform/endpoint/node/autoChatEndpoint.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/autoChatEndpoint.js +6 -3
- package/dist/src/_internal/platform/endpoint/node/autoChatEndpoint.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.d.ts +6 -2
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.js +34 -12
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/copilotChatEndpoint.d.ts +2 -1
- package/dist/src/_internal/platform/endpoint/node/copilotChatEndpoint.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/copilotChatEndpoint.js +5 -3
- package/dist/src/_internal/platform/endpoint/node/copilotChatEndpoint.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/messagesApi.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/messagesApi.js +55 -5
- package/dist/src/_internal/platform/endpoint/node/messagesApi.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/proxyXtabEndpoint.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/proxyXtabEndpoint.js +1 -0
- package/dist/src/_internal/platform/endpoint/node/proxyXtabEndpoint.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/responsesApi.d.ts +1 -0
- package/dist/src/_internal/platform/endpoint/node/responsesApi.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/responsesApi.js +14 -10
- package/dist/src/_internal/platform/endpoint/node/responsesApi.js.map +1 -1
- package/dist/src/_internal/platform/git/common/gitService.d.ts +4 -0
- package/dist/src/_internal/platform/git/common/gitService.d.ts.map +1 -1
- package/dist/src/_internal/platform/git/common/gitService.js.map +1 -1
- package/dist/src/_internal/platform/github/common/githubAPI.d.ts +1 -0
- package/dist/src/_internal/platform/github/common/githubAPI.d.ts.map +1 -1
- package/dist/src/_internal/platform/github/common/githubAPI.js +2 -0
- package/dist/src/_internal/platform/github/common/githubAPI.js.map +1 -1
- package/dist/src/_internal/platform/github/common/githubService.d.ts +10 -0
- package/dist/src/_internal/platform/github/common/githubService.d.ts.map +1 -1
- package/dist/src/_internal/platform/github/common/githubService.js +38 -0
- package/dist/src/_internal/platform/github/common/githubService.js.map +1 -1
- package/dist/src/_internal/platform/github/common/nullOctokitServiceImpl.d.ts +2 -1
- package/dist/src/_internal/platform/github/common/nullOctokitServiceImpl.d.ts.map +1 -1
- package/dist/src/_internal/platform/github/common/nullOctokitServiceImpl.js +3 -0
- package/dist/src/_internal/platform/github/common/nullOctokitServiceImpl.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.d.ts +11 -1
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.d.ts.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.js +27 -3
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.d.ts +2 -1
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.d.ts.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.js +2 -1
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/node/inlineEditsModelService.d.ts.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/node/inlineEditsModelService.js +7 -9
- package/dist/src/_internal/platform/inlineEdits/node/inlineEditsModelService.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/anthropic.d.ts +8 -1
- package/dist/src/_internal/platform/networking/common/anthropic.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/anthropic.js +20 -4
- package/dist/src/_internal/platform/networking/common/anthropic.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/fetcherService.d.ts +17 -0
- package/dist/src/_internal/platform/networking/common/fetcherService.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/fetcherService.js +27 -1
- package/dist/src/_internal/platform/networking/common/fetcherService.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/networking.d.ts +7 -0
- package/dist/src/_internal/platform/networking/common/networking.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/networking.js +4 -5
- package/dist/src/_internal/platform/networking/common/networking.js.map +1 -1
- package/dist/src/_internal/platform/networking/node/chatWebSocketManager.d.ts +76 -0
- package/dist/src/_internal/platform/networking/node/chatWebSocketManager.d.ts.map +1 -0
- package/dist/src/_internal/platform/networking/node/chatWebSocketManager.js +480 -0
- package/dist/src/_internal/platform/networking/node/chatWebSocketManager.js.map +1 -0
- package/dist/src/_internal/platform/networking/node/chatWebSocketTelemetry.d.ts +87 -0
- package/dist/src/_internal/platform/networking/node/chatWebSocketTelemetry.d.ts.map +1 -0
- package/dist/src/_internal/platform/networking/node/chatWebSocketTelemetry.js +265 -0
- package/dist/src/_internal/platform/networking/node/chatWebSocketTelemetry.js.map +1 -0
- package/dist/src/_internal/platform/otel/common/genAiAttributes.d.ts +85 -0
- package/dist/src/_internal/platform/otel/common/genAiAttributes.d.ts.map +1 -0
- package/dist/src/_internal/platform/otel/common/genAiAttributes.js +105 -0
- package/dist/src/_internal/platform/otel/common/genAiAttributes.js.map +1 -0
- package/dist/src/_internal/platform/otel/common/genAiEvents.d.ts +28 -0
- package/dist/src/_internal/platform/otel/common/genAiEvents.d.ts.map +1 -0
- package/dist/src/_internal/platform/otel/common/genAiEvents.js +91 -0
- package/dist/src/_internal/platform/otel/common/genAiEvents.js.map +1 -0
- package/dist/src/_internal/platform/otel/common/genAiMetrics.d.ts +30 -0
- package/dist/src/_internal/platform/otel/common/genAiMetrics.d.ts.map +1 -0
- package/dist/src/_internal/platform/otel/common/genAiMetrics.js +68 -0
- package/dist/src/_internal/platform/otel/common/genAiMetrics.js.map +1 -0
- package/dist/src/_internal/platform/otel/common/index.d.ts +8 -0
- package/dist/src/_internal/platform/otel/common/index.d.ts.map +1 -0
- package/dist/src/_internal/platform/otel/common/index.js +35 -0
- package/dist/src/_internal/platform/otel/common/index.js.map +1 -0
- package/dist/src/_internal/platform/otel/common/messageFormatters.d.ts +85 -0
- package/dist/src/_internal/platform/otel/common/messageFormatters.d.ts.map +1 -0
- package/dist/src/_internal/platform/otel/common/messageFormatters.js +122 -0
- package/dist/src/_internal/platform/otel/common/messageFormatters.js.map +1 -0
- package/dist/src/_internal/platform/otel/common/noopOtelService.d.ts +23 -0
- package/dist/src/_internal/platform/otel/common/noopOtelService.d.ts.map +1 -0
- package/dist/src/_internal/platform/otel/common/noopOtelService.js +46 -0
- package/dist/src/_internal/platform/otel/common/noopOtelService.js.map +1 -0
- package/dist/src/_internal/platform/otel/common/otelConfig.d.ts +35 -0
- package/dist/src/_internal/platform/otel/common/otelConfig.d.ts.map +1 -0
- package/dist/src/_internal/platform/otel/common/otelConfig.js +140 -0
- package/dist/src/_internal/platform/otel/common/otelConfig.js.map +1 -0
- package/dist/src/_internal/platform/otel/common/otelService.d.ts +100 -0
- package/dist/src/_internal/platform/otel/common/otelService.d.ts.map +1 -0
- package/dist/src/_internal/platform/otel/common/otelService.js +10 -0
- package/dist/src/_internal/platform/otel/common/otelService.js.map +1 -0
- package/dist/src/main.d.ts.map +1 -1
- package/dist/src/main.js +9 -0
- package/dist/src/main.js.map +1 -1
- package/dist/src/package.json +227 -87
- package/package.json +3 -2
|
@@ -7,6 +7,7 @@ import { IChatModelInformation } from '../../../platform/endpoint/common/endpoin
|
|
|
7
7
|
import { ChatEndpoint } from '../../../platform/endpoint/node/chatEndpoint';
|
|
8
8
|
import { ILogService } from '../../../platform/log/common/logService';
|
|
9
9
|
import { IChatEndpoint, ICreateEndpointBodyOptions, IEndpointBody, IMakeChatRequestOptions } from '../../../platform/networking/common/networking';
|
|
10
|
+
import { IChatWebSocketManager } from '../../../platform/networking/node/chatWebSocketManager';
|
|
10
11
|
import { IExperimentationService } from '../../../platform/telemetry/common/nullExperimentationService';
|
|
11
12
|
import { ITokenizerProvider } from '../../../platform/tokenizer/node/tokenizer';
|
|
12
13
|
import { IInstantiationService } from '../../../util/vs/platform/instantiation/common/instantiation';
|
|
@@ -27,7 +28,7 @@ export declare class OpenAIEndpoint extends ChatEndpoint {
|
|
|
27
28
|
private static readonly _maxHeaderValueLength;
|
|
28
29
|
private static readonly _maxCustomHeaderCount;
|
|
29
30
|
private readonly _customHeaders;
|
|
30
|
-
constructor(_modelMetadata: IChatModelInformation, _apiKey: string, _modelUrl: string, domainService: IDomainService, chatMLFetcher: IChatMLFetcher, tokenizerProvider: ITokenizerProvider, instantiationService: IInstantiationService, configurationService: IConfigurationService, expService: IExperimentationService, logService: ILogService);
|
|
31
|
+
constructor(_modelMetadata: IChatModelInformation, _apiKey: string, _modelUrl: string, domainService: IDomainService, chatMLFetcher: IChatMLFetcher, tokenizerProvider: ITokenizerProvider, instantiationService: IInstantiationService, configurationService: IConfigurationService, expService: IExperimentationService, chatWebSocketService: IChatWebSocketManager, logService: ILogService);
|
|
31
32
|
private _sanitizeCustomHeaders;
|
|
32
33
|
private _sanitizeHeaderValue;
|
|
33
34
|
createRequestBody(options: ICreateEndpointBodyOptions): IEndpointBody;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openAIEndpoint.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/byok/node/openAIEndpoint.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAyB,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAChG,OAAO,EAAE,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AACpG,OAAO,EAAE,cAAc,EAAE,MAAM,iDAAiD,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAEtE,OAAO,EAAyB,aAAa,EAAE,0BAA0B,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AAE1K,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AACxG,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,8DAA8D,CAAC;AAwBrG;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,CAKvE;AAED,qBAAa,cAAe,SAAQ,YAAY;IA4D9C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM;IAClC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM;IAIb,SAAS,CAAC,oBAAoB,EAAE,qBAAqB;
|
|
1
|
+
{"version":3,"file":"openAIEndpoint.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/byok/node/openAIEndpoint.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAyB,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAChG,OAAO,EAAE,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AACpG,OAAO,EAAE,cAAc,EAAE,MAAM,iDAAiD,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAEtE,OAAO,EAAyB,aAAa,EAAE,0BAA0B,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AAE1K,OAAO,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AAC/F,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AACxG,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,8DAA8D,CAAC;AAwBrG;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,CAKvE;AAED,qBAAa,cAAe,SAAQ,YAAY;IA4D9C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM;IAClC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM;IAIb,SAAS,CAAC,oBAAoB,EAAE,qBAAqB;IAI/D,SAAS,CAAC,UAAU,EAAE,WAAW;IAlE/C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CA4CrC;IAGH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAoC;IAGnF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAO;IACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAQ;IACrD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAM;IAEnD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyB;gBAEvD,cAAc,EAAE,qBAAqB,EAClB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACpB,aAAa,EAAE,cAAc,EAC7B,aAAa,EAAE,cAAc,EACzB,iBAAiB,EAAE,kBAAkB,EACxB,oBAAoB,EAAE,qBAAqB,EACrD,oBAAoB,EAAE,qBAAqB,EACzC,UAAU,EAAE,uBAAuB,EACrC,oBAAoB,EAAE,qBAAqB,EAC3C,UAAU,EAAE,WAAW;IAgB/C,OAAO,CAAC,sBAAsB;IAsE9B,OAAO,CAAC,oBAAoB;IA0BnB,iBAAiB,CAAC,OAAO,EAAE,0BAA0B,GAAG,aAAa;IA8BrE,aAAa,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;IA8B7D,IAAa,oBAAoB,IAAI,MAAM,CAE1C;IAEe,eAAe,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAehD,sBAAsB,CAAC,oBAAoB,EAAE,MAAM,GAAG,aAAa;IAKtD,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,CAAC;CAMzH"}
|
|
@@ -20,6 +20,7 @@ const chatEndpoint_1 = require("../../../platform/endpoint/node/chatEndpoint");
|
|
|
20
20
|
const logService_1 = require("../../../platform/log/common/logService");
|
|
21
21
|
const fetch_1 = require("../../../platform/networking/common/fetch");
|
|
22
22
|
const networking_1 = require("../../../platform/networking/common/networking");
|
|
23
|
+
const chatWebSocketManager_1 = require("../../../platform/networking/node/chatWebSocketManager");
|
|
23
24
|
const nullExperimentationService_1 = require("../../../platform/telemetry/common/nullExperimentationService");
|
|
24
25
|
const tokenizer_1 = require("../../../platform/tokenizer/node/tokenizer");
|
|
25
26
|
const instantiation_1 = require("../../../util/vs/platform/instantiation/common/instantiation");
|
|
@@ -111,8 +112,8 @@ let OpenAIEndpoint = class OpenAIEndpoint extends chatEndpoint_1.ChatEndpoint {
|
|
|
111
112
|
static { this._maxHeaderNameLength = 256; }
|
|
112
113
|
static { this._maxHeaderValueLength = 8192; }
|
|
113
114
|
static { this._maxCustomHeaderCount = 20; }
|
|
114
|
-
constructor(_modelMetadata, _apiKey, _modelUrl, domainService, chatMLFetcher, tokenizerProvider, instantiationService, configurationService, expService, logService) {
|
|
115
|
-
super(_modelMetadata, domainService, chatMLFetcher, tokenizerProvider, instantiationService, configurationService, expService, logService);
|
|
115
|
+
constructor(_modelMetadata, _apiKey, _modelUrl, domainService, chatMLFetcher, tokenizerProvider, instantiationService, configurationService, expService, chatWebSocketService, logService) {
|
|
116
|
+
super(_modelMetadata, domainService, chatMLFetcher, tokenizerProvider, instantiationService, configurationService, expService, chatWebSocketService, logService);
|
|
116
117
|
this._apiKey = _apiKey;
|
|
117
118
|
this._modelUrl = _modelUrl;
|
|
118
119
|
this.instantiationService = instantiationService;
|
|
@@ -277,10 +278,7 @@ let OpenAIEndpoint = class OpenAIEndpoint extends chatEndpoint_1.ChatEndpoint {
|
|
|
277
278
|
async makeChatRequest2(options, token) {
|
|
278
279
|
// Apply ignoreStatefulMarker: false for initial request
|
|
279
280
|
const modifiedOptions = { ...options, ignoreStatefulMarker: false };
|
|
280
|
-
|
|
281
|
-
if (response.type === commonTypes_1.ChatFetchResponseType.InvalidStatefulMarker) {
|
|
282
|
-
response = await this._makeChatRequest2({ ...options, ignoreStatefulMarker: true }, token);
|
|
283
|
-
}
|
|
281
|
+
const response = await super.makeChatRequest2(modifiedOptions, token);
|
|
284
282
|
return hydrateBYOKErrorMessages(response);
|
|
285
283
|
}
|
|
286
284
|
};
|
|
@@ -292,6 +290,7 @@ exports.OpenAIEndpoint = OpenAIEndpoint = OpenAIEndpoint_1 = __decorate([
|
|
|
292
290
|
__param(6, instantiation_1.IInstantiationService),
|
|
293
291
|
__param(7, configurationService_1.IConfigurationService),
|
|
294
292
|
__param(8, nullExperimentationService_1.IExperimentationService),
|
|
295
|
-
__param(9,
|
|
293
|
+
__param(9, chatWebSocketManager_1.IChatWebSocketManager),
|
|
294
|
+
__param(10, logService_1.ILogService)
|
|
296
295
|
], OpenAIEndpoint);
|
|
297
296
|
//# sourceMappingURL=openAIEndpoint.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openAIEndpoint.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/byok/node/openAIEndpoint.ts"],"names":[],"mappings":";;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"openAIEndpoint.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/byok/node/openAIEndpoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/_internal/extension/common/constants.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAEtE,0BAAkB,MAAM;IACvB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,WAAW,gBAAgB;IAC3B,cAAc,mBAAmB;IACjC,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,cAAc,mBAAmB;IACjC,QAAQ,aAAa;IACrB,eAAe,oBAAoB;IACnC,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,KAAK,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/_internal/extension/common/constants.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAEtE,0BAAkB,MAAM;IACvB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,WAAW,gBAAgB;IAC3B,cAAc,mBAAmB;IACjC,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,cAAc,mBAAmB;IACjC,QAAQ,aAAa;IACrB,eAAe,oBAAoB;IACnC,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,KAAK,cAAc;IACnB,QAAQ,aAAa;IACrB,WAAW,gBAAgB;IAC3B,cAAc,mBAAmB;IACjC,QAAQ,aAAa;CACrB;AAED,eAAO,MAAM,qBAAqB,oCAAoC,CAAC;AAGvE,eAAO,MAAM,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA4B5E,CAAC;AAGF,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAc3H;AAED,eAAO,MAAM,YAAY,wBAAwB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/_internal/extension/common/constants.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/_internal/extension/common/constants.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAgEhG,8CAcC;AA5ED,wEAAsE;AA4BzD,QAAA,qBAAqB,GAAG,iCAAiC,CAAC;AAEvE,oEAAoE;AACvD,QAAA,gBAAgB,GAAoD;IAChF,gCAAc,EAAE;QACf,SAAS,gCAAgB;QACzB,MAAM,0BAAa;QACnB,QAAQ,8BAAe;QACvB,OAAO,4BAAc;QACrB,KAAK,wBAAY;QACjB,KAAK,wBAAY;QACjB,aAAa,wCAAoB;QACjC,gBAAgB,8CAAuB;QACvC,YAAY,sCAAmB;QAC/B,SAAS,gCAAc;KACvB;IACD,8BAAe,EAAE;QAChB,QAAQ,8BAAe;KACvB;IACD,kCAAiB,EAAE;QAClB,SAAS,gDAAwB;KACjC;IACD,8BAAe,EAAE;QAChB,KAAK,wBAAY;QACjB,KAAK,wBAAY;QACjB,SAAS,gCAAgB;QACzB,QAAQ,8BAAe;QACvB,OAAO,4BAAc;QACrB,MAAM,0BAAa;QACnB,UAAU,kCAAiB;KAC3B;CACD,CAAC;AAEF,oFAAoF;AACpF,SAAgB,iBAAiB,CAAC,QAAgB,EAAE,QAAsB;IACzE,IAAI,MAAM,CAAC,IAAI,CAAC,wBAAgB,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAED,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,wBAAgB,CAAC,EAAE,CAAC;QAClE,IAAI,QAAQ,KAAK,0BAAY,CAAC,MAAM,IAAI,KAAK,iCAAkB,EAAE,CAAC;YACjE,SAAS;QACV,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;QACrC,CAAC;IACF,CAAC;AACF,CAAC;AAEY,QAAA,YAAY,GAAG,qBAAqB,CAAC"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
export declare class DelaySession {
|
|
2
2
|
private baseDebounceTime;
|
|
3
|
-
private
|
|
3
|
+
private expectedTotalTime;
|
|
4
4
|
private readonly providerInvocationTime;
|
|
5
5
|
private extraDebounce;
|
|
6
6
|
constructor(baseDebounceTime: number, expectedTotalTime: number | undefined, providerInvocationTime?: number);
|
|
7
7
|
setExtraDebounce(extraDebounce: number): void;
|
|
8
8
|
setBaseDebounceTime(baseDebounceTime: number): void;
|
|
9
|
+
setExpectedTotalTime(expectedTotalTime: number): void;
|
|
9
10
|
getDebounceTime(): number;
|
|
10
11
|
getArtificialDelay(): number;
|
|
11
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delay.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/common/delay.ts"],"names":[],"mappings":"AAMA,qBAAa,YAAY;IAIvB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"delay.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/common/delay.ts"],"names":[],"mappings":"AAMA,qBAAa,YAAY;IAIvB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IALxC,OAAO,CAAC,aAAa,CAAK;gBAGjB,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,MAAM,GAAG,SAAS,EAC5B,sBAAsB,GAAE,MAAmB;IAItD,gBAAgB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAI7C,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI;IAInD,oBAAoB,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI;IAI5D,eAAe;IAaf,kBAAkB;CASlB"}
|
|
@@ -18,6 +18,9 @@ class DelaySession {
|
|
|
18
18
|
setBaseDebounceTime(baseDebounceTime) {
|
|
19
19
|
this.baseDebounceTime = baseDebounceTime;
|
|
20
20
|
}
|
|
21
|
+
setExpectedTotalTime(expectedTotalTime) {
|
|
22
|
+
this.expectedTotalTime = expectedTotalTime;
|
|
23
|
+
}
|
|
21
24
|
getDebounceTime() {
|
|
22
25
|
const expectedDebounceTime = this.expectedTotalTime === undefined
|
|
23
26
|
? this.baseDebounceTime
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delay.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/common/delay.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAGhG,MAAa,YAAY;IAGxB,YACS,gBAAwB,
|
|
1
|
+
{"version":3,"file":"delay.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/common/delay.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAGhG,MAAa,YAAY;IAGxB,YACS,gBAAwB,EACxB,iBAAqC,EAC5B,yBAAiC,IAAI,CAAC,GAAG,EAAE;QAFpD,qBAAgB,GAAhB,gBAAgB,CAAQ;QACxB,sBAAiB,GAAjB,iBAAiB,CAAoB;QAC5B,2BAAsB,GAAtB,sBAAsB,CAAqB;QALrD,kBAAa,GAAG,CAAC,CAAC;IAO1B,CAAC;IAEM,gBAAgB,CAAC,aAAqB;QAC5C,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACpC,CAAC;IAEM,mBAAmB,CAAC,gBAAwB;QAClD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC1C,CAAC;IAEM,oBAAoB,CAAC,iBAAyB;QACpD,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC5C,CAAC;IAED,eAAe;QACd,MAAM,oBAAoB,GAAG,IAAI,CAAC,iBAAiB,KAAK,SAAS;YAChE,CAAC,CAAC,IAAI,CAAC,gBAAgB;YACvB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAE3D,MAAM,8BAA8B,GAAG,oBAAoB,GAAG,IAAI,CAAC,aAAa,CAAC;QAEjF,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,sBAAsB,CAAC;QAClE,MAAM,kBAAkB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,8BAA8B,GAAG,gBAAgB,CAAC,CAAC;QAE1F,OAAO,kBAAkB,CAAC;IAC3B,CAAC;IAED,kBAAkB;QACjB,IAAI,IAAI,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;YAC1C,OAAO,CAAC,CAAC;QACV,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,sBAAsB,CAAC;QAClE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,CAAC;QACrE,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AA5CD,oCA4CC"}
|
|
@@ -53,10 +53,16 @@ export declare class UserInteractionMonitor {
|
|
|
53
53
|
protected _recentUserActionsForTiming: (NESUserAction & {
|
|
54
54
|
kind: ActionKind.Accepted | ActionKind.Rejected;
|
|
55
55
|
})[];
|
|
56
|
+
private _lastActionWasAcceptance;
|
|
56
57
|
constructor(_configurationService: IConfigurationService, _experimentationService: IExperimentationService, _logService: ILogService, _telemetryService: ITelemetryService);
|
|
57
58
|
handleAcceptance(): void;
|
|
58
59
|
handleRejection(): void;
|
|
59
60
|
handleIgnored(): void;
|
|
61
|
+
/**
|
|
62
|
+
* Returns true if the last recorded user action was an acceptance.
|
|
63
|
+
* Used to skip aggressiveness min-response-time delay after accepts.
|
|
64
|
+
*/
|
|
65
|
+
get wasLastActionAcceptance(): boolean;
|
|
60
66
|
private _recordUserAction;
|
|
61
67
|
createDelaySession(requestTime: number | undefined): DelaySession;
|
|
62
68
|
private _getExpectedTotalTime;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userInteractionMonitor.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/common/userInteractionMonitor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAa,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AAC/G,OAAO,EAAE,mBAAmB,EAAiH,+BAA+B,EAAE,MAAM,kEAAkE,CAAC;AACvP,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AACxG,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AAEjF,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,oBAAY,UAAU;IACrB,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,OAAO,YAAY;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;CACjB;AAED,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAC9C,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAE1C;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACxC,OAAO,EAAE,aAAa,EAAE,EACxB,MAAM,EAAE,+BAA+B,GACrC,aAAa,EAAE,CAyCjB;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,aAAa,EAAE,EACxB,MAAM,EAAE,+BAA+B,GACrC,MAAM,CA0DR;AAED,qBAAa,sBAAsB;
|
|
1
|
+
{"version":3,"file":"userInteractionMonitor.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/common/userInteractionMonitor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAa,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AAC/G,OAAO,EAAE,mBAAmB,EAAiH,+BAA+B,EAAE,MAAM,kEAAkE,CAAC;AACvP,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AACxG,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AAEjF,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,oBAAY,UAAU;IACrB,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,OAAO,YAAY;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;CACjB;AAED,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAC9C,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAE1C;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACxC,OAAO,EAAE,aAAa,EAAE,EACxB,MAAM,EAAE,+BAA+B,GACrC,aAAa,EAAE,CAyCjB;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,aAAa,EAAE,EACxB,MAAM,EAAE,+BAA+B,GACrC,MAAM,CA0DR;AAED,qBAAa,sBAAsB;IAiBV,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACpC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAlBtD;;;OAGG;IACH,SAAS,CAAC,mCAAmC,EAAE,aAAa,EAAE,CAAM;IAEpE;;;OAGG;IACH,SAAS,CAAC,2BAA2B,EAAE,CAAC,aAAa,GAAG;QAAE,IAAI,EAAE,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAA;KAAE,CAAC,EAAE,CAAM;IAEpH,OAAO,CAAC,wBAAwB,CAAS;gBAGA,qBAAqB,EAAE,qBAAqB,EAC1C,uBAAuB,EAAE,uBAAuB,EAC5D,WAAW,EAAE,WAAW,EAClB,iBAAiB,EAAE,iBAAiB;IAKlE,gBAAgB,IAAI,IAAI;IAIxB,eAAe,IAAI,IAAI;IAIvB,aAAa,IAAI,IAAI;IAI5B;;;OAGG;IACH,IAAI,uBAAuB,IAAI,OAAO,CAErC;IAED,OAAO,CAAC,iBAAiB;IAkBlB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,YAAY;IASxE,OAAO,CAAC,qBAAqB;IAiC7B;;;OAGG;IACI,sBAAsB,IAAI;QAAE,mBAAmB,EAAE,mBAAmB,CAAC;QAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE;IA6BrH,SAAS,CAAC,mCAAmC,IAAI,+BAA+B;IA2BhF,OAAO,CAAC,sBAAsB;CAG9B"}
|
|
@@ -145,6 +145,7 @@ let UserInteractionMonitor = class UserInteractionMonitor {
|
|
|
145
145
|
* Only includes accepted and rejected actions (ignored actions don't affect timing).
|
|
146
146
|
*/
|
|
147
147
|
this._recentUserActionsForTiming = [];
|
|
148
|
+
this._lastActionWasAcceptance = false;
|
|
148
149
|
}
|
|
149
150
|
// Capture user interactions
|
|
150
151
|
handleAcceptance() {
|
|
@@ -156,8 +157,16 @@ let UserInteractionMonitor = class UserInteractionMonitor {
|
|
|
156
157
|
handleIgnored() {
|
|
157
158
|
this._recordUserAction(ActionKind.Ignored);
|
|
158
159
|
}
|
|
160
|
+
/**
|
|
161
|
+
* Returns true if the last recorded user action was an acceptance.
|
|
162
|
+
* Used to skip aggressiveness min-response-time delay after accepts.
|
|
163
|
+
*/
|
|
164
|
+
get wasLastActionAcceptance() {
|
|
165
|
+
return this._lastActionWasAcceptance;
|
|
166
|
+
}
|
|
159
167
|
_recordUserAction(kind) {
|
|
160
168
|
const now = Date.now();
|
|
169
|
+
this._lastActionWasAcceptance = kind === ActionKind.Accepted;
|
|
161
170
|
// Always record for aggressiveness calculation
|
|
162
171
|
this._recentUserActionsForAggressiveness.push({ time: now, kind });
|
|
163
172
|
this._recentUserActionsForAggressiveness = this._recentUserActionsForAggressiveness.slice(-exports.MAX_INTERACTIONS_STORED);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userInteractionMonitor.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/common/userInteractionMonitor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"userInteractionMonitor.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/common/userInteractionMonitor.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;;;;;;;;;;AAiChG,8DA4CC;AAYD,sDA6DC;AApJD,sGAA+G;AAC/G,wGAAuP;AACvP,wEAAsE;AACtE,8GAAwG;AACxG,4EAAiF;AACjF,wDAAyD;AACzD,mCAAuC;AAEvC,IAAY,UAIX;AAJD,WAAY,UAAU;IACrB,mCAAqB,CAAA;IACrB,mCAAqB,CAAA;IACrB,iCAAmB,CAAA;AACpB,CAAC,EAJW,UAAU,0BAAV,UAAU,QAIrB;AAUY,QAAA,2BAA2B,GAAG,EAAE,CAAC;AACjC,QAAA,uBAAuB,GAAG,EAAE,CAAC;AAE1C;;;;;GAKG;AACH,SAAgB,yBAAyB,CACxC,OAAwB,EACxB,MAAuC;IAEvC,MAAM,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAE5E,IAAI,CAAC,uBAAuB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACpD,2DAA2D;QAC3D,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,mCAA2B,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,MAAM,GAAoB,EAAE,CAAC;IACnC,IAAI,kBAAkB,GAAG,CAAC,CAAC;IAC3B,IAAI,YAAY,GAAG,CAAC,CAAC;IAErB,iCAAiC;IACjC,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,mCAA2B,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7F,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAE1B,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,OAAO,EAAE,CAAC;YACxC,IAAI,IAAI,GAAG,KAAK,CAAC;YACjB,IAAI,uBAAuB,IAAI,kBAAkB,IAAI,YAAY,EAAE,CAAC;gBACnE,IAAI,GAAG,IAAI,CAAC;YACb,CAAC;YACD,IAAI,iBAAiB,IAAI,YAAY,IAAI,YAAY,EAAE,CAAC;gBACvD,IAAI,GAAG,IAAI,CAAC;YACb,CAAC;YAED,IAAI,IAAI,EAAE,CAAC;gBACV,SAAS;YACV,CAAC;YAED,kBAAkB,EAAE,CAAC;YACrB,YAAY,EAAE,CAAC;QAChB,CAAC;aAAM,CAAC;YACP,kBAAkB,GAAG,CAAC,CAAC,CAAC,2CAA2C;QACpE,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC;IAED,qCAAqC;IACrC,MAAM,CAAC,OAAO,EAAE,CAAC;IACjB,OAAO,MAAM,CAAC;AACf,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,qBAAqB,CACpC,OAAwB,EACxB,MAAuC;IAEvC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,GAAG,CAAC,CAAC,6BAA6B;IAC1C,CAAC;IAED,8CAA8C;IAC9C,MAAM,MAAM,GAAG,yBAAyB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAE1D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,GAAG,CAAC,CAAC,6CAA6C;IAC1D,CAAC;IAED,2BAA2B;IAC3B,IAAI,aAAa,GAAG,CAAC,CAAC,CAAC,oCAAoC;IAC3D,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC,yBAAyB;IAC9C,IAAI,iBAAiB,GAAG,CAAC,CAAC,CAAC,6CAA6C;IAExE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAEzB,4DAA4D;QAC5D,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;YAClE,SAAS;QACV,CAAC;QAED,iBAAiB,EAAE,CAAC;QAEpB,mEAAmE;QACnE,0EAA0E;QAC1E,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC;QAErB,oDAAoD;QACpD,IAAI,KAAa,CAAC;QAClB,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACrB,KAAK,UAAU,CAAC,QAAQ;gBACvB,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC;gBAC7B,MAAM;YACP,KAAK,UAAU,CAAC,QAAQ;gBACvB,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC;gBAC7B,MAAM;YACP,KAAK,UAAU,CAAC,OAAO;gBACtB,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC;gBAC5B,MAAM;QACR,CAAC;QAED,8DAA8D;QAC9D,MAAM,UAAU,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;QAElG,aAAa,IAAI,UAAU,GAAG,MAAM,CAAC;QACrC,WAAW,IAAI,MAAM,CAAC;IACvB,CAAC;IAED,MAAM,QAAQ,GAAG,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC;IAErE,oEAAoE;IACpE,iDAAiD;IACjD,MAAM,cAAc,GAAG,iBAAiB,GAAG,mCAA2B,CAAC;IACvE,OAAO,GAAG,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,GAAG,cAAc,CAAC;AAChD,CAAC;AAEM,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAgBlC,YACwB,qBAA6D,EAC3D,uBAAiE,EAC7E,WAAyC,EACnC,iBAAqD;QAHhC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC1C,4BAAuB,GAAvB,uBAAuB,CAAyB;QAC5D,gBAAW,GAAX,WAAW,CAAa;QAClB,sBAAiB,GAAjB,iBAAiB,CAAmB;QAlBzE;;;WAGG;QACO,wCAAmC,GAAoB,EAAE,CAAC;QAEpE;;;WAGG;QACO,gCAA2B,GAA4E,EAAE,CAAC;QAE5G,6BAAwB,GAAG,KAAK,CAAC;IAOrC,CAAC;IAEL,4BAA4B;IAErB,gBAAgB;QACtB,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAEM,eAAe;QACrB,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAEM,aAAa;QACnB,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED;;;OAGG;IACH,IAAI,uBAAuB;QAC1B,OAAO,IAAI,CAAC,wBAAwB,CAAC;IACtC,CAAC;IAEO,iBAAiB,CAAC,IAAgB;QACzC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,IAAI,CAAC,wBAAwB,GAAG,IAAI,KAAK,UAAU,CAAC,QAAQ,CAAC;QAE7D,+CAA+C;QAC/C,IAAI,CAAC,mCAAmC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,mCAAmC,GAAG,IAAI,CAAC,mCAAmC,CAAC,KAAK,CAAC,CAAC,+BAAuB,CAAC,CAAC;QAEpH,qDAAqD;QACrD,IAAI,IAAI,KAAK,UAAU,CAAC,OAAO,EAAE,CAAC;YACjC,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC,mCAA2B,CAAC,CAAC;QACzG,CAAC;IACF,CAAC;IAED,2DAA2D;IAEpD,kBAAkB,CAAC,WAA+B;QACxD,MAAM,gBAAgB,GAAG,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,CAAC,gCAAS,CAAC,YAAY,CAAC,mBAAmB,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAEvJ,MAAM,sBAAsB,GAAG,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,CAAC,gCAAS,CAAC,YAAY,CAAC,iCAAiC,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC3K,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE5G,OAAO,IAAI,oBAAY,CAAC,gBAAgB,EAAE,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAC3E,CAAC;IAEO,qBAAqB,CAAC,gBAAwB;QACrD,MAAM,sBAAsB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QAC5D,MAAM,iBAAiB,GAAG,IAAI,CAAC,CAAC,YAAY;QAC5C,MAAM,iBAAiB,GAAG,EAAE,CAAC,CAAC,QAAQ;QACtC,MAAM,gBAAgB,GAAG,GAAG,CAAC;QAC7B,MAAM,iBAAiB,GAAG,GAAG,CAAC;QAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,kDAAkD;QAClD,iEAAiE;QACjE,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,2BAA2B,EAAE,CAAC;YACvD,MAAM,eAAe,GAAG,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC;YAC1C,IAAI,eAAe,GAAG,sBAAsB,EAAE,CAAC;gBAC9C,SAAS;YACV,CAAC;YAED,qDAAqD;YACrD,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,eAAe,GAAG,sBAAsB,CAAC,CAAC;YACxE,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,CAAC;YAChG,UAAU,IAAI,CAAC,GAAG,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC;QACtD,CAAC;QAED,IAAI,YAAY,GAAG,gBAAgB,GAAG,UAAU,CAAC;QAEjD,+CAA+C;QAC/C,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC,CAAC;QAEtF,OAAO,YAAY,CAAC;IACrB,CAAC;IAED,4DAA4D;IAE5D;;;OAGG;IACI,sBAAsB;QAC5B,gFAAgF;QAChF,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,CAAC,gCAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC3J,MAAM,SAAS,GAAG,yCAAqB,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QACpE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,kBAAkB,EAAE,SAAS,EAAE,CAAC;QAC1E,CAAC;QAED,0CAA0C;QAC1C,MAAM,6BAA6B,GAAG,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,CAAC,gCAAS,CAAC,YAAY,CAAC,kCAAkC,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAEnL,IAAI,6BAA6B,KAAK,SAAS,EAAE,CAAC;YACjD,OAAO,EAAE,mBAAmB,EAAE,6BAA6B,EAAE,kBAAkB,EAAE,SAAS,EAAE,CAAC;QAC9F,CAAC;QAED,uEAAuE;QACvE,IAAI,KAA0B,CAAC;QAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,mCAAmC,EAAE,CAAC;QAC1D,MAAM,kBAAkB,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAC/D,IAAI,kBAAkB,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YAChD,KAAK,GAAG,uCAAmB,CAAC,IAAI,CAAC;QAClC,CAAC;aAAM,IAAI,kBAAkB,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;YACzD,KAAK,GAAG,uCAAmB,CAAC,MAAM,CAAC;QACpC,CAAC;aAAM,CAAC;YACP,KAAK,GAAG,uCAAmB,CAAC,GAAG,CAAC;QACjC,CAAC;QACD,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC;IAC3D,CAAC;IAES,mCAAmC;QAC5C,MAAM,SAAS,GAAG,gCAAS,CAAC,YAAY,CAAC,gDAAgD,CAAC;QAC1F,MAAM,YAAY,GAAG,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,CAAC,SAAS,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAClH,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAChC,OAAO,8DAA0C,CAAC;QACnD,CAAC;QAED,IAAI,CAAC;YACJ,OAAO,IAAA,8DAA0C,EAAC,YAAY,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,CAAC,EAAE,CAAC;YACV,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,0EAA0E,CAAC,CAAC;YACtG,yHAAyH;YACzH;;;;;;;;cAQE;YACF,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,0CAA0C,EAAE,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,EAAE,YAAY,EAAE,mBAAU,CAAC,QAAQ,CAAC,mBAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YACjN,OAAO,8DAA0C,CAAC;QACnD,CAAC;IACF,CAAC;IAEO,sBAAsB,CAAC,MAAuC;QACrE,OAAO,qBAAqB,CAAC,IAAI,CAAC,mCAAmC,EAAE,MAAM,CAAC,CAAC;IAChF,CAAC;CACD,CAAA;AAxKY,wDAAsB;iCAAtB,sBAAsB;IAiBhC,WAAA,4CAAqB,CAAA;IACrB,WAAA,oDAAuB,CAAA;IACvB,WAAA,wBAAW,CAAA;IACX,WAAA,6BAAiB,CAAA;GApBP,sBAAsB,CAwKlC"}
|
|
@@ -57,6 +57,14 @@ export declare class NextEditProvider extends Disposable implements INextEditPro
|
|
|
57
57
|
* This allows reusing the in-flight request when the user actually accepts the suggestion.
|
|
58
58
|
*/
|
|
59
59
|
private _speculativePendingRequest;
|
|
60
|
+
/**
|
|
61
|
+
* A speculative request that is deferred until the originating stream completes.
|
|
62
|
+
* When a suggestion is shown while its stream is still running, we schedule the
|
|
63
|
+
* speculative request here instead of firing immediately. If more edits arrive
|
|
64
|
+
* from the stream, the schedule is cleared (the shown edit wasn't the last one).
|
|
65
|
+
* When the stream ends, if the schedule is still present, the speculative fires.
|
|
66
|
+
*/
|
|
67
|
+
private _scheduledSpeculativeRequest;
|
|
60
68
|
private _lastShownTime;
|
|
61
69
|
/** The requestId of the last shown suggestion. We store only the requestId (not the object) to avoid preventing garbage collection. */
|
|
62
70
|
private _lastShownSuggestionId;
|
|
@@ -98,6 +106,7 @@ export declare class NextEditProvider extends Disposable implements INextEditPro
|
|
|
98
106
|
handleRejection(docId: DocumentId, suggestion: NextEditResult): void;
|
|
99
107
|
handleIgnored(docId: DocumentId, suggestion: NextEditResult, supersededBy: INextEditResult | undefined): void;
|
|
100
108
|
private runSnippy;
|
|
109
|
+
private _addLogContextEntry;
|
|
101
110
|
clearCache(): void;
|
|
102
111
|
}
|
|
103
112
|
export declare class NextEditFetchRequest {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nextEditProvider.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/node/nextEditProvider.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,KAAK,MAAM,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAa,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AAC/G,OAAO,EAAE,UAAU,EAAE,MAAM,2DAA2D,CAAC;AAIvF,OAAO,EAAE,2BAA2B,EAAE,MAAM,2DAA2D,CAAC;AACxG,OAAO,EAAuB,mBAAmB,EAAE,MAAM,0DAA0D,CAAC;AACpH,OAAO,EAAE,0BAA0B,EAAkK,MAAM,gEAAgE,CAAC;AAE5Q,OAAO,EAAmC,uBAAuB,EAAE,MAAM,kFAAkF,CAAC;AAC5J,OAAO,EAAyB,qBAAqB,EAAE,MAAM,iFAAiF,CAAC;AAC/I,OAAO,EAAW,WAAW,EAAa,MAAM,yCAAyC,CAAC;AAE1F,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"nextEditProvider.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/node/nextEditProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -112,6 +112,14 @@ let NextEditProvider = NextEditProvider_1 = class NextEditProvider extends lifec
|
|
|
112
112
|
* This allows reusing the in-flight request when the user actually accepts the suggestion.
|
|
113
113
|
*/
|
|
114
114
|
this._speculativePendingRequest = null;
|
|
115
|
+
/**
|
|
116
|
+
* A speculative request that is deferred until the originating stream completes.
|
|
117
|
+
* When a suggestion is shown while its stream is still running, we schedule the
|
|
118
|
+
* speculative request here instead of firing immediately. If more edits arrive
|
|
119
|
+
* from the stream, the schedule is cleared (the shown edit wasn't the last one).
|
|
120
|
+
* When the stream ends, if the schedule is still present, the speculative fires.
|
|
121
|
+
*/
|
|
122
|
+
this._scheduledSpeculativeRequest = null;
|
|
115
123
|
this._lastShownTime = 0;
|
|
116
124
|
/** The requestId of the last shown suggestion. We store only the requestId (not the object) to avoid preventing garbage collection. */
|
|
117
125
|
this._lastShownSuggestionId = undefined;
|
|
@@ -127,6 +135,7 @@ let NextEditProvider = NextEditProvider_1 = class NextEditProvider extends lifec
|
|
|
127
135
|
}).recomputeInitiallyAndOnChange(this._store);
|
|
128
136
|
}
|
|
129
137
|
_cancelSpeculativeRequest() {
|
|
138
|
+
this._scheduledSpeculativeRequest = null;
|
|
130
139
|
if (this._speculativePendingRequest) {
|
|
131
140
|
this._speculativePendingRequest.request.cancellationTokenSource.cancel();
|
|
132
141
|
this._speculativePendingRequest = null;
|
|
@@ -474,11 +483,16 @@ let NextEditProvider = NextEditProvider_1 = class NextEditProvider extends lifec
|
|
|
474
483
|
const nLinesEditWindow = (shouldExpandEditWindow
|
|
475
484
|
? this._configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsAutoExpandEditWindowLines, this._expService)
|
|
476
485
|
: undefined);
|
|
477
|
-
const nextEditRequest = new statelessNextEditProvider_1.StatelessNextEditRequest(req.headerRequestId, req.opportunityId, doc.value.get(), projectedDocuments.map(d => d.nextEditDoc), activeDocAndIdx.idx, xtabEditHistory, firstEdit, nLinesEditWindow,
|
|
486
|
+
const nextEditRequest = new statelessNextEditProvider_1.StatelessNextEditRequest(req.headerRequestId, req.opportunityId, doc.value.get(), projectedDocuments.map(d => d.nextEditDoc), activeDocAndIdx.idx, xtabEditHistory, firstEdit, nLinesEditWindow, false, // isSpeculative
|
|
487
|
+
logContext, req.log.recordingBookmark, recording, req.providerRequestStartDateTime);
|
|
478
488
|
let nextEditResult;
|
|
479
489
|
if (this._pendingStatelessNextEditRequest) {
|
|
480
490
|
this._pendingStatelessNextEditRequest.cancellationTokenSource.cancel();
|
|
481
491
|
this._pendingStatelessNextEditRequest = null;
|
|
492
|
+
// Clear any scheduled (but not yet triggered) speculative request tied to the
|
|
493
|
+
// old stream — it would otherwise fire stale when the old stream's background
|
|
494
|
+
// loop calls handleStreamEnd after the stream has already been superseded.
|
|
495
|
+
this._scheduledSpeculativeRequest = null;
|
|
482
496
|
}
|
|
483
497
|
// Cancel speculative request if it doesn't match the document/state
|
|
484
498
|
// of this new request — it was built for a different document or post-edit state.
|
|
@@ -600,6 +614,13 @@ let NextEditProvider = NextEditProvider_1 = class NextEditProvider extends lifec
|
|
|
600
614
|
nextEditRequest.setResult(result);
|
|
601
615
|
disp.dispose();
|
|
602
616
|
removeFromPending();
|
|
617
|
+
// Fire any scheduled speculative request — the last shown edit
|
|
618
|
+
// was indeed the last edit from this stream.
|
|
619
|
+
if (this._scheduledSpeculativeRequest?.headerRequestId === nextEditRequest.headerRequestId) {
|
|
620
|
+
const scheduled = this._scheduledSpeculativeRequest;
|
|
621
|
+
this._scheduledSpeculativeRequest = null;
|
|
622
|
+
void this._triggerSpeculativeRequest(scheduled.suggestion);
|
|
623
|
+
}
|
|
603
624
|
return result;
|
|
604
625
|
};
|
|
605
626
|
try {
|
|
@@ -621,6 +642,11 @@ let NextEditProvider = NextEditProvider_1 = class NextEditProvider extends lifec
|
|
|
621
642
|
while (!res.done) {
|
|
622
643
|
const streamedEdit = res.value.v;
|
|
623
644
|
processEdit(streamedEdit, res.value.telemetryBuilder);
|
|
645
|
+
// A new edit arrived from the stream — the previously-shown
|
|
646
|
+
// edit was not the last one. Clear the scheduled speculative.
|
|
647
|
+
if (this._scheduledSpeculativeRequest?.headerRequestId === nextEditRequest.headerRequestId) {
|
|
648
|
+
this._scheduledSpeculativeRequest = null;
|
|
649
|
+
}
|
|
624
650
|
res = await editStream.next();
|
|
625
651
|
}
|
|
626
652
|
// Stream completed
|
|
@@ -712,24 +738,41 @@ let NextEditProvider = NextEditProvider_1 = class NextEditProvider extends lifec
|
|
|
712
738
|
this._lastShownTime = Date.now();
|
|
713
739
|
this._lastShownSuggestionId = suggestion.requestId;
|
|
714
740
|
this._lastOutcome = undefined; // clear so that outcome is "pending" until resolved
|
|
741
|
+
this._scheduledSpeculativeRequest = null; // clear any previously scheduled speculative
|
|
715
742
|
// Trigger speculative request for the post-edit document state
|
|
716
743
|
const speculativeRequestsEnablement = this._configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsSpeculativeRequests, this._expService);
|
|
717
744
|
if (speculativeRequestsEnablement === xtabPromptOptions_1.SpeculativeRequestsEnablement.On) {
|
|
718
|
-
|
|
745
|
+
// If the originating stream is still running, defer the speculative request
|
|
746
|
+
// until the stream completes. If more edits come from this stream, the
|
|
747
|
+
// schedule is cleared (the shown edit wasn't the last one). The speculative
|
|
748
|
+
// request only fires when the stream ends with the shown edit as the last one.
|
|
749
|
+
const originatingRequest = this._pendingStatelessNextEditRequest;
|
|
750
|
+
if (originatingRequest && originatingRequest.headerRequestId === suggestion.source.headerRequestId) {
|
|
751
|
+
this._scheduledSpeculativeRequest = {
|
|
752
|
+
suggestion,
|
|
753
|
+
headerRequestId: originatingRequest.headerRequestId,
|
|
754
|
+
};
|
|
755
|
+
}
|
|
756
|
+
else {
|
|
757
|
+
void this._triggerSpeculativeRequest(suggestion);
|
|
758
|
+
}
|
|
719
759
|
}
|
|
720
760
|
}
|
|
721
761
|
async _triggerSpeculativeRequest(suggestion) {
|
|
722
|
-
const logger = this._logger.createSubLogger('_triggerSpeculativeRequest');
|
|
723
762
|
const result = suggestion.result;
|
|
724
763
|
if (!result?.edit) {
|
|
725
|
-
logger.trace('no edit in suggestion result');
|
|
726
764
|
return;
|
|
727
765
|
}
|
|
728
766
|
const docId = result.targetDocumentId;
|
|
729
767
|
if (!docId) {
|
|
730
|
-
logger.trace('no target document ID in suggestion result');
|
|
731
768
|
return;
|
|
732
769
|
}
|
|
770
|
+
const logContext = new inlineEditLogContext_1.InlineEditRequestLogContext(docId.uri, 0, undefined);
|
|
771
|
+
const sw = new stopwatch_1.StopWatch();
|
|
772
|
+
const logger = this._logger.createSubLogger('_triggerSpeculativeRequest')
|
|
773
|
+
.withExtraTarget(logService_1.LogTarget.fromCallback((_level, msg) => {
|
|
774
|
+
logContext.trace(`[${Math.floor(sw.elapsed()).toString().padStart(4, ' ')}ms] ${msg}`);
|
|
775
|
+
}));
|
|
733
776
|
// Compute the post-edit document content
|
|
734
777
|
const postEditContent = result.edit.replace(result.documentBeforeEdits.value);
|
|
735
778
|
const preciseEdit = result.edit.removeCommonSuffixPrefix(result.documentBeforeEdits.value);
|
|
@@ -795,9 +838,6 @@ let NextEditProvider = NextEditProvider_1 = class NextEditProvider extends lifec
|
|
|
795
838
|
logger.trace('no history context for speculative request');
|
|
796
839
|
return;
|
|
797
840
|
}
|
|
798
|
-
// Create a speculative request
|
|
799
|
-
// Use a dummy version since this is speculative and we don't have the actual post-edit version
|
|
800
|
-
const logContext = new inlineEditLogContext_1.InlineEditRequestLogContext(docId.uri, 0, undefined);
|
|
801
841
|
const req = new NextEditFetchRequest(`sp-${suggestion.source.opportunityId}`, logContext, undefined, true, `sp-${(0, uuid_1.generateUuid)()}`);
|
|
802
842
|
logger.trace(`triggering speculative request for post-edit state (opportunityId=${req.opportunityId}, headerRequestId=${req.headerRequestId})`);
|
|
803
843
|
try {
|
|
@@ -823,10 +863,11 @@ let NextEditProvider = NextEditProvider_1 = class NextEditProvider extends lifec
|
|
|
823
863
|
* the next NES request can reuse or find the result in cache.
|
|
824
864
|
*/
|
|
825
865
|
async _createSpeculativeRequest(req, doc, shiftedSelection, historyContext, postEditContent, rootedEdit, appliedEdit, { triggeredBySpeculativeRequest, isSubsequentEdit }, parentLogger) {
|
|
826
|
-
const logger = parentLogger.createSubLogger('_createSpeculativeRequest');
|
|
827
866
|
const curDocId = doc.id;
|
|
828
867
|
const recording = this._debugRecorder?.getRecentLog();
|
|
829
868
|
const logContext = req.log;
|
|
869
|
+
logContext.setStatelessNextEditProviderId(this._statelessNextEditProvider.ID);
|
|
870
|
+
const logger = parentLogger.createSubLogger('_createSpeculativeRequest');
|
|
830
871
|
const activeDocAndIdx = historyContext.getDocumentAndIdx(curDocId);
|
|
831
872
|
if (!activeDocAndIdx) {
|
|
832
873
|
logger.trace('active doc not found in history context');
|
|
@@ -882,13 +923,22 @@ let NextEditProvider = NextEditProvider_1 = class NextEditProvider extends lifec
|
|
|
882
923
|
(0, assert_1.assertNever)(autoExpandEditWindowLinesSetting);
|
|
883
924
|
}
|
|
884
925
|
const nextEditRequest = new statelessNextEditProvider_1.StatelessNextEditRequest(req.headerRequestId, req.opportunityId, postEditText, // documentBeforeEdits is the post-edit state
|
|
885
|
-
projectedDocuments.map(d => d.nextEditDoc), activeDocAndIdx.idx, xtabEditHistory, firstEdit, nLinesEditWindow,
|
|
926
|
+
projectedDocuments.map(d => d.nextEditDoc), activeDocAndIdx.idx, xtabEditHistory, firstEdit, nLinesEditWindow, true, // isSpeculative
|
|
927
|
+
logContext, undefined, // recordingBookmark
|
|
886
928
|
recording, undefined);
|
|
929
|
+
logContext.setRequestInput(nextEditRequest);
|
|
887
930
|
logger.trace('starting speculative provider call');
|
|
888
931
|
// Start the provider call - this runs in the background and populates the cache
|
|
889
|
-
const label = `NES | spec | ${(0, path_1.basename)(doc.id.toUri().fsPath)} (v${doc.version})`;
|
|
890
|
-
const capturingToken = new capturingToken_1.CapturingToken(label, undefined,
|
|
891
|
-
void this._requestLogger.captureInvocation(capturingToken, () =>
|
|
932
|
+
const label = `NES | spec | ${(0, path_1.basename)(doc.id.toUri().fsPath)} (v${doc.version.get()})`;
|
|
933
|
+
const capturingToken = new capturingToken_1.CapturingToken(label, undefined, false, true);
|
|
934
|
+
void this._requestLogger.captureInvocation(capturingToken, async () => {
|
|
935
|
+
try {
|
|
936
|
+
await this._runSpeculativeProviderCall(nextEditRequest, projectedDocuments, curDocId, req, logger);
|
|
937
|
+
}
|
|
938
|
+
finally {
|
|
939
|
+
this._addLogContextEntry(logContext, label);
|
|
940
|
+
}
|
|
941
|
+
});
|
|
892
942
|
return nextEditRequest;
|
|
893
943
|
}
|
|
894
944
|
/**
|
|
@@ -1020,6 +1070,18 @@ let NextEditProvider = NextEditProvider_1 = class NextEditProvider extends lifec
|
|
|
1020
1070
|
}
|
|
1021
1071
|
this._snippyService.handlePostInsertion(docId.toUri(), suggestion.result.documentBeforeEdits, suggestion.result.edit);
|
|
1022
1072
|
}
|
|
1073
|
+
_addLogContextEntry(logContext, debugNameOverride) {
|
|
1074
|
+
if (!logContext.includeInLogTree) {
|
|
1075
|
+
return;
|
|
1076
|
+
}
|
|
1077
|
+
this._requestLogger.addEntry({
|
|
1078
|
+
type: "MarkdownContentRequest" /* LoggedRequestKind.MarkdownContentRequest */,
|
|
1079
|
+
debugName: debugNameOverride ?? logContext.getDebugName(),
|
|
1080
|
+
icon: logContext.getIcon(),
|
|
1081
|
+
startTimeMs: logContext.time,
|
|
1082
|
+
markdownContent: logContext.toLogDocument(),
|
|
1083
|
+
});
|
|
1084
|
+
}
|
|
1023
1085
|
clearCache() {
|
|
1024
1086
|
this._nextEditCache.clear();
|
|
1025
1087
|
this._rejectionCollector.clear();
|