@vscode/chat-lib 0.4.1-2 → 0.4.1-20
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/completions-core/vscode-node/lib/src/ghostText/completionsFromNetwork.js +1 -1
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/ghostText/completionsFromNetwork.js.map +1 -1
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/openai/model.d.ts +4 -0
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/openai/model.d.ts.map +1 -1
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/openai/model.js +4 -0
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/openai/model.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/common/delay.d.ts +3 -1
- package/dist/src/_internal/extension/inlineEdits/common/delay.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/common/delay.js +6 -0
- package/dist/src/_internal/extension/inlineEdits/common/delay.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/common/editRebase.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/common/editRebase.js +2 -35
- package/dist/src/_internal/extension/inlineEdits/common/editRebase.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 +19 -35
- package/dist/src/_internal/extension/inlineEdits/common/userInteractionMonitor.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditCache.d.ts +1 -0
- package/dist/src/_internal/extension/inlineEdits/node/nextEditCache.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.d.ts +21 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.js +218 -106
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProviderTelemetry.d.ts +7 -0
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProviderTelemetry.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProviderTelemetry.js +18 -3
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProviderTelemetry.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditResult.d.ts +2 -0
- package/dist/src/_internal/extension/inlineEdits/node/nextEditResult.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditResult.js.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.d.ts +19 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.d.ts.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.js +367 -98
- 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/diffHistoryForPrompt.d.ts +6 -1
- package/dist/src/_internal/extension/xtab/common/diffHistoryForPrompt.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/common/diffHistoryForPrompt.js +3 -1
- package/dist/src/_internal/extension/xtab/common/diffHistoryForPrompt.js.map +1 -1
- package/dist/src/_internal/extension/xtab/common/lintErrors.js +2 -1
- package/dist/src/_internal/extension/xtab/common/lintErrors.js.map +1 -1
- package/dist/src/_internal/extension/xtab/common/promptCrafting.d.ts +6 -1
- package/dist/src/_internal/extension/xtab/common/promptCrafting.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/common/promptCrafting.js +43 -6
- package/dist/src/_internal/extension/xtab/common/promptCrafting.js.map +1 -1
- package/dist/src/_internal/extension/xtab/common/recentFilesForPrompt.d.ts +22 -0
- package/dist/src/_internal/extension/xtab/common/recentFilesForPrompt.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/common/recentFilesForPrompt.js +116 -17
- package/dist/src/_internal/extension/xtab/common/recentFilesForPrompt.js.map +1 -1
- package/dist/src/_internal/extension/xtab/common/similarFilesContextService.d.ts +10 -0
- package/dist/src/_internal/extension/xtab/common/similarFilesContextService.d.ts.map +1 -0
- package/dist/src/_internal/extension/xtab/common/similarFilesContextService.js +10 -0
- package/dist/src/_internal/extension/xtab/common/similarFilesContextService.js.map +1 -0
- 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/xtabCustomDiffPatchResponseHandler.js +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.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 +3 -2
- package/dist/src/_internal/extension/xtab/node/xtabNextCursorPredictor.js.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.d.ts +6 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.js +105 -20
- 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 +35 -48
- package/dist/src/_internal/platform/configuration/common/configurationService.d.ts.map +1 -1
- package/dist/src/_internal/platform/configuration/common/configurationService.js +57 -66
- 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 +2 -0
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.js +32 -5
- 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 +36 -14
- 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 +1 -1
- package/dist/src/_internal/platform/endpoint/node/messagesApi.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/messagesApi.js +62 -13
- 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/triggerOptions.d.ts +8 -0
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/triggerOptions.d.ts.map +1 -0
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/triggerOptions.js +17 -0
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/triggerOptions.js.map +1 -0
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.d.ts +44 -0
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.d.ts.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.js +71 -2
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditLogContext.js +5 -5
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditLogContext.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.d.ts +15 -1
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.d.ts.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.js +22 -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 +9 -44
- package/dist/src/_internal/platform/inlineEdits/node/inlineEditsModelService.js.map +1 -1
- package/dist/src/_internal/platform/nesFetch/common/responseStream.js +2 -35
- package/dist/src/_internal/platform/nesFetch/common/responseStream.js.map +1 -1
- package/dist/src/_internal/platform/nesFetch/node/completionsFetchServiceImpl.js +3 -36
- package/dist/src/_internal/platform/nesFetch/node/completionsFetchServiceImpl.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/anthropic.d.ts +14 -12
- package/dist/src/_internal/platform/networking/common/anthropic.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/anthropic.js +38 -23
- package/dist/src/_internal/platform/networking/common/anthropic.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/fetcherService.d.ts +60 -1
- package/dist/src/_internal/platform/networking/common/fetcherService.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/fetcherService.js +56 -5
- package/dist/src/_internal/platform/networking/common/fetcherService.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/networking.d.ts +42 -4
- package/dist/src/_internal/platform/networking/common/networking.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/networking.js +20 -6
- package/dist/src/_internal/platform/networking/common/networking.js.map +1 -1
- package/dist/src/_internal/platform/networking/node/chatWebSocketManager.d.ts +83 -0
- package/dist/src/_internal/platform/networking/node/chatWebSocketManager.d.ts.map +1 -0
- package/dist/src/_internal/platform/networking/node/chatWebSocketManager.js +496 -0
- package/dist/src/_internal/platform/networking/node/chatWebSocketManager.js.map +1 -0
- package/dist/src/_internal/platform/networking/node/chatWebSocketTelemetry.d.ts +89 -0
- package/dist/src/_internal/platform/networking/node/chatWebSocketTelemetry.d.ts.map +1 -0
- package/dist/src/_internal/platform/networking/node/chatWebSocketTelemetry.js +269 -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/_internal/platform/proxyModels/node/proxyModelsService.js +4 -37
- package/dist/src/_internal/platform/proxyModels/node/proxyModelsService.js.map +1 -1
- package/dist/src/_internal/platform/requestLogger/node/nullRequestLogger.d.ts +1 -0
- package/dist/src/_internal/platform/requestLogger/node/nullRequestLogger.d.ts.map +1 -1
- package/dist/src/_internal/platform/requestLogger/node/nullRequestLogger.js +3 -0
- package/dist/src/_internal/platform/requestLogger/node/nullRequestLogger.js.map +1 -1
- package/dist/src/_internal/platform/requestLogger/node/requestLogger.d.ts +2 -0
- package/dist/src/_internal/platform/requestLogger/node/requestLogger.d.ts.map +1 -1
- package/dist/src/_internal/platform/requestLogger/node/requestLogger.js.map +1 -1
- package/dist/src/_internal/platform/telemetry/common/telemetry.d.ts +9 -1
- package/dist/src/_internal/platform/telemetry/common/telemetry.d.ts.map +1 -1
- package/dist/src/_internal/platform/telemetry/common/telemetry.js +33 -15
- package/dist/src/_internal/platform/telemetry/common/telemetry.js.map +1 -1
- package/dist/src/_internal/platform/telemetry/node/azureInsightsReporter.d.ts +1 -1
- package/dist/src/_internal/platform/telemetry/node/azureInsightsReporter.d.ts.map +1 -1
- package/dist/src/_internal/platform/telemetry/node/azureInsightsReporter.js +3 -2
- package/dist/src/_internal/platform/telemetry/node/azureInsightsReporter.js.map +1 -1
- package/dist/src/_internal/util/common/errors.d.ts +4 -2
- package/dist/src/_internal/util/common/errors.d.ts.map +1 -1
- package/dist/src/_internal/util/common/errors.js +16 -12
- package/dist/src/_internal/util/common/errors.js.map +1 -1
- package/dist/src/_internal/util/common/result.js +4 -37
- package/dist/src/_internal/util/common/result.js.map +1 -1
- package/dist/src/_internal/util/common/test/shims/chatTypes.d.ts +14 -2
- package/dist/src/_internal/util/common/test/shims/chatTypes.d.ts.map +1 -1
- package/dist/src/_internal/util/common/test/shims/chatTypes.js +17 -3
- package/dist/src/_internal/util/common/test/shims/chatTypes.js.map +1 -1
- package/dist/src/_internal/util/common/test/shims/vscodeTypesShim.js +1 -1
- package/dist/src/_internal/util/common/test/shims/vscodeTypesShim.js.map +1 -1
- package/dist/src/main.d.ts.map +1 -1
- package/dist/src/main.js +17 -0
- package/dist/src/main.js.map +1 -1
- package/dist/src/package.json +385 -234
- package/package.json +5 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xtabCustomDiffPatchResponseHandler.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,8GAAgH;AAChH,
|
|
1
|
+
{"version":3,"file":"xtabCustomDiffPatchResponseHandler.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { IDomainService } from '../../../platform/endpoint/common/domainService'
|
|
|
6
6
|
import { ChatEndpoint } from '../../../platform/endpoint/node/chatEndpoint';
|
|
7
7
|
import { ILogService } from '../../../platform/log/common/logService';
|
|
8
8
|
import { IFetcherService } from '../../../platform/networking/common/fetcherService';
|
|
9
|
+
import { IChatWebSocketManager } from '../../../platform/networking/node/chatWebSocketManager';
|
|
9
10
|
import { IExperimentationService } from '../../../platform/telemetry/common/nullExperimentationService';
|
|
10
11
|
import { ITelemetryService } from '../../../platform/telemetry/common/telemetry';
|
|
11
12
|
import { ITokenizerProvider } from '../../../platform/tokenizer/node/tokenizer';
|
|
@@ -15,7 +16,7 @@ export declare class XtabEndpoint extends ChatEndpoint {
|
|
|
15
16
|
private readonly _apiKey;
|
|
16
17
|
private readonly _configService;
|
|
17
18
|
private static chatModelInfo;
|
|
18
|
-
constructor(_url: string, _apiKey: string, _configuredModelName: string | undefined, _configService: IConfigurationService, _domainService: IDomainService, _fetcherService: IFetcherService, _capiClientService: ICAPIClientService, _telemetryService: ITelemetryService, _authService: IAuthenticationService, _chatMLFetcher: IChatMLFetcher, _tokenizerProvider: ITokenizerProvider, _instantiationService: IInstantiationService, _experimentationService: IExperimentationService, _logService: ILogService);
|
|
19
|
+
constructor(_url: string, _apiKey: string, _configuredModelName: string | undefined, _configService: IConfigurationService, _domainService: IDomainService, _fetcherService: IFetcherService, _capiClientService: ICAPIClientService, _telemetryService: ITelemetryService, _authService: IAuthenticationService, _chatMLFetcher: IChatMLFetcher, _tokenizerProvider: ITokenizerProvider, _instantiationService: IInstantiationService, _experimentationService: IExperimentationService, _chatWebSocketService: IChatWebSocketManager, _logService: ILogService);
|
|
19
20
|
get urlOrRequestMetadata(): string;
|
|
20
21
|
getExtraHeaders(): Record<string, string>;
|
|
21
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xtabEndpoint.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabEndpoint.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wDAAwD,CAAC;AAChG,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAyB,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AAC3H,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,iDAAiD,CAAC;AAEjF,OAAO,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,oDAAoD,CAAC;AACrF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AACxG,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAEhF,OAAO,EAAE,qBAAqB,EAAE,MAAM,8DAA8D,CAAC;AAGrG,qBAAa,YAAa,SAAQ,YAAY;
|
|
1
|
+
{"version":3,"file":"xtabEndpoint.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabEndpoint.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wDAAwD,CAAC;AAChG,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAyB,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AAC3H,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,iDAAiD,CAAC;AAEjF,OAAO,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,oDAAoD,CAAC;AACrF,OAAO,EAAE,qBAAqB,EAAE,MAAM,wDAAwD,CAAC;AAC/F,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AACxG,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAEhF,OAAO,EAAE,qBAAqB,EAAE,MAAM,8DAA8D,CAAC;AAGrG,qBAAa,YAAa,SAAQ,YAAY;IA6B5C,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAED,OAAO,CAAC,QAAQ,CAAC,cAAc;IA9BvD,OAAO,CAAC,MAAM,CAAC,aAAa,CAwB1B;gBAGgB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EAChC,oBAAoB,EAAE,MAAM,GAAG,SAAS,EACA,cAAc,EAAE,qBAAqB,EAC7D,cAAc,EAAE,cAAc,EAC7B,eAAe,EAAE,eAAe,EAC7B,kBAAkB,EAAE,kBAAkB,EACvC,iBAAiB,EAAE,iBAAiB,EAC/B,YAAY,EAAE,sBAAsB,EAC5C,cAAc,EAAE,cAAc,EAC1B,kBAAkB,EAAE,kBAAkB,EACnC,qBAAqB,EAAE,qBAAqB,EAC1C,uBAAuB,EAAE,uBAAuB,EAClD,qBAAqB,EAAE,qBAAqB,EACtD,WAAW,EAAE,WAAW;IAgBtC,IAAa,oBAAoB,IAAI,MAAM,CAE1C;IAGe,eAAe,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAYzD"}
|
|
@@ -23,6 +23,7 @@ const domainService_1 = require("../../../platform/endpoint/common/domainService
|
|
|
23
23
|
const chatEndpoint_1 = require("../../../platform/endpoint/node/chatEndpoint");
|
|
24
24
|
const logService_1 = require("../../../platform/log/common/logService");
|
|
25
25
|
const fetcherService_1 = require("../../../platform/networking/common/fetcherService");
|
|
26
|
+
const chatWebSocketManager_1 = require("../../../platform/networking/node/chatWebSocketManager");
|
|
26
27
|
const nullExperimentationService_1 = require("../../../platform/telemetry/common/nullExperimentationService");
|
|
27
28
|
const telemetry_1 = require("../../../platform/telemetry/common/telemetry");
|
|
28
29
|
const tokenizer_1 = require("../../../platform/tokenizer/node/tokenizer");
|
|
@@ -33,6 +34,7 @@ let XtabEndpoint = class XtabEndpoint extends chatEndpoint_1.ChatEndpoint {
|
|
|
33
34
|
static { this.chatModelInfo = {
|
|
34
35
|
id: "xtab-4o-mini-finetuned" /* CHAT_MODEL.XTAB_4O_MINI_FINETUNED */,
|
|
35
36
|
name: 'xtab-4o-mini-finetuned',
|
|
37
|
+
vendor: 'xtab',
|
|
36
38
|
model_picker_enabled: false,
|
|
37
39
|
is_chat_default: false,
|
|
38
40
|
is_chat_fallback: false,
|
|
@@ -54,9 +56,9 @@ let XtabEndpoint = class XtabEndpoint extends chatEndpoint_1.ChatEndpoint {
|
|
|
54
56
|
}
|
|
55
57
|
}
|
|
56
58
|
}; }
|
|
57
|
-
constructor(_url, _apiKey, _configuredModelName, _configService, _domainService, _fetcherService, _capiClientService, _telemetryService, _authService, _chatMLFetcher, _tokenizerProvider, _instantiationService, _experimentationService, _logService) {
|
|
59
|
+
constructor(_url, _apiKey, _configuredModelName, _configService, _domainService, _fetcherService, _capiClientService, _telemetryService, _authService, _chatMLFetcher, _tokenizerProvider, _instantiationService, _experimentationService, _chatWebSocketService, _logService) {
|
|
58
60
|
const chatModelInfo = _configuredModelName ? { ...XtabEndpoint_1.chatModelInfo, id: _configuredModelName } : XtabEndpoint_1.chatModelInfo;
|
|
59
|
-
super(chatModelInfo, _domainService, _chatMLFetcher, _tokenizerProvider, _instantiationService, _configService, _experimentationService, _logService);
|
|
61
|
+
super(chatModelInfo, _domainService, _chatMLFetcher, _tokenizerProvider, _instantiationService, _configService, _experimentationService, _chatWebSocketService, _logService);
|
|
60
62
|
this._url = _url;
|
|
61
63
|
this._apiKey = _apiKey;
|
|
62
64
|
this._configService = _configService;
|
|
@@ -89,6 +91,7 @@ exports.XtabEndpoint = XtabEndpoint = XtabEndpoint_1 = __decorate([
|
|
|
89
91
|
__param(10, tokenizer_1.ITokenizerProvider),
|
|
90
92
|
__param(11, instantiation_1.IInstantiationService),
|
|
91
93
|
__param(12, nullExperimentationService_1.IExperimentationService),
|
|
92
|
-
__param(13,
|
|
94
|
+
__param(13, chatWebSocketManager_1.IChatWebSocketManager),
|
|
95
|
+
__param(14, logService_1.ILogService)
|
|
93
96
|
], XtabEndpoint);
|
|
94
97
|
//# sourceMappingURL=xtabEndpoint.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xtabEndpoint.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabEndpoint.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;;;;;;;;;;;AAEhG,2FAAgG;AAChG,+EAA6E;AAC7E,sGAA2H;AAC3H,6EAAkF;AAClF,mFAAiF;AAEjF,+EAA4E;AAC5E,wEAAsE;AACtE,uFAAqF;AACrF,8GAAwG;AACxG,4EAAiF;AACjF,0EAAgF;AAChF,8DAA+D;AAC/D,gGAAqG;AAG9F,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,2BAAY;;aAE9B,kBAAa,GAA0B;QACrD,EAAE,kEAAmC;QACrC,IAAI,EAAE,wBAAwB;QAC9B,oBAAoB,EAAE,KAAK;QAC3B,eAAe,EAAE,KAAK;QACtB,gBAAgB,EAAE,KAAK;QACvB,OAAO,EAAE,SAAS;QAClB,YAAY,EAAE;YACb,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,wBAAwB;YAChC,SAAS,EAAE,yBAAa,CAAC,KAAK;YAC9B,MAAM,EAAE;gBACP,iBAAiB,EAAE,KAAK;gBACxB,iBAAiB,EAAE,IAAI;aACvB;YACD,QAAQ,EAAE;gBACT,SAAS,EAAE,IAAI;gBACf,mBAAmB,EAAE,KAAK;gBAC1B,UAAU,EAAE,KAAK;gBACjB,MAAM,EAAE,KAAK;gBACb,UAAU,EAAE,IAAI;aAChB;SACD;KACD,
|
|
1
|
+
{"version":3,"file":"xtabEndpoint.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabEndpoint.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;;;;;;;;;;;AAEhG,2FAAgG;AAChG,+EAA6E;AAC7E,sGAA2H;AAC3H,6EAAkF;AAClF,mFAAiF;AAEjF,+EAA4E;AAC5E,wEAAsE;AACtE,uFAAqF;AACrF,iGAA+F;AAC/F,8GAAwG;AACxG,4EAAiF;AACjF,0EAAgF;AAChF,8DAA+D;AAC/D,gGAAqG;AAG9F,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,2BAAY;;aAE9B,kBAAa,GAA0B;QACrD,EAAE,kEAAmC;QACrC,IAAI,EAAE,wBAAwB;QAC9B,MAAM,EAAE,MAAM;QACd,oBAAoB,EAAE,KAAK;QAC3B,eAAe,EAAE,KAAK;QACtB,gBAAgB,EAAE,KAAK;QACvB,OAAO,EAAE,SAAS;QAClB,YAAY,EAAE;YACb,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,wBAAwB;YAChC,SAAS,EAAE,yBAAa,CAAC,KAAK;YAC9B,MAAM,EAAE;gBACP,iBAAiB,EAAE,KAAK;gBACxB,iBAAiB,EAAE,IAAI;aACvB;YACD,QAAQ,EAAE;gBACT,SAAS,EAAE,IAAI;gBACf,mBAAmB,EAAE,KAAK;gBAC1B,UAAU,EAAE,KAAK;gBACjB,MAAM,EAAE,KAAK;gBACb,UAAU,EAAE,IAAI;aAChB;SACD;KACD,AAxB2B,CAwB1B;IAEF,YACkB,IAAY,EACZ,OAAe,EAChC,oBAAwC,EACA,cAAqC,EAC7D,cAA8B,EAC7B,eAAgC,EAC7B,kBAAsC,EACvC,iBAAoC,EAC/B,YAAoC,EAC5C,cAA8B,EAC1B,kBAAsC,EACnC,qBAA4C,EAC1C,uBAAgD,EAClD,qBAA4C,EACtD,WAAwB;QAErC,MAAM,aAAa,GAAG,oBAAoB,CAAC,CAAC,CAAC,EAAE,GAAG,cAAY,CAAC,aAAa,EAAE,EAAE,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC,cAAY,CAAC,aAAa,CAAC;QACtI,KAAK,CACJ,aAAa,EACb,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACrB,cAAc,EACd,uBAAuB,EACvB,qBAAqB,EACrB,WAAW,CACX,CAAC;QA3Be,SAAI,GAAJ,IAAI,CAAQ;QACZ,YAAO,GAAP,OAAO,CAAQ;QAEQ,mBAAc,GAAd,cAAc,CAAuB;IAyB9E,CAAC;IAED,IAAa,oBAAoB;QAChC,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,gCAAS,CAAC,YAAY,CAAC,0BAA0B,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC;IACtG,CAAC;IAGe,eAAe;QAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,gCAAS,CAAC,YAAY,CAAC,6BAA6B,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC;QACnH,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,OAAO,GAAG,mCAAmC,IAAI,CAAC,oBAAoB,iLAAiL,CAAC;YAC9P,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC;QACD,OAAO;YACN,eAAe,EAAE,UAAU,MAAM,EAAE;YACnC,SAAS,EAAE,MAAM;SACjB,CAAC;IACH,CAAC;;AA3EW,oCAAY;uBAAZ,YAAY;IAgCtB,WAAA,4CAAqB,CAAA;IACrB,WAAA,8BAAc,CAAA;IACd,WAAA,gCAAe,CAAA;IACf,WAAA,+BAAkB,CAAA;IAClB,WAAA,6BAAiB,CAAA;IACjB,WAAA,uCAAsB,CAAA;IACtB,WAAA,8BAAc,CAAA;IACd,YAAA,8BAAkB,CAAA;IAClB,YAAA,qCAAqB,CAAA;IACrB,YAAA,oDAAuB,CAAA;IACvB,YAAA,4CAAqB,CAAA;IACrB,YAAA,wBAAW,CAAA;GA3CD,YAAY,CA4ExB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xtabNextCursorPredictor.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabNextCursorPredictor.ts"],"names":[],"mappings":"AAOA,OAAO,EAAa,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AAE/G,OAAO,EAAE,wBAAwB,EAAE,MAAM,yEAAyE,CAAC;AAGnH,OAAO,EAAE,iCAAiC,EAAE,MAAM,gEAAgE,CAAC;AACnH,OAAO,EAAE,2BAA2B,EAAE,MAAM,+DAA+D,CAAC;AAC5G,OAAO,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAElE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AAGxG,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAGrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8DAA8D,CAAC;AAErG,OAAO,EAAsC,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAG5F,qBAAa,uBAAuB;IAKlC,OAAO,CAAC,QAAQ,CAAC,aAAa;IACP,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAP9D,OAAO,CAAC,UAAU,CAAU;gBAGV,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EAChB,YAAY,EAAE,qBAAqB,EACnC,aAAa,EAAE,qBAAqB,EAClC,UAAU,EAAE,uBAAuB,EAC/B,eAAe,EAAE,2BAA2B;IAKpF,mBAAmB,IAAI,wBAAwB,GAAG,SAAS;IA2BrD,yBAAyB,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,iCAAiC,GAAG,SAAS,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"xtabNextCursorPredictor.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabNextCursorPredictor.ts"],"names":[],"mappings":"AAOA,OAAO,EAAa,qBAAqB,EAAE,MAAM,6DAA6D,CAAC;AAE/G,OAAO,EAAE,wBAAwB,EAAE,MAAM,yEAAyE,CAAC;AAGnH,OAAO,EAAE,iCAAiC,EAAE,MAAM,gEAAgE,CAAC;AACnH,OAAO,EAAE,2BAA2B,EAAE,MAAM,+DAA+D,CAAC;AAC5G,OAAO,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAElE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+DAA+D,CAAC;AAGxG,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAGrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8DAA8D,CAAC;AAErG,OAAO,EAAsC,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAG5F,qBAAa,uBAAuB;IAKlC,OAAO,CAAC,QAAQ,CAAC,aAAa;IACP,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAP9D,OAAO,CAAC,UAAU,CAAU;gBAGV,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EAChB,YAAY,EAAE,qBAAqB,EACnC,aAAa,EAAE,qBAAqB,EAClC,UAAU,EAAE,uBAAuB,EAC/B,eAAe,EAAE,2BAA2B;IAKpF,mBAAmB,IAAI,wBAAwB,GAAG,SAAS;IA2BrD,yBAAyB,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,iCAAiC,GAAG,SAAS,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAuK7P,OAAO,CAAC,oBAAoB;CAa5B"}
|
|
@@ -134,7 +134,7 @@ let XtabNextCursorPredictor = class XtabNextCursorPredictor {
|
|
|
134
134
|
includeLineNumbers: includeLineNumbersInRecentSnippets,
|
|
135
135
|
},
|
|
136
136
|
});
|
|
137
|
-
const userMessage = (0, promptCrafting_1.getUserPrompt)(newPromptPieces);
|
|
137
|
+
const { prompt: userMessage } = (0, promptCrafting_1.getUserPrompt)(newPromptPieces);
|
|
138
138
|
const messages = (0, xtabUtils_1.constructMessages)({
|
|
139
139
|
systemMsg: systemMessage,
|
|
140
140
|
userMsg: userMessage
|
|
@@ -151,6 +151,7 @@ let XtabNextCursorPredictor = class XtabNextCursorPredictor {
|
|
|
151
151
|
const endpoint = this.instaService.createInstance(chatEndpoint_1.ChatEndpoint, {
|
|
152
152
|
id: modelName,
|
|
153
153
|
name: 'nes.nextCursorPosition',
|
|
154
|
+
vendor: modelName,
|
|
154
155
|
urlOrRequestMetadata: url ? url : { type: copilot_api_1.RequestType.ProxyChatCompletions },
|
|
155
156
|
model_picker_enabled: false,
|
|
156
157
|
is_chat_default: false,
|
|
@@ -209,7 +210,7 @@ let XtabNextCursorPredictor = class XtabNextCursorPredictor {
|
|
|
209
210
|
}
|
|
210
211
|
catch (err) {
|
|
211
212
|
tracer.trace(`Failed to parse predicted line number from response '${response.value}': ${err}`);
|
|
212
|
-
return result_1.Result.fromString(`failedToParseLine:"${response.value}". Error ${
|
|
213
|
+
return result_1.Result.fromString(`failedToParseLine:"${response.value}". Error ${errors_1.ErrorUtils.fromUnknown(err).message}`);
|
|
213
214
|
}
|
|
214
215
|
}
|
|
215
216
|
determineLintOptions() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xtabNextCursorPredictor.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabNextCursorPredictor.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEhG,qDAAkD;AAClD,2EAAgG;AAChG,sGAA+G;AAC/G,+EAA4E;AAC5E,sHAAmH;AACnH,oHAAsG;AACtG,wGAAyG;AAEzG,8GAA4G;AAG5G,8GAAwG;AACxG,sFAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"xtabNextCursorPredictor.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabNextCursorPredictor.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,10 @@ import { ISimulationTestContext } from '../../../platform/simulationTestContext/
|
|
|
15
15
|
import { IExperimentationService } from '../../../platform/telemetry/common/nullExperimentationService';
|
|
16
16
|
import { IWorkspaceService } from '../../../platform/workspace/common/workspaceService';
|
|
17
17
|
import { CancellationToken } from '../../../util/vs/base/common/cancellation';
|
|
18
|
+
import { LineReplacement } from '../../../util/vs/editor/common/core/edits/lineEdit';
|
|
18
19
|
import { OffsetRange } from '../../../util/vs/editor/common/core/ranges/offsetRange';
|
|
19
20
|
import { IInstantiationService } from '../../../util/vs/platform/instantiation/common/instantiation';
|
|
21
|
+
import { ISimilarFilesContextService } from '../common/similarFilesContextService';
|
|
20
22
|
import { CurrentDocument } from '../common/xtabCurrentDocument';
|
|
21
23
|
export interface ModelConfig extends xtabPromptOptions.PromptOptions {
|
|
22
24
|
modelName: string | undefined;
|
|
@@ -32,6 +34,7 @@ export declare class XtabProvider implements IStatelessNextEditProvider {
|
|
|
32
34
|
private readonly langCtxService;
|
|
33
35
|
private readonly langDiagService;
|
|
34
36
|
private readonly ignoreService;
|
|
37
|
+
private readonly similarFilesContextService;
|
|
35
38
|
static readonly ID = "XtabProvider";
|
|
36
39
|
readonly ID = "XtabProvider";
|
|
37
40
|
private static computeTokens;
|
|
@@ -39,13 +42,14 @@ export declare class XtabProvider implements IStatelessNextEditProvider {
|
|
|
39
42
|
private readonly terminalMonitor;
|
|
40
43
|
private forceUseDefaultModel;
|
|
41
44
|
private nextCursorPredictor;
|
|
42
|
-
constructor(modelService: IInlineEditsModelService, simulationCtx: ISimulationTestContext, instaService: IInstantiationService, workspaceService: IWorkspaceService, diffService: IDiffService, configService: IConfigurationService, expService: IExperimentationService, langCtxService: ILanguageContextProviderService, langDiagService: ILanguageDiagnosticsService, ignoreService: IIgnoreService);
|
|
45
|
+
constructor(modelService: IInlineEditsModelService, simulationCtx: ISimulationTestContext, instaService: IInstantiationService, workspaceService: IWorkspaceService, diffService: IDiffService, configService: IConfigurationService, expService: IExperimentationService, langCtxService: ILanguageContextProviderService, langDiagService: ILanguageDiagnosticsService, ignoreService: IIgnoreService, similarFilesContextService: ISimilarFilesContextService);
|
|
43
46
|
handleAcceptance(): void;
|
|
44
47
|
handleRejection(): void;
|
|
45
48
|
handleIgnored(): void;
|
|
46
49
|
provideNextEdit(request: StatelessNextEditRequest, logger: ILogger, logContext: InlineEditRequestLogContext, cancellationToken: CancellationToken): EditStreamingWithTelemetry;
|
|
47
50
|
private doGetNextEdit;
|
|
48
51
|
private doGetNextEditWithSelection;
|
|
52
|
+
private _applyAggressivenessSettings;
|
|
49
53
|
private getAndProcessLanguageContext;
|
|
50
54
|
private getLanguageContext;
|
|
51
55
|
private streamEditsWithFiltering;
|
|
@@ -59,6 +63,7 @@ export declare class XtabProvider implements IStatelessNextEditProvider {
|
|
|
59
63
|
private determineArtificialDelayMs;
|
|
60
64
|
private filterEdit;
|
|
61
65
|
}
|
|
66
|
+
export declare function filterOutEditsWithSubstrings(edits: readonly LineReplacement[], substringsToFilterOut: string[]): readonly LineReplacement[];
|
|
62
67
|
export declare function computeAreaAroundEditWindowLinesRange(currentDocument: CurrentDocument): OffsetRange;
|
|
63
68
|
export declare function mapChatFetcherErrorToNoNextEditReason(fetchError: ChatFetchError): NoNextEditReason;
|
|
64
69
|
export declare function overrideModelConfig(modelConfig: ModelConfig, overridingConfig: xtabPromptOptions.ModelConfiguration): ModelConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xtabProvider.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabProvider.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAuC,MAAM,2CAA2C,CAAC;AAChH,OAAO,EAAa,qBAAqB,EAAkB,MAAM,6DAA6D,CAAC;AAC/H,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAGzE,OAAO,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AAG/E,OAAO,EAAE,UAAU,EAAE,MAAM,2DAA2D,CAAC;AAEvF,OAAO,KAAK,iBAAiB,MAAM,kEAAkE,CAAC;AACtG,OAAO,
|
|
1
|
+
{"version":3,"file":"xtabProvider.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
48
48
|
var XtabProvider_1;
|
|
49
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
50
|
exports.EditIntentParseMode = exports.XtabProvider = void 0;
|
|
51
|
+
exports.filterOutEditsWithSubstrings = filterOutEditsWithSubstrings;
|
|
51
52
|
exports.computeAreaAroundEditWindowLinesRange = computeAreaAroundEditWindowLinesRange;
|
|
52
53
|
exports.mapChatFetcherErrorToNoNextEditReason = mapChatFetcherErrorToNoNextEditReason;
|
|
53
54
|
exports.overrideModelConfig = overrideModelConfig;
|
|
@@ -77,7 +78,7 @@ const nullExperimentationService_1 = require("../../../platform/telemetry/common
|
|
|
77
78
|
const workspaceService_1 = require("../../../platform/workspace/common/workspaceService");
|
|
78
79
|
const async_1 = require("../../../util/common/async");
|
|
79
80
|
const asyncIterableUtils_1 = require("../../../util/common/asyncIterableUtils");
|
|
80
|
-
const
|
|
81
|
+
const errors_1 = require("../../../util/common/errors");
|
|
81
82
|
const result_1 = require("../../../util/common/result");
|
|
82
83
|
const assert_1 = require("../../../util/vs/base/common/assert");
|
|
83
84
|
const async_2 = require("../../../util/vs/base/common/async");
|
|
@@ -96,6 +97,7 @@ const inlineSuggestion_1 = require("../common/inlineSuggestion");
|
|
|
96
97
|
const lintErrors_1 = require("../common/lintErrors");
|
|
97
98
|
const promptCrafting_1 = require("../common/promptCrafting");
|
|
98
99
|
const promptCraftingUtils_1 = require("../common/promptCraftingUtils");
|
|
100
|
+
const similarFilesContextService_1 = require("../common/similarFilesContextService");
|
|
99
101
|
const systemMessages_1 = require("../common/systemMessages");
|
|
100
102
|
const tags_1 = require("../common/tags");
|
|
101
103
|
const terminalOutput_1 = require("../common/terminalOutput");
|
|
@@ -104,6 +106,14 @@ const xtabCustomDiffPatchResponseHandler_1 = require("./xtabCustomDiffPatchRespo
|
|
|
104
106
|
const xtabEndpoint_1 = require("./xtabEndpoint");
|
|
105
107
|
const xtabNextCursorPredictor_1 = require("./xtabNextCursorPredictor");
|
|
106
108
|
const xtabUtils_1 = require("./xtabUtils");
|
|
109
|
+
/**
|
|
110
|
+
* Returns true if the user has made document edits since the request was created.
|
|
111
|
+
* Used to skip costly sub-requests (e.g. next cursor prediction) whose results will
|
|
112
|
+
* be stale by the time they return.
|
|
113
|
+
*/
|
|
114
|
+
function hasUserTypedSinceRequestStarted(request) {
|
|
115
|
+
return request.intermediateUserEdit === undefined || !request.intermediateUserEdit.isEmpty();
|
|
116
|
+
}
|
|
107
117
|
var RetryState;
|
|
108
118
|
(function (RetryState) {
|
|
109
119
|
class NotRetrying {
|
|
@@ -121,7 +131,7 @@ let XtabProvider = class XtabProvider {
|
|
|
121
131
|
static { XtabProvider_1 = this; }
|
|
122
132
|
static { this.ID = configurationService_1.XTabProviderId; }
|
|
123
133
|
static { this.computeTokens = (s) => Math.floor(s.length / 4); }
|
|
124
|
-
constructor(modelService, simulationCtx, instaService, workspaceService, diffService, configService, expService, langCtxService, langDiagService, ignoreService) {
|
|
134
|
+
constructor(modelService, simulationCtx, instaService, workspaceService, diffService, configService, expService, langCtxService, langDiagService, ignoreService, similarFilesContextService) {
|
|
125
135
|
this.modelService = modelService;
|
|
126
136
|
this.simulationCtx = simulationCtx;
|
|
127
137
|
this.instaService = instaService;
|
|
@@ -132,6 +142,7 @@ let XtabProvider = class XtabProvider {
|
|
|
132
142
|
this.langCtxService = langCtxService;
|
|
133
143
|
this.langDiagService = langDiagService;
|
|
134
144
|
this.ignoreService = ignoreService;
|
|
145
|
+
this.similarFilesContextService = similarFilesContextService;
|
|
135
146
|
this.ID = XtabProvider_1.ID;
|
|
136
147
|
this.forceUseDefaultModel = false;
|
|
137
148
|
this.userInteractionMonitor = this.instaService.createInstance(userInteractionMonitor_1.UserInteractionMonitor);
|
|
@@ -169,7 +180,7 @@ let XtabProvider = class XtabProvider {
|
|
|
169
180
|
return new statelessNextEditProvider_1.WithStatelessProviderTelemetry(noNextEditReason, telemetry.build(result_1.Result.error(noNextEditReason)));
|
|
170
181
|
}
|
|
171
182
|
catch (err) {
|
|
172
|
-
const error =
|
|
183
|
+
const error = errors_1.ErrorUtils.fromUnknown(err);
|
|
173
184
|
const noSuggestionReason = new statelessNextEditProvider_1.NoNextEditReason.Unexpected(error);
|
|
174
185
|
return new statelessNextEditProvider_1.WithStatelessProviderTelemetry(noSuggestionReason, telemetry.build(result_1.Result.error(noSuggestionReason)));
|
|
175
186
|
}
|
|
@@ -205,17 +216,26 @@ let XtabProvider = class XtabProvider {
|
|
|
205
216
|
// Apply extra debounce based on cursor position - only one applies
|
|
206
217
|
const isInlineSuggestionPosition = (0, inlineSuggestion_1.isInlineSuggestion)(currentDocument, cursorPosition);
|
|
207
218
|
telemetryBuilder.setIsInlineSuggestion(!!isInlineSuggestionPosition);
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
tracer.trace('Debouncing for inline suggestion position');
|
|
211
|
-
delaySession.setExtraDebounce(inlineSuggestionDebounce);
|
|
212
|
-
}
|
|
213
|
-
else if (isCursorAtEndOfLine) {
|
|
214
|
-
tracer.trace('Debouncing for cursor at end of line');
|
|
215
|
-
delaySession.setExtraDebounce(this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsExtraDebounceEndOfLine, this.expService));
|
|
219
|
+
if (request.isSpeculative) {
|
|
220
|
+
tracer.trace('No extra debounce applied for speculative request');
|
|
216
221
|
}
|
|
217
222
|
else {
|
|
218
|
-
|
|
223
|
+
const inlineSuggestionDebounce = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsExtraDebounceInlineSuggestion, this.expService);
|
|
224
|
+
if (isInlineSuggestionPosition && inlineSuggestionDebounce > 0) {
|
|
225
|
+
tracer.trace('Debouncing for inline suggestion position');
|
|
226
|
+
delaySession.setExtraDebounce(inlineSuggestionDebounce);
|
|
227
|
+
}
|
|
228
|
+
else if (isCursorAtEndOfLine) {
|
|
229
|
+
tracer.trace('Debouncing for cursor at end of line');
|
|
230
|
+
delaySession.setExtraDebounce(this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsExtraDebounceEndOfLine, this.expService));
|
|
231
|
+
}
|
|
232
|
+
else {
|
|
233
|
+
tracer.trace('No extra debounce applied');
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
// Adjust debounce based on user aggressiveness setting for non-aggressiveness models
|
|
237
|
+
if (!(0, xtabPromptOptions_1.isAggressivenessStrategy)(promptOptions.promptingStrategy)) {
|
|
238
|
+
this._applyAggressivenessSettings(delaySession, tracer);
|
|
219
239
|
}
|
|
220
240
|
const areaAroundEditWindowLinesRange = computeAreaAroundEditWindowLinesRange(currentDocument);
|
|
221
241
|
const editWindowLinesRange = this.computeEditWindowLinesRange(currentDocument, request, tracer, telemetryBuilder);
|
|
@@ -242,6 +262,11 @@ let XtabProvider = class XtabProvider {
|
|
|
242
262
|
const { clippedTaggedCurrentDoc, areaAroundCodeToEdit } = taggedCurrentFileContentResult.val;
|
|
243
263
|
telemetryBuilder.setNLinesOfCurrentFileInPrompt(clippedTaggedCurrentDoc.lines.length);
|
|
244
264
|
const { aggressivenessLevel, userHappinessScore } = this.userInteractionMonitor.getAggressivenessLevel();
|
|
265
|
+
// Log user's raw aggressiveness setting when explicitly changed from default
|
|
266
|
+
const userAggressivenessSetting = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.Advanced.InlineEditsAggressiveness, this.expService);
|
|
267
|
+
if (userAggressivenessSetting !== xtabPromptOptions_1.AggressivenessSetting.Default) {
|
|
268
|
+
telemetryBuilder.setUserAggressivenessSetting(userAggressivenessSetting);
|
|
269
|
+
}
|
|
245
270
|
// Log aggressiveness level and user happiness score when using an aggressiveness-aware prompting strategy
|
|
246
271
|
if ((0, xtabPromptOptions_1.isAggressivenessStrategy)(promptOptions.promptingStrategy)) {
|
|
247
272
|
telemetryBuilder.setXtabAggressivenessLevel(aggressivenessLevel);
|
|
@@ -255,7 +280,9 @@ let XtabProvider = class XtabProvider {
|
|
|
255
280
|
}
|
|
256
281
|
const lintErrors = new lintErrors_1.LintErrors(activeDocument.id, currentDocument, this.langDiagService);
|
|
257
282
|
const promptPieces = new promptCrafting_1.PromptPieces(currentDocument, editWindowLinesRange, areaAroundEditWindowLinesRange, activeDocument, request.xtabEditHistory, clippedTaggedCurrentDoc.lines, areaAroundCodeToEdit, langCtx, aggressivenessLevel, lintErrors, XtabProvider_1.computeTokens, promptOptions);
|
|
258
|
-
const userPrompt = (0, promptCrafting_1.getUserPrompt)(promptPieces);
|
|
283
|
+
const { prompt: userPrompt, nDiffsInPrompt, diffTokensInPrompt } = (0, promptCrafting_1.getUserPrompt)(promptPieces);
|
|
284
|
+
telemetryBuilder.setNDiffsInPrompt(nDiffsInPrompt);
|
|
285
|
+
telemetryBuilder.setDiffTokensInPrompt(diffTokensInPrompt);
|
|
259
286
|
const responseFormat = xtabPromptOptions.ResponseFormat.fromPromptingStrategy(promptOptions.promptingStrategy);
|
|
260
287
|
const prediction = this.getPredictedOutput(activeDocument, editWindowLines, responseFormat);
|
|
261
288
|
const messages = (0, xtabUtils_1.constructMessages)({
|
|
@@ -282,6 +309,8 @@ let XtabProvider = class XtabProvider {
|
|
|
282
309
|
telemetryBuilder.setTerminalOutput(terminalOutputData);
|
|
283
310
|
logContext.setTerminalData(terminalOutputData);
|
|
284
311
|
});
|
|
312
|
+
// Fire-and-forget: compute GhostText-style similar files context for telemetry
|
|
313
|
+
telemetryBuilder.setSimilarFilesContext(this.similarFilesContextService.compute(activeDocument.id.uri, activeDocument.languageId, activeDocument.documentAfterEdits.value, currentDocument.cursorOffset));
|
|
285
314
|
request.fetchIssued = true;
|
|
286
315
|
const cursorLineOffset = cursorPosition.column;
|
|
287
316
|
return yield* this.streamEditsWithFiltering(request, endpoint, messages, editWindow, editWindowLines, cursorOriginalLinesOffset, cursorLineOffset, editWindowLinesRange, promptPieces, prediction, {
|
|
@@ -292,6 +321,36 @@ let XtabProvider = class XtabProvider {
|
|
|
292
321
|
userHappinessScore,
|
|
293
322
|
}, delaySession, tracer, telemetryBuilder, logContext, cancellationToken, originalEditWindow);
|
|
294
323
|
}
|
|
324
|
+
_applyAggressivenessSettings(delaySession, tracer) {
|
|
325
|
+
const userAggressiveness = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.Advanced.InlineEditsAggressiveness, this.expService);
|
|
326
|
+
const configsByLevel = {
|
|
327
|
+
[xtabPromptOptions_1.AggressivenessSetting.Low]: { minResponseConfigKey: configurationService_1.ConfigKey.TeamInternal.InlineEditsAggressivenessLowMinResponseTimeMs },
|
|
328
|
+
[xtabPromptOptions_1.AggressivenessSetting.Medium]: { minResponseConfigKey: configurationService_1.ConfigKey.TeamInternal.InlineEditsAggressivenessMediumMinResponseTimeMs },
|
|
329
|
+
[xtabPromptOptions_1.AggressivenessSetting.High]: { debounceConfigKey: configurationService_1.ConfigKey.TeamInternal.InlineEditsAggressivenessHighDebounceMs },
|
|
330
|
+
[xtabPromptOptions_1.AggressivenessSetting.Default]: undefined,
|
|
331
|
+
};
|
|
332
|
+
const entry = configsByLevel[userAggressiveness];
|
|
333
|
+
if (!entry) {
|
|
334
|
+
return;
|
|
335
|
+
}
|
|
336
|
+
// Apply debounce override if configured for this level
|
|
337
|
+
if (entry.debounceConfigKey) {
|
|
338
|
+
const debounceMs = this.configService.getExperimentBasedConfig(entry.debounceConfigKey, this.expService);
|
|
339
|
+
delaySession.setBaseDebounceTime(debounceMs);
|
|
340
|
+
tracer.trace(`Aggressiveness ${userAggressiveness}: debounce set to ${debounceMs}ms`);
|
|
341
|
+
}
|
|
342
|
+
// Apply min response time if configured for this level
|
|
343
|
+
if (entry.minResponseConfigKey) {
|
|
344
|
+
// Skip min response time delay if the user just accepted a suggestion
|
|
345
|
+
if (this.userInteractionMonitor.wasLastActionAcceptance) {
|
|
346
|
+
tracer.trace(`Aggressiveness ${userAggressiveness}: skipping min response time (last action was acceptance)`);
|
|
347
|
+
return;
|
|
348
|
+
}
|
|
349
|
+
const minResponseTimeMs = this.configService.getExperimentBasedConfig(entry.minResponseConfigKey, this.expService);
|
|
350
|
+
delaySession.setExpectedTotalTime(minResponseTimeMs);
|
|
351
|
+
tracer.trace(`Aggressiveness ${userAggressiveness}: min response time set to ${minResponseTimeMs}ms`);
|
|
352
|
+
}
|
|
353
|
+
}
|
|
295
354
|
getAndProcessLanguageContext(request, delaySession, activeDocument, cursorPosition, promptOptions, tracer, logContext, cancellationToken) {
|
|
296
355
|
const recordingEnabled = this.configService.getConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsLogContextRecorderEnabled);
|
|
297
356
|
if (!promptOptions.languageContext.enabled && !recordingEnabled) {
|
|
@@ -367,7 +426,7 @@ let XtabProvider = class XtabProvider {
|
|
|
367
426
|
return { start, end, items: langCtxItems };
|
|
368
427
|
}
|
|
369
428
|
catch (error) {
|
|
370
|
-
logContext.setError(
|
|
429
|
+
logContext.setError(errors_1.ErrorUtils.fromUnknown(error));
|
|
371
430
|
tracer.trace(`Failed to fetch language context: ${error}`);
|
|
372
431
|
return undefined;
|
|
373
432
|
}
|
|
@@ -466,7 +525,7 @@ let XtabProvider = class XtabProvider {
|
|
|
466
525
|
})
|
|
467
526
|
.catch((err) => {
|
|
468
527
|
// in principle this shouldn't happen because ChatMLFetcher's fetchOne should not throw
|
|
469
|
-
logContext.setError(
|
|
528
|
+
logContext.setError(errors_1.ErrorUtils.fromUnknown(err));
|
|
470
529
|
logContext.addLog(`ChatMLFetcher fetch call threw -- this's UNEXPECTED!`);
|
|
471
530
|
}).finally(() => {
|
|
472
531
|
logContext.setFetchEndTime();
|
|
@@ -522,7 +581,7 @@ let XtabProvider = class XtabProvider {
|
|
|
522
581
|
const linesIter = linesStream[Symbol.asyncIterator]();
|
|
523
582
|
const firstLine = await linesIter.next();
|
|
524
583
|
if (chatResponseFailure !== undefined) { // handle fetch failure
|
|
525
|
-
return new statelessNextEditProvider_1.NoNextEditReason.Unexpected(
|
|
584
|
+
return new statelessNextEditProvider_1.NoNextEditReason.Unexpected(errors_1.ErrorUtils.fromUnknown(chatResponseFailure));
|
|
526
585
|
}
|
|
527
586
|
if (firstLine.done) { // no lines in response -- unexpected case but take as no suggestions
|
|
528
587
|
return new statelessNextEditProvider_1.NoNextEditReason.NoSuggestions(request.documentBeforeEdits, editWindow);
|
|
@@ -642,7 +701,7 @@ let XtabProvider = class XtabProvider {
|
|
|
642
701
|
catch (err) {
|
|
643
702
|
logContext.setError(err);
|
|
644
703
|
// Properly handle the error by pushing it as a result
|
|
645
|
-
return new statelessNextEditProvider_1.NoNextEditReason.Unexpected(
|
|
704
|
+
return new statelessNextEditProvider_1.NoNextEditReason.Unexpected(errors_1.ErrorUtils.fromUnknown(err));
|
|
646
705
|
}
|
|
647
706
|
}
|
|
648
707
|
async *doGetNextEditsWithCursorJump(request, editWindow, promptPieces, delaySession, tracer, logContext, cancellationToken, telemetryBuilder, retryState) {
|
|
@@ -651,10 +710,18 @@ let XtabProvider = class XtabProvider {
|
|
|
651
710
|
if (nextCursorLinePrediction === undefined || retryState instanceof RetryState.Retrying) {
|
|
652
711
|
return noSuggestions;
|
|
653
712
|
}
|
|
713
|
+
if (hasUserTypedSinceRequestStarted(request)) {
|
|
714
|
+
tracer.trace('Skipping cursor prediction: user typed during request');
|
|
715
|
+
return new statelessNextEditProvider_1.NoNextEditReason.GotCancelled('beforeNextCursorPredictionFetchUserTyped');
|
|
716
|
+
}
|
|
654
717
|
const nextCursorLineR = await this.nextCursorPredictor.predictNextCursorPosition(promptPieces, tracer, telemetryBuilder, cancellationToken);
|
|
655
718
|
if (cancellationToken.isCancellationRequested) {
|
|
656
719
|
return new statelessNextEditProvider_1.NoNextEditReason.GotCancelled('afterNextCursorPredictionFetch');
|
|
657
720
|
}
|
|
721
|
+
if (hasUserTypedSinceRequestStarted(request)) {
|
|
722
|
+
tracer.trace('Skipping cursor prediction: user typed during prediction fetch');
|
|
723
|
+
return new statelessNextEditProvider_1.NoNextEditReason.GotCancelled('afterNextCursorPredictionFetchUserTyped');
|
|
724
|
+
}
|
|
658
725
|
if (nextCursorLineR.isError()) {
|
|
659
726
|
tracer.trace(`Predicted next cursor line error: ${nextCursorLineR.err.message}`);
|
|
660
727
|
telemetryBuilder.setNextCursorLineError(nextCursorLineR.err.message);
|
|
@@ -871,6 +938,14 @@ let XtabProvider = class XtabProvider {
|
|
|
871
938
|
}
|
|
872
939
|
filters.push((edits) => filter(activeDoc, new lineEdit_1.LineEdit(edits)) ? [] : edits);
|
|
873
940
|
}
|
|
941
|
+
const substringsToFilterOut = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsFilterOutEditsWithSubstrings, this.expService);
|
|
942
|
+
if (substringsToFilterOut) {
|
|
943
|
+
const substrings = substringsToFilterOut
|
|
944
|
+
.split(',')
|
|
945
|
+
.map(s => s.trim())
|
|
946
|
+
.filter(s => s.length > 0);
|
|
947
|
+
filters.push((edits) => filterOutEditsWithSubstrings(edits, substrings));
|
|
948
|
+
}
|
|
874
949
|
return filters.reduce((acc, filter) => filter(acc), edits);
|
|
875
950
|
}
|
|
876
951
|
};
|
|
@@ -885,8 +960,14 @@ exports.XtabProvider = XtabProvider = XtabProvider_1 = __decorate([
|
|
|
885
960
|
__param(6, nullExperimentationService_1.IExperimentationService),
|
|
886
961
|
__param(7, languageContextProviderService_1.ILanguageContextProviderService),
|
|
887
962
|
__param(8, languageDiagnosticsService_1.ILanguageDiagnosticsService),
|
|
888
|
-
__param(9, ignoreService_1.IIgnoreService)
|
|
963
|
+
__param(9, ignoreService_1.IIgnoreService),
|
|
964
|
+
__param(10, similarFilesContextService_1.ISimilarFilesContextService)
|
|
889
965
|
], XtabProvider);
|
|
966
|
+
function filterOutEditsWithSubstrings(edits, substringsToFilterOut) {
|
|
967
|
+
return edits.filter(edit => {
|
|
968
|
+
return edit.newLines.every(line => substringsToFilterOut.every(substring => !line.includes(substring)));
|
|
969
|
+
});
|
|
970
|
+
}
|
|
890
971
|
function computeAreaAroundEditWindowLinesRange(currentDocument) {
|
|
891
972
|
const cursorLine = currentDocument.cursorLineOffset;
|
|
892
973
|
const areaAroundStart = Math.max(0, cursorLine - promptCrafting_1.N_LINES_AS_CONTEXT);
|
|
@@ -907,13 +988,13 @@ function mapChatFetcherErrorToNoNextEditReason(fetchError) {
|
|
|
907
988
|
case commonTypes_1.ChatFetchResponseType.AgentUnauthorized:
|
|
908
989
|
case commonTypes_1.ChatFetchResponseType.AgentFailedDependency:
|
|
909
990
|
case commonTypes_1.ChatFetchResponseType.InvalidStatefulMarker:
|
|
910
|
-
return new statelessNextEditProvider_1.NoNextEditReason.Uncategorized(
|
|
991
|
+
return new statelessNextEditProvider_1.NoNextEditReason.Uncategorized(errors_1.ErrorUtils.fromUnknown(fetchError));
|
|
911
992
|
case commonTypes_1.ChatFetchResponseType.BadRequest:
|
|
912
993
|
case commonTypes_1.ChatFetchResponseType.NotFound:
|
|
913
994
|
case commonTypes_1.ChatFetchResponseType.Failed:
|
|
914
995
|
case commonTypes_1.ChatFetchResponseType.NetworkError:
|
|
915
996
|
case commonTypes_1.ChatFetchResponseType.Unknown:
|
|
916
|
-
return new statelessNextEditProvider_1.NoNextEditReason.FetchFailure(
|
|
997
|
+
return new statelessNextEditProvider_1.NoNextEditReason.FetchFailure(errors_1.ErrorUtils.fromUnknown(fetchError));
|
|
917
998
|
}
|
|
918
999
|
}
|
|
919
1000
|
function overrideModelConfig(modelConfig, overridingConfig) {
|
|
@@ -921,10 +1002,13 @@ function overrideModelConfig(modelConfig, overridingConfig) {
|
|
|
921
1002
|
...modelConfig,
|
|
922
1003
|
modelName: overridingConfig.modelName,
|
|
923
1004
|
promptingStrategy: overridingConfig.promptingStrategy,
|
|
1005
|
+
includePostScript: overridingConfig.includePostScript ?? modelConfig.includePostScript,
|
|
924
1006
|
currentFile: {
|
|
925
1007
|
...modelConfig.currentFile,
|
|
1008
|
+
...overridingConfig.currentFile,
|
|
926
1009
|
includeTags: overridingConfig.includeTagsInCurrentFile,
|
|
927
1010
|
},
|
|
1011
|
+
recentlyViewedDocuments: { ...modelConfig.recentlyViewedDocuments, ...overridingConfig.recentlyViewedDocuments },
|
|
928
1012
|
lintOptions: overridingConfig.lintOptions ? { ...modelConfig.lintOptions, ...overridingConfig.lintOptions } : modelConfig.lintOptions,
|
|
929
1013
|
};
|
|
930
1014
|
}
|
|
@@ -937,6 +1021,7 @@ function pickSystemPrompt(promptingStrategy) {
|
|
|
937
1021
|
return systemMessages_1.simplifiedPrompt;
|
|
938
1022
|
case xtabPromptOptions.PromptingStrategy.PatchBased:
|
|
939
1023
|
case xtabPromptOptions.PromptingStrategy.PatchBased01:
|
|
1024
|
+
case xtabPromptOptions.PromptingStrategy.PatchBased02:
|
|
940
1025
|
case xtabPromptOptions.PromptingStrategy.Xtab275:
|
|
941
1026
|
case xtabPromptOptions.PromptingStrategy.XtabAggressiveness:
|
|
942
1027
|
case xtabPromptOptions.PromptingStrategy.Xtab275Aggressiveness:
|