@vscode/chat-lib 0.43.2026040705 → 0.43.2026040706-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/common/constants.d.ts +2 -1
- package/dist/src/_internal/extension/common/constants.d.ts.map +1 -1
- package/dist/src/_internal/extension/common/constants.js +3 -0
- package/dist/src/_internal/extension/common/constants.js.map +1 -1
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/ghostText/completionsFromNetwork.d.ts +1 -5
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/ghostText/completionsFromNetwork.d.ts.map +1 -1
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/ghostText/completionsFromNetwork.js +3 -11
- 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/networking.d.ts +0 -30
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/networking.d.ts.map +1 -1
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/networking.js +4 -82
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/networking.js.map +1 -1
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/openai/fetch.d.ts +2 -10
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/openai/fetch.d.ts.map +1 -1
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/openai/fetch.js +26 -173
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/openai/fetch.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditCache.d.ts +11 -0
- package/dist/src/_internal/extension/inlineEdits/node/nextEditCache.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditCache.js +21 -3
- package/dist/src/_internal/extension/inlineEdits/node/nextEditCache.js.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.d.ts +2 -2
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.js +34 -12
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProvider.js.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.d.ts +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.d.ts.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.js +37 -24
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.js.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcherTelemetry.d.ts.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcherTelemetry.js +4 -2
- package/dist/src/_internal/extension/prompt/node/chatMLFetcherTelemetry.js.map +1 -1
- package/dist/src/_internal/extension/xtab/common/fetchStreamError.d.ts +10 -0
- package/dist/src/_internal/extension/xtab/common/fetchStreamError.d.ts.map +1 -0
- package/dist/src/_internal/extension/xtab/common/fetchStreamError.js +19 -0
- package/dist/src/_internal/extension/xtab/common/fetchStreamError.js.map +1 -0
- package/dist/src/_internal/extension/xtab/node/cursorLineDivergence.d.ts +44 -0
- package/dist/src/_internal/extension/xtab/node/cursorLineDivergence.d.ts.map +1 -0
- package/dist/src/_internal/extension/xtab/node/cursorLineDivergence.js +181 -0
- package/dist/src/_internal/extension/xtab/node/cursorLineDivergence.js.map +1 -0
- package/dist/src/_internal/extension/xtab/node/editIntent.d.ts +31 -0
- package/dist/src/_internal/extension/xtab/node/editIntent.d.ts.map +1 -0
- package/dist/src/_internal/extension/xtab/node/editIntent.js +193 -0
- package/dist/src/_internal/extension/xtab/node/editIntent.js.map +1 -0
- package/dist/src/_internal/extension/xtab/node/responseFormatHandlers.d.ts +52 -0
- package/dist/src/_internal/extension/xtab/node/responseFormatHandlers.d.ts.map +1 -0
- package/dist/src/_internal/extension/xtab/node/responseFormatHandlers.js +134 -0
- package/dist/src/_internal/extension/xtab/node/responseFormatHandlers.js.map +1 -0
- package/dist/src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.d.ts +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.js +5 -5
- package/dist/src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.js.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.d.ts +10 -37
- package/dist/src/_internal/extension/xtab/node/xtabProvider.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.js +315 -361
- package/dist/src/_internal/extension/xtab/node/xtabProvider.js.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabUtils.d.ts +10 -0
- package/dist/src/_internal/extension/xtab/node/xtabUtils.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabUtils.js +24 -0
- package/dist/src/_internal/extension/xtab/node/xtabUtils.js.map +1 -1
- package/dist/src/_internal/platform/authentication/common/copilotToken.d.ts +1 -0
- package/dist/src/_internal/platform/authentication/common/copilotToken.d.ts.map +1 -1
- package/dist/src/_internal/platform/authentication/common/copilotToken.js +3 -0
- package/dist/src/_internal/platform/authentication/common/copilotToken.js.map +1 -1
- package/dist/src/_internal/platform/chat/common/chatMLFetcher.d.ts +1 -0
- package/dist/src/_internal/platform/chat/common/chatMLFetcher.d.ts.map +1 -1
- package/dist/src/_internal/platform/chat/common/chatMLFetcher.js +4 -0
- package/dist/src/_internal/platform/chat/common/chatMLFetcher.js.map +1 -1
- package/dist/src/_internal/platform/chat/common/commonTypes.d.ts.map +1 -1
- package/dist/src/_internal/platform/chat/common/commonTypes.js +34 -4
- package/dist/src/_internal/platform/chat/common/commonTypes.js.map +1 -1
- package/dist/src/_internal/platform/configuration/common/configurationService.d.ts +30 -13
- package/dist/src/_internal/platform/configuration/common/configurationService.d.ts.map +1 -1
- package/dist/src/_internal/platform/configuration/common/configurationService.js +37 -20
- package/dist/src/_internal/platform/configuration/common/configurationService.js.map +1 -1
- package/dist/src/_internal/platform/configuration/common/defaultsOnlyConfigurationService.d.ts +1 -1
- package/dist/src/_internal/platform/configuration/common/defaultsOnlyConfigurationService.d.ts.map +1 -1
- package/dist/src/_internal/platform/configuration/common/defaultsOnlyConfigurationService.js +1 -1
- package/dist/src/_internal/platform/configuration/common/defaultsOnlyConfigurationService.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.d.ts +20 -0
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.js +49 -2
- package/dist/src/_internal/platform/endpoint/common/chatModelCapabilities.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/endpointProvider.d.ts +2 -0
- package/dist/src/_internal/platform/endpoint/common/endpointProvider.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/endpointProvider.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/statefulMarkerContainer.d.ts +5 -0
- package/dist/src/_internal/platform/endpoint/common/statefulMarkerContainer.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/common/statefulMarkerContainer.js +13 -0
- package/dist/src/_internal/platform/endpoint/common/statefulMarkerContainer.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.d.ts +14 -2
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.js +41 -71
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/imageLimits.d.ts +14 -0
- package/dist/src/_internal/platform/endpoint/node/imageLimits.d.ts.map +1 -0
- package/dist/src/_internal/platform/endpoint/node/imageLimits.js +156 -0
- package/dist/src/_internal/platform/endpoint/node/imageLimits.js.map +1 -0
- package/dist/src/_internal/platform/endpoint/node/messagesApi.d.ts +4 -12
- package/dist/src/_internal/platform/endpoint/node/messagesApi.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/messagesApi.js +39 -162
- package/dist/src/_internal/platform/endpoint/node/messagesApi.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/responsesApi.d.ts +15 -2
- package/dist/src/_internal/platform/endpoint/node/responsesApi.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/responsesApi.js +259 -42
- package/dist/src/_internal/platform/endpoint/node/responsesApi.js.map +1 -1
- package/dist/src/_internal/platform/git/common/gitService.d.ts +8 -11
- 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 +3 -2
- package/dist/src/_internal/platform/github/common/githubService.d.ts.map +1 -1
- package/dist/src/_internal/platform/github/common/githubService.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.d.ts +15 -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 +17 -1
- package/dist/src/_internal/platform/inlineEdits/common/dataTypes/xtabPromptOptions.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditLogContext.d.ts +12 -3
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditLogContext.d.ts.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditLogContext.js +72 -46
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditLogContext.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/utils/utils.d.ts +3 -0
- package/dist/src/_internal/platform/inlineEdits/common/utils/utils.d.ts.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/utils/utils.js +12 -0
- package/dist/src/_internal/platform/inlineEdits/common/utils/utils.js.map +1 -1
- package/dist/src/_internal/platform/log/common/logService.d.ts +5 -0
- package/dist/src/_internal/platform/log/common/logService.d.ts.map +1 -1
- package/dist/src/_internal/platform/log/common/logService.js +22 -0
- package/dist/src/_internal/platform/log/common/logService.js.map +1 -1
- package/dist/src/_internal/platform/nesFetch/node/completionsFetchServiceImpl.d.ts +1 -1
- package/dist/src/_internal/platform/nesFetch/node/completionsFetchServiceImpl.d.ts.map +1 -1
- package/dist/src/_internal/platform/nesFetch/node/completionsFetchServiceImpl.js +1 -1
- package/dist/src/_internal/platform/nesFetch/node/completionsFetchServiceImpl.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/anthropic.d.ts +0 -58
- package/dist/src/_internal/platform/networking/common/anthropic.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/anthropic.js +6 -67
- package/dist/src/_internal/platform/networking/common/anthropic.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/fetch.d.ts +0 -12
- package/dist/src/_internal/platform/networking/common/fetch.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/fetch.js +5 -1
- package/dist/src/_internal/platform/networking/common/fetch.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/fetcherService.d.ts +1 -0
- package/dist/src/_internal/platform/networking/common/fetcherService.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/fetcherService.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/networking.d.ts +22 -4
- package/dist/src/_internal/platform/networking/common/networking.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/networking.js.map +1 -1
- package/dist/src/_internal/platform/networking/node/chatStream.d.ts +10 -0
- package/dist/src/_internal/platform/networking/node/chatStream.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/node/chatStream.js +28 -0
- package/dist/src/_internal/platform/networking/node/chatStream.js.map +1 -1
- package/dist/src/_internal/platform/networking/node/chatWebSocketManager.d.ts +24 -5
- package/dist/src/_internal/platform/networking/node/chatWebSocketManager.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/node/chatWebSocketManager.js +67 -20
- package/dist/src/_internal/platform/networking/node/chatWebSocketManager.js.map +1 -1
- package/dist/src/_internal/platform/networking/node/chatWebSocketTelemetry.d.ts +15 -1
- package/dist/src/_internal/platform/networking/node/chatWebSocketTelemetry.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/node/chatWebSocketTelemetry.js +51 -7
- package/dist/src/_internal/platform/networking/node/chatWebSocketTelemetry.js.map +1 -1
- package/dist/src/_internal/platform/otel/common/genAiEvents.d.ts.map +1 -1
- package/dist/src/_internal/platform/otel/common/genAiEvents.js +10 -2
- package/dist/src/_internal/platform/otel/common/genAiEvents.js.map +1 -1
- package/dist/src/_internal/platform/otel/common/index.d.ts +1 -1
- package/dist/src/_internal/platform/otel/common/index.d.ts.map +1 -1
- package/dist/src/_internal/platform/otel/common/index.js +2 -1
- package/dist/src/_internal/platform/otel/common/index.js.map +1 -1
- package/dist/src/_internal/platform/otel/common/messageFormatters.d.ts +13 -1
- package/dist/src/_internal/platform/otel/common/messageFormatters.d.ts.map +1 -1
- package/dist/src/_internal/platform/otel/common/messageFormatters.js +98 -0
- package/dist/src/_internal/platform/otel/common/messageFormatters.js.map +1 -1
- package/dist/src/_internal/platform/requestLogger/common/requestLogger.d.ts +170 -0
- package/dist/src/_internal/platform/requestLogger/common/requestLogger.d.ts.map +1 -0
- package/dist/src/_internal/platform/requestLogger/common/requestLogger.js +145 -0
- package/dist/src/_internal/platform/requestLogger/common/requestLogger.js.map +1 -0
- package/dist/src/_internal/platform/requestLogger/node/nullRequestLogger.d.ts +4 -4
- package/dist/src/_internal/platform/requestLogger/node/nullRequestLogger.d.ts.map +1 -1
- package/dist/src/_internal/platform/requestLogger/node/nullRequestLogger.js +1 -3
- package/dist/src/_internal/platform/requestLogger/node/nullRequestLogger.js.map +1 -1
- package/dist/src/_internal/platform/requestLogger/node/requestLogger.d.ts +4 -167
- package/dist/src/_internal/platform/requestLogger/node/requestLogger.d.ts.map +1 -1
- package/dist/src/_internal/platform/requestLogger/node/requestLogger.js +3 -139
- package/dist/src/_internal/platform/requestLogger/node/requestLogger.js.map +1 -1
- package/dist/src/main.d.ts +2 -0
- package/dist/src/main.d.ts.map +1 -1
- package/dist/src/main.js +48 -6
- package/dist/src/main.js.map +1 -1
- package/dist/src/package.json +192 -151
- package/package.json +70 -71
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/openai/stream.d.ts +0 -182
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/openai/stream.d.ts.map +0 -1
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/openai/stream.js +0 -558
- package/dist/src/_internal/extension/completions-core/vscode-node/lib/src/openai/stream.js.map +0 -1
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*---------------------------------------------------------------------------------------------
|
|
3
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
4
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
5
|
+
*--------------------------------------------------------------------------------------------*/
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.ResponseParseResult = void 0;
|
|
8
|
+
exports.handleEditWindowOnly = handleEditWindowOnly;
|
|
9
|
+
exports.handleCodeBlock = handleCodeBlock;
|
|
10
|
+
exports.handleEditWindowWithEditIntent = handleEditWindowWithEditIntent;
|
|
11
|
+
exports.handleUnifiedWithXml = handleUnifiedWithXml;
|
|
12
|
+
const statelessNextEditProvider_1 = require("../../../platform/inlineEdits/common/statelessNextEditProvider");
|
|
13
|
+
const lineEdit_1 = require("../../../util/vs/editor/common/core/edits/lineEdit");
|
|
14
|
+
const lineRange_1 = require("../../../util/vs/editor/common/core/ranges/lineRange");
|
|
15
|
+
const tags_1 = require("../common/tags");
|
|
16
|
+
const editIntent_1 = require("./editIntent");
|
|
17
|
+
const xtabUtils_1 = require("./xtabUtils");
|
|
18
|
+
// ============================================================================
|
|
19
|
+
// Result type
|
|
20
|
+
// ============================================================================
|
|
21
|
+
var ResponseParseResult;
|
|
22
|
+
(function (ResponseParseResult) {
|
|
23
|
+
/**
|
|
24
|
+
* The response contains edit-window lines to be fed into *ResponseProcessor.diff*.
|
|
25
|
+
*/
|
|
26
|
+
class EditWindowLines {
|
|
27
|
+
constructor(lines, editIntentMetadata) {
|
|
28
|
+
this.lines = lines;
|
|
29
|
+
this.editIntentMetadata = editIntentMetadata;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
ResponseParseResult.EditWindowLines = EditWindowLines;
|
|
33
|
+
/**
|
|
34
|
+
* The handler has finished — no more processing needed. Carries a {@link NoNextEditReason}.
|
|
35
|
+
*/
|
|
36
|
+
class Done {
|
|
37
|
+
constructor(reason) {
|
|
38
|
+
this.reason = reason;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
ResponseParseResult.Done = Done;
|
|
42
|
+
/**
|
|
43
|
+
* The handler yields edits directly (e.g. INSERT or CustomDiffPatch).
|
|
44
|
+
* The coordinator should `yield*` the stream.
|
|
45
|
+
*/
|
|
46
|
+
class DirectEdits {
|
|
47
|
+
constructor(stream) {
|
|
48
|
+
this.stream = stream;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
ResponseParseResult.DirectEdits = DirectEdits;
|
|
52
|
+
})(ResponseParseResult || (exports.ResponseParseResult = ResponseParseResult = {}));
|
|
53
|
+
// ============================================================================
|
|
54
|
+
// Handler: EditWindowOnly
|
|
55
|
+
// ============================================================================
|
|
56
|
+
function handleEditWindowOnly(linesStream) {
|
|
57
|
+
return new ResponseParseResult.EditWindowLines(linesStream);
|
|
58
|
+
}
|
|
59
|
+
// ============================================================================
|
|
60
|
+
// Handler: CodeBlock
|
|
61
|
+
// ============================================================================
|
|
62
|
+
function handleCodeBlock(linesStream) {
|
|
63
|
+
return new ResponseParseResult.EditWindowLines((0, xtabUtils_1.linesWithBackticksRemoved)(linesStream));
|
|
64
|
+
}
|
|
65
|
+
// ============================================================================
|
|
66
|
+
// Handler: EditWindowWithEditIntent / EditWindowWithEditIntentShort
|
|
67
|
+
// ============================================================================
|
|
68
|
+
async function handleEditWindowWithEditIntent(linesStream, tracer, parseMode) {
|
|
69
|
+
const { editIntent, remainingLinesStream, parseError } = await (0, editIntent_1.parseEditIntentFromStream)(linesStream, tracer, parseMode);
|
|
70
|
+
return new ResponseParseResult.EditWindowLines(remainingLinesStream, { intent: editIntent, parseError });
|
|
71
|
+
}
|
|
72
|
+
async function handleUnifiedWithXml(linesStream, ctx, documentBeforeEdits, tracer) {
|
|
73
|
+
const linesIter = linesStream[Symbol.asyncIterator]();
|
|
74
|
+
const firstLine = await linesIter.next();
|
|
75
|
+
if (firstLine.done) {
|
|
76
|
+
return new ResponseParseResult.Done(new statelessNextEditProvider_1.NoNextEditReason.NoSuggestions(documentBeforeEdits, ctx.editWindow));
|
|
77
|
+
}
|
|
78
|
+
const trimmedFirstLine = firstLine.value.trim();
|
|
79
|
+
if (trimmedFirstLine === tags_1.ResponseTags.NO_CHANGE.start) {
|
|
80
|
+
return new ResponseParseResult.Done(new statelessNextEditProvider_1.NoNextEditReason.NoSuggestions(documentBeforeEdits, ctx.editWindow));
|
|
81
|
+
}
|
|
82
|
+
if (trimmedFirstLine === tags_1.ResponseTags.INSERT.start) {
|
|
83
|
+
return new ResponseParseResult.DirectEdits(generateInsertEdits(linesIter, ctx, documentBeforeEdits));
|
|
84
|
+
}
|
|
85
|
+
if (trimmedFirstLine === tags_1.ResponseTags.EDIT.start) {
|
|
86
|
+
const editLines = generateEditLines(linesIter);
|
|
87
|
+
return new ResponseParseResult.EditWindowLines(editLines);
|
|
88
|
+
}
|
|
89
|
+
return new ResponseParseResult.Done(new statelessNextEditProvider_1.NoNextEditReason.Unexpected(new Error(`unexpected tag ${trimmedFirstLine}`)));
|
|
90
|
+
}
|
|
91
|
+
// ============================================================================
|
|
92
|
+
// Internal generators for UnifiedWithXml sub-tags
|
|
93
|
+
// ============================================================================
|
|
94
|
+
async function* generateInsertEdits(linesIter, ctx, documentBeforeEdits) {
|
|
95
|
+
const { editWindowLines, editWindowLineRange, cursorOriginalLinesOffset, cursorColumnZeroBased, editWindow, originalEditWindow, targetDocument, isFromCursorJump } = ctx;
|
|
96
|
+
const lineWithCursorContinued = await linesIter.next();
|
|
97
|
+
if (lineWithCursorContinued.done || lineWithCursorContinued.value.includes(tags_1.ResponseTags.INSERT.end)) {
|
|
98
|
+
return new statelessNextEditProvider_1.NoNextEditReason.NoSuggestions(documentBeforeEdits, editWindow);
|
|
99
|
+
}
|
|
100
|
+
const cursorLineContent = editWindowLines[cursorOriginalLinesOffset];
|
|
101
|
+
const edit = new lineEdit_1.LineReplacement(new lineRange_1.LineRange(editWindowLineRange.start + cursorOriginalLinesOffset + 1 /* 0-based to 1-based */, editWindowLineRange.start + cursorOriginalLinesOffset + 2), [cursorLineContent.slice(0, cursorColumnZeroBased) + lineWithCursorContinued.value + cursorLineContent.slice(cursorColumnZeroBased)]);
|
|
102
|
+
yield { edit, isFromCursorJump, window: editWindow, originalWindow: originalEditWindow, targetDocument };
|
|
103
|
+
const lines = [];
|
|
104
|
+
let v = await linesIter.next();
|
|
105
|
+
while (!v.done) {
|
|
106
|
+
if (v.value.includes(tags_1.ResponseTags.INSERT.end)) {
|
|
107
|
+
break;
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
lines.push(v.value);
|
|
111
|
+
}
|
|
112
|
+
v = await linesIter.next();
|
|
113
|
+
}
|
|
114
|
+
const line = editWindowLineRange.start + cursorOriginalLinesOffset + 2;
|
|
115
|
+
yield {
|
|
116
|
+
edit: new lineEdit_1.LineReplacement(new lineRange_1.LineRange(line, line), lines),
|
|
117
|
+
isFromCursorJump,
|
|
118
|
+
window: editWindow,
|
|
119
|
+
originalWindow: originalEditWindow,
|
|
120
|
+
targetDocument,
|
|
121
|
+
};
|
|
122
|
+
return new statelessNextEditProvider_1.NoNextEditReason.NoSuggestions(documentBeforeEdits, editWindow);
|
|
123
|
+
}
|
|
124
|
+
async function* generateEditLines(linesIter) {
|
|
125
|
+
let v = await linesIter.next();
|
|
126
|
+
while (!v.done) {
|
|
127
|
+
if (v.value.includes(tags_1.ResponseTags.EDIT.end)) {
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
130
|
+
yield v.value;
|
|
131
|
+
v = await linesIter.next();
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
//# sourceMappingURL=responseFormatHandlers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"responseFormatHandlers.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/responseFormatHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ declare class Patch {
|
|
|
18
18
|
toString(): string;
|
|
19
19
|
}
|
|
20
20
|
export declare class XtabCustomDiffPatchResponseHandler {
|
|
21
|
-
static handleResponse(linesStream: AsyncIterable<string>, currentDocument: CurrentDocument, activeDocumentId: DocumentId, workspaceRoot: URI | undefined, window: OffsetRange | undefined, parentTracer: ILogger
|
|
21
|
+
static handleResponse(linesStream: AsyncIterable<string>, currentDocument: CurrentDocument, activeDocumentId: DocumentId, workspaceRoot: URI | undefined, window: OffsetRange | undefined, parentTracer: ILogger): AsyncGenerator<StreamedEdit, NoNextEditReason, void>;
|
|
22
22
|
private static resolveEdit;
|
|
23
23
|
private static resolveTargetDocument;
|
|
24
24
|
static extractEdits(linesStream: AsyncIterable<string>): AsyncGenerator<Patch>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xtabCustomDiffPatchResponseHandler.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,2DAA2D,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gEAAgE,CAAC;AAChH,OAAO,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAGlE,OAAO,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAGvD,OAAO,EAAE,WAAW,EAAE,MAAM,wDAAwD,CAAC;
|
|
1
|
+
{"version":3,"file":"xtabCustomDiffPatchResponseHandler.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,2DAA2D,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gEAAgE,CAAC;AAChH,OAAO,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAGlE,OAAO,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAGvD,OAAO,EAAE,WAAW,EAAE,MAAM,wDAAwD,CAAC;AAIrF,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhE,cAAM,KAAK;IAKT;;OAEG;aACa,QAAQ,EAAE,MAAM;aAChB,gBAAgB,EAAE,MAAM;IARlC,YAAY,EAAE,MAAM,EAAE,CAAM;IAC5B,UAAU,EAAE,MAAM,EAAE,CAAM;IAEjC,OAAO;WAQO,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI;IAShD,OAAO,CAAC,IAAI,EAAE,MAAM;IAab,QAAQ,IAAI,MAAM;CAOzB;AAGD,qBAAa,kCAAkC;WAEzB,cAAc,CAClC,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,EAClC,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,UAAU,EAC5B,aAAa,EAAE,GAAG,GAAG,SAAS,EAC9B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,YAAY,EAAE,OAAO,GACnB,cAAc,CAAC,YAAY,EAAE,gBAAgB,EAAE,IAAI,CAAC;IA8BvD,OAAO,CAAC,MAAM,CAAC,WAAW;IAI1B,OAAO,CAAC,MAAM,CAAC,qBAAqB;WAWf,YAAY,CAAC,WAAW,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC;CAyB5F"}
|
|
@@ -12,6 +12,7 @@ const path_1 = require("../../../util/vs/base/common/path");
|
|
|
12
12
|
const uri_1 = require("../../../util/vs/base/common/uri");
|
|
13
13
|
const lineEdit_1 = require("../../../util/vs/editor/common/core/edits/lineEdit");
|
|
14
14
|
const lineRange_1 = require("../../../util/vs/editor/common/core/ranges/lineRange");
|
|
15
|
+
const fetchStreamError_1 = require("../common/fetchStreamError");
|
|
15
16
|
const promptCraftingUtils_1 = require("../common/promptCraftingUtils");
|
|
16
17
|
const tags_1 = require("../common/tags");
|
|
17
18
|
class Patch {
|
|
@@ -56,15 +57,11 @@ class Patch {
|
|
|
56
57
|
}
|
|
57
58
|
}
|
|
58
59
|
class XtabCustomDiffPatchResponseHandler {
|
|
59
|
-
static async *handleResponse(linesStream, currentDocument, activeDocumentId, workspaceRoot, window, parentTracer
|
|
60
|
+
static async *handleResponse(linesStream, currentDocument, activeDocumentId, workspaceRoot, window, parentTracer) {
|
|
60
61
|
const tracer = parentTracer.createSubLogger(['XtabCustomDiffPatchResponseHandler', 'handleResponse']);
|
|
61
62
|
const activeDocRelativePath = (0, promptCraftingUtils_1.toUniquePath)(activeDocumentId, workspaceRoot?.path);
|
|
62
63
|
try {
|
|
63
64
|
for await (const edit of XtabCustomDiffPatchResponseHandler.extractEdits(linesStream)) {
|
|
64
|
-
const fetchFailure = getFetchFailure?.();
|
|
65
|
-
if (fetchFailure) {
|
|
66
|
-
return fetchFailure;
|
|
67
|
-
}
|
|
68
65
|
const targetDocument = edit.filePath === activeDocRelativePath
|
|
69
66
|
? activeDocumentId
|
|
70
67
|
: XtabCustomDiffPatchResponseHandler.resolveTargetDocument(edit.filePath, workspaceRoot);
|
|
@@ -81,6 +78,9 @@ class XtabCustomDiffPatchResponseHandler {
|
|
|
81
78
|
}
|
|
82
79
|
}
|
|
83
80
|
catch (e) {
|
|
81
|
+
if (e instanceof fetchStreamError_1.FetchStreamError) {
|
|
82
|
+
return e.reason;
|
|
83
|
+
}
|
|
84
84
|
const err = errors_1.ErrorUtils.fromUnknown(e);
|
|
85
85
|
return new statelessNextEditProvider_1.NoNextEditReason.Unexpected(err);
|
|
86
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xtabCustomDiffPatchResponseHandler.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,0FAAuF;AACvF,8GAAgH;AAEhH,wDAAyD;AACzD,4DAA+D;AAC/D,0DAAuD;AACvD,iFAAqF;AACrF,oFAAiF;AAEjF,uEAA6D;AAC7D,yCAA8C;AAI9C,MAAM,KAAK;IAIV;IACC;;OAEG;IACa,QAAgB,EAChB,gBAAwB;QADxB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,qBAAgB,GAAhB,gBAAgB,CAAQ;QARlC,iBAAY,GAAa,EAAE,CAAC;QAC5B,eAAU,GAAa,EAAE,CAAC;IAQ7B,CAAC;IAEE,MAAM,CAAC,MAAM,CAAC,IAAY;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACzC,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACb,CAAC;QACD,MAAM,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC;QACvC,OAAO,IAAI,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,CAAC,IAAY;QACnB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACpC,OAAO,IAAI,CAAC;QACb,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACjC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAClC,OAAO,IAAI,CAAC;QACb,CAAC;aAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IAEM,QAAQ;QACd,OAAO;YACN,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,gBAAgB,EAAE;YAC3C,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;SACpC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;CACD;AAGD,MAAa,kCAAkC;IAEvC,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAClC,WAAkC,EAClC,eAAgC,EAChC,gBAA4B,EAC5B,aAA8B,EAC9B,MAA+B,EAC/B,YAAqB
|
|
1
|
+
{"version":3,"file":"xtabCustomDiffPatchResponseHandler.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,16 @@ export declare class XtabProvider implements IStatelessNextEditProvider {
|
|
|
56
56
|
private getLanguageContext;
|
|
57
57
|
private streamEditsWithFiltering;
|
|
58
58
|
private streamEdits;
|
|
59
|
+
/**
|
|
60
|
+
* Initiates the HTTP fetch, sets up the streaming pipeline, and returns either
|
|
61
|
+
* a clean line stream (with cursor-tag removal and latency logging applied)
|
|
62
|
+
* or an error / retry signal.
|
|
63
|
+
*
|
|
64
|
+
* This method encapsulates all fetch infrastructure so that downstream response
|
|
65
|
+
* format handlers only need an `AsyncIterable<string>` line stream.
|
|
66
|
+
*/
|
|
67
|
+
private _performFetch;
|
|
68
|
+
private _streamEditsImpl;
|
|
59
69
|
private doGetNextEditsWithCursorJump;
|
|
60
70
|
private handleCrossFilePrediction;
|
|
61
71
|
private computeEditWindowLinesRange;
|
|
@@ -81,41 +91,4 @@ export declare function determineLanguageContextOptions(languageId: LanguageId,
|
|
|
81
91
|
traitPosition: 'before' | 'after';
|
|
82
92
|
}): LanguageContextOptions;
|
|
83
93
|
export declare function getPredictionContents(doc: StatelessNextEditDocument, editWindowLines: readonly string[], responseFormat: xtabPromptOptions.ResponseFormat): string;
|
|
84
|
-
export interface ParseEditIntentResult {
|
|
85
|
-
editIntent: xtabPromptOptions.EditIntent;
|
|
86
|
-
remainingLinesStream: AsyncIterable<string>;
|
|
87
|
-
parseError?: string;
|
|
88
|
-
}
|
|
89
|
-
/**
|
|
90
|
-
* Mode for parsing edit intent from the model response.
|
|
91
|
-
*/
|
|
92
|
-
export declare enum EditIntentParseMode {
|
|
93
|
-
/** Parse using XML-style tags: <|edit_intent|>value<|/edit_intent|> */
|
|
94
|
-
Tags = "tags",
|
|
95
|
-
/** Parse using short names on the first line: N|L|M|H */
|
|
96
|
-
ShortName = "shortName"
|
|
97
|
-
}
|
|
98
|
-
/**
|
|
99
|
-
* Parses the edit_intent from the first line of the response stream.
|
|
100
|
-
* The edit_intent MUST be on the first line, otherwise it's treated as not provided.
|
|
101
|
-
* Returns the parsed EditIntent and a new stream with the remaining content.
|
|
102
|
-
*
|
|
103
|
-
* Supports two modes:
|
|
104
|
-
* - Tags (default): <|edit_intent|>low|medium|high|no_edit<|/edit_intent|>
|
|
105
|
-
* - ShortName: N|L|M|H on the first line
|
|
106
|
-
*
|
|
107
|
-
* @param linesStream The stream of lines from the model response
|
|
108
|
-
* @param tracer Logger for tracing
|
|
109
|
-
* @param mode The parse mode (Tags or ShortName), defaults to Tags
|
|
110
|
-
*/
|
|
111
|
-
export declare function parseEditIntentFromStream(linesStream: AsyncIterable<string>, tracer: ILogger, mode?: EditIntentParseMode): Promise<ParseEditIntentResult>;
|
|
112
|
-
/**
|
|
113
|
-
* Finds the range of lines containing merge conflict markers within a specified edit window.
|
|
114
|
-
*
|
|
115
|
-
* @param lines - Array of strings representing the lines of text to search through
|
|
116
|
-
* @param editWindowRange - The range within which to search for merge conflict markers
|
|
117
|
-
* @param maxMergeConflictLines - Maximum number of lines to search for conflict markers
|
|
118
|
-
* @returns An OffsetRange object representing the start and end of the conflict markers, or undefined if not found
|
|
119
|
-
*/
|
|
120
|
-
export declare function findMergeConflictMarkersRange(lines: string[], editWindowRange: OffsetRange, maxMergeConflictLines: number): OffsetRange | undefined;
|
|
121
94
|
//# sourceMappingURL=xtabProvider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xtabProvider.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabProvider.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAsE,MAAM,2CAA2C,CAAC;AAC/I,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;AAK/E,OAAO,EAAE,UAAU,EAAE,MAAM,2DAA2D,CAAC;AACvF,OAAO,EAA4B,uCAAuC,EAAE,MAAM,yEAAyE,CAAC;AAC5J,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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"}
|