@vscode/chat-lib 0.2.1-32 → 0.2.1-34
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/inlineEdits/node/nextEditProviderTelemetry.d.ts.map +1 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProviderTelemetry.js +3 -1
- package/dist/src/_internal/extension/inlineEdits/node/nextEditProviderTelemetry.js.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.d.ts +16 -0
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.d.ts.map +1 -1
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.js +57 -2
- package/dist/src/_internal/extension/prompt/node/chatMLFetcher.js.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.d.ts +2 -2
- package/dist/src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.js +15 -13
- package/dist/src/_internal/extension/xtab/node/xtabCustomDiffPatchResponseHandler.js.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabNextCursorPredictor.d.ts +3 -1
- package/dist/src/_internal/extension/xtab/node/xtabNextCursorPredictor.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabNextCursorPredictor.js +4 -3
- package/dist/src/_internal/extension/xtab/node/xtabNextCursorPredictor.js.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.d.ts +5 -28
- package/dist/src/_internal/extension/xtab/node/xtabProvider.d.ts.map +1 -1
- package/dist/src/_internal/extension/xtab/node/xtabProvider.js +197 -192
- package/dist/src/_internal/extension/xtab/node/xtabProvider.js.map +1 -1
- package/dist/src/_internal/platform/configuration/common/configurationService.d.ts +14 -2
- package/dist/src/_internal/platform/configuration/common/configurationService.d.ts.map +1 -1
- package/dist/src/_internal/platform/configuration/common/configurationService.js +8 -4
- package/dist/src/_internal/platform/configuration/common/configurationService.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.js +4 -0
- package/dist/src/_internal/platform/endpoint/node/chatEndpoint.js.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/messagesApi.d.ts.map +1 -1
- package/dist/src/_internal/platform/endpoint/node/messagesApi.js +4 -2
- package/dist/src/_internal/platform/endpoint/node/messagesApi.js.map +1 -1
- package/dist/src/_internal/platform/git/common/gitService.d.ts +2 -1
- 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/inlineEdits/common/inlineEditLogContext.d.ts +4 -0
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditLogContext.d.ts.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditLogContext.js +3 -0
- package/dist/src/_internal/platform/inlineEdits/common/inlineEditLogContext.js.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.d.ts +8 -2
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.d.ts.map +1 -1
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.js +10 -0
- package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.js.map +1 -1
- package/dist/src/_internal/platform/networking/common/anthropic.d.ts +8 -8
- package/dist/src/_internal/platform/networking/common/anthropic.d.ts.map +1 -1
- package/dist/src/_internal/platform/networking/common/anthropic.js +33 -20
- package/dist/src/_internal/platform/networking/common/anthropic.js.map +1 -1
- package/dist/src/_internal/util/common/test/shims/chatTypes.d.ts +8 -4
- package/dist/src/_internal/util/common/test/shims/chatTypes.d.ts.map +1 -1
- package/dist/src/_internal/util/common/test/shims/chatTypes.js +13 -7
- package/dist/src/_internal/util/common/test/shims/chatTypes.js.map +1 -1
- package/dist/src/_internal/util/common/test/shims/vscodeTypesShim.js +3 -3
- package/dist/src/_internal/util/common/test/shims/vscodeTypesShim.js.map +1 -1
- package/dist/src/_internal/vscodeTypes.d.ts +1 -1
- package/dist/src/_internal/vscodeTypes.d.ts.map +1 -1
- package/dist/src/_internal/vscodeTypes.js +3 -3
- package/dist/src/_internal/vscodeTypes.js.map +1 -1
- package/dist/src/package.json +133 -20
- package/package.json +2 -2
|
@@ -26,7 +26,6 @@ const errors_1 = require("../../../util/common/errors");
|
|
|
26
26
|
const result_1 = require("../../../util/common/result");
|
|
27
27
|
const tokenizer_1 = require("../../../util/common/tokenizer");
|
|
28
28
|
const assert_1 = require("../../../util/vs/base/common/assert");
|
|
29
|
-
const cancellation_1 = require("../../../util/vs/base/common/cancellation");
|
|
30
29
|
const instantiation_1 = require("../../../util/vs/platform/instantiation/common/instantiation");
|
|
31
30
|
const lintErrors_1 = require("../common/lintErrors");
|
|
32
31
|
const promptCrafting_1 = require("../common/promptCrafting");
|
|
@@ -60,7 +59,7 @@ let XtabNextCursorPredictor = class XtabNextCursorPredictor {
|
|
|
60
59
|
(0, assert_1.assertNever)(originalNextCursorLinePrediction);
|
|
61
60
|
}
|
|
62
61
|
}
|
|
63
|
-
async predictNextCursorPosition(promptPieces, parentTracer) {
|
|
62
|
+
async predictNextCursorPosition(promptPieces, parentTracer, telemetryBuilder, cancellationToken) {
|
|
64
63
|
const tracer = parentTracer.sub('predictNextCursorPosition');
|
|
65
64
|
const systemMessage = `Your task is to predict the next line number in the current file where the developer is most likely to make their next edit, using the provided context. If you don't think anywhere is a good next line jump target, just output the current line number of the cursor. Make sure to just output the line number and nothing else (no explanation, reasoning, etc.).`;
|
|
66
65
|
const maxTokens = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.Advanced.InlineEditsNextCursorPredictionCurrentFileMaxTokens, this.expService);
|
|
@@ -95,6 +94,7 @@ let XtabNextCursorPredictor = class XtabNextCursorPredictor {
|
|
|
95
94
|
systemMsg: systemMessage,
|
|
96
95
|
userMsg: userMessage
|
|
97
96
|
});
|
|
97
|
+
telemetryBuilder?.setCursorJumpPrompt(messages);
|
|
98
98
|
const modelName = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsNextCursorPredictionModelName, this.expService);
|
|
99
99
|
if (modelName === undefined) {
|
|
100
100
|
tracer.trace('Model name for cursor prediction is not defined; skipping prediction');
|
|
@@ -138,7 +138,7 @@ let XtabNextCursorPredictor = class XtabNextCursorPredictor {
|
|
|
138
138
|
finishedCb: undefined,
|
|
139
139
|
location: commonTypes_1.ChatLocation.Other,
|
|
140
140
|
requestOptions,
|
|
141
|
-
},
|
|
141
|
+
}, cancellationToken);
|
|
142
142
|
if (response.type !== commonTypes_1.ChatFetchResponseType.Success) {
|
|
143
143
|
if (response.type === commonTypes_1.ChatFetchResponseType.NotFound) {
|
|
144
144
|
tracer.trace('Next cursor position prediction endpoint not found; disabling predictor for current session.');
|
|
@@ -147,6 +147,7 @@ let XtabNextCursorPredictor = class XtabNextCursorPredictor {
|
|
|
147
147
|
return result_1.Result.fromString(`fetchError:${response.type}`);
|
|
148
148
|
}
|
|
149
149
|
try {
|
|
150
|
+
telemetryBuilder?.setCursorJumpResponse(response.value);
|
|
150
151
|
const trimmed = response.value.trim();
|
|
151
152
|
const lineNumber = parseInt(trimmed, 10);
|
|
152
153
|
if (isNaN(lineNumber)) {
|
|
@@ -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;AAEnH,wGAAyG;
|
|
1
|
+
{"version":3,"file":"xtabNextCursorPredictor.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabNextCursorPredictor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,35 +1,18 @@
|
|
|
1
|
-
import { Raw } from '@vscode/prompt-tsx';
|
|
2
1
|
import { IConfigurationService } from '../../../platform/configuration/common/configurationService';
|
|
3
2
|
import { IDiffService } from '../../../platform/diff/common/diffService';
|
|
4
3
|
import { IIgnoreService } from '../../../platform/ignore/common/ignoreService';
|
|
5
|
-
import * as xtabPromptOptions from '../../../platform/inlineEdits/common/dataTypes/xtabPromptOptions';
|
|
6
4
|
import { InlineEditRequestLogContext } from '../../../platform/inlineEdits/common/inlineEditLogContext';
|
|
7
5
|
import { IInlineEditsModelService } from '../../../platform/inlineEdits/common/inlineEditsModelService';
|
|
8
|
-
import { IStatelessNextEditProvider,
|
|
6
|
+
import { IStatelessNextEditProvider, PushEdit, ShowNextEditPreference, StatelessNextEditRequest, StatelessNextEditResult } from '../../../platform/inlineEdits/common/statelessNextEditProvider';
|
|
9
7
|
import { ILanguageContextProviderService } from '../../../platform/languageContextProvider/common/languageContextProviderService';
|
|
10
8
|
import { ILanguageDiagnosticsService } from '../../../platform/languages/common/languageDiagnosticsService';
|
|
11
|
-
import { Prediction } from '../../../platform/networking/common/fetch';
|
|
12
|
-
import { IChatEndpoint } from '../../../platform/networking/common/networking';
|
|
13
9
|
import { ISimulationTestContext } from '../../../platform/simulationTestContext/common/simulationTestContext';
|
|
14
10
|
import { IExperimentationService } from '../../../platform/telemetry/common/nullExperimentationService';
|
|
15
11
|
import { IWorkspaceService } from '../../../platform/workspace/common/workspaceService';
|
|
16
|
-
import { Result } from '../../../util/common/result';
|
|
17
12
|
import { ITracer } from '../../../util/common/tracing';
|
|
18
13
|
import { CancellationToken } from '../../../util/vs/base/common/cancellation';
|
|
19
14
|
import { OffsetRange } from '../../../util/vs/editor/common/core/ranges/offsetRange';
|
|
20
15
|
import { IInstantiationService } from '../../../util/vs/platform/instantiation/common/instantiation';
|
|
21
|
-
import { DelaySession } from '../../inlineEdits/common/delay';
|
|
22
|
-
import { PromptPieces } from '../common/promptCrafting';
|
|
23
|
-
declare namespace RetryState {
|
|
24
|
-
class NotRetrying {
|
|
25
|
-
static INSTANCE: NotRetrying;
|
|
26
|
-
}
|
|
27
|
-
class Retrying {
|
|
28
|
-
readonly reason: 'cursorJump' | 'expandedWindow';
|
|
29
|
-
constructor(reason: 'cursorJump' | 'expandedWindow');
|
|
30
|
-
}
|
|
31
|
-
type t = NotRetrying | Retrying;
|
|
32
|
-
}
|
|
33
16
|
export declare class XtabProvider implements IStatelessNextEditProvider {
|
|
34
17
|
private readonly modelService;
|
|
35
18
|
private readonly simulationCtx;
|
|
@@ -52,19 +35,13 @@ export declare class XtabProvider implements IStatelessNextEditProvider {
|
|
|
52
35
|
handleAcceptance(): void;
|
|
53
36
|
handleRejection(): void;
|
|
54
37
|
provideNextEdit(request: StatelessNextEditRequest, pushEdit: PushEdit, tracer: ITracer, logContext: InlineEditRequestLogContext, cancellationToken: CancellationToken): Promise<StatelessNextEditResult>;
|
|
55
|
-
private filterEdit;
|
|
56
|
-
_provideNextEdit(request: StatelessNextEditRequest, pushEdit: PushEdit, tracer: ITracer, logContext: InlineEditRequestLogContext, cancellationToken: CancellationToken): Promise<StatelessNextEditResult>;
|
|
57
38
|
private doGetNextEdit;
|
|
58
39
|
private doGetNextEditWithSelection;
|
|
59
40
|
private getAndProcessLanguageContext;
|
|
60
41
|
private getLanguageContext;
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
shouldRemoveCursorTagFromResponse: boolean;
|
|
65
|
-
retryState: RetryState.t;
|
|
66
|
-
}, delaySession: DelaySession, parentTracer: ITracer, telemetryBuilder: StatelessNextEditTelemetryBuilder, logContext: InlineEditRequestLogContext, cancellationToken: CancellationToken): Promise<void | Result<void, NoNextEditReason>>;
|
|
67
|
-
private pushNoSuggestionsOrRetry;
|
|
42
|
+
private streamEditsWithFiltering;
|
|
43
|
+
private streamEdits;
|
|
44
|
+
private doGetNextEditsWithCursorJump;
|
|
68
45
|
private computeAreaAroundEditWindowLinesRange;
|
|
69
46
|
private computeEditWindowLinesRange;
|
|
70
47
|
private static mapChatFetcherErrorToNoNextEditReason;
|
|
@@ -77,6 +54,7 @@ export declare class XtabProvider implements IStatelessNextEditProvider {
|
|
|
77
54
|
private getPredictionContents;
|
|
78
55
|
private debounce;
|
|
79
56
|
private determineArtificialDelayMs;
|
|
57
|
+
private filterEdit;
|
|
80
58
|
}
|
|
81
59
|
/**
|
|
82
60
|
* Finds the range of lines containing merge conflict markers within a specified edit window.
|
|
@@ -87,5 +65,4 @@ export declare class XtabProvider implements IStatelessNextEditProvider {
|
|
|
87
65
|
* @returns An OffsetRange object representing the start and end of the conflict markers, or undefined if not found
|
|
88
66
|
*/
|
|
89
67
|
export declare function findMergeConflictMarkersRange(lines: string[], editWindowRange: OffsetRange, maxMergeConflictLines: number): OffsetRange | undefined;
|
|
90
|
-
export {};
|
|
91
68
|
//# 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":"
|
|
1
|
+
{"version":3,"file":"xtabProvider.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/xtab/node/xtabProvider.ts"],"names":[],"mappings":"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"}
|