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

package/dist/src/_internal/extension/inlineEdits/common/userInteractionMonitor.js

@@ -3,41 +3,202 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var UserInteractionMonitor_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserInteractionMonitor = void 0;
+exports.UserInteractionMonitor = exports.MAX_INTERACTIONS_STORED = exports.MAX_INTERACTIONS_CONSIDERED = exports.ActionKind = void 0;
+exports.getWindowWithIgnoredLimit = getWindowWithIgnoredLimit;
+exports.getUserHappinessScore = getUserHappinessScore;
 const configurationService_1 = require("../../../platform/configuration/common/configurationService");
 const xtabPromptOptions_1 = require("../../../platform/inlineEdits/common/dataTypes/xtabPromptOptions");
+const logService_1 = require("../../../platform/log/common/logService");
 const nullExperimentationService_1 = require("../../../platform/telemetry/common/nullExperimentationService");
+const telemetry_1 = require("../../../platform/telemetry/common/telemetry");
+const errors = __importStar(require("../../../util/common/errors"));
 const delay_1 = require("./delay");
+var ActionKind;
+(function (ActionKind) {
+    ActionKind["Accepted"] = "accepted";
+    ActionKind["Rejected"] = "rejected";
+    ActionKind["Ignored"] = "ignored";
+})(ActionKind || (exports.ActionKind = ActionKind = {}));
+exports.MAX_INTERACTIONS_CONSIDERED = 10;
+exports.MAX_INTERACTIONS_STORED = 30;
+/**
+ * Get window of actions with ignored action limiting via window expansion.
+ *
+ * When ignored limit is reached, skip excess ignored actions but expand window
+ * further back to still get MAX_INTERACTIONS_CONSIDERED items.
+ */
+function getWindowWithIgnoredLimit(actions, config) {
+    const { limitConsecutiveIgnored, limitTotalIgnored, ignoredLimit } = config;
+    if (!limitConsecutiveIgnored && !limitTotalIgnored) {
+        // No limiting - just take last MAX_INTERACTIONS_CONSIDERED
+        return actions.slice(-exports.MAX_INTERACTIONS_CONSIDERED);
+    }
+    const result = [];
+    let consecutiveIgnored = 0;
+    let totalIgnored = 0;
+    // Walk backwards through history
+    for (let i = actions.length - 1; i >= 0 && result.length < exports.MAX_INTERACTIONS_CONSIDERED; i--) {
+        const action = actions[i];
+        if (action.kind === ActionKind.Ignored) {
+            let skip = false;
+            if (limitConsecutiveIgnored && consecutiveIgnored >= ignoredLimit) {
+                skip = true;
+            }
+            if (limitTotalIgnored && totalIgnored >= ignoredLimit) {
+                skip = true;
+            }
+            if (skip) {
+                continue;
+            }
+            consecutiveIgnored++;
+            totalIgnored++;
+        }
+        else {
+            consecutiveIgnored = 0; // Reset consecutive count on accept/reject
+        }
+        result.push(action);
+    }
+    // Reverse to get chronological order
+    result.reverse();
+    return result;
+}
+/**
+ * Calculate user happiness score from actions.
+ * Value between 0 and 1 indicating user happiness.
+ * 1 means very happy, 0 means very unhappy.
+ *
+ * Uses position-weighted scoring with ignored action limiting:
+ * - More recent actions have higher weight
+ * - Ignored actions can be limited (consecutive or total) to prevent score dilution
+ * - Score is adjusted towards neutral (0.5) based on data confidence
+ */
+function getUserHappinessScore(actions, config) {
+    if (actions.length === 0) {
+        return 0.5; // neutral score when no data
+    }
+    // Get window of actions with ignored limiting
+    const window = getWindowWithIgnoredLimit(actions, config);
+    if (window.length === 0) {
+        return 0.5; // neutral score when no data after filtering
+    }
+    // Calculate weighted score
+    let weightedScore = 0; // Sum of weighted normalized scores
+    let totalWeight = 0; // Sum of weights applied
+    let scoredActionCount = 0; // Count of actions that contributed to score
+    for (let i = 0; i < window.length; i++) {
+        const action = window[i];
+        // Skip ignored actions if not included in score calculation
+        if (action.kind === ActionKind.Ignored && !config.includeIgnored) {
+            continue;
+        }
+        scoredActionCount++;
+        // Calculate weight based on position (more recent = higher weight)
+        // Position 0 (oldest) has lowest weight, last position has highest weight
+        const weight = i + 1;
+        // Get score based on action kind from configuration
+        let score;
+        switch (action.kind) {
+            case ActionKind.Accepted:
+                score = config.acceptedScore;
+                break;
+            case ActionKind.Rejected:
+                score = config.rejectedScore;
+                break;
+            case ActionKind.Ignored:
+                score = config.ignoredScore;
+                break;
+        }
+        // Normalize score to 0-1 range based on accept/reject weights
+        const normalized = (score - config.rejectedScore) / (config.acceptedScore - config.rejectedScore);
+        weightedScore += normalized * weight;
+        totalWeight += weight;
+    }
+    const rawScore = totalWeight > 0 ? weightedScore / totalWeight : 0.5;
+    // Adjust score towards neutral (0.5) when we have fewer data points
+    // This prevents extreme scores with limited data
+    const dataConfidence = scoredActionCount / exports.MAX_INTERACTIONS_CONSIDERED;
+    return 0.5 + (rawScore - 0.5) * dataConfidence;
+}
 let UserInteractionMonitor = class UserInteractionMonitor {
-    static { UserInteractionMonitor_1 = this; }
-    static { this.MAX_INTERACTIONS_CONSIDERED = 10; }
-    constructor(_configurationService, _experimentationService) {
+    constructor(_configurationService, _experimentationService, _logService, _telemetryService) {
         this._configurationService = _configurationService;
         this._experimentationService = _experimentationService;
-        this._recentUserActions = [];
+        this._logService = _logService;
+        this._telemetryService = _telemetryService;
+        /**
+         * Used for aggressiveness level calculation.
+         * Includes all action types (accepted, rejected, ignored).
+         */
+        this._recentUserActionsForAggressiveness = [];
+        /**
+         * Used for timing/debounce calculation.
+         * Only includes accepted and rejected actions (ignored actions don't affect timing).
+         */
+        this._recentUserActionsForTiming = [];
     }
     // Capture user interactions
     handleAcceptance() {
-        this._recordUserAction('accepted');
+        this._recordUserAction(ActionKind.Accepted);
     }
     handleRejection() {
-        this._recordUserAction('rejected');
+        this._recordUserAction(ActionKind.Rejected);
+    }
+    handleIgnored() {
+        this._recordUserAction(ActionKind.Ignored);
     }
     _recordUserAction(kind) {
-        this._recentUserActions.push({ time: Date.now(), kind });
-        // keep at most 10 user actions
-        this._recentUserActions = this._recentUserActions.slice(-UserInteractionMonitor_1.MAX_INTERACTIONS_CONSIDERED);
+        const now = Date.now();
+        // Always record for aggressiveness calculation
+        this._recentUserActionsForAggressiveness.push({ time: now, kind });
+        this._recentUserActionsForAggressiveness = this._recentUserActionsForAggressiveness.slice(-exports.MAX_INTERACTIONS_STORED);
+        // Only record accepts/rejects for timing calculation
+        if (kind !== ActionKind.Ignored) {
+            this._recentUserActionsForTiming.push({ time: now, kind });
+            this._recentUserActionsForTiming = this._recentUserActionsForTiming.slice(-exports.MAX_INTERACTIONS_CONSIDERED);
+        }
     }
     // Creates a DelaySession based on recent user interactions
     createDelaySession(requestTime) {
@@ -55,14 +216,15 @@ let UserInteractionMonitor = class UserInteractionMonitor {
         const now = Date.now();
         let multiplier = 1;
         // Calculate impact of each action with time decay
-        for (const action of this._recentUserActions) {
+        // Uses timing-specific array which only contains accepts/rejects
+        for (const action of this._recentUserActionsForTiming) {
             const timeSinceAction = now - action.time;
             if (timeSinceAction > DEBOUNCE_DECAY_TIME_MS) {
                 continue;
             }
             // Exponential decay: impact decreases as time passes
             const decayFactor = Math.exp(-timeSinceAction / DEBOUNCE_DECAY_TIME_MS);
-            const actionWeight = action.kind === 'rejected' ? REJECTION_WEIGHT : ACCEPTANCE_WEIGHT;
+            const actionWeight = action.kind === ActionKind.Rejected ? REJECTION_WEIGHT : ACCEPTANCE_WEIGHT;
             multiplier *= 1 + ((actionWeight - 1) * decayFactor);
         }
         let debounceTime = baseDebounceTime * multiplier;
@@ -81,11 +243,12 @@ let UserInteractionMonitor = class UserInteractionMonitor {
             return { aggressivenessLevel: configuredAggressivenessLevel, userHappinessScore: undefined };
         }
         let level;
-        const userHappinessScore = this._getUserHappinessScore();
-        if (userHappinessScore >= 0.7) {
+        const config = this._getUserHappinessScoreConfiguration();
+        const userHappinessScore = this._getUserHappinessScore(config);
+        if (userHappinessScore >= config.highThreshold) {
             level = xtabPromptOptions_1.AggressivenessLevel.High;
         }
-        else if (userHappinessScore >= 0.4) {
+        else if (userHappinessScore >= config.mediumThreshold) {
             level = xtabPromptOptions_1.AggressivenessLevel.Medium;
         }
         else {
@@ -93,36 +256,40 @@ let UserInteractionMonitor = class UserInteractionMonitor {
         }
         return { aggressivenessLevel: level, userHappinessScore };
     }
-    /**
-     * Value between 0 and 1 indicating user happiness.
-     * 1 means very happy, 0 means very unhappy.
-     */
-    _getUserHappinessScore() {
-        if (this._recentUserActions.length === 0) {
-            return 0.5; // neutral score when no data
+    _getUserHappinessScoreConfiguration() {
+        const configKey = configurationService_1.ConfigKey.TeamInternal.InlineEditsUserHappinessScoreConfigurationString;
+        const configString = this._configurationService.getExperimentBasedConfig(configKey, this._experimentationService);
+        if (configString === undefined) {
+            return xtabPromptOptions_1.DEFAULT_USER_HAPPINESS_SCORE_CONFIGURATION;
         }
-        let weightedScore = 0;
-        let totalWeight = 0;
-        for (let i = 0; i < this._recentUserActions.length; i++) {
-            const action = this._recentUserActions[i];
-            // Calculate weight based on position (more recent = higher weight)
-            // Position 0 (oldest) has lowest weight, last position has highest weight
-            const weight = i + 1;
-            // Accepted = 1, Rejected = 0
-            const score = action.kind === 'accepted' ? 1 : 0;
-            weightedScore += score * weight;
-            totalWeight += weight;
+        try {
+            return (0, xtabPromptOptions_1.parseUserHappinessScoreConfigurationString)(configString);
         }
-        const rawScore = totalWeight > 0 ? weightedScore / totalWeight : 0.5;
-        // Adjust score towards neutral (0.5) when we have fewer data points
-        // This prevents extreme scores with limited data
-        const dataConfidence = this._recentUserActions.length / UserInteractionMonitor_1.MAX_INTERACTIONS_CONSIDERED;
-        return 0.5 + (rawScore - 0.5) * dataConfidence;
+        catch (e) {
+            this._logService.error(e, 'Failed to parse user happiness score configuration, using default config');
+            // Log to telemetry when we fail to parse an experimental config, but still offer the default config to avoid disruption.
+            /* __GDPR__
+                "incorrectNesAdaptiveAggressivenessConfig" : {
+                    "owner": "bstee615",
+                    "comment": "Capture if model configuration string is invalid JSON.",
+                    "configName": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Name of the configuration that failed to parse." },
+                    "errorMessage": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "Error message from JSON.parse." },
+                    "configValue": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "comment": "The invalid JSON string." }
+                }
+            */
+            this._telemetryService.sendMSFTTelemetryEvent('incorrectNesAdaptiveAggressivenessConfig', { configName: configKey.id, errorMessage: errors.toString(errors.fromUnknown(e)), configValue: configString });
+            return xtabPromptOptions_1.DEFAULT_USER_HAPPINESS_SCORE_CONFIGURATION;
+        }
+    }
+    _getUserHappinessScore(config) {
+        return getUserHappinessScore(this._recentUserActionsForAggressiveness, config);
     }
 };
 exports.UserInteractionMonitor = UserInteractionMonitor;
-exports.UserInteractionMonitor = UserInteractionMonitor = UserInteractionMonitor_1 = __decorate([
+exports.UserInteractionMonitor = UserInteractionMonitor = __decorate([
     __param(0, configurationService_1.IConfigurationService),
-    __param(1, nullExperimentationService_1.IExperimentationService)
+    __param(1, nullExperimentationService_1.IExperimentationService),
+    __param(2, logService_1.ILogService),
+    __param(3, telemetry_1.ITelemetryService)
 ], UserInteractionMonitor);
 //# sourceMappingURL=userInteractionMonitor.js.map

package/dist/src/_internal/extension/inlineEdits/common/userInteractionMonitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"userInteractionMonitor.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/common/userInteractionMonitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"userInteractionMonitor.js","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/common/userInteractionMonitor.ts"],"names":[],"mappings":"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"}

package/dist/src/_internal/extension/inlineEdits/node/nextEditCache.d.ts

@@ -8,15 +8,25 @@ import { AnnotatedStringReplacement, StringEdit, StringReplacement } from '../..
 import { OffsetRange } from '../../../util/vs/editor/common/core/ranges/offsetRange';
 import { StringText } from '../../../util/vs/editor/common/core/text/abstractText';
 import { EditDataWithIndex } from '../common/editRebase';
-import { INesConfigs } from './nesConfigs';
 import { NextEditFetchRequest } from './nextEditProvider';
 export interface CachedEditOpts {
     isFromCursorJump: boolean;
+    /**
+     * For cursor jump edits, this is the edit window around the original cursor position
+     * (before the jump), allowing the edit to be served from cache when the cursor is
+     * in either the original location or the jump target location.
+     */
+    originalEditWindow?: OffsetRange;
 }
 export interface CachedEdit {
     docId: DocumentId;
     documentBeforeEdit: StringText;
     editWindow?: OffsetRange;
+    /**
+     * For cursor jump edits, the edit window around the original cursor position.
+     * @see CachedEditOpts.originalEditWindow
+     */
+    originalEditWindow?: OffsetRange;
     edit: StringReplacement | undefined;
     isFromCursorJump: boolean;
     edits?: StringReplacement[];
@@ -43,10 +53,10 @@ export declare class NextEditCache extends Disposable {
     constructor(workspace: ObservableWorkspace, _logService: ILogService, configService: IConfigurationService, expService: IExperimentationService);
     setKthNextEdit(docId: DocumentId, documentContents: StringText, editWindow: OffsetRange | undefined, nextEdit: StringReplacement, subsequentN: number, nextEdits: StringReplacement[] | undefined, userEditSince: StringEdit | undefined, source: NextEditFetchRequest, opts: CachedEditOpts): CachedEdit | undefined;
     setNoNextEdit(docId: DocumentId, documentContents: StringText, editWindow: OffsetRange | undefined, source: NextEditFetchRequest): void;
-    lookupNextEdit(docId: DocumentId, currentDocumentContents: StringText, currentSelection: readonly OffsetRange[], nesConfigs: INesConfigs): CachedOrRebasedEdit | undefined;
-    tryRebaseCacheEntry(cachedEdit: CachedEdit, currentDocumentContents: StringText, currentSelection: readonly OffsetRange[], nesConfigs: INesConfigs): CachedOrRebasedEdit | undefined;
+    lookupNextEdit(docId: DocumentId, currentDocumentContents: StringText, currentSelection: readonly OffsetRange[]): CachedOrRebasedEdit | undefined;
+    tryRebaseCacheEntry(cachedEdit: CachedEdit, currentDocumentContents: StringText, currentSelection: readonly OffsetRange[]): CachedOrRebasedEdit | undefined;
     rejectedNextEdit(requestId: string): void;
-    isRejectedNextEdit(docId: DocumentId, currentDocumentContents: StringText, edit: StringReplacement, nesConfigs: INesConfigs): boolean;
+    isRejectedNextEdit(docId: DocumentId, currentDocumentContents: StringText, edit: StringReplacement): boolean;
     evictedCachedEdit(cachedEdit: CachedEdit): void;
     clear(): void;
 }

package/dist/src/_internal/extension/inlineEdits/node/nextEditCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nextEditCache.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/node/nextEditCache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nextEditCache.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/extension/inlineEdits/node/nextEditCache.ts"],"names":[],"mappings":"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"}

package/dist/src/_internal/extension/inlineEdits/node/nextEditCache.js

@@ -8,7 +8,6 @@ exports.NextEditCache = void 0;
 const configurationService_1 = require("../../../platform/configuration/common/configurationService");
 const observable_1 = require("../../../platform/inlineEdits/common/utils/observable");
 const cache_1 = require("../../../util/common/cache");
-const tracing_1 = require("../../../util/common/tracing");
 const lifecycle_1 = require("../../../util/vs/base/common/lifecycle");
 const observableInternal_1 = require("../../../util/vs/base/common/observableInternal");
 const editRebase_1 = require("../common/editRebase");
@@ -59,31 +58,31 @@ class NextEditCache extends lifecycle_1.Disposable {
         }
         docCache.setNoNextEdit(documentContents, editWindow, source);
     }
-    lookupNextEdit(docId, currentDocumentContents, currentSelection, nesConfigs) {
+    lookupNextEdit(docId, currentDocumentContents, currentSelection) {
         const docCache = this._documentCaches.get(docId);
         if (!docCache) {
             return undefined;
         }
-        return docCache.lookupNextEdit(currentDocumentContents, currentSelection, nesConfigs);
+        return docCache.lookupNextEdit(currentDocumentContents, currentSelection);
     }
-    tryRebaseCacheEntry(cachedEdit, currentDocumentContents, currentSelection, nesConfigs) {
+    tryRebaseCacheEntry(cachedEdit, currentDocumentContents, currentSelection) {
         const docCache = this._documentCaches.get(cachedEdit.docId);
         if (!docCache) {
             return undefined;
         }
-        return docCache.tryRebaseCacheEntry(cachedEdit, currentDocumentContents, currentSelection, nesConfigs);
+        return docCache.tryRebaseCacheEntry(cachedEdit, currentDocumentContents, currentSelection);
     }
     rejectedNextEdit(requestId) {
         this._sharedCache.getValues()
             .filter(v => v.source.headerRequestId === requestId)
             .forEach(v => v.rejected = true);
     }
-    isRejectedNextEdit(docId, currentDocumentContents, edit, nesConfigs) {
+    isRejectedNextEdit(docId, currentDocumentContents, edit) {
         const docCache = this._documentCaches.get(docId);
         if (!docCache) {
             return false;
         }
-        return docCache.isRejectedNextEdit(currentDocumentContents, edit, nesConfigs);
+        return docCache.isRejectedNextEdit(currentDocumentContents, edit);
     }
     evictedCachedEdit(cachedEdit) {
         const docCache = this._documentCaches.get(cachedEdit.docId);
@@ -103,17 +102,16 @@ class DocumentEditCache {
         this.docId = docId;
         this._doc = _doc;
         this._sharedCache = _sharedCache;
-        this._logService = _logService;
         this._trackedCachedEdits = [];
-        this._tracer = (0, tracing_1.createTracer)(['NES', 'DocumentEditCache'], (s) => this._logService.trace(s));
+        this._logger = _logService.createSubLogger(['NES', 'DocumentEditCache']);
     }
     handleEdit(edit) {
-        const tracer = this._tracer.sub('handleEdit');
+        const logger = this._logger.createSubLogger('handleEdit');
         for (const cachedEdit of this._trackedCachedEdits) {
             if (cachedEdit.userEditSince) {
                 cachedEdit.userEditSince = cachedEdit.userEditSince.compose(edit);
                 cachedEdit.rebaseFailed = false;
-                if (!(0, editRebase_1.checkEditConsistency)(cachedEdit.documentBeforeEdit.value, cachedEdit.userEditSince, this._doc.value.get().value, tracer)) {
+                if (!(0, editRebase_1.checkEditConsistency)(cachedEdit.documentBeforeEdit.value, cachedEdit.userEditSince, this._doc.value.get().value, logger)) {
                     cachedEdit.userEditSince = undefined;
                 }
             }
@@ -130,9 +128,9 @@ class DocumentEditCache {
     }
     setKthNextEdit(documentContents, editWindow, nextEdit, nextEdits, userEditSince, subsequentN, source, opts) {
         const key = this._getKey(documentContents.value);
-        const cachedEdit = { docId: this.docId, edit: nextEdit, edits: nextEdits, detailedEdits: [], userEditSince, subsequentN, source, documentBeforeEdit: documentContents, editWindow, cacheTime: Date.now(), isFromCursorJump: opts.isFromCursorJump };
+        const cachedEdit = { docId: this.docId, edit: nextEdit, edits: nextEdits, detailedEdits: [], userEditSince, subsequentN, source, documentBeforeEdit: documentContents, editWindow, originalEditWindow: opts.originalEditWindow, cacheTime: Date.now(), isFromCursorJump: opts.isFromCursorJump };
         if (userEditSince) {
-            if (!(0, editRebase_1.checkEditConsistency)(cachedEdit.documentBeforeEdit.value, userEditSince, this._doc.value.get().value, this._tracer.sub('setKthNextEdit'))) {
+            if (!(0, editRebase_1.checkEditConsistency)(cachedEdit.documentBeforeEdit.value, userEditSince, this._doc.value.get().value, this._logger.createSubLogger('setKthNextEdit'))) {
                 cachedEdit.userEditSince = undefined;
             }
             else {
@@ -161,54 +159,70 @@ class DocumentEditCache {
             this._nextEditCache.evictedCachedEdit(evicted[1]);
         }
     }
-    lookupNextEdit(currentDocumentContents, currentSelection, nesConfigs) {
+    lookupNextEdit(currentDocumentContents, currentSelection) {
         // TODO@chrmarti: Update entries i > 1 with user edits and edit window and start tracking.
         const key = this._getKey(currentDocumentContents.value);
         const cachedEdit = this._sharedCache.get(key);
         if (cachedEdit) {
             const editWindow = cachedEdit.editWindow;
+            const originalEditWindow = cachedEdit.originalEditWindow;
             const cursorRange = currentSelection[0];
-            if (editWindow && !editWindow.containsRange(cursorRange)) {
+            // For cursor jump edits, allow cache hits when cursor is in either the jump target window
+            // (editWindow) or the original cursor location window (originalEditWindow)
+            const inEditWindow = editWindow?.containsRange(cursorRange);
+            const inOriginalWindow = originalEditWindow?.containsRange(cursorRange);
+            if (editWindow && !inEditWindow && !inOriginalWindow) {
                 return undefined;
             }
             return cachedEdit;
         }
         for (const cachedEdit of this._trackedCachedEdits) {
-            const rebased = this.tryRebaseCacheEntry(cachedEdit, currentDocumentContents, currentSelection, nesConfigs);
+            const rebased = this.tryRebaseCacheEntry(cachedEdit, currentDocumentContents, currentSelection);
             if (rebased) {
                 return rebased;
             }
         }
         return undefined;
     }
-    tryRebaseCacheEntry(cachedEdit, currentDocumentContents, currentSelection, nesConfigs) {
-        const tracer = this._tracer.sub('tryRebaseCacheEntry');
+    tryRebaseCacheEntry(cachedEdit, currentDocumentContents, currentSelection) {
+        const logger = this._logger.createSubLogger('tryRebaseCacheEntry');
         if (cachedEdit.userEditSince && !cachedEdit.rebaseFailed) {
             const originalEdits = cachedEdit.edits || (cachedEdit.edit ? [cachedEdit.edit] : []);
-            const res = (0, editRebase_1.tryRebase)(cachedEdit.documentBeforeEdit.value, cachedEdit.editWindow, originalEdits, cachedEdit.detailedEdits, cachedEdit.userEditSince, currentDocumentContents.value, currentSelection, 'strict', tracer, nesConfigs);
-            if (res === 'rebaseFailed') {
-                cachedEdit.rebaseFailed = true;
-            }
-            else if (res === 'inconsistentEdits' || res === 'error') {
-                cachedEdit.userEditSince = undefined;
-            }
-            else if (res === 'outsideEditWindow') {
-                // miss
-            }
-            else if (res.length) {
-                if (!cachedEdit.rejected && this.isRejectedNextEdit(currentDocumentContents, res[0].rebasedEdit, nesConfigs)) {
-                    cachedEdit.rejected = true;
+            // For cursor jump edits, try rebasing with the primary edit window first.
+            // If that fails due to cursor being outside, try with the original edit window
+            // (the window around the cursor's original position before the jump).
+            const windowsToTry = cachedEdit.originalEditWindow
+                ? [cachedEdit.editWindow, cachedEdit.originalEditWindow]
+                : [cachedEdit.editWindow];
+            for (const window of windowsToTry) {
+                const res = (0, editRebase_1.tryRebase)(cachedEdit.documentBeforeEdit.value, window, originalEdits, cachedEdit.detailedEdits, cachedEdit.userEditSince, currentDocumentContents.value, currentSelection, 'strict', logger);
+                if (res === 'rebaseFailed') {
+                    cachedEdit.rebaseFailed = true;
+                    return undefined;
+                }
+                else if (res === 'inconsistentEdits' || res === 'error') {
+                    cachedEdit.userEditSince = undefined;
+                    return undefined;
+                }
+                else if (res === 'outsideEditWindow') {
+                    // Try the next window (if available)
+                    continue;
+                }
+                else if (res.length) {
+                    if (!cachedEdit.rejected && this.isRejectedNextEdit(currentDocumentContents, res[0].rebasedEdit)) {
+                        cachedEdit.rejected = true;
+                    }
+                    return { ...cachedEdit, ...res[0] };
+                }
+                else if (!originalEdits.length) {
+                    return cachedEdit; // cached 'no edits'
                 }
-                return { ...cachedEdit, ...res[0] };
-            }
-            else if (!originalEdits.length) {
-                return cachedEdit; // cached 'no edits'
             }
         }
         return undefined;
     }
-    isRejectedNextEdit(currentDocumentContents, edit, nesConfigs) {
-        const tracer = this._tracer.sub('isRejectedNextEdit');
+    isRejectedNextEdit(currentDocumentContents, edit) {
+        const logger = this._logger.createSubLogger('isRejectedNextEdit');
         const resultEdit = edit.removeCommonSuffixAndPrefix(currentDocumentContents.value);
         for (const rejectedEdit of this._trackedCachedEdits.filter(edit => edit.rejected)) {
             if (!rejectedEdit.userEditSince) {
@@ -218,13 +232,13 @@ class DocumentEditCache {
             if (!edits.length) {
                 continue; // cached 'no edits'
             }
-            const rejectedEdits = (0, editRebase_1.tryRebase)(rejectedEdit.documentBeforeEdit.value, undefined, edits, rejectedEdit.detailedEdits, rejectedEdit.userEditSince, currentDocumentContents.value, [], 'lenient', tracer, nesConfigs);
+            const rejectedEdits = (0, editRebase_1.tryRebase)(rejectedEdit.documentBeforeEdit.value, undefined, edits, rejectedEdit.detailedEdits, rejectedEdit.userEditSince, currentDocumentContents.value, [], 'lenient', logger);
             if (typeof rejectedEdits === 'string') {
                 continue;
             }
             const rejected = rejectedEdits.some(rejected => rejected.rebasedEdit.removeCommonSuffixAndPrefix(currentDocumentContents.value).equals(resultEdit));
             if (rejected) {
-                tracer.trace('Found rejected edit that matches current edit');
+                logger.trace('Found rejected edit that matches current edit');
                 return true;
             }
         }