@vscode/chat-lib 0.3.1-2 → 0.3.1-21

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

@@ -47,7 +47,14 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 var XtabProvider_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.XtabProvider = void 0;
+exports.EditIntentParseMode = exports.XtabProvider = void 0;
+exports.computeAreaAroundEditWindowLinesRange = computeAreaAroundEditWindowLinesRange;
+exports.mapChatFetcherErrorToNoNextEditReason = mapChatFetcherErrorToNoNextEditReason;
+exports.overrideModelConfig = overrideModelConfig;
+exports.pickSystemPrompt = pickSystemPrompt;
+exports.determineLanguageContextOptions = determineLanguageContextOptions;
+exports.getPredictionContents = getPredictionContents;
+exports.parseEditIntentFromStream = parseEditIntentFromStream;
 exports.findMergeConflictMarkersRange = findMergeConflictMarkersRange;
 const chatMLFetcher_1 = require("../../../platform/chat/common/chatMLFetcher");
 const commonTypes_1 = require("../../../platform/chat/common/commonTypes");
@@ -69,6 +76,7 @@ const simulationTestContext_1 = require("../../../platform/simulationTestContext
 const nullExperimentationService_1 = require("../../../platform/telemetry/common/nullExperimentationService");
 const workspaceService_1 = require("../../../platform/workspace/common/workspaceService");
 const async_1 = require("../../../util/common/async");
+const asyncIterableUtils_1 = require("../../../util/common/asyncIterableUtils");
 const errors = __importStar(require("../../../util/common/errors"));
 const result_1 = require("../../../util/common/result");
 const assert_1 = require("../../../util/vs/base/common/assert");
@@ -84,10 +92,12 @@ const vscodeTypesShim_1 = require("../../../util/common/test/shims/vscodeTypesSh
 const nearbyCursorInlineEditProvider_1 = require("../../inlineEdits/common/nearbyCursorInlineEditProvider");
 const userInteractionMonitor_1 = require("../../inlineEdits/common/userInteractionMonitor");
 const importFiltering_1 = require("../../inlineEdits/node/importFiltering");
+const inlineSuggestion_1 = require("../common/inlineSuggestion");
 const lintErrors_1 = require("../common/lintErrors");
 const promptCrafting_1 = require("../common/promptCrafting");
 const systemMessages_1 = require("../common/systemMessages");
 const tags_1 = require("../common/tags");
+const terminalOutput_1 = require("../common/terminalOutput");
 const xtabCurrentDocument_1 = require("../common/xtabCurrentDocument");
 const xtabCustomDiffPatchResponseHandler_1 = require("./xtabCustomDiffPatchResponseHandler");
 const xtabEndpoint_1 = require("./xtabEndpoint");
@@ -124,7 +134,8 @@ let XtabProvider = class XtabProvider {
         this.ID = XtabProvider_1.ID;
         this.showNextEditPreference = "always" /* ShowNextEditPreference.Always */;
         this.forceUseDefaultModel = false;
-        this.userInteractionMonitor = new userInteractionMonitor_1.UserInteractionMonitor(this.configService, this.expService);
+        this.userInteractionMonitor = this.instaService.createInstance(userInteractionMonitor_1.UserInteractionMonitor);
+        this.terminalMonitor = this.instaService.createInstance(terminalOutput_1.TerminalMonitor);
         this.nextCursorPredictor = this.instaService.createInstance(xtabNextCursorPredictor_1.XtabNextCursorPredictor, XtabProvider_1.computeTokens);
     }
     handleAcceptance() {
@@ -133,56 +144,50 @@ let XtabProvider = class XtabProvider {
     handleRejection() {
         this.userInteractionMonitor.handleRejection();
     }
-    async provideNextEdit(request, pushEdit, tracer, logContext, cancellationToken) {
-        const telemetry = new statelessNextEditProvider_1.StatelessNextEditTelemetryBuilder(request);
+    handleIgnored() {
+        this.userInteractionMonitor.handleIgnored();
+    }
+    async *provideNextEdit(request, logger, logContext, cancellationToken) {
+        const telemetry = new statelessNextEditProvider_1.StatelessNextEditTelemetryBuilder(request.headerRequestId);
         logContext.setProviderStartTime();
         try {
             if (request.xtabEditHistory.length === 0) {
-                return statelessNextEditProvider_1.StatelessNextEditResult.noEdit(new statelessNextEditProvider_1.NoNextEditReason.ActiveDocumentHasNoEdits(), telemetry);
+                const noSuggestionReason = new statelessNextEditProvider_1.NoNextEditReason.ActiveDocumentHasNoEdits();
+                return new statelessNextEditProvider_1.WithStatelessProviderTelemetry(noSuggestionReason, telemetry.build(result_1.Result.error(noSuggestionReason)));
             }
             const delaySession = this.userInteractionMonitor.createDelaySession(request.providerRequestStartDateTime);
-            const iterator = this.doGetNextEdit(request, delaySession, tracer, logContext, cancellationToken, telemetry, RetryState.NotRetrying.INSTANCE);
+            const iterator = this.doGetNextEdit(request, delaySession, logger, logContext, cancellationToken, telemetry, RetryState.NotRetrying.INSTANCE);
             let res = await iterator.next(); // for-async-await loop doesn't work because we need to access the final return value
-            let nextEditResult;
-            if (res.done) {
-                // stream already ended, so we can just return the final reason
-                nextEditResult = result_1.Result.error(res.value);
-                pushEdit(nextEditResult);
+            while (!res.done) {
+                yield new statelessNextEditProvider_1.WithStatelessProviderTelemetry(res.value, telemetry.build(result_1.Result.ok(undefined)));
+                res = await iterator.next();
             }
-            else {
-                // stream is not done yet, so we push the first edit and then continue streaming in the background
-                nextEditResult = result_1.Result.ok(undefined);
-                (async () => {
-                    let nEdits = 0;
-                    while (!res.done) {
-                        nEdits++;
-                        pushEdit(result_1.Result.ok(res.value));
-                        res = await iterator.next();
-                    }
-                    pushEdit(result_1.Result.error(res.value));
-                })().catch((err) => {
-                    const error = errors.fromUnknown(err);
-                    logContext.addLog(`Error while streaming further edits: ${errors.fromUnknown(err)}`);
-                    pushEdit(result_1.Result.error(new statelessNextEditProvider_1.NoNextEditReason.Unexpected(error)));
-                });
-            }
-            if (nextEditResult.isError() && nextEditResult.err instanceof statelessNextEditProvider_1.NoNextEditReason.GotCancelled) {
+            const noNextEditReason = res.value;
+            if (noNextEditReason instanceof statelessNextEditProvider_1.NoNextEditReason.GotCancelled) {
                 logContext.setIsSkipped();
             }
-            return new statelessNextEditProvider_1.StatelessNextEditResult(nextEditResult, telemetry.build(nextEditResult));
+            return new statelessNextEditProvider_1.WithStatelessProviderTelemetry(noNextEditReason, telemetry.build(result_1.Result.error(noNextEditReason)));
         }
         catch (err) {
-            return statelessNextEditProvider_1.StatelessNextEditResult.noEdit(new statelessNextEditProvider_1.NoNextEditReason.Unexpected(errors.fromUnknown(err)), telemetry);
+            const error = errors.fromUnknown(err);
+            const noSuggestionReason = new statelessNextEditProvider_1.NoNextEditReason.Unexpected(error);
+            return new statelessNextEditProvider_1.WithStatelessProviderTelemetry(noSuggestionReason, telemetry.build(result_1.Result.error(noSuggestionReason)));
         }
         finally {
             logContext.setProviderEndTime();
         }
     }
-    doGetNextEdit(request, delaySession, tracer, logContext, cancellationToken, telemetryBuilder, retryState) {
-        return this.doGetNextEditWithSelection(request, (0, nearbyCursorInlineEditProvider_1.getOrDeduceSelectionFromLastEdit)(request.getActiveDocument()), delaySession, tracer, logContext, cancellationToken, telemetryBuilder, retryState);
+    doGetNextEdit(request, delaySession, logger, logContext, cancellationToken, telemetryBuilder, retryState) {
+        return this.doGetNextEditWithSelection(request, (0, nearbyCursorInlineEditProvider_1.getOrDeduceSelectionFromLastEdit)(request.getActiveDocument()), delaySession, logger, logContext, cancellationToken, telemetryBuilder, retryState);
     }
-    async *doGetNextEditWithSelection(request, selection, delaySession, parentTracer, logContext, cancellationToken, telemetryBuilder, retryState) {
-        const tracer = parentTracer.sub(['XtabProvider', 'doGetNextEditWithSelection']);
+    async *doGetNextEditWithSelection(request, selection, delaySession, parentTracer, logContext, cancellationToken, telemetryBuilder, retryState, 
+    /**
+     * For cursor jump scenarios, this is the edit window around the original cursor position
+     * (before the jump). When provided, yielded edits will include this as `originalWindow`
+     * so the cache can serve the edit when the cursor is in either location.
+     */
+    originalEditWindow) {
+        const tracer = parentTracer.createSubLogger(['XtabProvider', 'doGetNextEditWithSelection']);
         const activeDocument = request.getActiveDocument();
         if (selection === null) {
             return new statelessNextEditProvider_1.NoNextEditReason.Uncategorized(new Error('NoSelection'));
@@ -196,15 +201,23 @@ let XtabProvider = class XtabProvider {
         const cursorLine = currentDocument.lines[currentDocument.cursorLineOffset];
         // check if there's any non-whitespace character after the cursor in the line
         const isCursorAtEndOfLine = cursorLine.substring(cursorPosition.column - 1).match(/^\s*$/) !== null;
-        if (isCursorAtEndOfLine) {
+        telemetryBuilder.setIsCursorAtLineEnd(isCursorAtEndOfLine);
+        // Apply extra debounce based on cursor position - only one applies
+        const isInlineSuggestionPosition = (0, inlineSuggestion_1.isInlineSuggestion)(currentDocument, cursorPosition);
+        telemetryBuilder.setIsInlineSuggestion(!!isInlineSuggestionPosition);
+        const inlineSuggestionDebounce = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsExtraDebounceInlineSuggestion, this.expService);
+        if (isInlineSuggestionPosition && inlineSuggestionDebounce > 0) {
+            tracer.trace('Debouncing for inline suggestion position');
+            delaySession.setExtraDebounce(inlineSuggestionDebounce);
+        }
+        else if (isCursorAtEndOfLine) {
             tracer.trace('Debouncing for cursor at end of line');
             delaySession.setExtraDebounce(this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsExtraDebounceEndOfLine, this.expService));
         }
         else {
-            tracer.trace('Debouncing for cursor NOT at end of line');
+            tracer.trace('No extra debounce applied');
         }
-        telemetryBuilder.setIsCursorAtLineEnd(isCursorAtEndOfLine);
-        const areaAroundEditWindowLinesRange = this.computeAreaAroundEditWindowLinesRange(currentDocument);
+        const areaAroundEditWindowLinesRange = computeAreaAroundEditWindowLinesRange(currentDocument);
         const editWindowLinesRange = this.computeEditWindowLinesRange(currentDocument, request, tracer, telemetryBuilder);
         const cursorOriginalLinesOffset = Math.max(0, currentDocument.cursorLineOffset - editWindowLinesRange.start);
         const editWindowLastLineLength = currentDocument.transformer.getLineLength(editWindowLinesRange.endExclusive);
@@ -219,8 +232,8 @@ let XtabProvider = class XtabProvider {
         const shouldRemoveCursorTagFromResponse = !doesIncludeCursorTag; // we'd like to remove the tag only if the original edit-window didn't include the tag
         const taggedCurrentFileContentResult = (0, promptCrafting_1.constructTaggedFile)(currentDocument, editWindowLinesRange, areaAroundEditWindowLinesRange, promptOptions, XtabProvider_1.computeTokens, {
             includeLineNumbers: {
-                areaAroundCodeToEdit: false,
-                currentFileContent: promptOptions.promptingStrategy === xtabPromptOptions_1.PromptingStrategy.XtabAggressiveness || promptOptions.promptingStrategy === xtabPromptOptions_1.PromptingStrategy.PatchBased,
+                areaAroundCodeToEdit: xtabPromptOptions.IncludeLineNumbersOption.None,
+                currentFileContent: promptOptions.currentFile.includeLineNumbers,
             }
         });
         if (taggedCurrentFileContentResult.isError()) {
@@ -229,8 +242,8 @@ let XtabProvider = class XtabProvider {
         const { clippedTaggedCurrentDoc, areaAroundCodeToEdit } = taggedCurrentFileContentResult.val;
         telemetryBuilder.setNLinesOfCurrentFileInPrompt(clippedTaggedCurrentDoc.lines.length);
         const { aggressivenessLevel, userHappinessScore } = this.userInteractionMonitor.getAggressivenessLevel();
-        // Log aggressiveness level and user happiness score when using XtabAggressiveness prompting strategy
-        if (promptOptions.promptingStrategy === xtabPromptOptions_1.PromptingStrategy.XtabAggressiveness) {
+        // Log aggressiveness level and user happiness score when using an aggressiveness-aware prompting strategy
+        if ((0, xtabPromptOptions_1.isAggressivenessStrategy)(promptOptions.promptingStrategy)) {
             telemetryBuilder.setXtabAggressivenessLevel(aggressivenessLevel);
             if (userHappinessScore !== undefined) {
                 telemetryBuilder.setXtabUserHappinessScore(userHappinessScore);
@@ -240,13 +253,13 @@ let XtabProvider = class XtabProvider {
         if (cancellationToken.isCancellationRequested) {
             return new statelessNextEditProvider_1.NoNextEditReason.GotCancelled('afterLanguageContextAwait');
         }
-        const lintErrors = promptOptions.lintOptions ? new lintErrors_1.LintErrors(promptOptions.lintOptions, activeDocument.id, currentDocument, this.langDiagService) : undefined;
+        const lintErrors = new lintErrors_1.LintErrors(activeDocument.id, currentDocument, this.langDiagService);
         const promptPieces = new promptCrafting_1.PromptPieces(currentDocument, editWindowLinesRange, areaAroundEditWindowLinesRange, activeDocument, request.xtabEditHistory, clippedTaggedCurrentDoc.lines, areaAroundCodeToEdit, langCtx, aggressivenessLevel, lintErrors, XtabProvider_1.computeTokens, promptOptions);
         const userPrompt = (0, promptCrafting_1.getUserPrompt)(promptPieces);
         const responseFormat = xtabPromptOptions.ResponseFormat.fromPromptingStrategy(promptOptions.promptingStrategy);
         const prediction = this.getPredictedOutput(activeDocument, editWindowLines, responseFormat);
         const messages = (0, xtabUtils_1.constructMessages)({
-            systemMsg: this.pickSystemPrompt(promptOptions.promptingStrategy),
+            systemMsg: pickSystemPrompt(promptOptions.promptingStrategy),
             userMsg: userPrompt,
         });
         logContext.setPrompt(messages);
@@ -260,13 +273,24 @@ let XtabProvider = class XtabProvider {
         if (cancellationToken.isCancellationRequested) {
             return new statelessNextEditProvider_1.NoNextEditReason.GotCancelled('afterDebounce');
         }
+        // Fire-and-forget: collect lint errors and terminal output for telemetry in background to avoid blocking the main path
+        Promise.resolve().then(() => {
+            const lintErrorsData = lintErrors.getData();
+            telemetryBuilder.setLintErrors(lintErrorsData);
+            logContext.setDiagnosticsData(lintErrorsData);
+            const terminalOutputData = this.terminalMonitor.getData();
+            telemetryBuilder.setTerminalOutput(terminalOutputData);
+            logContext.setTerminalData(terminalOutputData);
+        });
         request.fetchIssued = true;
         const cursorLineOffset = cursorPosition.column;
         return yield* this.streamEditsWithFiltering(request, endpoint, messages, editWindow, editWindowLines, cursorOriginalLinesOffset, cursorLineOffset, editWindowLinesRange, promptPieces, prediction, {
             shouldRemoveCursorTagFromResponse,
             responseFormat,
             retryState,
-        }, delaySession, tracer, telemetryBuilder, logContext, cancellationToken);
+            aggressivenessLevel,
+            userHappinessScore,
+        }, delaySession, tracer, telemetryBuilder, logContext, cancellationToken, originalEditWindow);
     }
     getAndProcessLanguageContext(request, delaySession, activeDocument, cursorPosition, promptOptions, tracer, logContext, cancellationToken) {
         const recordingEnabled = this.configService.getConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsLogContextRecorderEnabled);
@@ -276,7 +300,6 @@ let XtabProvider = class XtabProvider {
         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());
             langCtxPromise.then(langCtxs => {
                 if (langCtxs) {
                     logContext.setLanguageContext(langCtxs);
@@ -301,7 +324,7 @@ let XtabProvider = class XtabProvider {
             const cursorPositionVscode = new vscodeTypesShim_1.Position(cursorPosition.lineNumber - 1, cursorPosition.column - 1);
             const ctxRequest = {
                 opportunityId: request.opportunityId,
-                completionId: request.id,
+                completionId: request.headerRequestId,
                 documentContext: {
                     uri: textDoc.uri.toString(),
                     languageId: textDoc.languageId,
@@ -350,9 +373,9 @@ let XtabProvider = class XtabProvider {
         }
     }
     async *streamEditsWithFiltering(request, endpoint, messages, editWindow, editWindowLines, cursorOriginalLinesOffset, cursorLineOffset, // cursor offset within the line it's in; 1-based
-    editWindowLineRange, promptPieces, prediction, opts, delaySession, parentTracer, telemetryBuilder, logContext, cancellationToken) {
-        const tracer = parentTracer.sub('streamEditsWithFiltering');
-        const iterator = this.streamEdits(request, endpoint, messages, editWindow, editWindowLines, cursorOriginalLinesOffset, cursorLineOffset, editWindowLineRange, promptPieces, prediction, opts, delaySession, tracer, telemetryBuilder, logContext, cancellationToken);
+    editWindowLineRange, promptPieces, prediction, opts, delaySession, parentTracer, telemetryBuilder, logContext, cancellationToken, originalEditWindow) {
+        const tracer = parentTracer.createSubLogger('streamEditsWithFiltering');
+        const iterator = this.streamEdits(request, endpoint, messages, editWindow, editWindowLines, cursorOriginalLinesOffset, cursorLineOffset, editWindowLineRange, promptPieces, prediction, opts, delaySession, tracer, telemetryBuilder, logContext, cancellationToken, originalEditWindow);
         let nEdits = 0;
         let r = await iterator.next();
         while (!r.done) {
@@ -377,8 +400,8 @@ let XtabProvider = class XtabProvider {
         return r.value;
     }
     async *streamEdits(request, endpoint, messages, editWindow, editWindowLines, cursorOriginalLinesOffset, cursorLineOffset, // cursor offset within the line it's in; 1-based
-    editWindowLineRange, promptPieces, prediction, opts, delaySession, parentTracer, telemetryBuilder, logContext, cancellationToken) {
-        const tracer = parentTracer.sub('streamEdits');
+    editWindowLineRange, promptPieces, prediction, opts, delaySession, parentTracer, telemetryBuilder, logContext, cancellationToken, originalEditWindow) {
+        const tracer = parentTracer.createSubLogger('streamEdits');
         const useFetcher = this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.NextEditSuggestionsFetcher, this.expService) || undefined;
         const fetchStreamSource = new chatMLFetcher_1.FetchStreamSource();
         const fetchRequestStopWatch = new stopwatch_1.StopWatch();
@@ -386,6 +409,7 @@ let XtabProvider = class XtabProvider {
         let chatResponseFailure;
         let ttft;
         const firstTokenReceived = new async_2.DeferredPromise();
+        logContext.setHeaderRequestId(request.headerRequestId);
         telemetryBuilder.setFetchStartedAt();
         logContext.setFetchStartTime();
         // we must not await this promise because we want to stream edits as they come in
@@ -414,9 +438,13 @@ let XtabProvider = class XtabProvider {
             },
             userInitiatedRequest: undefined,
             telemetryProperties: {
-                requestId: request.id,
+                requestId: request.headerRequestId,
             },
             useFetcher,
+            customMetadata: {
+                aggressivenessLevel: opts.aggressivenessLevel,
+                userHappinessScore: opts.userHappinessScore,
+            },
         }, cancellationToken);
         telemetryBuilder.setResponse(fetchResultPromise.then((response) => ({ response, ttft })));
         logContext.setFullResponse(fetchResultPromise.then((response) => response.type === commonTypes_1.ChatFetchResponseType.Success ? response.value : undefined));
@@ -428,7 +456,7 @@ let XtabProvider = class XtabProvider {
                 this.forceUseDefaultModel = true;
                 return yield* this.doGetNextEdit(request, delaySession, tracer, logContext, cancellationToken, telemetryBuilder, opts.retryState); // use the same retry state
             }
-            return XtabProvider_1.mapChatFetcherErrorToNoNextEditReason(fetchRes);
+            return mapChatFetcherErrorToNoNextEditReason(fetchRes);
         }
         fetchResultPromise
             .then((response) => {
@@ -448,26 +476,47 @@ let XtabProvider = class XtabProvider {
             fetchStreamSource.resolve();
             logContext.setResponse(responseSoFar);
         });
-        const llmLinesStream = (0, xtabUtils_1.toLines)(fetchStreamSource.stream);
+        const llmLinesStream = asyncIterableUtils_1.AsyncIterUtilsExt.splitLines(asyncIterableUtils_1.AsyncIterUtils.map(fetchStreamSource.stream, (chunk) => chunk.delta.text));
         // logging of times
         // removal of cursor tag if option is set
-        const linesStream = (() => {
+        const linesStream = (async function* () {
             let i = 0;
-            return llmLinesStream.map((v) => {
+            for await (const v of llmLinesStream) {
                 const trace = `Line ${i++} emitted with latency ${fetchRequestStopWatch.elapsed()} ms`;
                 tracer.trace(trace);
-                return opts.shouldRemoveCursorTagFromResponse
+                yield opts.shouldRemoveCursorTagFromResponse
                     ? v.replaceAll(tags_1.PromptTags.CURSOR, '')
                     : v;
-            });
+            }
         })();
         const isFromCursorJump = opts.retryState instanceof RetryState.Retrying && opts.retryState.reason === 'cursorJump';
         let cleanedLinesStream;
         if (opts.responseFormat === xtabPromptOptions.ResponseFormat.EditWindowOnly) {
             cleanedLinesStream = linesStream;
         }
+        else if (opts.responseFormat === xtabPromptOptions.ResponseFormat.EditWindowWithEditIntent ||
+            opts.responseFormat === xtabPromptOptions.ResponseFormat.EditWindowWithEditIntentShort) {
+            // Determine parse mode based on response format
+            const parseMode = opts.responseFormat === xtabPromptOptions.ResponseFormat.EditWindowWithEditIntentShort
+                ? EditIntentParseMode.ShortName
+                : EditIntentParseMode.Tags;
+            // Parse the edit_intent from the response
+            const { editIntent, remainingLinesStream, parseError } = await parseEditIntentFromStream(linesStream, tracer, parseMode);
+            // Log the edit intent for telemetry
+            telemetryBuilder.setEditIntent(editIntent);
+            // Log parse errors for telemetry - this helps detect malformed model output during flights
+            if (parseError) {
+                telemetryBuilder.setEditIntentParseError(parseError);
+            }
+            // Check if we should show this edit based on intent and aggressiveness
+            if (!xtabPromptOptions.EditIntent.shouldShowEdit(editIntent, promptPieces.aggressivenessLevel)) {
+                tracer.trace(`Filtered out edit due to edit intent "${editIntent}" with aggressiveness "${promptPieces.aggressivenessLevel}"`);
+                return new statelessNextEditProvider_1.NoNextEditReason.FilteredOut(`editIntent:${editIntent} aggressivenessLevel:${promptPieces.aggressivenessLevel}`);
+            }
+            cleanedLinesStream = remainingLinesStream;
+        }
         else if (opts.responseFormat === xtabPromptOptions.ResponseFormat.CustomDiffPatch) {
-            return yield* xtabCustomDiffPatchResponseHandler_1.XtabCustomDiffPatchResponseHandler.handleResponse(linesStream, request.documentBeforeEdits, editWindow);
+            return yield* xtabCustomDiffPatchResponseHandler_1.XtabCustomDiffPatchResponseHandler.handleResponse(linesStream, request.documentBeforeEdits, editWindow, originalEditWindow);
         }
         else if (opts.responseFormat === xtabPromptOptions.ResponseFormat.UnifiedWithXml) {
             const linesIter = linesStream[Symbol.asyncIterator]();
@@ -488,7 +537,7 @@ let XtabProvider = class XtabProvider {
                     return new statelessNextEditProvider_1.NoNextEditReason.NoSuggestions(request.documentBeforeEdits, editWindow);
                 }
                 const edit = new lineEdit_1.LineReplacement(new lineRange_1.LineRange(editWindowLineRange.start + cursorOriginalLinesOffset + 1 /* 0-based to 1-based */, editWindowLineRange.start + cursorOriginalLinesOffset + 2), [editWindowLines[cursorOriginalLinesOffset].slice(0, cursorLineOffset - 1) + lineWithCursorContinued.value + editWindowLines[cursorOriginalLinesOffset].slice(cursorLineOffset - 1)]);
-                yield { edit, isFromCursorJump, window: editWindow };
+                yield { edit, isFromCursorJump, window: editWindow, originalWindow: originalEditWindow };
                 const lines = [];
                 let v = await linesIter.next();
                 while (!v.done) {
@@ -504,21 +553,22 @@ let XtabProvider = class XtabProvider {
                 yield {
                     edit: new lineEdit_1.LineReplacement(new lineRange_1.LineRange(line, line), lines),
                     isFromCursorJump,
-                    window: editWindow
+                    window: editWindow,
+                    originalWindow: originalEditWindow
                 };
                 return new statelessNextEditProvider_1.NoNextEditReason.NoSuggestions(request.documentBeforeEdits, editWindow);
             }
             if (trimmedLines === tags_1.ResponseTags.EDIT.start) {
-                cleanedLinesStream = new async_2.AsyncIterableObject(async (emitter) => {
+                cleanedLinesStream = (async function* () {
                     let v = await linesIter.next();
                     while (!v.done) {
                         if (v.value.includes(tags_1.ResponseTags.EDIT.end)) {
                             return;
                         }
-                        emitter.emitOne(v.value);
+                        yield v.value;
                         v = await linesIter.next();
                     }
-                });
+                })();
             }
             else {
                 return new statelessNextEditProvider_1.NoNextEditReason.Unexpected(new Error(`unexpected tag ${trimmedLines}`));
@@ -531,7 +581,7 @@ let XtabProvider = class XtabProvider {
             (0, assert_1.assertNever)(opts.responseFormat);
         }
         const diffOptions = {
-            emitFastCursorLineChange: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabProviderEmitFastCursorLineChange, this.expService),
+            emitFastCursorLineChange: responseProcessor_1.ResponseProcessor.mapEmitFastCursorLineChange(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),
         };
@@ -580,12 +630,12 @@ let XtabProvider = class XtabProvider {
                             }
                         }
                     }
-                    yield { edit: singleLineEdit, isFromCursorJump, window: editWindow };
+                    yield { edit: singleLineEdit, isFromCursorJump, window: editWindow, originalWindow: originalEditWindow };
                     i++;
                 }
             }
             if (chatResponseFailure) {
-                return XtabProvider_1.mapChatFetcherErrorToNoNextEditReason(chatResponseFailure);
+                return mapChatFetcherErrorToNoNextEditReason(chatResponseFailure);
             }
             return new statelessNextEditProvider_1.NoNextEditReason.NoSuggestions(request.documentBeforeEdits, editWindow);
         }
@@ -633,7 +683,7 @@ let XtabProvider = class XtabProvider {
                 return new statelessNextEditProvider_1.NoNextEditReason.NoSuggestions(request.documentBeforeEdits, editWindow, nextCursorPosition);
             }
             case nextCursorLinePrediction_1.NextCursorLinePrediction.OnlyWithEdit: {
-                const v = this.doGetNextEditWithSelection(request, new range_1.Range(nextCursorLineOneBased, nextCursorColumn, nextCursorLineOneBased, nextCursorColumn), delaySession, tracer, logContext, cancellationToken, telemetryBuilder, new RetryState.Retrying('cursorJump'));
+                const v = this.doGetNextEditWithSelection(request, new range_1.Range(nextCursorLineOneBased, nextCursorColumn, nextCursorLineOneBased, nextCursorColumn), delaySession, tracer, logContext, cancellationToken, telemetryBuilder, new RetryState.Retrying('cursorJump'), editWindow);
                 return yield* v;
             }
             default: {
@@ -641,12 +691,6 @@ let XtabProvider = class XtabProvider {
             }
         }
     }
-    computeAreaAroundEditWindowLinesRange(currentDocument) {
-        const cursorLine = currentDocument.cursorLineOffset;
-        const areaAroundStart = Math.max(0, cursorLine - promptCrafting_1.N_LINES_AS_CONTEXT);
-        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, tracer, telemetry) {
         const currentDocLines = currentDocument.lines;
         const cursorLineOffset = currentDocument.cursorLineOffset;
@@ -709,29 +753,6 @@ let XtabProvider = class XtabProvider {
         }
         return new offsetRange_1.OffsetRange(codeToEditStart, codeToEditEndExcl);
     }
-    static mapChatFetcherErrorToNoNextEditReason(fetchError) {
-        switch (fetchError.type) {
-            case commonTypes_1.ChatFetchResponseType.Canceled:
-                return new statelessNextEditProvider_1.NoNextEditReason.GotCancelled('afterFetchCall');
-            case commonTypes_1.ChatFetchResponseType.OffTopic:
-            case commonTypes_1.ChatFetchResponseType.Filtered:
-            case commonTypes_1.ChatFetchResponseType.PromptFiltered:
-            case commonTypes_1.ChatFetchResponseType.Length:
-            case commonTypes_1.ChatFetchResponseType.RateLimited:
-            case commonTypes_1.ChatFetchResponseType.QuotaExceeded:
-            case commonTypes_1.ChatFetchResponseType.ExtensionBlocked:
-            case commonTypes_1.ChatFetchResponseType.AgentUnauthorized:
-            case commonTypes_1.ChatFetchResponseType.AgentFailedDependency:
-            case commonTypes_1.ChatFetchResponseType.InvalidStatefulMarker:
-                return new statelessNextEditProvider_1.NoNextEditReason.Uncategorized(errors.fromUnknown(fetchError));
-            case commonTypes_1.ChatFetchResponseType.BadRequest:
-            case commonTypes_1.ChatFetchResponseType.NotFound:
-            case commonTypes_1.ChatFetchResponseType.Failed:
-            case commonTypes_1.ChatFetchResponseType.NetworkError:
-            case commonTypes_1.ChatFetchResponseType.Unknown:
-                return new statelessNextEditProvider_1.NoNextEditReason.FetchFailure(errors.fromUnknown(fetchError));
-        }
-    }
     determineModelConfiguration(activeDocument) {
         if (this.forceUseDefaultModel) {
             const defaultOptions = {
@@ -739,7 +760,7 @@ let XtabProvider = class XtabProvider {
                 ...xtabPromptOptions.DEFAULT_OPTIONS,
             };
             const defaultModelConfig = this.modelService.defaultModelConfiguration();
-            return XtabProvider_1.overrideModelConfig(defaultOptions, defaultModelConfig);
+            return overrideModelConfig(defaultOptions, defaultModelConfig);
         }
         const sourcedModelConfig = {
             modelName: undefined,
@@ -747,6 +768,8 @@ let XtabProvider = class XtabProvider {
             currentFile: {
                 maxTokens: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabCurrentFileMaxTokens, this.expService),
                 includeTags: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabIncludeTagsInCurrentFile, this.expService),
+                includeLineNumbers: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabIncludeLineNumbersInCurrentFile, this.expService),
+                includeCursorTag: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabIncludeCursorTagInCurrentFile, this.expService),
                 prioritizeAboveCursor: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabPrioritizeAboveCursor, this.expService)
             },
             pagedClipping: {
@@ -756,9 +779,9 @@ let XtabProvider = class XtabProvider {
                 nDocuments: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabNRecentlyViewedDocuments, this.expService),
                 maxTokens: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabRecentlyViewedDocumentsMaxTokens, this.expService),
                 includeViewedFiles: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabIncludeViewedFiles, this.expService),
-                includeLineNumbers: false, // Line numbers are only used for next cursor prediction
+                includeLineNumbers: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabRecentlyViewedIncludeLineNumbers, this.expService),
             },
-            languageContext: this.determineLanguageContextOptions(activeDocument.languageId, {
+            languageContext: determineLanguageContextOptions(activeDocument.languageId, {
                 enabled: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabLanguageContextEnabled, this.expService),
                 enabledLanguages: this.configService.getConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabLanguageContextEnabledLanguages),
                 enableAllContextProviders: this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.Advanced.DiagnosticsContextProvider, this.expService)
@@ -780,48 +803,7 @@ let XtabProvider = class XtabProvider {
         const modelConfig = selectedModelConfig.promptingStrategy === xtabPromptOptions.PromptingStrategy.CopilotNesXtab
             ? { ...selectedModelConfig, includeTagsInCurrentFile: true }
             : selectedModelConfig;
-        return XtabProvider_1.overrideModelConfig(sourcedModelConfig, modelConfig);
-    }
-    static overrideModelConfig(modelConfig, overridingConfig) {
-        return {
-            ...modelConfig,
-            modelName: overridingConfig.modelName,
-            promptingStrategy: overridingConfig.promptingStrategy,
-            currentFile: {
-                ...modelConfig.currentFile,
-                includeTags: overridingConfig.includeTagsInCurrentFile,
-            },
-            lintOptions: overridingConfig.lintOptions ? { ...modelConfig.lintOptions, ...overridingConfig.lintOptions } : modelConfig.lintOptions,
-        };
-    }
-    pickSystemPrompt(promptingStrategy) {
-        switch (promptingStrategy) {
-            case xtabPromptOptions.PromptingStrategy.UnifiedModel:
-                return systemMessages_1.unifiedModelSystemPrompt;
-            case xtabPromptOptions.PromptingStrategy.Codexv21NesUnified:
-            case xtabPromptOptions.PromptingStrategy.SimplifiedSystemPrompt:
-                return systemMessages_1.simplifiedPrompt;
-            case xtabPromptOptions.PromptingStrategy.PatchBased:
-            case xtabPromptOptions.PromptingStrategy.Xtab275:
-            case xtabPromptOptions.PromptingStrategy.XtabAggressiveness:
-                return systemMessages_1.xtab275SystemPrompt;
-            case xtabPromptOptions.PromptingStrategy.Nes41Miniv3:
-                return systemMessages_1.nes41Miniv3SystemPrompt;
-            case xtabPromptOptions.PromptingStrategy.CopilotNesXtab:
-            case undefined:
-                return systemMessages_1.systemPromptTemplate;
-            default:
-                (0, assert_1.assertNever)(promptingStrategy);
-        }
-    }
-    determineLanguageContextOptions(languageId, { enabled, enabledLanguages, maxTokens, enableAllContextProviders, traitPosition }) {
-        if (languageId in enabledLanguages) {
-            return { enabled: enabledLanguages[languageId], maxTokens, traitPosition };
-        }
-        if (enableAllContextProviders) {
-            return { enabled: true, maxTokens, traitPosition };
-        }
-        return { enabled, maxTokens, traitPosition };
+        return overrideModelConfig(sourcedModelConfig, modelConfig);
     }
     getEndpoint(configuredModelName) {
         const url = this.configService.getConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabProviderUrl);
@@ -833,46 +815,27 @@ let XtabProvider = class XtabProvider {
         return (0, proxyXtabEndpoint_1.createProxyXtabEndpoint)(this.instaService, configuredModelName);
     }
     getPredictedOutput(doc, editWindowLines, responseFormat) {
-        return this.configService.getConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabProviderUsePrediction)
+        return this.configService.getExperimentBasedConfig(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabProviderUsePrediction, this.expService)
             ? {
                 type: 'content',
-                content: this.getPredictionContents(doc, editWindowLines, responseFormat)
+                content: getPredictionContents(doc, editWindowLines, responseFormat)
             }
             : undefined;
     }
-    getPredictionContents(doc, editWindowLines, responseFormat) {
-        if (responseFormat === xtabPromptOptions.ResponseFormat.UnifiedWithXml) {
-            return ['<EDIT>', ...editWindowLines, '</EDIT>'].join('\n');
-        }
-        else if (responseFormat === xtabPromptOptions.ResponseFormat.EditWindowOnly) {
-            return editWindowLines.join('\n');
-        }
-        else if (responseFormat === xtabPromptOptions.ResponseFormat.CodeBlock) {
-            return ['```', ...editWindowLines, '```'].join('\n');
-        }
-        else if (responseFormat === xtabPromptOptions.ResponseFormat.CustomDiffPatch) {
-            const workspacePath = doc.workspaceRoot?.path;
-            const workspaceRelativeDocPath = (0, promptCrafting_1.toUniquePath)(doc.id, workspacePath);
-            return `${workspaceRelativeDocPath}:`;
-        }
-        else {
-            (0, assert_1.assertNever)(responseFormat);
-        }
-    }
-    async debounce(delaySession, retryState, tracer, telemetry) {
+    async debounce(delaySession, retryState, logger, telemetry) {
         if (this.simulationCtx.isInSimulationTests) {
             return;
         }
         if (retryState instanceof RetryState.Retrying) {
-            tracer.trace('Skipping debounce on retry');
+            logger.trace('Skipping debounce on retry');
             return;
         }
         const debounceTime = delaySession.getDebounceTime();
-        tracer.trace(`Debouncing for ${debounceTime} ms`);
+        logger.trace(`Debouncing for ${debounceTime} ms`);
         telemetry.setDebounceTime(debounceTime);
         await (0, async_2.timeout)(debounceTime);
     }
-    determineArtificialDelayMs(delaySession, tracer, telemetry) {
+    determineArtificialDelayMs(delaySession, logger, telemetry) {
         if (this.simulationCtx.isInSimulationTests) {
             return;
         }
@@ -880,7 +843,7 @@ let XtabProvider = class XtabProvider {
         if (artificialDelay <= 0) {
             return undefined;
         }
-        tracer.trace(`Enforcing artificial delay of ${artificialDelay} ms`);
+        logger.trace(`Enforcing artificial delay of ${artificialDelay} ms`);
         telemetry.setArtificialDelay(artificialDelay);
         return artificialDelay;
     }
@@ -923,6 +886,257 @@ exports.XtabProvider = XtabProvider = XtabProvider_1 = __decorate([
     __param(8, languageDiagnosticsService_1.ILanguageDiagnosticsService),
     __param(9, ignoreService_1.IIgnoreService)
 ], XtabProvider);
+function computeAreaAroundEditWindowLinesRange(currentDocument) {
+    const cursorLine = currentDocument.cursorLineOffset;
+    const areaAroundStart = Math.max(0, cursorLine - promptCrafting_1.N_LINES_AS_CONTEXT);
+    const areaAroundEndExcl = Math.min(currentDocument.lines.length, cursorLine + promptCrafting_1.N_LINES_AS_CONTEXT + 1);
+    return new offsetRange_1.OffsetRange(areaAroundStart, areaAroundEndExcl);
+}
+function mapChatFetcherErrorToNoNextEditReason(fetchError) {
+    switch (fetchError.type) {
+        case commonTypes_1.ChatFetchResponseType.Canceled:
+            return new statelessNextEditProvider_1.NoNextEditReason.GotCancelled('afterFetchCall');
+        case commonTypes_1.ChatFetchResponseType.OffTopic:
+        case commonTypes_1.ChatFetchResponseType.Filtered:
+        case commonTypes_1.ChatFetchResponseType.PromptFiltered:
+        case commonTypes_1.ChatFetchResponseType.Length:
+        case commonTypes_1.ChatFetchResponseType.RateLimited:
+        case commonTypes_1.ChatFetchResponseType.QuotaExceeded:
+        case commonTypes_1.ChatFetchResponseType.ExtensionBlocked:
+        case commonTypes_1.ChatFetchResponseType.AgentUnauthorized:
+        case commonTypes_1.ChatFetchResponseType.AgentFailedDependency:
+        case commonTypes_1.ChatFetchResponseType.InvalidStatefulMarker:
+            return new statelessNextEditProvider_1.NoNextEditReason.Uncategorized(errors.fromUnknown(fetchError));
+        case commonTypes_1.ChatFetchResponseType.BadRequest:
+        case commonTypes_1.ChatFetchResponseType.NotFound:
+        case commonTypes_1.ChatFetchResponseType.Failed:
+        case commonTypes_1.ChatFetchResponseType.NetworkError:
+        case commonTypes_1.ChatFetchResponseType.Unknown:
+            return new statelessNextEditProvider_1.NoNextEditReason.FetchFailure(errors.fromUnknown(fetchError));
+    }
+}
+function overrideModelConfig(modelConfig, overridingConfig) {
+    return {
+        ...modelConfig,
+        modelName: overridingConfig.modelName,
+        promptingStrategy: overridingConfig.promptingStrategy,
+        currentFile: {
+            ...modelConfig.currentFile,
+            includeTags: overridingConfig.includeTagsInCurrentFile,
+        },
+        lintOptions: overridingConfig.lintOptions ? { ...modelConfig.lintOptions, ...overridingConfig.lintOptions } : modelConfig.lintOptions,
+    };
+}
+function pickSystemPrompt(promptingStrategy) {
+    switch (promptingStrategy) {
+        case xtabPromptOptions.PromptingStrategy.UnifiedModel:
+            return systemMessages_1.unifiedModelSystemPrompt;
+        case xtabPromptOptions.PromptingStrategy.Codexv21NesUnified:
+        case xtabPromptOptions.PromptingStrategy.SimplifiedSystemPrompt:
+            return systemMessages_1.simplifiedPrompt;
+        case xtabPromptOptions.PromptingStrategy.PatchBased:
+        case xtabPromptOptions.PromptingStrategy.PatchBased01:
+        case xtabPromptOptions.PromptingStrategy.Xtab275:
+        case xtabPromptOptions.PromptingStrategy.XtabAggressiveness:
+        case xtabPromptOptions.PromptingStrategy.Xtab275Aggressiveness:
+        case xtabPromptOptions.PromptingStrategy.Xtab275EditIntent:
+        case xtabPromptOptions.PromptingStrategy.Xtab275EditIntentShort:
+            return systemMessages_1.xtab275SystemPrompt;
+        case xtabPromptOptions.PromptingStrategy.Nes41Miniv3:
+            return systemMessages_1.nes41Miniv3SystemPrompt;
+        case xtabPromptOptions.PromptingStrategy.CopilotNesXtab:
+        case undefined:
+            return systemMessages_1.systemPromptTemplate;
+        default:
+            (0, assert_1.assertNever)(promptingStrategy);
+    }
+}
+function determineLanguageContextOptions(languageId, { enabled, enabledLanguages, maxTokens, enableAllContextProviders, traitPosition }) {
+    if (languageId in enabledLanguages) {
+        return { enabled: enabledLanguages[languageId], maxTokens, traitPosition };
+    }
+    if (enableAllContextProviders) {
+        return { enabled: true, maxTokens, traitPosition };
+    }
+    return { enabled, maxTokens, traitPosition };
+}
+function getPredictionContents(doc, editWindowLines, responseFormat) {
+    if (responseFormat === xtabPromptOptions.ResponseFormat.UnifiedWithXml) {
+        return ['<EDIT>', ...editWindowLines, '</EDIT>'].join('\n');
+    }
+    else if (responseFormat === xtabPromptOptions.ResponseFormat.EditWindowOnly) {
+        return editWindowLines.join('\n');
+    }
+    else if (responseFormat === xtabPromptOptions.ResponseFormat.EditWindowWithEditIntent) {
+        // For EditWindowWithIntent, we predict the edit intent as high (most likely case) followed by the code
+        return ['<|edit_intent|>high<|/edit_intent|>', ...editWindowLines].join('\n');
+    }
+    else if (responseFormat === xtabPromptOptions.ResponseFormat.EditWindowWithEditIntentShort) {
+        // For EditWindowWithIntentShort, we predict 'H' (high) followed by the code
+        return ['H', ...editWindowLines].join('\n');
+    }
+    else if (responseFormat === xtabPromptOptions.ResponseFormat.CodeBlock) {
+        return ['```', ...editWindowLines, '```'].join('\n');
+    }
+    else if (responseFormat === xtabPromptOptions.ResponseFormat.CustomDiffPatch) {
+        const workspacePath = doc.workspaceRoot?.path;
+        const workspaceRelativeDocPath = (0, promptCrafting_1.toUniquePath)(doc.id, workspacePath);
+        return `${workspaceRelativeDocPath}:`;
+    }
+    else {
+        (0, assert_1.assertNever)(responseFormat);
+    }
+}
+/**
+ * Mode for parsing edit intent from the model response.
+ */
+var EditIntentParseMode;
+(function (EditIntentParseMode) {
+    /** Parse using XML-style tags: <|edit_intent|>value<|/edit_intent|> */
+    EditIntentParseMode["Tags"] = "tags";
+    /** Parse using short names on the first line: N|L|M|H */
+    EditIntentParseMode["ShortName"] = "shortName";
+})(EditIntentParseMode || (exports.EditIntentParseMode = EditIntentParseMode = {}));
+/**
+ * Parses the edit_intent from the first line of the response stream.
+ * The edit_intent MUST be on the first line, otherwise it's treated as not provided.
+ * Returns the parsed EditIntent and a new stream with the remaining content.
+ *
+ * Supports two modes:
+ * - Tags (default): <|edit_intent|>low|medium|high|no_edit<|/edit_intent|>
+ * - ShortName: N|L|M|H on the first line
+ *
+ * @param linesStream The stream of lines from the model response
+ * @param tracer Logger for tracing
+ * @param mode The parse mode (Tags or ShortName), defaults to Tags
+ */
+async function parseEditIntentFromStream(linesStream, tracer, mode = EditIntentParseMode.Tags) {
+    if (mode === EditIntentParseMode.ShortName) {
+        return parseEditIntentFromStreamShortName(linesStream, tracer);
+    }
+    return parseEditIntentFromStreamTags(linesStream, tracer);
+}
+/**
+ * Parses the edit_intent using short name format (N|L|M|H on first line).
+ */
+async function parseEditIntentFromStreamShortName(linesStream, tracer) {
+    let editIntent = xtabPromptOptions.EditIntent.High; // Default to high (always show) if no short name found
+    let parseError;
+    const linesIter = linesStream[Symbol.asyncIterator]();
+    const firstLineResult = await linesIter.next();
+    if (firstLineResult.done) {
+        // Empty stream
+        parseError = 'emptyResponse';
+        tracer.warn(`Empty response stream, no edit_intent short name found`);
+        const remainingLinesStream = (async function* () { })();
+        return { editIntent, remainingLinesStream, parseError };
+    }
+    const firstLine = firstLineResult.value.trim();
+    // Check if the first line is a single character short name
+    const parsedIntent = xtabPromptOptions.EditIntent.fromShortName(firstLine);
+    if (parsedIntent !== undefined) {
+        editIntent = parsedIntent;
+        tracer.trace(`Parsed edit_intent short name from first line: "${firstLine}" -> ${editIntent}`);
+        // Create a new stream with the remaining lines (excluding the short name line)
+        const remainingLinesStream = (async function* () {
+            let next = await linesIter.next();
+            while (!next.done) {
+                yield next.value;
+                next = await linesIter.next();
+            }
+        })();
+        return { editIntent, remainingLinesStream, parseError };
+    }
+    // Short name not found or invalid
+    parseError = `unknownIntentValue:${firstLine}`;
+    tracer.warn(`Edit intent parse error: ${parseError} (using Xtab275EditIntentShort prompting strategy). ` +
+        `Defaulting to High (always show). First line was: "${firstLine.substring(0, 100)}..."`);
+    // Return the first line plus the rest of the stream
+    const remainingLinesStream = (async function* () {
+        yield firstLineResult.value; // Use original value, not trimmed
+        let next = await linesIter.next();
+        while (!next.done) {
+            yield next.value;
+            next = await linesIter.next();
+        }
+    })();
+    return { editIntent, remainingLinesStream, parseError };
+}
+/**
+ * Parses the edit_intent tag from the first line of the response stream (original tag-based format).
+ */
+async function parseEditIntentFromStreamTags(linesStream, tracer) {
+    const EDIT_INTENT_START_TAG = '<|edit_intent|>';
+    const EDIT_INTENT_END_TAG = '<|/edit_intent|>';
+    let editIntent = xtabPromptOptions.EditIntent.High; // Default to high (always show) if no tag found
+    let parseError;
+    const linesIter = linesStream[Symbol.asyncIterator]();
+    const firstLineResult = await linesIter.next();
+    if (firstLineResult.done) {
+        // Empty stream
+        parseError = 'emptyResponse';
+        tracer.warn(`Empty response stream, no edit_intent tag found`);
+        const remainingLinesStream = (async function* () { })();
+        return { editIntent, remainingLinesStream, parseError };
+    }
+    const firstLine = firstLineResult.value;
+    // Check if the first line contains the complete edit_intent tag
+    const startIdx = firstLine.indexOf(EDIT_INTENT_START_TAG);
+    const endIdx = firstLine.indexOf(EDIT_INTENT_END_TAG);
+    if (startIdx !== -1 && endIdx !== -1 && endIdx > startIdx) {
+        // Found complete tag on first line
+        const intentValue = firstLine.substring(startIdx + EDIT_INTENT_START_TAG.length, endIdx).trim().toLowerCase();
+        // Check if it's a known intent value
+        const knownIntentValues = ['no_edit', 'low', 'medium', 'high'];
+        if (!knownIntentValues.includes(intentValue)) {
+            parseError = `unknownIntentValue:${intentValue}`;
+            tracer.warn(`Unknown edit_intent value: "${intentValue}", defaulting to High`);
+        }
+        editIntent = xtabPromptOptions.EditIntent.fromString(intentValue);
+        tracer.trace(`Parsed edit_intent from first line: "${intentValue}" -> ${editIntent}`);
+        // Calculate remaining content after the end tag on the first line
+        const afterEndTag = firstLine.substring(endIdx + EDIT_INTENT_END_TAG.length);
+        // Create a new stream that first yields remaining content from first line, then continues
+        const remainingLinesStream = (async function* () {
+            // Only yield remaining content from first line if non-empty
+            if (afterEndTag.trim() !== '') {
+                yield afterEndTag;
+            }
+            // Continue with rest of the stream
+            let next = await linesIter.next();
+            while (!next.done) {
+                yield next.value;
+                next = await linesIter.next();
+            }
+        })();
+        return { editIntent, remainingLinesStream, parseError };
+    }
+    // Determine the parse error type
+    if (startIdx !== -1 && endIdx === -1) {
+        // Start tag found but no end tag - malformed (possibly split across lines)
+        parseError = 'malformedTag:startWithoutEnd';
+    }
+    else if (startIdx === -1 && endIdx !== -1) {
+        // End tag found but no start tag - malformed
+        parseError = 'malformedTag:endWithoutStart';
+    }
+    else {
+        // No tag found at all
+        parseError = 'noTagFound';
+    }
+    tracer.warn(`Edit intent parse error: ${parseError} (using Xtab275EditIntent prompting strategy). ` +
+        `Defaulting to High (always show). First line was: "${firstLine.substring(0, 100)}..."`);
+    // Return the first line plus the rest of the stream
+    const remainingLinesStream = (async function* () {
+        yield firstLine;
+        let next = await linesIter.next();
+        while (!next.done) {
+            yield next.value;
+            next = await linesIter.next();
+        }
+    })();
+    return { editIntent, remainingLinesStream, parseError };
+}
 /**
  * Finds the range of lines containing merge conflict markers within a specified edit window.
  *