@vscode/chat-lib 0.1.1-9 → 0.1.2-0

package/dist/src/_internal/extension/xtab/node/xtabProvider.js

@@ -49,15 +49,10 @@ var XtabProvider_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XtabProvider = void 0;
 exports.findMergeConflictMarkersRange = findMergeConflictMarkersRange;
-const copilot_api_1 = require("@vscode/copilot-api");
-const prompt_tsx_1 = require("@vscode/prompt-tsx");
-const rawTypes_1 = require("@vscode/prompt-tsx/dist/base/output/rawTypes");
 const chatMLFetcher_1 = require("../../../platform/chat/common/chatMLFetcher");
 const commonTypes_1 = require("../../../platform/chat/common/commonTypes");
-const globalStringUtils_1 = require("../../../platform/chat/common/globalStringUtils");
 const configurationService_1 = require("../../../platform/configuration/common/configurationService");
 const diffService_1 = require("../../../platform/diff/common/diffService");
-const chatEndpoint_1 = require("../../../platform/endpoint/node/chatEndpoint");
 const proxyXtabEndpoint_1 = require("../../../platform/endpoint/node/proxyXtabEndpoint");
 const ignoreService_1 = require("../../../platform/ignore/common/ignoreService");
 const nextCursorLinePrediction_1 = require("../../../platform/inlineEdits/common/dataTypes/nextCursorLinePrediction");
@@ -68,7 +63,6 @@ const statelessNextEditProviders_1 = require("../../../platform/inlineEdits/comm
 const languageContextProviderService_1 = require("../../../platform/languageContextProvider/common/languageContextProviderService");
 const languageDiagnosticsService_1 = require("../../../platform/languages/common/languageDiagnosticsService");
 const languageContextService_1 = require("../../../platform/languageServer/common/languageContextService");
-const logService_1 = require("../../../platform/log/common/logService");
 const simulationTestContext_1 = require("../../../platform/simulationTestContext/common/simulationTestContext");
 const nullExperimentationService_1 = require("../../../platform/telemetry/common/nullExperimentationService");
 const telemetry_1 = require("../../../platform/telemetry/common/telemetry");
@@ -76,14 +70,10 @@ const workspaceService_1 = require("../../../platform/workspace/common/workspace
 const async_1 = require("../../../util/common/async");
 const errors = __importStar(require("../../../util/common/errors"));
 const result_1 = require("../../../util/common/result");
-const tokenizer_1 = require("../../../util/common/tokenizer");
-const tracing_1 = require("../../../util/common/tracing");
 const assert_1 = require("../../../util/vs/base/common/assert");
 const async_2 = require("../../../util/vs/base/common/async");
-const cancellation_1 = require("../../../util/vs/base/common/cancellation");
 const stopwatch_1 = require("../../../util/vs/base/common/stopwatch");
 const lineEdit_1 = require("../../../util/vs/editor/common/core/edits/lineEdit");
-const stringEdit_1 = require("../../../util/vs/editor/common/core/edits/stringEdit");
 const position_1 = require("../../../util/vs/editor/common/core/position");
 const range_1 = require("../../../util/vs/editor/common/core/range");
 const lineRange_1 = require("../../../util/vs/editor/common/core/ranges/lineRange");
@@ -98,19 +88,19 @@ const systemMessages_1 = require("../common/systemMessages");
 const tags_1 = require("../common/tags");
 const xtabCurrentDocument_1 = require("../common/xtabCurrentDocument");
 const xtabEndpoint_1 = require("./xtabEndpoint");
+const xtabNextCursorPredictor_1 = require("./xtabNextCursorPredictor");
 const xtabUtils_1 = require("./xtabUtils");
 let XtabProvider = class XtabProvider {
     static { XtabProvider_1 = this; }
     static { this.ID = configurationService_1.XTabProviderId; }
     static { this.computeTokens = (s) => Math.floor(s.length / 4); }
-    constructor(simulationCtx, instaService, workspaceService, diffService, configService, expService, logService, langCtxService, langDiagService, ignoreService, telemetryService) {
+    constructor(simulationCtx, instaService, workspaceService, diffService, configService, expService, langCtxService, langDiagService, ignoreService, telemetryService) {
         this.simulationCtx = simulationCtx;
         this.instaService = instaService;
         this.workspaceService = workspaceService;
         this.diffService = diffService;
         this.configService = configService;
         this.expService = expService;
-        this.logService = logService;
         this.langCtxService = langCtxService;
         this.langDiagService = langDiagService;
         this.ignoreService = ignoreService;
@@ -120,7 +110,7 @@ let XtabProvider = class XtabProvider {
         this.showNextEditPreference = "always" /* ShowNextEditPreference.Always */;
         this.forceUseDefaultModel = false;
         this.delayer = new delayer_1.Delayer(this.configService, this.expService);
-        this.tracer = (0, tracing_1.createTracer)(['NES', 'XtabProvider'], (s) => this.logService.trace(s));
+        this.nextCursorPredictor = this.instaService.createInstance(xtabNextCursorPredictor_1.XtabNextCursorPredictor, XtabProvider_1.computeTokens);
     }
     handleAcceptance() {
         this.delayer.handleAcceptance();
@@ -128,7 +118,7 @@ let XtabProvider = class XtabProvider {
     handleRejection() {
         this.delayer.handleRejection();
     }
-    provideNextEdit(request, pushEdit, logContext, cancellationToken) {
+    provideNextEdit(request, pushEdit, tracer, logContext, cancellationToken) {
         const filteringPushEdit = (result) => {
             if (result.isError()) {
                 pushEdit(result);
@@ -141,7 +131,7 @@ let XtabProvider = class XtabProvider {
             }
             pushEdit(result);
         };
-        return this._provideNextEdit(request, filteringPushEdit, logContext, cancellationToken);
+        return this._provideNextEdit(request, filteringPushEdit, tracer, logContext, cancellationToken);
     }
     filterEdit(activeDoc, edits) {
         const filters = [
@@ -168,7 +158,7 @@ let XtabProvider = class XtabProvider {
         }
         return filters.reduce((acc, filter) => filter(acc), edits);
     }
-    async _provideNextEdit(request, pushEdit, logContext, cancellationToken) {
+    async _provideNextEdit(request, pushEdit, tracer, logContext, cancellationToken) {
         const telemetry = new statelessNextEditProvider_1.StatelessNextEditTelemetryBuilder(request);
         logContext.setProviderStartTime();
         try {
@@ -176,13 +166,10 @@ let XtabProvider = class XtabProvider {
                 return statelessNextEditProvider_1.StatelessNextEditResult.noEdit(new statelessNextEditProvider_1.NoNextEditReason.ActiveDocumentHasNoEdits(), telemetry);
             }
             const delaySession = this.delayer.createDelaySession(request.providerRequestStartDateTime);
-            const nextEditResult = await this.doGetNextEdit(request, pushEdit, delaySession, logContext, cancellationToken, telemetry, 0 /* RetryState.NotRetrying */);
+            const nextEditResult = await this.doGetNextEdit(request, pushEdit, delaySession, tracer, logContext, cancellationToken, telemetry, 0 /* RetryState.NotRetrying */);
             if (nextEditResult.isError() && nextEditResult.err instanceof statelessNextEditProvider_1.NoNextEditReason.GotCancelled) {
                 logContext.setIsSkipped();
             }
-            if (nextEditResult.isOk()) {
-                await this.enforceArtificialDelay(delaySession, telemetry);
-            }
             return new statelessNextEditProvider_1.StatelessNextEditResult(nextEditResult, telemetry.build(nextEditResult));
         }
         catch (err) {
@@ -192,11 +179,11 @@ let XtabProvider = class XtabProvider {
             logContext.setProviderEndTime();
         }
     }
-    async doGetNextEdit(request, pushEdit, delaySession, logContext, cancellationToken, telemetryBuilder, retryState) {
-        return this.doGetNextEditWithSelection(request, (0, nearbyCursorInlineEditProvider_1.getOrDeduceSelectionFromLastEdit)(request.getActiveDocument()), pushEdit, delaySession, { showLabel: false }, logContext, cancellationToken, telemetryBuilder, retryState);
+    async doGetNextEdit(request, pushEdit, delaySession, tracer, logContext, cancellationToken, telemetryBuilder, retryState) {
+        return this.doGetNextEditWithSelection(request, (0, nearbyCursorInlineEditProvider_1.getOrDeduceSelectionFromLastEdit)(request.getActiveDocument()), pushEdit, delaySession, tracer, logContext, cancellationToken, telemetryBuilder, retryState);
     }
-    async doGetNextEditWithSelection(request, selection, pushEdit, delaySession, opts, logContext, cancellationToken, telemetryBuilder, retryState) {
-        const tracer = this.tracer.sub('doGetNextEditWithSelection');
+    async doGetNextEditWithSelection(request, selection, pushEdit, delaySession, parentTracer, logContext, cancellationToken, telemetryBuilder, retryState) {
+        const tracer = parentTracer.sub(['XtabProvider', 'doGetNextEditWithSelection']);
         const activeDocument = request.getActiveDocument();
         if (selection === null) {
             return result_1.Result.error(new statelessNextEditProvider_1.NoNextEditReason.Uncategorized(new Error('NoSelection')));
@@ -219,7 +206,7 @@ let XtabProvider = class XtabProvider {
         }
         telemetryBuilder.setIsCursorAtLineEnd(isCursorAtEndOfLine);
         const areaAroundEditWindowLinesRange = this.computeAreaAroundEditWindowLinesRange(currentDocument);
-        const editWindowLinesRange = this.computeEditWindowLinesRange(currentDocument, request, retryState, telemetryBuilder);
+        const editWindowLinesRange = this.computeEditWindowLinesRange(currentDocument, request, retryState, tracer, telemetryBuilder);
         const cursorOriginalLinesOffset = Math.max(0, currentDocument.cursorLineOffset - editWindowLinesRange.start);
         const editWindowLastLineLength = currentDocument.transformer.getLineLength(editWindowLinesRange.endExclusive);
         const editWindow = currentDocument.transformer.getOffsetRange(new range_1.Range(editWindowLinesRange.start + 1, 1, editWindowLinesRange.endExclusive, editWindowLastLineLength + 1));
@@ -231,13 +218,13 @@ let XtabProvider = class XtabProvider {
         // Expected: editWindow.substring(activeDocument.documentAfterEdits.value) === editWindowLines.join('\n')
         const doesIncludeCursorTag = editWindowLines.some(line => line.includes(tags_1.PromptTags.CURSOR));
         const shouldRemoveCursorTagFromResponse = !doesIncludeCursorTag; // we'd like to remove the tag only if the original edit-window didn't include the tag
-        const taggedCurrentFileContentResult = this.constructTaggedFile(currentDocument, editWindowLinesRange, areaAroundEditWindowLinesRange, promptOptions, XtabProvider_1.computeTokens, { includeLineNumbers: { areaAroundCodeToEdit: false, currentFileContent: false } });
+        const taggedCurrentFileContentResult = (0, promptCrafting_1.constructTaggedFile)(currentDocument, editWindowLinesRange, areaAroundEditWindowLinesRange, promptOptions, XtabProvider_1.computeTokens, { includeLineNumbers: { areaAroundCodeToEdit: false, currentFileContent: false } });
         if (taggedCurrentFileContentResult.isError()) {
             return result_1.Result.error(new statelessNextEditProvider_1.NoNextEditReason.PromptTooLarge('currentFile'));
         }
         const { taggedCurrentDocLines, areaAroundCodeToEdit } = taggedCurrentFileContentResult.val;
         telemetryBuilder.setNLinesOfCurrentFileInPrompt(taggedCurrentDocLines.length);
-        const langCtx = await this.getAndProcessLanguageContext(request, delaySession, activeDocument, cursorPosition, promptOptions, logContext, cancellationToken);
+        const langCtx = await this.getAndProcessLanguageContext(request, delaySession, activeDocument, cursorPosition, promptOptions, tracer, logContext, cancellationToken);
         if (cancellationToken.isCancellationRequested) {
             return result_1.Result.error(new statelessNextEditProvider_1.NoNextEditReason.GotCancelled('afterLanguageContextAwait'));
         }
@@ -245,82 +232,37 @@ let XtabProvider = class XtabProvider {
         const userPrompt = (0, promptCrafting_1.getUserPrompt)(promptPieces);
         const responseFormat = xtabPromptOptions.ResponseFormat.fromPromptingStrategy(promptOptions.promptingStrategy);
         const prediction = this.getPredictedOutput(editWindowLines, responseFormat);
-        const messages = constructMessages({
+        const messages = (0, xtabUtils_1.constructMessages)({
             systemMsg: this.pickSystemPrompt(promptOptions.promptingStrategy),
             userMsg: userPrompt,
         });
         logContext.setPrompt(messages);
         telemetryBuilder.setPrompt(messages);
         const HARD_CHAR_LIMIT = 30000 * 4; // 30K tokens, assuming 4 chars per token -- we use approximation here because counting tokens exactly is time-consuming
-        const promptCharCount = charCount(messages);
+        const promptCharCount = (0, xtabUtils_1.charCount)(messages);
         if (promptCharCount > HARD_CHAR_LIMIT) {
             return result_1.Result.error(new statelessNextEditProvider_1.NoNextEditReason.PromptTooLarge('final'));
         }
-        await this.debounce(delaySession, telemetryBuilder);
+        await this.debounce(delaySession, tracer, telemetryBuilder);
         if (cancellationToken.isCancellationRequested) {
             return result_1.Result.error(new statelessNextEditProvider_1.NoNextEditReason.GotCancelled('afterDebounce'));
         }
         request.fetchIssued = true;
         const cursorLineOffset = cursorPosition.column;
         this.streamEdits(request, pushEdit, endpoint, messages, editWindow, editWindowLines, cursorOriginalLinesOffset, cursorLineOffset, editWindowLinesRange, promptPieces, prediction, {
-            showLabel: opts.showLabel,
             shouldRemoveCursorTagFromResponse,
             responseFormat,
             retryState,
         }, delaySession, tracer, telemetryBuilder, logContext, cancellationToken);
         return result_1.Result.ok(undefined);
     }
-    constructTaggedFile(currentDocument, editWindowLinesRange, areaAroundEditWindowLinesRange, promptOptions, computeTokens, opts) {
-        const contentWithCursorAsLinesOriginal = (() => {
-            const addCursorTagEdit = stringEdit_1.StringEdit.single(stringEdit_1.StringReplacement.insert(currentDocument.cursorOffset, tags_1.PromptTags.CURSOR));
-            const contentWithCursor = addCursorTagEdit.applyOnText(currentDocument.content);
-            return contentWithCursor.getLines();
-        })();
-        const addLineNumbers = (lines) => lines.map((line, idx) => `${idx}| ${line}`);
-        const contentWithCursorAsLines = opts.includeLineNumbers.areaAroundCodeToEdit
-            ? addLineNumbers(contentWithCursorAsLinesOriginal)
-            : contentWithCursorAsLinesOriginal;
-        const editWindowWithCursorAsLines = contentWithCursorAsLines.slice(editWindowLinesRange.start, editWindowLinesRange.endExclusive);
-        const areaAroundCodeToEdit = [
-            tags_1.PromptTags.AREA_AROUND.start,
-            ...contentWithCursorAsLines.slice(areaAroundEditWindowLinesRange.start, editWindowLinesRange.start),
-            tags_1.PromptTags.EDIT_WINDOW.start,
-            ...editWindowWithCursorAsLines,
-            tags_1.PromptTags.EDIT_WINDOW.end,
-            ...contentWithCursorAsLines.slice(editWindowLinesRange.endExclusive, areaAroundEditWindowLinesRange.endExclusive),
-            tags_1.PromptTags.AREA_AROUND.end
-        ].join('\n');
-        const currentFileContentWithCursorLines = opts.includeLineNumbers.currentFileContent
-            ? addLineNumbers(contentWithCursorAsLinesOriginal)
-            : contentWithCursorAsLinesOriginal;
-        const currentFileContentLines = opts.includeLineNumbers.currentFileContent
-            ? addLineNumbers(currentDocument.lines)
-            : currentDocument.lines;
-        let areaAroundCodeToEditForCurrentFile;
-        if (promptOptions.currentFile.includeTags && opts.includeLineNumbers.currentFileContent === opts.includeLineNumbers.areaAroundCodeToEdit) {
-            areaAroundCodeToEditForCurrentFile = areaAroundCodeToEdit;
-        }
-        else {
-            const editWindowLines = currentFileContentLines.slice(editWindowLinesRange.start, editWindowLinesRange.endExclusive);
-            areaAroundCodeToEditForCurrentFile = [
-                ...currentFileContentWithCursorLines.slice(areaAroundEditWindowLinesRange.start, editWindowLinesRange.start),
-                ...editWindowLines,
-                ...currentFileContentWithCursorLines.slice(editWindowLinesRange.endExclusive, areaAroundEditWindowLinesRange.endExclusive),
-            ].join('\n');
-        }
-        const taggedCurrentFileContentResult = (0, promptCrafting_1.createTaggedCurrentFileContentUsingPagedClipping)(currentFileContentLines, areaAroundCodeToEditForCurrentFile, areaAroundEditWindowLinesRange, computeTokens, promptOptions.pagedClipping.pageSize, promptOptions.currentFile);
-        return taggedCurrentFileContentResult.map(taggedCurrentDocLines => ({
-            taggedCurrentDocLines,
-            areaAroundCodeToEdit,
-        }));
-    }
-    getAndProcessLanguageContext(request, delaySession, activeDocument, cursorPosition, promptOptions, logContext, cancellationToken) {
+    getAndProcessLanguageContext(request, delaySession, activeDocument, cursorPosition, promptOptions, tracer, logContext, cancellationToken) {
         const recordingEnabled = this.configService.getConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsLogContextRecorderEnabled);
         const diagnosticsContextProviderEnabled = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.Advanced.DiagnosticsContextProvider, this.expService);
         if (!promptOptions.languageContext.enabled && !recordingEnabled && !diagnosticsContextProviderEnabled) {
             return Promise.resolve(undefined);
         }
-        const langCtxPromise = this.getLanguageContext(request, delaySession, activeDocument, cursorPosition, logContext, cancellationToken);
+        const langCtxPromise = this.getLanguageContext(request, delaySession, activeDocument, cursorPosition, tracer, logContext, cancellationToken);
         // if recording, add diagnostics for the file to the recording and hook up the language context promise to write to the recording
         if (recordingEnabled) {
             logContext.setFileDiagnostics(this.langDiagService.getAllDiagnostics());
@@ -334,13 +276,13 @@ let XtabProvider = class XtabProvider {
             ? langCtxPromise
             : Promise.resolve(undefined);
     }
-    async getLanguageContext(request, delaySession, activeDocument, cursorPosition, logContext, cancellationToken) {
+    async getLanguageContext(request, delaySession, activeDocument, cursorPosition, tracer, logContext, cancellationToken) {
         try {
             const textDoc = this.workspaceService.textDocuments.find(doc => doc.uri.toString() === activeDocument.id.uri);
             if (textDoc === undefined) {
                 return undefined;
             }
-            const providers = this.langCtxService.getContextProviders(textDoc);
+            const providers = this.langCtxService.getContextProviders(textDoc, languageContextProviderService_1.ProviderTarget.NES);
             if (providers.length < 1) {
                 return undefined;
             }
@@ -392,7 +334,7 @@ let XtabProvider = class XtabProvider {
         }
         catch (error) {
             logContext.setError(errors.fromUnknown(error));
-            this.tracer.trace(`Failed to fetch language context: ${error}`);
+            tracer.trace(`Failed to fetch language context: ${error}`);
             return undefined;
         }
     }
@@ -446,7 +388,7 @@ let XtabProvider = class XtabProvider {
                 !this.forceUseDefaultModel // if we haven't already forced using the default model; otherwise, this could cause an infinite loop
             ) {
                 this.forceUseDefaultModel = true;
-                return this.doGetNextEdit(request, pushEdit, delaySession, logContext, cancellationToken, telemetryBuilder, opts.retryState); // use the same retry state
+                return this.doGetNextEdit(request, pushEdit, delaySession, tracer, logContext, cancellationToken, telemetryBuilder, opts.retryState); // use the same retry state
             }
             pushEdit(result_1.Result.error(XtabProvider_1.mapChatFetcherErrorToNoNextEditReason(fetchRes)));
             return;
@@ -478,7 +420,6 @@ let XtabProvider = class XtabProvider {
             let i = 0;
             return llmLinesStream.map((v) => {
                 const trace = `Line ${i++} emitted with latency ${fetchRequestStopWatch.elapsed()} ms`;
-                logContext.addLog(trace);
                 tracer.trace(trace);
                 return opts.shouldRemoveCursorTagFromResponse
                     ? v.replaceAll(tags_1.PromptTags.CURSOR, '')
@@ -502,7 +443,7 @@ let XtabProvider = class XtabProvider {
             }
             const trimmedLines = firstLine.value.trim();
             if (trimmedLines === tags_1.ResponseTags.NO_CHANGE.start) {
-                await this.pushNoSuggestionsOrRetry(request, editWindow, promptPieces, pushEdit, delaySession, logContext, cancellationToken, telemetryBuilder, opts.retryState);
+                await this.pushNoSuggestionsOrRetry(request, editWindow, promptPieces, pushEdit, delaySession, tracer, logContext, cancellationToken, telemetryBuilder, opts.retryState);
                 return;
             }
             if (trimmedLines === tags_1.ResponseTags.INSERT.start) {
@@ -556,17 +497,17 @@ let XtabProvider = class XtabProvider {
             (0, assert_1.assertNever)(opts.responseFormat);
         }
         const diffOptions = {
-            emitFastCursorLineChange: opts.showLabel
-                ? false
-                : this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabProviderEmitFastCursorLineChange, this.expService),
+            emitFastCursorLineChange: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabProviderEmitFastCursorLineChange, this.expService),
             nLinesToConverge: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabNNonSignificantLinesToConverge, this.expService),
             nSignificantLinesToConverge: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabNSignificantLinesToConverge, this.expService),
         };
+        tracer.trace(`starting to diff stream against edit window lines with latency ${fetchRequestStopWatch.elapsed()} ms`);
         (async () => {
             let i = 0;
             let hasBeenDelayed = false;
             try {
                 for await (const edit of responseProcessor_1.ResponseProcessor.diff(editWindowLines, cleanedLinesStream, cursorOriginalLinesOffset, diffOptions)) {
+                    tracer.trace(`ResponseProcessor streamed edit #${i} with latency ${fetchRequestStopWatch.elapsed()} ms`);
                     const singleLineEdits = [];
                     if (edit.lineRange.startLineNumber === edit.lineRange.endLineNumberExclusive || // we don't want to run diff on insertion
                         edit.newLines.length === 0 || // we don't want to run diff on deletion
@@ -582,6 +523,7 @@ let XtabProvider = class XtabProvider {
                             maxComputationTimeMs: 0,
                             computeMoves: false
                         });
+                        tracer.trace(`Ran diff for #${i} with latency ${fetchRequestStopWatch.elapsed()} ms`);
                         const translateByNLines = editWindowLineRange.start + edit.lineRange.startLineNumber;
                         for (const change of diffResult.changes) {
                             const singleLineEdit = new lineEdit_1.LineReplacement(new lineRange_1.LineRange(translateByNLines + change.original.startLineNumber - 1, translateByNLines + change.original.endLineNumberExclusive - 1), edit.newLines.slice(change.modified.startLineNumber - 1, change.modified.endLineNumberExclusive - 1));
@@ -593,12 +535,20 @@ let XtabProvider = class XtabProvider {
                     }
                     logContext.setResponse(responseSoFar);
                     for (const singleLineEdit of singleLineEdits) {
-                        this.trace(`pushing edit #${i}:\n${singleLineEdit.toString()}`, logContext, tracer);
+                        tracer.trace(`pushing edit #${i}:\n${singleLineEdit.toString()}`);
                         if (!hasBeenDelayed) { // delay only the first one
                             hasBeenDelayed = true;
-                            await this.enforceArtificialDelay(delaySession, telemetryBuilder);
+                            const artificialDelay = this.determineArtificialDelayMs(delaySession, tracer, telemetryBuilder);
+                            if (artificialDelay) {
+                                await (0, async_2.timeout)(artificialDelay);
+                                tracer.trace(`Artificial delay of ${artificialDelay} ms completed`);
+                                if (cancellationToken.isCancellationRequested) {
+                                    pushEdit(result_1.Result.error(new statelessNextEditProvider_1.NoNextEditReason.GotCancelled('afterArtificialDelay')));
+                                    return;
+                                }
+                            }
                         }
-                        pushEdit(result_1.Result.ok({ edit: singleLineEdit, window: editWindow, showLabel: opts.showLabel }));
+                        pushEdit(result_1.Result.ok({ edit: singleLineEdit, window: editWindow }));
                         i++;
                     }
                 }
@@ -611,7 +561,7 @@ let XtabProvider = class XtabProvider {
                     pushEdit(result_1.Result.error(new statelessNextEditProvider_1.NoNextEditReason.NoSuggestions(request.documentBeforeEdits, editWindow)));
                 }
                 else {
-                    await this.pushNoSuggestionsOrRetry(request, editWindow, promptPieces, pushEdit, delaySession, logContext, cancellationToken, telemetryBuilder, opts.retryState);
+                    await this.pushNoSuggestionsOrRetry(request, editWindow, promptPieces, pushEdit, delaySession, tracer, logContext, cancellationToken, telemetryBuilder, opts.retryState);
                 }
             }
             catch (err) {
@@ -621,37 +571,35 @@ let XtabProvider = class XtabProvider {
             }
         })();
     }
-    async pushNoSuggestionsOrRetry(request, editWindow, promptPieces, pushEdit, delaySession, logContext, cancellationToken, telemetryBuilder, retryState) {
+    async pushNoSuggestionsOrRetry(request, editWindow, promptPieces, pushEdit, delaySession, tracer, logContext, cancellationToken, telemetryBuilder, retryState) {
         const allowRetryWithExpandedWindow = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabProviderRetryWithNMoreLinesBelow, this.expService);
         // if allowed to retry and not retrying already, flip the retry state and try again
         if (allowRetryWithExpandedWindow && retryState === 0 /* RetryState.NotRetrying */ && request.expandedEditWindowNLines === undefined) {
-            this.doGetNextEdit(request, pushEdit, delaySession, logContext, cancellationToken, telemetryBuilder, 1 /* RetryState.Retrying */);
+            this.doGetNextEdit(request, pushEdit, delaySession, tracer, logContext, cancellationToken, telemetryBuilder, 1 /* RetryState.Retrying */);
             return;
         }
-        let nextCursorLinePrediction = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsNextCursorPredictionEnabled, this.expService);
-        nextCursorLinePrediction = (nextCursorLinePrediction === true ? nextCursorLinePrediction_1.NextCursorLinePrediction.OnlyWithEdit :
-            (nextCursorLinePrediction === false ? undefined : nextCursorLinePrediction));
+        const nextCursorLinePrediction = this.nextCursorPredictor.determineEnablement();
         if (nextCursorLinePrediction !== undefined && retryState === 0 /* RetryState.NotRetrying */) {
-            const nextCursorLineR = await this.predictNextCursorPosition(promptPieces);
+            const nextCursorLineR = await this.nextCursorPredictor.predictNextCursorPosition(promptPieces, tracer);
             if (cancellationToken.isCancellationRequested) {
                 pushEdit(result_1.Result.error(new statelessNextEditProvider_1.NoNextEditReason.NoSuggestions(request.documentBeforeEdits, editWindow)));
                 return;
             }
             if (nextCursorLineR.isError()) {
-                this.tracer.trace(`Predicted next cursor line error: ${nextCursorLineR.err.message}`);
+                tracer.trace(`Predicted next cursor line error: ${nextCursorLineR.err.message}`);
                 telemetryBuilder.setNextCursorLineError(nextCursorLineR.err.message);
             }
             else {
                 const nextCursorLineZeroBased = nextCursorLineR.val;
                 const lineDistanceFromCursorLine = nextCursorLineZeroBased - promptPieces.currentDocument.cursorLineOffset;
                 telemetryBuilder.setNextCursorLineDistance(lineDistanceFromCursorLine);
-                this.tracer.trace(`Predicted next cursor line: ${nextCursorLineZeroBased}`);
+                tracer.trace(`Predicted next cursor line: ${nextCursorLineZeroBased}`);
                 if (nextCursorLineZeroBased >= promptPieces.currentDocument.lines.length) { // >= because the line index is zero-based
-                    this.tracer.trace(`Predicted next cursor line error: exceedsDocumentLines`);
+                    tracer.trace(`Predicted next cursor line error: exceedsDocumentLines`);
                     telemetryBuilder.setNextCursorLineError('exceedsDocumentLines');
                 }
                 else if (promptPieces.editWindowLinesRange.contains(nextCursorLineZeroBased)) {
-                    this.tracer.trace(`Predicted next cursor line error: withinEditWindow`);
+                    tracer.trace(`Predicted next cursor line error: withinEditWindow`);
                     telemetryBuilder.setNextCursorLineError('withinEditWindow');
                 }
                 else {
@@ -666,7 +614,7 @@ let XtabProvider = class XtabProvider {
                         }
                         case nextCursorLinePrediction_1.NextCursorLinePrediction.OnlyWithEdit:
                         case nextCursorLinePrediction_1.NextCursorLinePrediction.LabelOnlyWithEdit: {
-                            this.doGetNextEditWithSelection(request, new range_1.Range(nextCursorLineOneBased, nextCursorColumn, nextCursorLineOneBased, nextCursorColumn), pushEdit, delaySession, { showLabel: nextCursorLinePrediction === nextCursorLinePrediction_1.NextCursorLinePrediction.LabelOnlyWithEdit }, logContext, cancellationToken, telemetryBuilder, 1 /* RetryState.Retrying */);
+                            this.doGetNextEditWithSelection(request, new range_1.Range(nextCursorLineOneBased, nextCursorColumn, nextCursorLineOneBased, nextCursorColumn), pushEdit, delaySession, tracer, logContext, cancellationToken, telemetryBuilder, 1 /* RetryState.Retrying */);
                             return;
                         }
                         default: {
@@ -685,7 +633,7 @@ let XtabProvider = class XtabProvider {
         const areaAroundEndExcl = Math.min(currentDocument.lines.length, cursorLine + promptCrafting_1.N_LINES_AS_CONTEXT + 1);
         return new offsetRange_1.OffsetRange(areaAroundStart, areaAroundEndExcl);
     }
-    computeEditWindowLinesRange(currentDocument, request, retryState, telemetry) {
+    computeEditWindowLinesRange(currentDocument, request, retryState, tracer, telemetry) {
         const currentDocLines = currentDocument.lines;
         const cursorLineOffset = currentDocument.cursorLineOffset;
         let nLinesAbove;
@@ -711,17 +659,17 @@ let XtabProvider = class XtabProvider {
         }
         let nLinesBelow;
         if (request.expandedEditWindowNLines !== undefined) {
-            this.tracer.trace(`Using expanded nLinesBelow: ${request.expandedEditWindowNLines}`);
+            tracer.trace(`Using expanded nLinesBelow: ${request.expandedEditWindowNLines}`);
             nLinesBelow = request.expandedEditWindowNLines;
         }
         else {
             const overriddenNLinesBelow = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabProviderNLinesBelow, this.expService);
             if (overriddenNLinesBelow !== undefined) {
-                this.tracer.trace(`Using overridden nLinesBelow: ${overriddenNLinesBelow}`);
+                tracer.trace(`Using overridden nLinesBelow: ${overriddenNLinesBelow}`);
                 nLinesBelow = overriddenNLinesBelow;
             }
             else {
-                this.tracer.trace(`Using default nLinesBelow: ${promptCrafting_1.N_LINES_BELOW}`);
+                tracer.trace(`Using default nLinesBelow: ${promptCrafting_1.N_LINES_BELOW}`);
                 nLinesBelow = promptCrafting_1.N_LINES_BELOW; // default
             }
         }
@@ -738,12 +686,12 @@ let XtabProvider = class XtabProvider {
                 const onlyMergeConflictLines = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabOnlyMergeConflictLines, this.expService);
                 telemetry.setMergeConflictExpanded(onlyMergeConflictLines ? 'only' : 'normal');
                 if (onlyMergeConflictLines) {
-                    this.tracer.trace(`Expanding edit window to include ONLY merge conflict markers: ${mergeConflictRange.toString()}`);
+                    tracer.trace(`Expanding edit window to include ONLY merge conflict markers: ${mergeConflictRange.toString()}`);
                     codeToEditStart = mergeConflictRange.start;
                     codeToEditEndExcl = mergeConflictRange.endExclusive;
                 }
                 else {
-                    this.tracer.trace(`Expanding edit window to include merge conflict markers: ${mergeConflictRange.toString()}; edit window range [${codeToEditStart}, ${codeToEditEndExcl})`);
+                    tracer.trace(`Expanding edit window to include merge conflict markers: ${mergeConflictRange.toString()}; edit window range [${codeToEditStart}, ${codeToEditEndExcl})`);
                     codeToEditEndExcl = Math.max(codeToEditEndExcl, mergeConflictRange.endExclusive);
                 }
             }
@@ -860,90 +808,6 @@ let XtabProvider = class XtabProvider {
             },
         };
     }
-    async predictNextCursorPosition(promptPieces) {
-        const tracer = this.tracer.sub('predictNextCursorPosition');
-        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.).`;
-        const maxTokens = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.Advanced.InlineEditsNextCursorPredictionCurrentFileMaxTokens, this.expService);
-        const currentFileContentR = this.constructTaggedFile(promptPieces.currentDocument, promptPieces.editWindowLinesRange, promptPieces.areaAroundEditWindowLinesRange, {
-            ...promptPieces.opts,
-            currentFile: {
-                ...promptPieces.opts.currentFile,
-                maxTokens,
-                includeTags: false,
-            }
-        }, XtabProvider_1.computeTokens, { includeLineNumbers: { areaAroundCodeToEdit: false, currentFileContent: true } });
-        if (currentFileContentR.isError()) {
-            tracer.trace(`Failed to construct tagged file: ${currentFileContentR.err}`);
-            return result_1.Result.fromString(currentFileContentR.err);
-        }
-        const { taggedCurrentDocLines, areaAroundCodeToEdit } = currentFileContentR.val;
-        const newPromptPieces = new promptCrafting_1.PromptPieces(promptPieces.currentDocument, promptPieces.editWindowLinesRange, promptPieces.areaAroundEditWindowLinesRange, promptPieces.activeDoc, promptPieces.xtabHistory, taggedCurrentDocLines, areaAroundCodeToEdit, promptPieces.langCtx, XtabProvider_1.computeTokens, {
-            ...promptPieces.opts,
-            includePostScript: false,
-        });
-        const userMessage = (0, promptCrafting_1.getUserPrompt)(newPromptPieces);
-        const messages = constructMessages({
-            systemMsg: systemMessage,
-            userMsg: userMessage
-        });
-        const modelName = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsNextCursorPredictionModelName, this.expService);
-        if (modelName === undefined) {
-            tracer.trace('Model name for cursor prediction is not defined; skipping prediction');
-            return result_1.Result.fromString('modelNameNotDefined');
-        }
-        const url = this.configService.getConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsNextCursorPredictionUrl);
-        const secretKey = this.configService.getConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsNextCursorPredictionApiKey);
-        const endpoint = this.instaService.createInstance(chatEndpoint_1.ChatEndpoint, {
-            id: modelName,
-            name: 'nes.nextCursorPosition',
-            urlOrRequestMetadata: url ? url : { type: copilot_api_1.RequestType.ProxyChatCompletions },
-            model_picker_enabled: false,
-            is_chat_default: false,
-            is_chat_fallback: false,
-            version: '',
-            capabilities: {
-                type: 'chat',
-                family: '',
-                tokenizer: tokenizer_1.TokenizerType.CL100K,
-                limits: undefined,
-                supports: {
-                    parallel_tool_calls: false,
-                    tool_calls: false,
-                    streaming: true,
-                    vision: false,
-                    prediction: false,
-                    thinking: false
-                }
-            },
-        });
-        const response = await endpoint.makeChatRequest2({
-            messages,
-            debugName: 'nes.nextCursorPosition',
-            finishedCb: undefined,
-            location: commonTypes_1.ChatLocation.Other,
-            requestOptions: secretKey ? {
-                secretKey,
-            } : undefined,
-        }, cancellation_1.CancellationToken.None);
-        if (response.type !== commonTypes_1.ChatFetchResponseType.Success) {
-            return result_1.Result.fromString(`fetchError:${response.type}`);
-        }
-        try {
-            const trimmed = response.value.trim();
-            const lineNumber = parseInt(trimmed, 10);
-            if (isNaN(lineNumber)) {
-                return result_1.Result.fromString(`gotNaN`);
-            }
-            if (lineNumber < 0) {
-                return result_1.Result.fromString(`negativeLineNumber`);
-            }
-            return result_1.Result.ok(lineNumber);
-        }
-        catch (err) {
-            tracer.trace(`Failed to parse predicted line number from response '${response.value}': ${err}`);
-            return result_1.Result.fromString(`failedToParseLine:"${response.value}". Error ${errors.fromUnknown(err).message}`);
-        }
-    }
     pickSystemPrompt(promptingStrategy) {
         switch (promptingStrategy) {
             case xtabPromptOptions.PromptingStrategy.UnifiedModel:
@@ -997,29 +861,26 @@ let XtabProvider = class XtabProvider {
             (0, assert_1.assertNever)(responseFormat);
         }
     }
-    async debounce(delaySession, telemetry) {
+    async debounce(delaySession, tracer, telemetry) {
         if (this.simulationCtx.isInSimulationTests) {
             return;
         }
         const debounceTime = delaySession.getDebounceTime();
-        this.tracer.trace(`Debouncing for ${debounceTime} ms`);
+        tracer.trace(`Debouncing for ${debounceTime} ms`);
         telemetry.setDebounceTime(debounceTime);
         await (0, async_2.timeout)(debounceTime);
     }
-    async enforceArtificialDelay(delaySession, telemetry) {
+    determineArtificialDelayMs(delaySession, tracer, telemetry) {
         if (this.simulationCtx.isInSimulationTests) {
             return;
         }
         const artificialDelay = delaySession.getArtificialDelay();
-        this.tracer.trace(`Enforcing artificial delay of ${artificialDelay} ms`);
-        telemetry.setArtificialDelay(artificialDelay);
-        if (artificialDelay > 0) {
-            await (0, async_2.timeout)(artificialDelay);
+        if (artificialDelay <= 0) {
+            return undefined;
         }
-    }
-    trace(msg, logContext, tracer) {
-        tracer.trace(msg);
-        logContext.addLog(msg);
+        tracer.trace(`Enforcing artificial delay of ${artificialDelay} ms`);
+        telemetry.setArtificialDelay(artificialDelay);
+        return artificialDelay;
     }
 };
 exports.XtabProvider = XtabProvider;
@@ -1030,11 +891,10 @@ exports.XtabProvider = XtabProvider = XtabProvider_1 = __decorate([
     __param(3, diffService_1.IDiffService),
     __param(4, configurationService_1.IConfigurationService),
     __param(5, nullExperimentationService_1.IExperimentationService),
-    __param(6, logService_1.ILogService),
-    __param(7, languageContextProviderService_1.ILanguageContextProviderService),
-    __param(8, languageDiagnosticsService_1.ILanguageDiagnosticsService),
-    __param(9, ignoreService_1.IIgnoreService),
-    __param(10, telemetry_1.ITelemetryService)
+    __param(6, languageContextProviderService_1.ILanguageContextProviderService),
+    __param(7, languageDiagnosticsService_1.ILanguageDiagnosticsService),
+    __param(8, ignoreService_1.IIgnoreService),
+    __param(9, telemetry_1.ITelemetryService)
 ], XtabProvider);
 /**
  * Finds the range of lines containing merge conflict markers within a specified edit window.
@@ -1058,20 +918,4 @@ function findMergeConflictMarkersRange(lines, editWindowRange, maxMergeConflictL
     }
     return undefined;
 }
-function constructMessages({ systemMsg, userMsg }) {
-    return [
-        {
-            role: prompt_tsx_1.Raw.ChatRole.System,
-            content: (0, globalStringUtils_1.toTextParts)(systemMsg)
-        },
-        {
-            role: prompt_tsx_1.Raw.ChatRole.User,
-            content: (0, globalStringUtils_1.toTextParts)(userMsg)
-        }
-    ];
-}
-function charCount(messages) {
-    const promptCharCount = messages.reduce((total, msg) => total + msg.content.reduce((subtotal, part) => subtotal + (part.type === rawTypes_1.ChatCompletionContentPartKind.Text ? part.text.length : 0), 0), 0);
-    return promptCharCount;
-}
 //# sourceMappingURL=xtabProvider.js.map