@vscode/chat-lib 0.4.0 → 0.4.1-1

package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.js

@@ -4,7 +4,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatelessNextEditTelemetryBuilder = exports.StatelessNextEditResult = exports.NoNextEditReason = exports.FilteredOutReason = exports.StatelessNextEditDocument = exports.StatelessNextEditRequest = void 0;
+exports.StatelessNextEditTelemetryBuilder = exports.StatelessNextEditResult = exports.NoNextEditReason = exports.FilteredOutReason = exports.StatelessNextEditDocument = exports.StatelessNextEditRequest = exports.WithStatelessProviderTelemetry = void 0;
 const result_1 = require("../../../util/common/result");
 const assert_1 = require("../../../util/vs/base/common/assert");
 const async_1 = require("../../../util/vs/base/common/async");
@@ -13,13 +13,20 @@ const stringEdit_1 = require("../../../util/vs/editor/common/core/edits/stringEd
 const abstractText_1 = require("../../../util/vs/editor/common/core/text/abstractText");
 const workspaceLog_1 = require("../../workspaceRecorder/common/workspaceLog");
 const stringifyChatMessages_1 = require("./utils/stringifyChatMessages");
+class WithStatelessProviderTelemetry {
+    constructor(v, telemetryBuilder) {
+        this.v = v;
+        this.telemetryBuilder = telemetryBuilder;
+    }
+}
+exports.WithStatelessProviderTelemetry = WithStatelessProviderTelemetry;
 class StatelessNextEditRequest {
     static { this.ID = 0; }
     get result() {
         return this._result.p;
     }
-    constructor(id, opportunityId, documentBeforeEdits, documents, activeDocumentIdx, xtabEditHistory, firstEdit, expandedEditWindowNLines, logContext, recordingBookmark, recording, providerRequestStartDateTime) {
-        this.id = id;
+    constructor(headerRequestId, opportunityId, documentBeforeEdits, documents, activeDocumentIdx, xtabEditHistory, firstEdit, expandedEditWindowNLines, logContext, recordingBookmark, recording, providerRequestStartDateTime) {
+        this.headerRequestId = headerRequestId;
         this.opportunityId = opportunityId;
         this.documentBeforeEdits = documentBeforeEdits;
         this.documents = documents;
@@ -54,7 +61,7 @@ class StatelessNextEditRequest {
     }
     serialize() {
         return {
-            id: this.id,
+            id: this.headerRequestId,
             documents: this.documents.map(d => d.serialize()),
             activeDocumentIdx: this.activeDocumentIdx,
             recording: this.recording,
@@ -234,13 +241,13 @@ class StatelessNextEditTelemetryBuilder {
     /**
      * It takes a request to automatically capture some properties from the request.
      */
-    constructor(request) {
+    constructor(headerRequestId) {
         this._nextCursorPrediction = {
             nextCursorLineError: undefined,
             nextCursorLineDistance: undefined
         };
         this.startTime = Date.now();
-        this.requestUuid = request.id;
+        this.requestUuid = headerRequestId;
     }
     build(result) {
         const endTime = Date.now();
@@ -278,6 +285,7 @@ class StatelessNextEditTelemetryBuilder {
             promptLineCount,
             promptCharCount,
             isCursorAtEndOfLine: this._isCursorAtLineEnd,
+            isInlineSuggestion: this._isInlineSuggestion,
             debounceTime: this._debounceTime,
             artificialDelay: this._artificialDelay,
             fetchStartedAt: this._fetchStartedAt,
@@ -289,8 +297,13 @@ class StatelessNextEditTelemetryBuilder {
             lineDistanceToMostRecentEdit: this._lineDistanceToMostRecentEdit,
             xtabAggressivenessLevel: this._xtabAggressivenessLevel,
             xtabUserHappinessScore: this._xtabUserHappinessScore,
+            editIntent: this._editIntent,
+            editIntentParseError: this._editIntentParseError,
+            cursorJumpModelName: this._cursorJumpModelName,
             cursorJumpPrompt: this._cursorJumpPrompt ? JSON.stringify(this._cursorJumpPrompt.map(({ role, content }) => ({ role, content }))) : undefined,
             cursorJumpResponse: this._cursorJumpResponse,
+            lintErrors: this._lintErrors,
+            terminalOutput: this._terminalOutput,
         };
     }
     setLogProbThreshold(logProbThreshold) {
@@ -321,6 +334,10 @@ class StatelessNextEditTelemetryBuilder {
         this._isCursorAtLineEnd = isCursorAtLineEnd;
         return this;
     }
+    setIsInlineSuggestion(isInlineSuggestion) {
+        this._isInlineSuggestion = isInlineSuggestion;
+        return this;
+    }
     setDebounceTime(debounceTime) {
         this._debounceTime = debounceTime;
         return this;
@@ -349,6 +366,10 @@ class StatelessNextEditTelemetryBuilder {
         });
         return this;
     }
+    setCursorJumpModelName(modelName) {
+        this._cursorJumpModelName = modelName;
+        return this;
+    }
     setCursorJumpPrompt(prompt) {
         this._cursorJumpPrompt = prompt;
         return this;
@@ -388,6 +409,22 @@ class StatelessNextEditTelemetryBuilder {
         this._xtabUserHappinessScore = score;
         return this;
     }
+    setEditIntent(editIntent) {
+        this._editIntent = editIntent;
+        return this;
+    }
+    setEditIntentParseError(error) {
+        this._editIntentParseError = error;
+        return this;
+    }
+    setLintErrors(lintErrors) {
+        this._lintErrors = lintErrors;
+        return this;
+    }
+    setTerminalOutput(terminalOutput) {
+        this._terminalOutput = terminalOutput;
+        return this;
+    }
 }
 exports.StatelessNextEditTelemetryBuilder = StatelessNextEditTelemetryBuilder;
 //# sourceMappingURL=statelessNextEditProvider.js.map

package/dist/src/_internal/platform/inlineEdits/common/statelessNextEditProvider.js.map

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

package/dist/src/_internal/platform/inlineEdits/common/workspaceEditTracker/nesXtabHistoryTracker.d.ts

@@ -1,8 +1,12 @@
 import { Disposable } from '../../../../util/vs/base/common/lifecycle';
+import { IObservable } from '../../../../util/vs/base/common/observableInternal';
 import { OffsetRange } from '../../../../util/vs/editor/common/core/ranges/offsetRange';
 import { StringText } from '../../../../util/vs/editor/common/core/text/abstractText';
+import { IConfigurationService } from '../../../configuration/common/configurationService';
+import { IExperimentationService } from '../../../telemetry/common/nullExperimentationService';
 import { DocumentId } from '../dataTypes/documentId';
 import { RootedEdit } from '../dataTypes/edit';
+import { DiffHistoryMergeStrategy } from '../dataTypes/xtabHistoryOptions';
 import { ObservableWorkspace } from '../observableWorkspace';
 export interface IXtabHistoryDocumentEntry {
     docId: DocumentId;
@@ -17,19 +21,54 @@ export interface IXtabHistoryVisibleRangesEntry extends IXtabHistoryDocumentEntr
     documentContent: StringText;
 }
 export type IXtabHistoryEntry = IXtabHistoryEditEntry | IXtabHistoryVisibleRangesEntry;
+/**
+ * Controls how consecutive edits to the same document are merged in history.
+ */
+export type XtabEditMergeStrategy = 
+/** Merge when the first replacement of both line-edits starts on the same line. */
+{
+    readonly kind: DiffHistoryMergeStrategy.SameStartLine;
+}
+/** Merge when all replacements in both line-edits are within `lineGap` lines of each other. */
+ | {
+    readonly kind: DiffHistoryMergeStrategy.Proximity;
+    readonly lineGap: number;
+}
+/**
+ * Layer 1 (keystroke coalescing): merge if edits are within `lineGap` lines AND arrived within `splitAfterMs`.
+ * Layer 2 (logical splitting): if either condition fails, start a new history entry.
+ */
+ | {
+    readonly kind: DiffHistoryMergeStrategy.Hybrid;
+    readonly lineGap: number;
+    readonly splitAfterMs: number;
+};
+export declare namespace XtabEditMergeStrategy {
+    const sameStartLine: XtabEditMergeStrategy;
+    function proximity(lineGap: number): XtabEditMergeStrategy;
+    function hybrid(lineGap: number, splitAfterMs: number): XtabEditMergeStrategy;
+    /**
+     * Constructs a {@link XtabEditMergeStrategy} from config values.
+     */
+    function fromConfig(strategyKind: DiffHistoryMergeStrategy, lineGap: number, splitAfterMs: number): XtabEditMergeStrategy;
+}
 export declare class NesXtabHistoryTracker extends Disposable {
-    private readonly maxHistorySize;
+    private readonly _configurationService;
+    private readonly _expService;
     /** Max # of entries in history */
     private static MAX_HISTORY_SIZE;
     private readonly idToEntry;
     private readonly history;
-    constructor(workspace: ObservableWorkspace, maxHistorySize?: number);
+    private readonly maxHistorySize;
+    protected mergeStrategy: IObservable<XtabEditMergeStrategy>;
+    constructor(workspace: ObservableWorkspace, maxHistorySize: number | undefined, _configurationService: IConfigurationService, _expService: IExperimentationService);
     getHistory(): IXtabHistoryEntry[];
     /**
      * If the document isn't already in history, add it to the history.
      * If the document is in history either with an edit or selection entry, do not include it again.
      */
     private handleVisibleRangesChange;
+    private shouldMerge;
     private handleEdits;
     private pushToHistory;
     private compactHistory;

package/dist/src/_internal/platform/inlineEdits/common/workspaceEditTracker/nesXtabHistoryTracker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nesXtabHistoryTracker.d.ts","sourceRoot":"","sources":["../../../../../../../src/_internal/platform/inlineEdits/common/workspaceEditTracker/nesXtabHistoryTracker.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,2CAA2C,CAAC;AAIvE,OAAO,EAAE,WAAW,EAAE,MAAM,2DAA2D,CAAC;AACxF,OAAO,EAAE,UAAU,EAAE,MAAM,0DAA0D,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAuB,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAGlF,MAAM,WAAW,yBAAyB;IACzC,KAAK,EAAE,UAAU,CAAC;CAClB;AAED,MAAM,WAAW,qBAAsB,SAAQ,yBAAyB;IACvE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;CACjB;AAED,MAAM,WAAW,8BAA+B,SAAQ,yBAAyB;IAChF,IAAI,EAAE,eAAe,CAAC;IACtB,aAAa,EAAE,SAAS,WAAW,EAAE,CAAC;IACtC,eAAe,EAAE,UAAU,CAAC;CAC5B;AAED,MAAM,MAAM,iBAAiB,GAC1B,qBAAqB,GACrB,8BAA8B,CAAA;AAcjC,qBAAa,qBAAsB,SAAQ,UAAU;IAQR,OAAO,CAAC,QAAQ,CAAC,cAAc;IAN3E,kCAAkC;IAClC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAM;IAErC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+E;IACzG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgC;gBAE5C,SAAS,EAAE,mBAAmB,EAAmB,cAAc,SAAyC;IAwBpH,UAAU,IAAI,iBAAiB,EAAE;IAIjC;;;OAGG;IACH,OAAO,CAAC,yBAAyB;IAwBjC,OAAO,CAAC,WAAW;IA4CnB,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,cAAc;CAWtB"}
+{"version":3,"file":"nesXtabHistoryTracker.d.ts","sourceRoot":"","sources":["../../../../../../../src/_internal/platform/inlineEdits/common/workspaceEditTracker/nesXtabHistoryTracker.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,2CAA2C,CAAC;AAGvE,OAAO,EAAW,WAAW,EAAE,MAAM,oDAAoD,CAAC;AAG1F,OAAO,EAAE,WAAW,EAAE,MAAM,2DAA2D,CAAC;AACxF,OAAO,EAAE,UAAU,EAAE,MAAM,0DAA0D,CAAC;AACtF,OAAO,EAAa,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AACtG,OAAO,EAAE,uBAAuB,EAAE,MAAM,sDAAsD,CAAC;AAC/F,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAuB,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAIlF,MAAM,WAAW,yBAAyB;IACzC,KAAK,EAAE,UAAU,CAAC;CAClB;AAED,MAAM,WAAW,qBAAsB,SAAQ,yBAAyB;IACvE,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;CACjB;AAED,MAAM,WAAW,8BAA+B,SAAQ,yBAAyB;IAChF,IAAI,EAAE,eAAe,CAAC;IACtB,aAAa,EAAE,SAAS,WAAW,EAAE,CAAC;IACtC,eAAe,EAAE,UAAU,CAAC;CAC5B;AAED,MAAM,MAAM,iBAAiB,GAC1B,qBAAqB,GACrB,8BAA8B,CAAA;AAcjC;;GAEG;AACH,MAAM,MAAM,qBAAqB;AAChC,mFAAmF;AACjF;IAAE,QAAQ,CAAC,IAAI,EAAE,wBAAwB,CAAC,aAAa,CAAA;CAAE;AAC3D,+FAA+F;GAC7F;IAAE,QAAQ,CAAC,IAAI,EAAE,wBAAwB,CAAC,SAAS,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE;AACjF;;;GAGG;GACD;IAAE,QAAQ,CAAC,IAAI,EAAE,wBAAwB,CAAC,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/G,yBAAiB,qBAAqB,CAAC;IAC/B,MAAM,aAAa,EAAE,qBAAwE,CAAC;IAErG,SAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,qBAAqB,CAEhE;IAED,SAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,qBAAqB,CAEnF;IAED;;OAEG;IACH,SAAgB,UAAU,CAAC,YAAY,EAAE,wBAAwB,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,qBAAqB,CAW/H;CACD;AAmBD,qBAAa,qBAAsB,SAAQ,UAAU;IAe5B,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAdtD,kCAAkC;IAClC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAM;IAErC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA2G;IACrI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgC;IAExD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IAExC,SAAS,CAAC,aAAa,EAAE,WAAW,CAAC,qBAAqB,CAAC,CAAC;gBAG3D,SAAS,EAAE,mBAAmB,EAC9B,cAAc,EAAE,MAAM,GAAG,SAAS,EACM,qBAAqB,EAAE,qBAAqB,EAC1C,WAAW,EAAE,uBAAuB;IAiC/E,UAAU,IAAI,iBAAiB,EAAE;IAIjC;;;OAGG;IACH,OAAO,CAAC,yBAAyB;IAwBjC,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,WAAW;IA0CnB,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,cAAc;CAWtB"}

package/dist/src/_internal/platform/inlineEdits/common/workspaceEditTracker/nesXtabHistoryTracker.js

@@ -3,22 +3,85 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
+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 __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var NesXtabHistoryTracker_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NesXtabHistoryTracker = void 0;
+exports.NesXtabHistoryTracker = exports.XtabEditMergeStrategy = void 0;
 const assert_1 = require("../../../../util/vs/base/common/assert");
 const lifecycle_1 = require("../../../../util/vs/base/common/lifecycle");
 const linkedList_1 = require("../../../../util/vs/base/common/linkedList");
 const observable_1 = require("../../../../util/vs/base/common/observable");
+const observableInternal_1 = require("../../../../util/vs/base/common/observableInternal");
+const configurationService_1 = require("../../../configuration/common/configurationService");
+const nullExperimentationService_1 = require("../../../telemetry/common/nullExperimentationService");
 const edit_1 = require("../dataTypes/edit");
+const xtabHistoryOptions_1 = require("../dataTypes/xtabHistoryOptions");
 const observable_2 = require("../utils/observable");
-class NesXtabHistoryTracker extends lifecycle_1.Disposable {
+const utils_1 = require("../utils/utils");
+var XtabEditMergeStrategy;
+(function (XtabEditMergeStrategy) {
+    XtabEditMergeStrategy.sameStartLine = { kind: xtabHistoryOptions_1.DiffHistoryMergeStrategy.SameStartLine };
+    function proximity(lineGap) {
+        return { kind: xtabHistoryOptions_1.DiffHistoryMergeStrategy.Proximity, lineGap };
+    }
+    XtabEditMergeStrategy.proximity = proximity;
+    function hybrid(lineGap, splitAfterMs) {
+        return { kind: xtabHistoryOptions_1.DiffHistoryMergeStrategy.Hybrid, lineGap, splitAfterMs };
+    }
+    XtabEditMergeStrategy.hybrid = hybrid;
+    /**
+     * Constructs a {@link XtabEditMergeStrategy} from config values.
+     */
+    function fromConfig(strategyKind, lineGap, splitAfterMs) {
+        switch (strategyKind) {
+            case xtabHistoryOptions_1.DiffHistoryMergeStrategy.Proximity:
+                return proximity(lineGap);
+            case xtabHistoryOptions_1.DiffHistoryMergeStrategy.Hybrid:
+                return hybrid(lineGap, splitAfterMs);
+            case xtabHistoryOptions_1.DiffHistoryMergeStrategy.SameStartLine:
+                return XtabEditMergeStrategy.sameStartLine;
+            default:
+                (0, assert_1.assertNever)(strategyKind);
+        }
+    }
+    XtabEditMergeStrategy.fromConfig = fromConfig;
+})(XtabEditMergeStrategy || (exports.XtabEditMergeStrategy = XtabEditMergeStrategy = {}));
+/**
+ * Returns whether all replacements in `a` are within `maxLineGap` lines of some replacement in `b` (and vice-versa).
+ */
+function areLineEditsWithinProximity(a, b, maxLineGap) {
+    if (a.isEmpty() || b.isEmpty()) {
+        return false;
+    }
+    // Every replacement in `a` must be close to at least one replacement in `b`.
+    for (const repA of a.replacements) {
+        const closeToSomeInB = b.replacements.some(repB => repA.lineRange.distanceToRange(repB.lineRange) <= maxLineGap);
+        if (!closeToSomeInB) {
+            return false;
+        }
+    }
+    return true;
+}
+let NesXtabHistoryTracker = class NesXtabHistoryTracker extends lifecycle_1.Disposable {
+    static { NesXtabHistoryTracker_1 = this; }
     /** Max # of entries in history */
     static { this.MAX_HISTORY_SIZE = 50; }
-    constructor(workspace, maxHistorySize = NesXtabHistoryTracker.MAX_HISTORY_SIZE) {
+    constructor(workspace, maxHistorySize, _configurationService, _expService) {
         super();
-        this.maxHistorySize = maxHistorySize;
+        this._configurationService = _configurationService;
+        this._expService = _expService;
         this.idToEntry = new Map();
         this.history = new linkedList_1.LinkedList();
+        this.maxHistorySize = maxHistorySize ?? NesXtabHistoryTracker_1.MAX_HISTORY_SIZE;
+        this.mergeStrategy = (0, observableInternal_1.derived)(reader => XtabEditMergeStrategy.fromConfig(this._configurationService.getExperimentBasedConfigObservable(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabDiffMergeStrategy, this._expService).read(reader), this._configurationService.getExperimentBasedConfigObservable(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabDiffMergeLineGap, this._expService).read(reader), this._configurationService.getExperimentBasedConfigObservable(configurationService_1.ConfigKey.TeamInternal.InlineEditsXtabDiffMergeSplitAfterMs, this._expService).read(reader)));
         (0, observable_1.mapObservableArrayCached)(this, workspace.openDocuments, (doc, store) => {
             // add .value to all observables
             store.add((0, observable_2.autorunWithChanges)(this, {
@@ -57,9 +120,24 @@ class NesXtabHistoryTracker extends lifecycle_1.Disposable {
         }
         const entry = { docId: doc.id, kind: 'visibleRanges', visibleRanges: visibleRangesChange.value, documentContent: doc.value.get() };
         const removeFromHistory = this.history.push(entry);
-        this.idToEntry.set(doc.id, { entry, removeFromHistory });
+        this.idToEntry.set(doc.id, { entry, removeFromHistory, lastEditTimestamp: (0, utils_1.now)() });
         this.compactHistory();
     }
+    shouldMerge(lastLineEdit, currentLineEdit, lastEditTimestamp) {
+        const strategy = this.mergeStrategy.get();
+        switch (strategy.kind) {
+            case xtabHistoryOptions_1.DiffHistoryMergeStrategy.SameStartLine:
+                return !currentLineEdit.isEmpty()
+                    && !lastLineEdit.isEmpty()
+                    && lastLineEdit.replacements[0].lineRange.startLineNumber === currentLineEdit.replacements[0].lineRange.startLineNumber;
+            case xtabHistoryOptions_1.DiffHistoryMergeStrategy.Proximity:
+                return areLineEditsWithinProximity(currentLineEdit, lastLineEdit, strategy.lineGap);
+            case xtabHistoryOptions_1.DiffHistoryMergeStrategy.Hybrid: {
+                const withinTimeWindow = ((0, utils_1.now)() - lastEditTimestamp) <= strategy.splitAfterMs;
+                return withinTimeWindow && areLineEditsWithinProximity(currentLineEdit, lastLineEdit, strategy.lineGap);
+            }
+        }
+    }
     handleEdits(doc, rootedEdits) {
         (0, assert_1.assert)(rootedEdits.previous !== undefined, `Document has previous version`);
         (0, assert_1.assert)(rootedEdits.changes.length === 1, `Expected 1 edit change but got ${rootedEdits.changes.length}`);
@@ -83,7 +161,7 @@ class NesXtabHistoryTracker extends lifecycle_1.Disposable {
         const lastRootedEdit = previousRecord.entry.edit;
         const lastLineEdit = edit_1.RootedEdit.toLineEdit(lastRootedEdit);
         const currentLineEdit = edit_1.RootedEdit.toLineEdit(currentRootedEdit);
-        if (!currentLineEdit.isEmpty() && !lastLineEdit.isEmpty() && lastLineEdit.replacements[0].lineRange.startLineNumber === currentLineEdit.replacements[0].lineRange.startLineNumber) {
+        if (this.shouldMerge(lastLineEdit, currentLineEdit, previousRecord.lastEditTimestamp)) {
             // merge edits
             previousRecord.removeFromHistory();
             const composedEdit = lastRootedEdit.edit.compose(currentEdit);
@@ -97,7 +175,7 @@ class NesXtabHistoryTracker extends lifecycle_1.Disposable {
     pushToHistory(docId, edit) {
         const entry = { docId, kind: 'edit', edit };
         const removeFromHistory = this.history.push(entry);
-        this.idToEntry.set(docId, { entry, removeFromHistory });
+        this.idToEntry.set(docId, { entry, removeFromHistory, lastEditTimestamp: (0, utils_1.now)() });
         this.compactHistory();
     }
     compactHistory() {
@@ -111,6 +189,10 @@ class NesXtabHistoryTracker extends lifecycle_1.Disposable {
             }
         }
     }
-}
+};
 exports.NesXtabHistoryTracker = NesXtabHistoryTracker;
+exports.NesXtabHistoryTracker = NesXtabHistoryTracker = NesXtabHistoryTracker_1 = __decorate([
+    __param(2, configurationService_1.IConfigurationService),
+    __param(3, nullExperimentationService_1.IExperimentationService)
+], NesXtabHistoryTracker);
 //# sourceMappingURL=nesXtabHistoryTracker.js.map

package/dist/src/_internal/platform/inlineEdits/common/workspaceEditTracker/nesXtabHistoryTracker.js.map

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

package/dist/src/_internal/platform/inlineEdits/node/inlineEditsModelService.d.ts

@@ -28,26 +28,33 @@ export declare class InlineEditsModelService extends Disposable implements IInli
     private _localModelConfigObs;
     private _expBasedModelConfigObs;
     private _defaultModelConfigObs;
+    private _useSlashModelsObs;
+    private _undesiredModelsObs;
     private _modelsObs;
     private _currentModelObs;
     private _modelInfoObs;
     readonly onModelListUpdated: Event<void>;
+    private readonly _setModelQueue;
     private _logger;
     constructor(_tokenStore: ICopilotTokenStore, _proxyModelsService: IProxyModelsService, _undesiredModelsManager: IUndesiredModelsManager, _configService: IConfigurationService, _expService: IExperimentationService, _telemetryService: ITelemetryService, _logService: ILogService);
     get modelInfo(): vscode.InlineCompletionModelInfo | undefined;
     setCurrentModelId(newPreferredModelId: string): Promise<void>;
+    private _setCurrentModelIdCore;
     private aggregateModels;
     selectedModelConfiguration(): ModelConfiguration;
     defaultModelConfiguration(): ModelConfiguration;
     private isConfiguredModel;
     private determineDefaultModel;
     private _pickModel;
-    private parseModelConfigStringSetting;
+    private parseModelConfigString;
 }
 export declare namespace UndesiredModels {
-    class Manager implements IUndesiredModelsManager {
+    class Manager extends Disposable implements IUndesiredModelsManager {
         private readonly _vscodeExtensionContext;
         _serviceBrand: undefined;
+        private readonly _onDidChange;
+        readonly onDidChange: Event<void>;
+        private readonly _queue;
         constructor(_vscodeExtensionContext: IVSCodeExtensionContext);
         isUndesiredModelId(modelId: string): boolean;
         addUndesiredModelId(modelId: string): Promise<void>;

package/dist/src/_internal/platform/inlineEdits/node/inlineEditsModelService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inlineEditsModelService.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/platform/inlineEdits/node/inlineEditsModelService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inlineEditsModelService.d.ts","sourceRoot":"","sources":["../../../../../../src/_internal/platform/inlineEdits/node/inlineEditsModelService.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,KAAK,MAAM,MAAM,QAAQ,CAAC;AAMtC,OAAO,EAAW,KAAK,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAGpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAoC,qBAAqB,EAAE,MAAM,iDAAiD,CAAC;AAC1H,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EAAW,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAmE,kBAAkB,EAAqB,MAAM,uCAAuC,CAAC;AAC/J,OAAO,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAuBtG,qBAAa,uBAAwB,SAAQ,UAAW,YAAW,wBAAwB;IAkDrE,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC3B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAChC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAtD1C,aAAa,EAAE,SAAS,CAAC;IAEzB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,CAM5C;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAMrC;IAEF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAM1C;IAEF,OAAO,CAAC,gBAAgB,CAAqG;IAG7H,OAAO,CAAC,iBAAiB,CAAoH;IAE7I,OAAO,CAAC,sBAAsB,CAA0H;IACxJ,OAAO,CAAC,oBAAoB,CAA6G;IACzI,OAAO,CAAC,uBAAuB,CAAoJ;IACnL,OAAO,CAAC,sBAAsB,CAA2J;IACzL,OAAO,CAAC,kBAAkB,CAA8H;IACxJ,OAAO,CAAC,mBAAmB,CAA2G;IAEtI,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,aAAa,CAAyB;IAE9C,SAAgB,kBAAkB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAEhD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAmB;IAClD,OAAO,CAAC,OAAO,CAAU;gBAGa,WAAW,EAAE,kBAAkB,EAC9B,mBAAmB,EAAE,mBAAmB,EACpC,uBAAuB,EAAE,uBAAuB,EAClD,cAAc,EAAE,qBAAqB,EACnC,WAAW,EAAE,uBAAuB,EAC1C,iBAAiB,EAAE,iBAAiB,EAC1C,WAAW,EAAE,WAAW;IAyCvD,IAAI,SAAS,IAAI,MAAM,CAAC,yBAAyB,GAAG,SAAS,CAY5D;IAGD,iBAAiB,CAAC,mBAAmB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAI/C,sBAAsB;IA0CpC,OAAO,CAAC,eAAe;IAoFhB,0BAA0B,IAAI,kBAAkB;IAUhD,yBAAyB,IAAI,kBAAkB;IAWtD,OAAO,CAAC,iBAAiB;IAczB,OAAO,CAAC,qBAAqB;IAmB7B,OAAO,CAAC,UAAU;IA2ClB,OAAO,CAAC,sBAAsB;CAyB9B;AAED,yBAAiB,eAAe,CAAC;IAKhC,MAAa,OAAQ,SAAQ,UAAW,YAAW,uBAAuB;QAS/C,OAAO,CAAC,QAAQ,CAAC,uBAAuB;QAR1D,aAAa,EAAE,SAAS,CAAC;QAEjC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAuC;QACpE,QAAQ,CAAC,WAAW,cAA2B;QAE/C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;oBAGC,uBAAuB,EAAE,uBAAuB;QAK3F,kBAAkB,CAAC,OAAO,EAAE,MAAM;QAKlC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;QAWnD,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;QAYtD,OAAO,CAAC,UAAU;QAIlB,OAAO,CAAC,UAAU;KAKlB;CACD"}