@sourcegraph/cody-web 0.7.4 → 0.7.7

package/dist/{agent.worker-CiIPD-tv.mjs → agent.worker-BZzA02C_.mjs}

@@ -18,7 +18,7 @@ var __privateWrapper = (obj, member, setter2, getter) => ({
   }
 });
 var _a2, _b, _constructing, _max, _maxSize, _dispose, _disposeAfter, _fetchMethod, _size, _calculatedSize, _keyMap, _keyList, _valList, _next, _prev, _head, _tail, _free, _disposed, _sizes, _starts, _ttls, _hasDispose, _hasFetchMethod, _hasDisposeAfter, _LRUCache_instances, initializeTTLTracking_fn, _updateItemAge, _statusTTL, _setItemTTL, _isStale, initializeSizeTracking_fn, _removeItemSize, _addItemSize, _requireSize, indexes_fn, rindexes_fn, isValidIndex_fn, evict_fn, backgroundFetch_fn, isBackgroundFetch_fn, connect_fn, moveToTail_fn, _c, _d, _e, _constructing2, _f, _g, _max2, _maxSize2, _dispose2, _disposeAfter2, _fetchMethod2, _size2, _calculatedSize2, _keyMap2, _keyList2, _valList2, _next2, _prev2, _head2, _tail2, _free2, _disposed2, _sizes2, _starts2, _ttls2, _hasDispose2, _hasFetchMethod2, _hasDisposeAfter2, _LRUCache_instances2, initializeTTLTracking_fn2, _updateItemAge2, _statusTTL2, _setItemTTL2, _isStale2, initializeSizeTracking_fn2, _removeItemSize2, _addItemSize2, _requireSize2, indexes_fn2, rindexes_fn2, isValidIndex_fn2, evict_fn2, backgroundFetch_fn2, isBackgroundFetch_fn2, connect_fn2, moveToTail_fn2, _root2, _hasMagic, _uflag, _parts, _parent, _parentIndex, _negs, _filledNegs, _options, _toString, _emptyExt, _AST_instances, fillNegs_fn, _AST_static, parseAST_fn, partsToRegExp_fn, parseGlob_fn, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
-import { bz as createSubscriber, bA as graphqlClient, bB as logError$2, aV as lodashExports, bC as logDebug$1, bD as isFileURI, w as wrapInActiveSpan, bE as INCLUDE_EVERYTHING_CONTEXT_FILTERS, bF as EXCLUDE_EVERYTHING_CONTEXT_FILTERS, bG as isAbortError, b8 as isError$1, bb as isDefined, bH as onAbort, bI as CHAT_OUTPUT_TOKEN_BUDGET, bk as ModelTag, b3 as CodyIDE, bJ as isEnterpriseUser, b2 as isCodyProUser, bs as CHAT_INPUT_TOKEN_BUDGET, bK as getModelInfo, bL as EXTENDED_CHAT_INPUT_TOKEN_BUDGET, bM as EXTENDED_USER_CONTEXT_TOKEN_BUDGET, g as getDefaultExportFromCjs, bN as pathFunctionsForURI, bO as uriBasename, bP as uriHasPrefix, bQ as isWindows, aL as URI, bR as Utils$1, p as ps, bS as Observable, b5 as commonjsGlobal, bT as fromVSCodeEvent, bU as ClientConfigSingleton, by as PromptString, bV as isCustomModel, bW as recordErrorToSpan, bX as dependentAbortController, bY as addCustomUserAgent, bZ as addTraceparent, b_ as fetch$2, b$ as verifyResponseCode, b7 as cryptoJsExports, c0 as openCtx, c1 as extensionForLanguage, c2 as isSourcegraphToken, c3 as _, c4 as toRangeData, c5 as DOTCOM_URL, c6 as requireBase64Js, c7 as isDotCom, c8 as NetworkError, c9 as isRateLimitError, ca as isAuthError, cb as offlineModeAuthStatus, cc as unauthenticatedStatus, cd as semver, t as telemetryRecorder, ce as defaultAuthStatus, bt as ACCOUNT_USAGE_URL, cf as SourcegraphGraphQLAPIClient, cg as networkErrorAuthStatus, ch as NoOpTelemetryRecorderProvider, ci as TimestampTelemetryProcessor_1, cj as updateGlobalTelemetryInstances, ck as TelemetryRecorderProvider, cl as telemetryRecorderProvider, cm as convertGitCloneURLToCodebaseName, cn as subscriptionDisposable, d as dedent$1, co as uriExtname, cp as SUPPORTED_URI_SCHEMAS, cq as require$$1$4, cr as dedupeWith$1, cs as getEditorInsertSpaces, ct as TimeoutError, cu as getActiveTraceAndSpanId, cv as isNetworkError$1, cw as trace, bj as isCodyProModel, b6 as CodyTaskState, be as isEqual, cx as getAugmentedNamespace, cy as main$1, cz as setUserAgent, cA as TESTING_TELEMETRY_EXPORTER, cB as dist, bm as isMacOS, bl as CustomCommandType, bx as setDisplayPathEnvInfo, T as TokenCounterUtils, C as ContextItemSource, cC as _root, cD as _baseGetTag, cE as isObjectLike_1, cF as isObject_1, bw as isErrorLike, au as displayPath, cG as DefaultChatCommands, cH as uriParseNameAndExtension, cI as uriDirname, cJ as DefaultEditCommands, an as FILE_CONTEXT_MENTION_PROVIDER, ao as SYMBOL_CONTEXT_MENTION_PROVIDER, ap as REMOTE_REPOSITORY_PROVIDER_URI, cK as promiseFactoryToObservable, cL as webMentionProvidersMetadata, cM as allMentionProvidersMetadata, cN as combineLatest$1, cO as expandToLineRange, am as displayPathBasename, av as displayLineRange, cP as truncateTextNearestLine, cQ as TokenCounter, bq as View, aQ as parseMentionQuery, cR as tracer, bd as isAbortErrorOrSocketHangUp, cS as isContextWindowLimitError, cT as truncatePromptString, cU as inputTextWithoutContextChipsFromPromptEditorState, bc as reformatBotMessageForChat, b1 as hydrateAfterPostMessage, cV as addMessageListenersForExtensionAPI, cW as createMessageAPIForExtension, cX as CODY_PASSTHROUGH_VSCODE_OPEN_COMMAND_ID, cY as editorStateFromPromptString, cZ as getEditorTabSize$1, bi as pluralize, c_ as AbortError, c$ as getEditorIndentString, b9 as RateLimitError$1, d0 as logResponseHeadersToSpan, d1 as TracedError, d2 as isNodeResponse, d3 as SpanStatusCode, aq as REMOTE_FILE_PROVIDER_URI, as as CURRENT_REPOSITORY_DIRECTORY_PROVIDER_URI, d4 as assertFileURI, ar as REMOTE_DIRECTORY_PROVIDER_URI, at as WEB_PROVIDER_URI, d5 as setOpenCtx, d6 as GIT_OPENCTX_PROVIDER_URI, d7 as ACCOUNT_UPGRADE_URL, aZ as scanForMentionTriggerInUserTextInput, ay as LARGE_FILE_WARNING_LABEL, d8 as GENERAL_HELP_LABEL, d9 as diffLines, da as psDedent, db as languageFromFilename, dc as ProgrammingLanguage, dd as truncatePromptStringStart, de as posixFilePaths, df as CODY_DOC_URL, ba as CODY_FEEDBACK_URL, dg as DISCORD_URL, dh as CODY_SUPPORT_URL, bu as getRelativeChatPeriod, di as SG_BLOG_URL, dj as ACCOUNT_LIMITS_INFO_URL, dk as setLogger, dl as CODY_OLLAMA_DOCS_URL, bv as browser$3 } from "./browser-BTzYzFoB.mjs";
+import { by as Observable, bz as unsubscribe, bA as createSubscriber, bB as graphqlClient, bC as logError$2, aU as lodashExports, bD as logDebug$1, bE as isFileURI, w as wrapInActiveSpan, bF as INCLUDE_EVERYTHING_CONTEXT_FILTERS, bG as isDotCom, bH as EXCLUDE_EVERYTHING_CONTEXT_FILTERS, bI as isAbortError, b7 as isError$1, ba as isDefined, bJ as onAbort, bK as CHAT_OUTPUT_TOKEN_BUDGET, bj as ModelTag, b2 as CodyIDE, bL as isEnterpriseUser, b1 as isCodyProUser, br as CHAT_INPUT_TOKEN_BUDGET, bM as getModelInfo, bN as EXTENDED_CHAT_INPUT_TOKEN_BUDGET, bO as EXTENDED_USER_CONTEXT_TOKEN_BUDGET, g as getDefaultExportFromCjs, bP as pathFunctionsForURI, bQ as uriBasename, bR as uriHasPrefix, bS as isWindows, aK as URI, bT as Utils$1, p as ps, bU as fromVSCodeEvent, bV as ClientConfigSingleton, bx as PromptString, bW as isCustomModel, bX as recordErrorToSpan, bY as dependentAbortController, bZ as addCustomUserAgent, b_ as addTraceparent, b$ as fetch$2, c0 as verifyResponseCode, b6 as cryptoJsExports, c1 as openCtx, c2 as AsyncSerialScheduler_1, c3 as extensionForLanguage, c4 as isSourcegraphToken, c5 as _, c6 as toRangeData, c7 as DOTCOM_URL, c8 as base64Js, b4 as commonjsGlobal, c9 as NetworkError, ca as isRateLimitError, cb as isAuthError, t as telemetryRecorder, cc as semver, cd as NO_INITIAL_VALUE, ce as distinctUntilChanged$1, cf as SourcegraphGraphQLAPIClient, cg as isNetworkLikeError, ch as NoOpTelemetryRecorderProvider, ci as TimestampTelemetryProcessor_1, cj as updateGlobalTelemetryInstances, ck as TelemetryRecorderProvider, cl as telemetryRecorderProvider, cm as convertGitCloneURLToCodebaseName, cn as subscriptionDisposable, d as dedent$1, co as uriExtname, cp as SUPPORTED_URI_SCHEMAS, cq as require$$1$4, cr as dedupeWith$1, cs as getEditorInsertSpaces, ct as TimeoutError, cu as getActiveTraceAndSpanId, cv as isNetworkError, cw as trace, bi as isCodyProModel, b5 as CodyTaskState, aS as createExtensionAPI, aT as createMessageAPIForWebview, bd as isEqual, cx as getAugmentedNamespace, cy as main$1, cz as setUserAgent, cA as TESTING_TELEMETRY_EXPORTER, cB as dist, cC as waitUntilComplete, bl as isMacOS, bk as CustomCommandType, bw as setDisplayPathEnvInfo, bs as ACCOUNT_USAGE_URL, T as TokenCounterUtils, C as ContextItemSource, cD as _root, cE as _baseGetTag, cF as isObjectLike_1, cG as isObject_1, bv as isErrorLike, at as displayPath, cH as DefaultChatCommands, cI as uriParseNameAndExtension, cJ as uriDirname, cK as DefaultEditCommands, an as FILE_CONTEXT_MENTION_PROVIDER, ao as SYMBOL_CONTEXT_MENTION_PROVIDER, ap as REMOTE_REPOSITORY_PROVIDER_URI, cL as promiseFactoryToObservable, cM as webMentionProvidersMetadata, cN as allMentionProvidersMetadata, cO as combineLatest$1, cP as expandToLineRange, am as displayPathBasename, au as displayLineRange, cQ as truncateTextNearestLine, cR as TokenCounter, bp as View, aP as parseMentionQuery, cS as tracer, bc as isAbortErrorOrSocketHangUp, cT as isContextWindowLimitError, cU as truncatePromptString, cV as inputTextWithoutContextChipsFromPromptEditorState, bb as reformatBotMessageForChat, b0 as hydrateAfterPostMessage, cW as addMessageListenersForExtensionAPI, cX as createMessageAPIForExtension, cY as startWith$1, cZ as promiseToObservable$1, c_ as CODY_PASSTHROUGH_VSCODE_OPEN_COMMAND_ID, c$ as editorStateFromPromptString, d0 as getEditorTabSize$1, bh as pluralize, d1 as AbortError, d2 as psDedent, d3 as getEditorIndentString, b8 as RateLimitError$1, d4 as logResponseHeadersToSpan, d5 as TracedError, d6 as isNodeResponse, d7 as SpanStatusCode, d8 as assertFileURI, aq as REMOTE_FILE_PROVIDER_URI, ar as REMOTE_DIRECTORY_PROVIDER_URI, as as WEB_PROVIDER_URI, d9 as setOpenCtx, da as GIT_OPENCTX_PROVIDER_URI, db as ACCOUNT_UPGRADE_URL, aY as scanForMentionTriggerInUserTextInput, ax as LARGE_FILE_WARNING_LABEL, dc as GENERAL_HELP_LABEL, dd as diffLines, de as languageFromFilename, df as ProgrammingLanguage, dg as truncatePromptStringStart, dh as posixFilePaths, di as CODY_DOC_URL, b9 as CODY_FEEDBACK_URL, dj as DISCORD_URL, dk as CODY_SUPPORT_URL, bt as getRelativeChatPeriod, dl as SG_BLOG_URL, dm as ACCOUNT_LIMITS_INFO_URL, dn as setLogger, dp as CODY_OLLAMA_DOCS_URL, bu as browser$3 } from "./browser-hDxNMh5y.mjs";
 function _mergeNamespaces(n, m) {
   for (var i = 0; i < m.length; i++) {
     const e = m[i];
@@ -38,6 +38,185 @@ function _mergeNamespaces(n, m) {
   }
   return Object.freeze(Object.defineProperty(n, Symbol.toStringTag, { value: "Module" }));
 }
+var __awaiter$2 = function(thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function(resolve2) {
+      resolve2(value);
+    });
+  }
+  return new (P || (P = Promise))(function(resolve2, reject) {
+    function fulfilled(value) {
+      try {
+        step6(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function rejected(value) {
+      try {
+        step6(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function step6(result) {
+      result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+    step6((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+class AsyncSerialScheduler {
+  constructor(observer) {
+    this._baseObserver = observer;
+    this._pendingPromises = /* @__PURE__ */ new Set();
+  }
+  complete() {
+    Promise.all(this._pendingPromises).then(() => this._baseObserver.complete()).catch((error) => this._baseObserver.error(error));
+  }
+  error(error) {
+    this._baseObserver.error(error);
+  }
+  schedule(task) {
+    const prevPromisesCompletion = Promise.all(this._pendingPromises);
+    const values = [];
+    const next = (value) => values.push(value);
+    const promise = Promise.resolve().then(() => __awaiter$2(this, void 0, void 0, function* () {
+      yield prevPromisesCompletion;
+      yield task(next);
+      this._pendingPromises.delete(promise);
+      for (const value of values) {
+        this._baseObserver.next(value);
+      }
+    })).catch((error) => {
+      this._pendingPromises.delete(promise);
+      this._baseObserver.error(error);
+    });
+    this._pendingPromises.add(promise);
+  }
+}
+var __awaiter$1 = function(thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function(resolve2) {
+      resolve2(value);
+    });
+  }
+  return new (P || (P = Promise))(function(resolve2, reject) {
+    function fulfilled(value) {
+      try {
+        step6(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function rejected(value) {
+      try {
+        step6(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function step6(result) {
+      result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+    step6((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+function filter$2(test2) {
+  return (observable) => {
+    return new Observable((observer) => {
+      const scheduler = new AsyncSerialScheduler(observer);
+      const subscription = observable.subscribe({
+        complete() {
+          scheduler.complete();
+        },
+        error(error) {
+          scheduler.error(error);
+        },
+        next(input) {
+          scheduler.schedule((next) => __awaiter$1(this, void 0, void 0, function* () {
+            if (yield test2(input)) {
+              next(input);
+            }
+          }));
+        }
+      });
+      return () => unsubscribe(subscription);
+    });
+  };
+}
+var __awaiter = function(thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function(resolve2) {
+      resolve2(value);
+    });
+  }
+  return new (P || (P = Promise))(function(resolve2, reject) {
+    function fulfilled(value) {
+      try {
+        step6(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function rejected(value) {
+      try {
+        step6(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function step6(result) {
+      result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+    step6((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+function map$1(mapper) {
+  return (observable) => {
+    return new Observable((observer) => {
+      const scheduler = new AsyncSerialScheduler(observer);
+      const subscription = observable.subscribe({
+        complete() {
+          scheduler.complete();
+        },
+        error(error) {
+          scheduler.error(error);
+        },
+        next(input) {
+          scheduler.schedule((next) => __awaiter(this, void 0, void 0, function* () {
+            const mapped = yield mapper(input);
+            next(mapped);
+          }));
+        }
+      });
+      return () => unsubscribe(subscription);
+    });
+  };
+}
+class MulticastSubject extends Observable {
+  constructor() {
+    super((observer) => {
+      this._observers.add(observer);
+      return () => this._observers.delete(observer);
+    });
+    this._observers = /* @__PURE__ */ new Set();
+  }
+  next(value) {
+    for (const observer of this._observers) {
+      observer.next(value);
+    }
+  }
+  error(error) {
+    for (const observer of this._observers) {
+      observer.error(error);
+    }
+  }
+  complete() {
+    for (const observer of this._observers) {
+      observer.complete();
+    }
+  }
+}
 var define_process_default$o = { env: {} };
 const version$2 = "0.5.1";
 class ResponseError extends Error {
@@ -6681,6 +6860,7 @@ class ContextFiltersProvider {
     __publicField2(this, "lastFetchDelay", 0);
     __publicField2(this, "lastResultLifetime");
     __publicField2(this, "fetchIntervalId");
+    __publicField2(this, "authStatusProvider", null);
     __publicField2(this, "contextFiltersSubscriber", createSubscriber());
     __publicField2(this, "onContextFiltersChanged", this.contextFiltersSubscriber.subscribe);
   }
@@ -6688,8 +6868,9 @@ class ContextFiltersProvider {
   get timerStateForTest() {
     return { delay: this.lastFetchDelay, lifetime: this.lastResultLifetime };
   }
-  async init(getRepoNamesFromWorkspaceUri) {
+  async init(getRepoNamesFromWorkspaceUri, authStatusProvider) {
     this.getRepoNamesFromWorkspaceUri = getRepoNamesFromWorkspaceUri;
+    this.authStatusProvider = authStatusProvider;
     this.reset();
     this.startRefetchTimer(await this.fetchContextFilters());
   }
@@ -6733,7 +6914,7 @@ class ContextFiltersProvider {
    */
   setTestingContextFilters(contextFilters) {
     if (contextFilters === null) {
-      this.init(this.getRepoNamesFromWorkspaceUri);
+      this.init(this.getRepoNamesFromWorkspaceUri, this.authStatusProvider);
     } else {
       this.setContextFilters(contextFilters);
     }
@@ -6813,7 +6994,13 @@ class ContextFiltersProvider {
     this.reset();
   }
   hasAllowEverythingFilters() {
-    return graphqlClient.isDotCom() || this.lastContextFiltersResponse === INCLUDE_EVERYTHING_CONTEXT_FILTERS;
+    return this.isDotCom() || this.lastContextFiltersResponse === INCLUDE_EVERYTHING_CONTEXT_FILTERS;
+  }
+  isDotCom() {
+    if (!this.authStatusProvider) {
+      throw new Error("authStatusProvider is not set, ContextFiltersProvider.init must be called");
+    }
+    return isDotCom(this.authStatusProvider.status);
   }
   hasIgnoreEverythingFilters() {
     return this.lastContextFiltersResponse === EXCLUDE_EVERYTHING_CONTEXT_FILTERS;
@@ -7131,6 +7318,7 @@ const _ModelsService = class _ModelsService {
     __publicField2(this, "authStatus");
     /** Cache of users preferences and defaults across each endpoint they have used */
     __publicField2(this, "_preferences");
+    __publicField2(this, "_selectedOrDefaultModelChanges", new MulticastSubject());
   }
   // Get all the providers currently available to the user
   get models() {
@@ -7203,9 +7391,13 @@ const _ModelsService = class _ModelsService {
     delete preferences.selected[usage];
     await this.flush();
   }
+  get selectedOrDefaultModelChanges() {
+    return this._selectedOrDefaultModelChanges;
+  }
   async flush() {
     var _a3;
     await ((_a3 = this.storage) == null ? void 0 : _a3.set(_ModelsService.STORAGE_KEY, JSON.stringify(this._preferences)));
+    this._selectedOrDefaultModelChanges.next();
   }
   /**
    * Add new models for use.
@@ -7558,7 +7750,7 @@ class ChatClient {
       ...params,
       messages: messagesToSend
     };
-    const customHeaders = isFireworks && this.getAuthStatus().isFireworksTracingEnabled ? { "X-Fireworks-Genie": "true" } : {};
+    const customHeaders = isFireworks && authStatus.isFireworksTracingEnabled ? { "X-Fireworks-Genie": "true" } : {};
     return this.completions.stream(
       completionParams,
       {
@@ -8213,252 +8405,6 @@ class Typewriter {
     }
   }
 }
-var __awaiter$3 = function(thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function(resolve2) {
-      resolve2(value);
-    });
-  }
-  return new (P || (P = Promise))(function(resolve2, reject) {
-    function fulfilled(value) {
-      try {
-        step6(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function rejected(value) {
-      try {
-        step6(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function step6(result) {
-      result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-    step6((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-let AsyncSerialScheduler$1 = class AsyncSerialScheduler2 {
-  constructor(observer) {
-    this._baseObserver = observer;
-    this._pendingPromises = /* @__PURE__ */ new Set();
-  }
-  complete() {
-    Promise.all(this._pendingPromises).then(() => this._baseObserver.complete()).catch((error) => this._baseObserver.error(error));
-  }
-  error(error) {
-    this._baseObserver.error(error);
-  }
-  schedule(task) {
-    const prevPromisesCompletion = Promise.all(this._pendingPromises);
-    const values = [];
-    const next = (value) => values.push(value);
-    const promise = Promise.resolve().then(() => __awaiter$3(this, void 0, void 0, function* () {
-      yield prevPromisesCompletion;
-      yield task(next);
-      this._pendingPromises.delete(promise);
-      for (const value of values) {
-        this._baseObserver.next(value);
-      }
-    })).catch((error) => {
-      this._pendingPromises.delete(promise);
-      this._baseObserver.error(error);
-    });
-    this._pendingPromises.add(promise);
-  }
-};
-function unsubscribe(subscription) {
-  if (typeof subscription === "function") {
-    subscription();
-  } else if (subscription && typeof subscription.unsubscribe === "function") {
-    subscription.unsubscribe();
-  }
-}
-var __awaiter$2 = function(thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function(resolve2) {
-      resolve2(value);
-    });
-  }
-  return new (P || (P = Promise))(function(resolve2, reject) {
-    function fulfilled(value) {
-      try {
-        step6(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function rejected(value) {
-      try {
-        step6(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function step6(result) {
-      result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-    step6((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-function filter$2(test2) {
-  return (observable) => {
-    return new Observable((observer) => {
-      const scheduler = new AsyncSerialScheduler$1(observer);
-      const subscription = observable.subscribe({
-        complete() {
-          scheduler.complete();
-        },
-        error(error) {
-          scheduler.error(error);
-        },
-        next(input) {
-          scheduler.schedule((next) => __awaiter$2(this, void 0, void 0, function* () {
-            if (yield test2(input)) {
-              next(input);
-            }
-          }));
-        }
-      });
-      return () => unsubscribe(subscription);
-    });
-  };
-}
-var __awaiter$1 = function(thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function(resolve2) {
-      resolve2(value);
-    });
-  }
-  return new (P || (P = Promise))(function(resolve2, reject) {
-    function fulfilled(value) {
-      try {
-        step6(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function rejected(value) {
-      try {
-        step6(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function step6(result) {
-      result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-    step6((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-function map$1(mapper) {
-  return (observable) => {
-    return new Observable((observer) => {
-      const scheduler = new AsyncSerialScheduler$1(observer);
-      const subscription = observable.subscribe({
-        complete() {
-          scheduler.complete();
-        },
-        error(error) {
-          scheduler.error(error);
-        },
-        next(input) {
-          scheduler.schedule((next) => __awaiter$1(this, void 0, void 0, function* () {
-            const mapped = yield mapper(input);
-            next(mapped);
-          }));
-        }
-      });
-      return () => unsubscribe(subscription);
-    });
-  };
-}
-class MulticastSubject extends Observable {
-  constructor() {
-    super((observer) => {
-      this._observers.add(observer);
-      return () => this._observers.delete(observer);
-    });
-    this._observers = /* @__PURE__ */ new Set();
-  }
-  next(value) {
-    for (const observer of this._observers) {
-      observer.next(value);
-    }
-  }
-  error(error) {
-    for (const observer of this._observers) {
-      observer.error(error);
-    }
-  }
-  complete() {
-    for (const observer of this._observers) {
-      observer.complete();
-    }
-  }
-}
-var _scheduler = {};
-var __awaiter = commonjsGlobal && commonjsGlobal.__awaiter || function(thisArg, _arguments, P, generator) {
-  function adopt(value) {
-    return value instanceof P ? value : new P(function(resolve2) {
-      resolve2(value);
-    });
-  }
-  return new (P || (P = Promise))(function(resolve2, reject) {
-    function fulfilled(value) {
-      try {
-        step6(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function rejected(value) {
-      try {
-        step6(generator["throw"](value));
-      } catch (e) {
-        reject(e);
-      }
-    }
-    function step6(result) {
-      result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
-    }
-    step6((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-Object.defineProperty(_scheduler, "__esModule", { value: true });
-var AsyncSerialScheduler_1 = _scheduler.AsyncSerialScheduler = void 0;
-class AsyncSerialScheduler {
-  constructor(observer) {
-    this._baseObserver = observer;
-    this._pendingPromises = /* @__PURE__ */ new Set();
-  }
-  complete() {
-    Promise.all(this._pendingPromises).then(() => this._baseObserver.complete()).catch((error) => this._baseObserver.error(error));
-  }
-  error(error) {
-    this._baseObserver.error(error);
-  }
-  schedule(task) {
-    const prevPromisesCompletion = Promise.all(this._pendingPromises);
-    const values = [];
-    const next = (value) => values.push(value);
-    const promise = Promise.resolve().then(() => __awaiter(this, void 0, void 0, function* () {
-      yield prevPromisesCompletion;
-      yield task(next);
-      this._pendingPromises.delete(promise);
-      for (const value of values) {
-        this._baseObserver.next(value);
-      }
-    })).catch((error) => {
-      this._pendingPromises.delete(promise);
-      this._baseObserver.error(error);
-    });
-    this._pendingPromises.add(promise);
-  }
-}
-AsyncSerialScheduler_1 = _scheduler.AsyncSerialScheduler = AsyncSerialScheduler;
 var define_process_default$j = { env: {} };
 var FeatureFlag = /* @__PURE__ */ ((FeatureFlag2) => {
   FeatureFlag2["TestFlagDoNotUse"] = "test-flag-do-not-use";
@@ -8474,12 +8420,17 @@ var FeatureFlag = /* @__PURE__ */ ((FeatureFlag2) => {
   FeatureFlag2["CodyAutocompleteFIMModelExperimentVariant3"] = "cody-autocomplete-fim-model-experiment-variant-3-v2";
   FeatureFlag2["CodyAutocompleteFIMModelExperimentVariant4"] = "cody-autocomplete-fim-model-experiment-variant-4-v2";
   FeatureFlag2["CodyAutocompleteClaude3"] = "cody-autocomplete-claude-3";
-  FeatureFlag2["CodyAutocompleteContextBfgMixed"] = "cody-autocomplete-context-bfg-mixed";
   FeatureFlag2["CodyAutocompleteUserLatency"] = "cody-autocomplete-user-latency";
   FeatureFlag2["CodyAutocompletePreloadingExperimentBaseFeatureFlag"] = "cody-autocomplete-preloading-experiment-flag";
   FeatureFlag2["CodyAutocompletePreloadingExperimentVariant1"] = "cody-autocomplete-preloading-experiment-variant-1";
   FeatureFlag2["CodyAutocompletePreloadingExperimentVariant2"] = "cody-autocomplete-preloading-experiment-variant-2";
   FeatureFlag2["CodyAutocompletePreloadingExperimentVariant3"] = "cody-autocomplete-preloading-experiment-variant-3";
+  FeatureFlag2["CodyAutocompleteContextExperimentBaseFeatureFlag"] = "cody-autocomplete-context-experiment-flag";
+  FeatureFlag2["CodyAutocompleteContextExperimentVariant1"] = "cody-autocomplete-context-experiment-variant-1";
+  FeatureFlag2["CodyAutocompleteContextExperimentVariant2"] = "cody-autocomplete-context-experiment-variant-2";
+  FeatureFlag2["CodyAutocompleteContextExperimentVariant3"] = "cody-autocomplete-context-experiment-variant-3";
+  FeatureFlag2["CodyAutocompleteContextExperimentVariant4"] = "cody-autocomplete-context-experiment-variant-4";
+  FeatureFlag2["CodyAutocompleteContextExperimentControl"] = "cody-autocomplete-context-experiment-control";
   FeatureFlag2["CodyAutocompleteContextExtendLanguagePool"] = "cody-autocomplete-context-extend-language-pool";
   FeatureFlag2["UseSscForCodySubscription"] = "use-ssc-for-cody-subscription";
   FeatureFlag2["CodyProTrialEnded"] = "cody-pro-trial-ended";
@@ -17859,8 +17810,8 @@ const capabilities = {
 };
 const dependencies = {
   "@anthropic-ai/sdk": "^0.20.8",
-  "@openctx/provider-linear-issues": "^0.0.6",
-  "@openctx/vscode-lib": "^0.0.21",
+  "@openctx/provider-linear-issues": "^0.0.7",
+  "@openctx/vscode-lib": "^0.0.22",
   "@opentelemetry/api": "^1.7.0",
   "@opentelemetry/core": "^1.18.1",
   "@opentelemetry/exporter-trace-otlp-http": "^0.45.1",
@@ -19715,10 +19666,6 @@ const emptyFileWatcher = {
 let clientInfo;
 function setClientInfo(newClientInfo) {
   clientInfo = newClientInfo;
-  setClientNameVersion(
-    clientInfo.legacyNameForServerIdentification ?? clientInfo.name,
-    clientInfo.version
-  );
   if (newClientInfo.extensionConfiguration) {
     setExtensionConfiguration(newClientInfo.extensionConfiguration);
   }
@@ -22819,7 +22766,7 @@ function requireBuffer() {
   if (hasRequiredBuffer) return buffer;
   hasRequiredBuffer = 1;
   (function(exports2) {
-    const base64 = requireBase64Js();
+    const base64 = base64Js;
     const ieee7542 = requireIeee754();
     const customInspectSymbol = typeof Symbol === "function" && typeof Symbol["for"] === "function" ? Symbol["for"]("nodejs.util.inspect.custom") : null;
     exports2.Buffer = Buffer2;
@@ -33545,52 +33492,47 @@ function getOSArch() {
     arch: arch2
   };
 }
-var AccountMenuOptions = /* @__PURE__ */ ((AccountMenuOptions2) => {
-  AccountMenuOptions2["SignOut"] = "Sign Out";
-  AccountMenuOptions2["Manage"] = "Manage Account";
-  AccountMenuOptions2["Switch"] = "Switch Account...";
-  return AccountMenuOptions2;
-})(AccountMenuOptions || {});
-async function openAccountMenu(authStatus) {
-  if (!authStatus.authenticated || !authStatus.endpoint) {
-    return;
+class AuthProviderSimplified {
+  async openExternalAuthUrl(method, tokenReceiverUrl) {
+    if (!await openExternalAuthUrl(method, tokenReceiverUrl)) {
+      return false;
+    }
+    authProvider.instance.setAuthPendingToEndpoint(DOTCOM_URL.toString());
+    return true;
   }
-  const isOffline = authStatus.isOfflineMode;
-  const isDotComInstance = isDotCom(authStatus.endpoint) && !isOffline;
-  const displayName2 = authStatus.displayName || authStatus.username;
-  const email = authStatus.primaryEmail || "No Email";
-  const username = authStatus.username || authStatus.displayName;
-  const planDetail = `Plan: ${authStatus.userCanUpgrade ? "Cody Free" : "Cody Pro"}`;
-  const enterpriseDetail = `Enterprise Instance:
-${authStatus.endpoint}`;
-  const offlineDetail = "Use Cody offline with Ollama";
-  const options = isDotComInstance ? [
-    "Manage Account"
-    /* Manage */
-  ] : [];
-  options.push(
-    "Switch Account...",
-    "Sign Out"
-    /* SignOut */
-  );
-  const messageOptions = {
-    modal: true,
-    detail: isOffline ? offlineDetail : isDotComInstance ? planDetail : enterpriseDetail
-  };
-  const online = isDotComInstance ? `Signed in as ${displayName2} (${email})` : `Signed in as @${username}`;
-  const offline = "Offline Mode";
-  const message = isOffline ? offline : online;
-  const option = await window$1.showInformationMessage(message, messageOptions, ...options);
-  switch (option !== void 0) {
-    case (option == null ? void 0 : option.startsWith("Sign Out")):
-      return "Sign Out";
-    case (option == null ? void 0 : option.startsWith("Manage")):
-      return "Manage Account";
-    case (option == null ? void 0 : option.startsWith("Switch")):
-      return "Switch Account...";
+}
+function getAuthReferralCode() {
+  return {
+    "vscode-insiders": "CODY_INSIDERS",
+    vscodium: "CODY_VSCODIUM",
+    cursor: "CODY_CURSOR"
+  }[env.uriScheme] || "CODY";
+}
+function openExternalAuthUrl(provider, tokenReceiverUrl) {
+  const referralCode = getAuthReferralCode();
+  const tokenReceiver = tokenReceiverUrl ? `&tokenReceiverUrl=${encodeURIComponent(tokenReceiverUrl)}` : "";
+  const newTokenUrl = `/user/settings/tokens/new/callback?requestFrom=${referralCode}${tokenReceiver}`;
+  const site = new URL(newTokenUrl, DOTCOM_URL);
+  const genericLoginUrl = `${site}sign-in?returnTo=${newTokenUrl}`;
+  const gitHubLoginUrl = `${site}.auth/openidconnect/login?prompt_auth=github&pc=sams&redirect=${newTokenUrl}`;
+  const gitLabLoginUrl = `${site}.auth/openidconnect/login?prompt_auth=gitlab&pc=sams&redirect=${newTokenUrl}`;
+  const googleLoginUrl = `${site}.auth/openidconnect/login?prompt_auth=google&pc=sams&redirect=${newTokenUrl}`;
+  let uriSpec;
+  switch (provider) {
+    case "github":
+      uriSpec = gitHubLoginUrl;
+      break;
+    case "gitlab":
+      uriSpec = gitLabLoginUrl;
+      break;
+    case "google":
+      uriSpec = googleLoginUrl;
+      break;
     default:
-      return void 0;
+      uriSpec = genericLoginUrl;
+      break;
   }
+  return env.openExternal(uriSpec);
 }
 let runningAuthProgressIndicator = null;
 function startAuthProgressIndicator() {
@@ -33614,38 +33556,285 @@ function closeAuthProgressIndicator() {
   runningAuthProgressIndicator == null ? void 0 : runningAuthProgressIndicator();
   runningAuthProgressIndicator = null;
 }
+async function showSignInMenu(type2, uri2) {
+  const authStatus = authProvider.instance.status;
+  const mode = authStatus.authenticated ? "switch" : "signin";
+  logDebug("AuthProvider:signinMenu", mode);
+  telemetryRecorder.recordEvent("cody.auth.login", "clicked");
+  const item = await showAuthMenu(mode);
+  if (!item) {
+    return;
+  }
+  const menuID = item == null ? void 0 : item.id;
+  telemetryRecorder.recordEvent("cody.auth.signin.menu", "clicked", {
+    privateMetadata: { menuID }
+  });
+  switch (menuID) {
+    case "enterprise": {
+      const instanceUrl = await showInstanceURLInputBox(item.uri);
+      if (!instanceUrl) {
+        return;
+      }
+      authProvider.instance.setAuthPendingToEndpoint(instanceUrl);
+      redirectToEndpointLogin(instanceUrl);
+      break;
+    }
+    case "dotcom":
+      redirectToEndpointLogin(DOTCOM_URL.href);
+      break;
+    case "token": {
+      const instanceUrl = await showInstanceURLInputBox(item.uri);
+      if (!instanceUrl) {
+        return;
+      }
+      await signinMenuForInstanceUrl(instanceUrl);
+      break;
+    }
+    default: {
+      const selectedEndpoint = item.uri;
+      const token = await secretStorage.get(selectedEndpoint);
+      let authStatus2 = await authProvider.instance.auth({
+        endpoint: selectedEndpoint,
+        token: token || null
+      });
+      if (!(authStatus2 == null ? void 0 : authStatus2.authenticated)) {
+        const newToken = await showAccessTokenInputBox(item.uri);
+        if (!newToken) {
+          return;
+        }
+        authStatus2 = await authProvider.instance.auth({
+          endpoint: selectedEndpoint,
+          token: newToken || null
+        });
+      }
+      await showAuthResultMessage(selectedEndpoint, authStatus2);
+      logDebug("AuthProvider:signinMenu", mode, selectedEndpoint);
+    }
+  }
+}
+function getItemLabel$1(uri2, current) {
+  const icon2 = current ? "$(check) " : "";
+  if (isDotCom(uri2)) {
+    return `${icon2}Sourcegraph.com`;
+  }
+  return `${icon2}${uri2}`;
+}
+async function showAuthMenu(type2) {
+  const endpointHistory = localStorage.getEndpointHistory() ?? [];
+  const historySize = endpointHistory == null ? void 0 : endpointHistory.length;
+  const history = historySize > 0 ? endpointHistory == null ? void 0 : endpointHistory.map((uri2, i) => ({
+    id: uri2,
+    label: getItemLabel$1(uri2, type2 === "switch" && i === historySize - 1),
+    description: "",
+    uri: uri2
+  })).reverse() : [];
+  const separator = [{ label: type2 === "signin" ? "previously used" : "current", kind: -1 }];
+  const optionItems = [...LoginMenuOptionItems, ...separator, ...history];
+  const option = await window$1.showQuickPick(
+    optionItems,
+    AuthMenuOptions[type2]
+  );
+  return option;
+}
+async function showInstanceURLInputBox(title) {
+  const result = await window$1.showInputBox({
+    title,
+    prompt: "Enter the URL of the Sourcegraph instance. For example, https://sourcegraph.example.com.",
+    placeHolder: "https://sourcegraph.example.com",
+    value: "https://",
+    password: false,
+    ignoreFocusOut: true,
+    // valide input to ensure the user is not entering a token as URL
+    validateInput: (value) => {
+      if (!value) {
+        return null;
+      }
+      if (isSourcegraphToken(value)) {
+        return "Please enter a valid URL";
+      }
+      if (value.length > 4 && !value.startsWith("http")) {
+        return "URL must start with http or https";
+      }
+      if (!/([.]|^https?:\/\/)/.test(value)) {
+        return "Please enter a valid URL";
+      }
+      return null;
+    }
+  });
+  if (typeof result === "string") {
+    return result.trim();
+  }
+  return result;
+}
+async function showAccessTokenInputBox(endpoint) {
+  const result = await window$1.showInputBox({
+    title: endpoint,
+    prompt: 'Paste your access token. To create an access token, go to "Settings" and then "Access tokens" on the Sourcegraph instance.',
+    placeHolder: "Access Token",
+    password: true,
+    ignoreFocusOut: true
+  });
+  if (typeof result === "string") {
+    return result.trim();
+  }
+  return result;
+}
+const AuthMenuOptions = {
+  signin: {
+    title: "Other Sign-in Options",
+    placeholder: "Choose a sign-in option"
+  },
+  switch: {
+    title: "Switch Account",
+    placeHolder: "Choose an account"
+  }
+};
+const LoginMenuOptionItems = [
+  {
+    id: "enterprise",
+    label: "Sign In to Sourcegraph Enterprise Instance",
+    description: "v5.1 and above",
+    totalSteps: 1,
+    picked: true
+  },
+  {
+    id: "token",
+    label: "Sign In to Sourcegraph Enterprise Instance with Access Token",
+    description: "v5.0 and above",
+    totalSteps: 2
+  },
+  {
+    id: "token",
+    label: "Sign In with URL and Access Token",
+    totalSteps: 2
+  }
+];
+async function signinMenuForInstanceUrl(instanceUrl) {
+  const accessToken = await showAccessTokenInputBox(instanceUrl);
+  if (!accessToken) {
+    return;
+  }
+  const authState = await authProvider.instance.auth({
+    endpoint: instanceUrl,
+    token: accessToken
+  });
+  telemetryRecorder.recordEvent("cody.auth.signin.token", "clicked", {
+    metadata: {
+      success: authState.authenticated ? 1 : 0
+    }
+  });
+  await showAuthResultMessage(instanceUrl, authState);
+}
+function redirectToEndpointLogin(uri2) {
+  const endpoint = formatURL(uri2);
+  if (!endpoint) {
+    return;
+  }
+  if (env.uiKind === UIKind.Web) {
+    const newTokenNoCallbackUrl = new URL("/user/settings/tokens/new", endpoint);
+    void env.openExternal(Uri.parse(newTokenNoCallbackUrl.href));
+    void signinMenuForInstanceUrl(endpoint);
+    return;
+  }
+  const newTokenCallbackUrl = new URL("/user/settings/tokens/new/callback", endpoint);
+  newTokenCallbackUrl.searchParams.append("requestFrom", getAuthReferralCode());
+  authProvider.instance.setAuthPendingToEndpoint(endpoint);
+  void env.openExternal(Uri.parse(newTokenCallbackUrl.href));
+}
+async function showAuthResultMessage(endpoint, authStatus) {
+  if (authStatus == null ? void 0 : authStatus.authenticated) {
+    const authority = Uri.parse(endpoint).authority;
+    await window$1.showInformationMessage(`Signed in to ${authority || endpoint}`);
+  } else {
+    await showAuthFailureMessage(endpoint);
+  }
+}
+async function showAuthFailureMessage(endpoint) {
+  const authority = Uri.parse(endpoint).authority;
+  await window$1.showErrorMessage(
+    `Authentication failed. Please ensure Cody is enabled for ${authority} and verify your email address if required.`
+  );
+}
+async function tokenCallbackHandler(uri2, customHeaders) {
+  closeAuthProgressIndicator();
+  const params = new URLSearchParams(uri2.query);
+  const token = params.get("code");
+  const endpoint = authProvider.instance.status.endpoint;
+  if (!token || !endpoint) {
+    return;
+  }
+  const authState = await authProvider.instance.auth({ endpoint, token, customHeaders });
+  telemetryRecorder.recordEvent("cody.auth.fromCallback.web", "succeeded", {
+    metadata: {
+      success: (authState == null ? void 0 : authState.authenticated) ? 1 : 0
+    }
+  });
+  if (authState == null ? void 0 : authState.authenticated) {
+    await window$1.showInformationMessage(`Signed in to ${endpoint}`);
+  } else {
+    await showAuthFailureMessage(endpoint);
+  }
+}
+function formatURL(uri2) {
+  try {
+    if (!uri2) {
+      return null;
+    }
+    if (isSourcegraphToken(uri2)) {
+      throw new Error("Access Token is not a valid URL");
+    }
+    if (!uri2.startsWith("http")) {
+      uri2 = `https://${uri2}`;
+    }
+    const endpointUri = new URL(uri2);
+    return endpointUri.href;
+  } catch (error) {
+    console.error("Invalid URL: ", error);
+    return null;
+  }
+}
+async function showSignOutMenu() {
+  telemetryRecorder.recordEvent("cody.auth.logout", "clicked");
+  const { endpoint } = authProvider.instance.status;
+  if (endpoint) {
+    await signOut(endpoint);
+    logDebug("AuthProvider:signoutMenu", endpoint);
+  }
+}
+async function signOut(endpoint) {
+  await secretStorage.deleteToken(endpoint);
+  await localStorage.deleteEndpoint();
+  await authProvider.instance.auth({ endpoint, token: null });
+  await commands$1.executeCommand("setContext", "cody.activated", false);
+}
 function newAuthStatus(options) {
   var _a3;
-  const {
-    isOfflineMode,
-    endpoint,
-    siteHasCodyEnabled,
-    username,
-    authenticated,
-    isDotCom: isDotCom2,
-    siteVersion,
-    userOrganizations
-  } = options;
-  if (isOfflineMode) {
-    return { ...offlineModeAuthStatus, endpoint, username };
+  if (!options.authenticated) {
+    return { authenticated: false, endpoint: options.endpoint, showInvalidAccessTokenError: true };
   }
-  if (!authenticated) {
-    return { ...unauthenticatedStatus, endpoint };
+  const { isOfflineMode, username, endpoint, siteVersion, userOrganizations } = options;
+  if (isOfflineMode) {
+    return {
+      authenticated: true,
+      endpoint,
+      username,
+      codyApiVersion: 0,
+      siteVersion: "offline",
+      isOfflineMode: true
+    };
   }
-  const primaryEmail = typeof options.primaryEmail === "string" ? options.primaryEmail : ((_a3 = options.primaryEmail) == null ? void 0 : _a3.email) || "";
-  const requiresVerifiedEmail = isDotCom2;
-  const hasVerifiedEmail = requiresVerifiedEmail && options.hasVerifiedEmail;
-  const isAllowed = !requiresVerifiedEmail || hasVerifiedEmail;
+  const isDotCom_ = isDotCom(endpoint);
+  const primaryEmail = typeof options.primaryEmail === "string" ? options.primaryEmail : (_a3 = options.primaryEmail) == null ? void 0 : _a3.email;
+  const requiresVerifiedEmail = isDotCom_;
+  const hasVerifiedEmail = requiresVerifiedEmail && options.authenticated && options.hasVerifiedEmail;
   return {
     ...options,
-    showInvalidAccessTokenError: false,
     endpoint,
     primaryEmail,
     requiresVerifiedEmail,
     hasVerifiedEmail,
-    isLoggedIn: siteHasCodyEnabled && authenticated && isAllowed,
-    codyApiVersion: inferCodyApiVersion(siteVersion, isDotCom2),
-    isFireworksTracingEnabled: isDotCom2 && !!(userOrganizations == null ? void 0 : userOrganizations.nodes.find((org) => org.name === "sourcegraph"))
+    codyApiVersion: inferCodyApiVersion(siteVersion, isDotCom_),
+    isFireworksTracingEnabled: isDotCom_ && !!(userOrganizations == null ? void 0 : userOrganizations.nodes.find((org) => org.name === "sourcegraph"))
   };
 }
 const countGeneratedCode = (text) => {
@@ -33729,7 +33918,7 @@ function getEnterpriseOutputLimit(model2) {
 async function syncModels(authStatus) {
   var _a3, _b2;
   modelsService.instance.setAuthStatus(authStatus);
-  if (authStatus.isOfflineMode) {
+  if (authStatus.authenticated && authStatus.isOfflineMode) {
     modelsService.instance.setModels([]);
     return;
   }
@@ -33742,12 +33931,15 @@ async function syncModels(authStatus) {
     logDebug("ModelsService", "new models API enabled");
     const serverSideModels = await fetchServerSideModels(authStatus.endpoint || "");
     if (serverSideModels) {
-      modelsService.instance.setServerSentModels(serverSideModels);
+      modelsService.instance.setServerSentModels({
+        ...serverSideModels,
+        models: maybeAdjustContextWindows(serverSideModels.models)
+      });
       registerModelsFromVSCodeConfiguration();
       return;
     }
   }
-  if (authStatus.isDotCom) {
+  if (isDotCom(authStatus)) {
     modelsService.instance.setModels(getDotComDefaultModels());
     registerModelsFromVSCodeConfiguration();
     return;
@@ -33799,6 +33991,13 @@ async function fetchServerSideModels(endpoint) {
   const client = new RestClient(endpoint, userAccessToken, customHeaders);
   return await client.getAvailableModels();
 }
+const maybeAdjustContextWindows = (models) => models.map((model2) => {
+  let maxInputTokens = model2.contextWindow.maxInputTokens;
+  if (/^mi(x|s)tral/.test(model2.modelName)) {
+    maxInputTokens = Math.round(model2.contextWindow.maxInputTokens * 0.85);
+  }
+  return { ...model2, contextWindow: { ...model2.contextWindow, maxInputTokens } };
+});
 function logFirstEnrollmentEvent(key, isEnabled) {
   const isEnrolled = localStorage.getEnrollmentHistory(key);
   const eventName = getFeatureFlagEventName(key);
@@ -33843,159 +34042,18 @@ const maybeStartInteractiveTutorial = async () => {
   }
   return commands$1.executeCommand("cody.tutorial.start");
 };
-function getItemLabel$1(uri2, current) {
-  const icon2 = current ? "$(check) " : "";
-  if (isDotCom(uri2)) {
-    return `${icon2}Sourcegraph.com`;
-  }
-  return `${icon2}${uri2}`;
-}
-const AuthMenu = async (type2, historyItems) => {
-  const historySize = historyItems == null ? void 0 : historyItems.length;
-  const history = historySize > 0 ? historyItems == null ? void 0 : historyItems.map((uri2, i) => ({
-    id: uri2,
-    label: getItemLabel$1(uri2, type2 === "switch" && i === historySize - 1),
-    description: "",
-    uri: uri2
-  })).reverse() : [];
-  const separator = [{ label: type2 === "signin" ? "previously used" : "current", kind: -1 }];
-  const optionItems = [...LoginMenuOptionItems, ...separator, ...history];
-  const option = await window$1.showQuickPick(
-    optionItems,
-    AuthMenuOptions[type2]
-  );
-  return option;
-};
-async function showInstanceURLInputBox(title) {
-  const result = await window$1.showInputBox({
-    title,
-    prompt: "Enter the URL of the Sourcegraph instance. For example, https://sourcegraph.example.com.",
-    placeHolder: "https://sourcegraph.example.com",
-    value: "https://",
-    password: false,
-    ignoreFocusOut: true,
-    // valide input to ensure the user is not entering a token as URL
-    validateInput: (value) => {
-      if (!value) {
-        return null;
-      }
-      if (isSourcegraphToken(value)) {
-        return "Please enter a valid URL";
-      }
-      if (value.length > 4 && !value.startsWith("http")) {
-        return "URL must start with http or https";
-      }
-      if (!/([.]|^https?:\/\/)/.test(value)) {
-        return "Please enter a valid URL";
-      }
-      return null;
-    }
-  });
-  if (typeof result === "string") {
-    return result.trim();
-  }
-  return result;
-}
-async function showAccessTokenInputBox(endpoint) {
-  const result = await window$1.showInputBox({
-    title: endpoint,
-    prompt: 'Paste your access token. To create an access token, go to "Settings" and then "Access tokens" on the Sourcegraph instance.',
-    placeHolder: "Access Token",
-    password: true,
-    ignoreFocusOut: true
-  });
-  if (typeof result === "string") {
-    return result.trim();
-  }
-  return result;
-}
-const AuthMenuOptions = {
-  signin: {
-    title: "Other Sign-in Options",
-    placeholder: "Choose a sign-in option"
-  },
-  switch: {
-    title: "Switch Account",
-    placeHolder: "Choose an account"
-  }
-};
-const LoginMenuOptionItems = [
-  {
-    id: "enterprise",
-    label: "Sign In to Sourcegraph Enterprise Instance",
-    description: "v5.1 and above",
-    totalSteps: 1,
-    picked: true
-  },
-  {
-    id: "token",
-    label: "Sign In to Sourcegraph Enterprise Instance with Access Token",
-    description: "v5.0 and above",
-    totalSteps: 2
-  },
-  {
-    id: "token",
-    label: "Sign In with URL and Access Token",
-    totalSteps: 2
-  }
-];
-class AuthProviderSimplified {
-  async openExternalAuthUrl(method, tokenReceiverUrl) {
-    if (!await openExternalAuthUrl(method, tokenReceiverUrl)) {
-      return false;
-    }
-    authProvider.instance.authProviderSimplifiedWillAttemptAuth();
-    return true;
-  }
-}
-function getAuthReferralCode() {
-  return {
-    "vscode-insiders": "CODY_INSIDERS",
-    vscodium: "CODY_VSCODIUM",
-    cursor: "CODY_CURSOR"
-  }[env.uriScheme] || "CODY";
-}
-function openExternalAuthUrl(provider, tokenReceiverUrl) {
-  const referralCode = getAuthReferralCode();
-  const tokenReceiver = tokenReceiverUrl ? `&tokenReceiverUrl=${encodeURIComponent(tokenReceiverUrl)}` : "";
-  const newTokenUrl = `/user/settings/tokens/new/callback?requestFrom=${referralCode}${tokenReceiver}`;
-  const site = new URL(newTokenUrl, DOTCOM_URL);
-  const genericLoginUrl = `${site}sign-in?returnTo=${newTokenUrl}`;
-  const gitHubLoginUrl = `${site}.auth/openidconnect/login?prompt_auth=github&pc=sams&redirect=${newTokenUrl}`;
-  const gitLabLoginUrl = `${site}.auth/openidconnect/login?prompt_auth=gitlab&pc=sams&redirect=${newTokenUrl}`;
-  const googleLoginUrl = `${site}.auth/openidconnect/login?prompt_auth=google&pc=sams&redirect=${newTokenUrl}`;
-  let uriSpec;
-  switch (provider) {
-    case "github":
-      uriSpec = gitHubLoginUrl;
-      break;
-    case "gitlab":
-      uriSpec = gitLabLoginUrl;
-      break;
-    case "google":
-      uriSpec = googleLoginUrl;
-      break;
-    default:
-      uriSpec = genericLoginUrl;
-      break;
-  }
-  return env.openExternal(uriSpec);
-}
 const HAS_AUTHENTICATED_BEFORE_KEY = "has-authenticated-before";
 class AuthProvider {
   constructor(config) {
-    __publicField2(this, "endpointHistory", []);
     __publicField2(this, "client", null);
-    __publicField2(this, "status", defaultAuthStatus);
+    __publicField2(this, "_status", null);
     __publicField2(this, "didChangeEvent", new AgentEventEmitter());
     __publicField2(this, "disposables", [this.didChangeEvent]);
     __publicField2(this, "changes", fromVSCodeEvent(
       this.didChangeEvent.event,
-      this.getAuthStatus.bind(this)
-    ));
+      () => this._status ?? NO_INITIAL_VALUE
+    ).pipe(distinctUntilChanged$1()));
     this.config = config;
-    this.status.endpoint = "init";
-    this.loadEndpointHistory();
   }
   dispose() {
     for (const d2 of this.disposables) {
@@ -34018,114 +34076,6 @@ class AuthProvider {
       isExtensionStartup: true
     }).catch((error) => logError$2("AuthProvider:init:failed", lastEndpoint, { verbose: error }));
   }
-  // Display quickpick to select endpoint to sign in to
-  async signinMenu(type2, uri2) {
-    const mode = this.status.isLoggedIn ? "switch" : "signin";
-    logDebug("AuthProvider:signinMenu", mode);
-    telemetryRecorder.recordEvent("cody.auth.login", "clicked");
-    const item = await AuthMenu(mode, this.endpointHistory);
-    if (!item) {
-      return;
-    }
-    const menuID = type2 || (item == null ? void 0 : item.id);
-    telemetryRecorder.recordEvent("cody.auth.signin.menu", "clicked", {
-      privateMetadata: { menuID }
-    });
-    switch (menuID) {
-      case "enterprise": {
-        const instanceUrl = await showInstanceURLInputBox(item.uri);
-        if (!instanceUrl) {
-          return;
-        }
-        this.status.endpoint = instanceUrl;
-        this.redirectToEndpointLogin(instanceUrl);
-        break;
-      }
-      case "dotcom":
-        this.redirectToEndpointLogin(DOTCOM_URL.href);
-        break;
-      case "token": {
-        const instanceUrl = await showInstanceURLInputBox(uri2 || item.uri);
-        if (!instanceUrl) {
-          return;
-        }
-        await this.signinMenuForInstanceUrl(instanceUrl);
-        break;
-      }
-      default: {
-        const selectedEndpoint = item.uri;
-        const token = await secretStorage.get(selectedEndpoint);
-        let authStatus = await this.auth({
-          endpoint: selectedEndpoint,
-          token: token || null
-        });
-        if (!(authStatus == null ? void 0 : authStatus.isLoggedIn)) {
-          const newToken = await showAccessTokenInputBox(item.uri);
-          if (!newToken) {
-            return;
-          }
-          authStatus = await this.auth({
-            endpoint: selectedEndpoint,
-            token: newToken || null
-          });
-        }
-        await showAuthResultMessage(selectedEndpoint, authStatus);
-        logDebug("AuthProvider:signinMenu", mode, selectedEndpoint);
-      }
-    }
-  }
-  async signinMenuForInstanceUrl(instanceUrl) {
-    const accessToken = await showAccessTokenInputBox(instanceUrl);
-    if (!accessToken) {
-      return;
-    }
-    const authState = await this.auth({
-      endpoint: instanceUrl,
-      token: accessToken
-    });
-    telemetryRecorder.recordEvent("cody.auth.signin.token", "clicked", {
-      metadata: {
-        success: authState.isLoggedIn ? 1 : 0
-      }
-    });
-    await showAuthResultMessage(instanceUrl, authState);
-  }
-  async signoutMenu() {
-    telemetryRecorder.recordEvent("cody.auth.logout", "clicked");
-    const { endpoint } = this.getAuthStatus();
-    if (endpoint) {
-      await this.signout(endpoint);
-      logDebug("AuthProvider:signoutMenu", endpoint);
-    }
-  }
-  async accountMenu() {
-    const selected = await openAccountMenu(this.status);
-    if (selected === void 0) {
-      return;
-    }
-    switch (selected) {
-      case AccountMenuOptions.Manage: {
-        const uri2 = Uri.parse(ACCOUNT_USAGE_URL.toString()).with({
-          query: `cody_client_user=${encodeURIComponent(this.status.username)}`
-        });
-        void env.openExternal(uri2);
-        break;
-      }
-      case AccountMenuOptions.Switch:
-        await this.signinMenu();
-        break;
-      case AccountMenuOptions.SignOut:
-        await this.signoutMenu();
-        break;
-    }
-  }
-  // Log user out of the selected endpoint (remove token from secret)
-  async signout(endpoint) {
-    await secretStorage.deleteToken(endpoint);
-    await localStorage.deleteEndpoint();
-    await this.auth({ endpoint: "", token: null });
-    await commands$1.executeCommand("setContext", "cody.activated", false);
-  }
   // Create Auth Status
   async makeAuthStatus(config, isOfflineMode) {
     var _a3;
@@ -34134,15 +34084,22 @@ class AuthProvider {
     const isCodyWeb = workspace.getConfiguration().get("cody.advanced.agent.ide") === CodyIDE.Web;
     if (isOfflineMode) {
       const lastUser = localStorage.getLastStoredUser();
-      return { ...offlineModeAuthStatus, ...lastUser };
+      return {
+        endpoint: (lastUser == null ? void 0 : lastUser.endpoint) ?? "https://offline.sourcegraph.com",
+        username: (lastUser == null ? void 0 : lastUser.username) ?? "offline-user",
+        authenticated: true,
+        isOfflineMode: true,
+        codyApiVersion: 0,
+        siteVersion: ""
+      };
     }
     if (isCodyWeb) {
       if (!endpoint) {
-        return { ...defaultAuthStatus, endpoint };
+        return { authenticated: false, endpoint };
       }
     } else {
       if (!token || !endpoint) {
-        return { ...defaultAuthStatus, endpoint };
+        return { authenticated: false, endpoint };
       }
     }
     if (this.config !== config || !this.client) {
@@ -34155,24 +34112,27 @@ class AuthProvider {
       this.client.getCurrentUserInfo()
     ]);
     logDebug("CodyLLMConfiguration", JSON.stringify(codyLLMConfiguration));
-    if (isError$1(userInfo) && isNetworkError(userInfo)) {
-      return { ...networkErrorAuthStatus, endpoint };
+    if (isError$1(userInfo) && isNetworkLikeError(userInfo)) {
+      return { authenticated: false, showNetworkError: true, endpoint };
     }
     if (!userInfo || isError$1(userInfo)) {
-      return { ...unauthenticatedStatus, endpoint };
+      return { authenticated: false, endpoint, showInvalidAccessTokenError: true };
+    }
+    if (!siteHasCodyEnabled) {
+      window$1.showErrorMessage(
+        `Cody is not enabled on this Sourcegraph instance (${endpoint}). Ask a site administrator to enable it.`
+      );
+      return { authenticated: false, endpoint };
     }
     const configOverwrites = isError$1(codyLLMConfiguration) ? void 0 : codyLLMConfiguration;
-    const isDotCom2 = this.client.isDotCom();
-    if (!isDotCom2) {
+    if (!isDotCom(endpoint)) {
       return newAuthStatus({
         ...userInfo,
         endpoint,
-        isDotCom: isDotCom2,
         siteVersion,
         configOverwrites,
         authenticated: true,
         hasVerifiedEmail: false,
-        siteHasCodyEnabled,
         userCanUpgrade: false
       });
     }
@@ -34181,8 +34141,6 @@ class AuthProvider {
     return newAuthStatus({
       ...userInfo,
       endpoint,
-      isDotCom: isDotCom2,
-      siteHasCodyEnabled,
       siteVersion,
       configOverwrites,
       authenticated: !!userInfo.id,
@@ -34190,8 +34148,25 @@ class AuthProvider {
       primaryEmail: ((_a3 = userInfo.primaryEmail) == null ? void 0 : _a3.email) ?? ""
     });
   }
-  getAuthStatus() {
-    return this.status;
+  get status() {
+    if (!this._status) {
+      throw new Error("AuthStatus is not initialized");
+    }
+    return this._status;
+  }
+  /** Like {@link AuthProvider.status} but throws if not authed. */
+  get statusAuthed() {
+    if (!this._status) {
+      throw new Error("AuthStatus is not initialized");
+    }
+    if (!this._status.authenticated) {
+      throw new Error("Not authenticated");
+    }
+    return this._status;
+  }
+  /** Like {@link AuthProvider.status} but returns null instead of throwing if not ready. */
+  get statusOrNotReadyYet() {
+    return this._status;
   }
   // It processes the authentication steps and stores the login info before sharing the auth status with chatview
   async auth({
@@ -34201,8 +34176,12 @@ class AuthProvider {
     isExtensionStartup = false,
     isOfflineMode = false
   }) {
+    const formattedEndpoint = formatURL(endpoint);
+    if (!formattedEndpoint) {
+      throw new Error(`invalid endpoint URL: ${JSON.stringify(endpoint)}`);
+    }
     const config = {
-      serverEndpoint: formatURL(endpoint) ?? "",
+      serverEndpoint: formattedEndpoint,
       accessToken: token,
       customHeaders: customHeaders || this.config.customHeaders
     };
@@ -34211,17 +34190,24 @@ class AuthProvider {
       if (!isOfflineMode) {
         await this.storeAuthInfo(config.serverEndpoint, config.accessToken);
       }
-      await commands$1.executeCommand("setContext", "cody.activated", authStatus.isLoggedIn);
+      await commands$1.executeCommand(
+        "setContext",
+        "cody.activated",
+        authStatus.authenticated
+      );
       await this.setAuthStatus(authStatus);
-      if (isExtensionStartup && authStatus.isLoggedIn) {
+      if (isExtensionStartup && authStatus.authenticated) {
         await this.setHasAuthenticatedBefore();
-      } else if (authStatus.isLoggedIn) {
+      } else if (authStatus.authenticated) {
         this.handleFirstEverAuthentication();
       }
       return authStatus;
     } catch (error) {
       logDebug("AuthProvider:auth", "failed", error);
-      return await this.reloadAuthStatus().catch(() => unauthenticatedStatus);
+      return await this.reloadAuthStatus().catch(() => ({
+        authenticated: false,
+        endpoint: config.serverEndpoint
+      }));
     }
   }
   // Set auth status in case of reload
@@ -34236,13 +34222,10 @@ class AuthProvider {
   }
   // Set auth status and share it with chatview
   async setAuthStatus(authStatus) {
-    if (this.status === authStatus) {
-      return;
-    }
-    this.status = authStatus;
-    if (authStatus.endpoint === "init") {
+    if (this._status === authStatus) {
       return;
     }
+    this._status = authStatus;
     await this.updateAuthStatus(authStatus);
   }
   async updateAuthStatus(authStatus) {
@@ -34253,61 +34236,18 @@ class AuthProvider {
     } catch (error) {
       logDebug("AuthProvider", "updateAuthStatus error", error);
     } finally {
-      this.didChangeEvent.fire(this.getAuthStatus());
+      this.didChangeEvent.fire(this.status);
       let eventValue;
-      if (authStatus.showNetworkError || authStatus.showInvalidAccessTokenError) {
-        eventValue = "failed";
-      } else if (authStatus.isLoggedIn) {
+      if (authStatus.authenticated) {
         eventValue = "connected";
+      } else if (authStatus.showNetworkError || authStatus.showInvalidAccessTokenError) {
+        eventValue = "failed";
       } else {
         eventValue = "disconnected";
       }
       telemetryRecorder.recordEvent("cody.auth", eventValue);
     }
   }
-  // Register URI Handler (vscode://sourcegraph.cody-ai) for resolving token
-  // sending back from sourcegraph.com
-  async tokenCallbackHandler(uri2, customHeaders) {
-    closeAuthProgressIndicator();
-    const params = new URLSearchParams(uri2.query);
-    const token = params.get("code");
-    const endpoint = this.status.endpoint;
-    if (!token || !endpoint) {
-      return;
-    }
-    const authState = await this.auth({ endpoint, token, customHeaders });
-    telemetryRecorder.recordEvent("cody.auth.fromCallback.web", "succeeded", {
-      metadata: {
-        success: (authState == null ? void 0 : authState.isLoggedIn) ? 1 : 0
-      }
-    });
-    if (authState == null ? void 0 : authState.isLoggedIn) {
-      await window$1.showInformationMessage(`Signed in to ${endpoint}`);
-    } else {
-      await showAuthFailureMessage(endpoint);
-    }
-  }
-  /** Open callback URL in browser to get token from instance. */
-  redirectToEndpointLogin(uri2) {
-    const endpoint = formatURL(uri2);
-    if (!endpoint) {
-      return;
-    }
-    if (env.uiKind === UIKind.Web) {
-      const newTokenNoCallbackUrl = new URL("/user/settings/tokens/new", endpoint);
-      void env.openExternal(Uri.parse(newTokenNoCallbackUrl.href));
-      void this.signinMenuForInstanceUrl(endpoint);
-      return;
-    }
-    const newTokenCallbackUrl = new URL("/user/settings/tokens/new/callback", endpoint);
-    newTokenCallbackUrl.searchParams.append("requestFrom", getAuthReferralCode());
-    this.status.endpoint = endpoint;
-    void env.openExternal(Uri.parse(newTokenCallbackUrl.href));
-  }
-  // Refresh current endpoint history with the one from local storage
-  loadEndpointHistory() {
-    this.endpointHistory = localStorage.getEndpointHistory() || [];
-  }
   // Store endpoint in local storage, token in secret storage, and update endpoint history.
   async storeAuthInfo(endpoint, token) {
     if (!endpoint) {
@@ -34317,13 +34257,10 @@ class AuthProvider {
     if (token) {
       await secretStorage.storeToken(endpoint, token);
     }
-    this.loadEndpointHistory();
   }
-  // Notifies the AuthProvider that the simplified onboarding experiment is
-  // kicking off an authorization flow. That flow ends when (if) this
-  // AuthProvider gets a call to tokenCallbackHandler.
-  authProviderSimplifiedWillAttemptAuth() {
-    this.status.endpoint = DOTCOM_URL.toString();
+  setAuthPendingToEndpoint(endpoint) {
+    this._status = { authenticated: false, endpoint };
+    this.didChangeEvent.fire(this._status);
   }
   // Logs a telemetry event if the user has never authenticated to Sourcegraph.
   handleFirstEverAuthentication() {
@@ -34339,42 +34276,6 @@ class AuthProvider {
   }
 }
 const authProvider = singletonNotYetSet();
-function isNetworkError(error) {
-  const message = error.message;
-  return message.includes("ENOTFOUND") || message.includes("ECONNREFUSED") || message.includes("ECONNRESET") || message.includes("EHOSTUNREACH") || message.includes("ETIMEDOUT");
-}
-function formatURL(uri2) {
-  try {
-    if (!uri2) {
-      return null;
-    }
-    if (isSourcegraphToken(uri2)) {
-      throw new Error("Access Token is not a valid URL");
-    }
-    if (!uri2.startsWith("http")) {
-      uri2 = `https://${uri2}`;
-    }
-    const endpointUri = new URL(uri2);
-    return endpointUri.href;
-  } catch (error) {
-    console.error("Invalid URL: ", error);
-    return null;
-  }
-}
-async function showAuthResultMessage(endpoint, authStatus) {
-  if (authStatus == null ? void 0 : authStatus.isLoggedIn) {
-    const authority = Uri.parse(endpoint).authority;
-    await window$1.showInformationMessage(`Signed in to ${authority || endpoint}`);
-  } else {
-    await showAuthFailureMessage(endpoint);
-  }
-}
-async function showAuthFailureMessage(endpoint) {
-  const authority = Uri.parse(endpoint).authority;
-  await window$1.showErrorMessage(
-    `Authentication failed. Please ensure Cody is enabled for ${authority} and verify your email address if required.`
-  );
-}
 const { platform, arch } = getOSArch();
 const getExtensionDetails = (config) => ({
   ide: config.agentIDE ?? CodyIDE.VSCode,
@@ -35097,7 +34998,7 @@ class RepoNameResolver {
       throw new Error("RepoNameResolver not initialized");
     }
     const uniqueRemoteUrls = Array.from(new Set(remoteUrls));
-    if (authProvider.instance.getAuthStatus().isDotCom) {
+    if (isDotCom(authProvider.instance.status)) {
       return uniqueRemoteUrls.map(convertGitCloneURLToCodebaseName).filter(isDefined);
     }
     const repoNames = await Promise.all(
@@ -38454,18 +38355,30 @@ const languages = {
   ...cQueries,
   ...cppQueries
 };
+let cached;
+function isRunningInsideAgent() {
+  if (cached === void 0) {
+    cached = workspace.getConfiguration().get("cody.advanced.agent.running", false);
+  }
+  return cached;
+}
 class CompletionProviderConfig {
   constructor() {
     __publicField2(this, "_config");
     __publicField2(this, "flagsToResolve", [
-      FeatureFlag.CodyAutocompleteContextBfgMixed,
       FeatureFlag.CodyAutocompleteUserLatency,
       FeatureFlag.CodyAutocompleteTracing,
       FeatureFlag.CodyAutocompleteContextExtendLanguagePool,
       FeatureFlag.CodyAutocompletePreloadingExperimentBaseFeatureFlag,
       FeatureFlag.CodyAutocompletePreloadingExperimentVariant1,
       FeatureFlag.CodyAutocompletePreloadingExperimentVariant2,
-      FeatureFlag.CodyAutocompletePreloadingExperimentVariant3
+      FeatureFlag.CodyAutocompletePreloadingExperimentVariant3,
+      FeatureFlag.CodyAutocompleteContextExperimentBaseFeatureFlag,
+      FeatureFlag.CodyAutocompleteContextExperimentVariant1,
+      FeatureFlag.CodyAutocompleteContextExperimentVariant2,
+      FeatureFlag.CodyAutocompleteContextExperimentVariant3,
+      FeatureFlag.CodyAutocompleteContextExperimentVariant4,
+      FeatureFlag.CodyAutocompleteContextExperimentControl
     ]);
   }
   get config() {
@@ -38506,9 +38419,49 @@ class CompletionProviderConfig {
         return "jaccard-similarity";
       case "new-jaccard-similarity":
         return "new-jaccard-similarity";
+      case "recent-edits":
+        return "recent-edits";
+      case "recent-edits-1m":
+        return "recent-edits-1m";
+      case "recent-edits-5m":
+        return "recent-edits-5m";
+      case "recent-edits-mixed":
+        return "recent-edits-mixed";
       default:
-        return this.getPrefetchedFlag(FeatureFlag.CodyAutocompleteContextBfgMixed) ? "bfg-mixed" : "jaccard-similarity";
+        return this.experimentBasedContextStrategy();
+    }
+  }
+  experimentBasedContextStrategy() {
+    const defaultContextStrategy = "jaccard-similarity";
+    const isContextExperimentFlagEnabled = this.getPrefetchedFlag(
+      FeatureFlag.CodyAutocompleteContextExperimentBaseFeatureFlag
+    );
+    if (isRunningInsideAgent() || !isContextExperimentFlagEnabled) {
+      return defaultContextStrategy;
+    }
+    const [variant1, variant2, variant3, variant4, control2] = [
+      this.getPrefetchedFlag(FeatureFlag.CodyAutocompleteContextExperimentVariant1),
+      this.getPrefetchedFlag(FeatureFlag.CodyAutocompleteContextExperimentVariant2),
+      this.getPrefetchedFlag(FeatureFlag.CodyAutocompleteContextExperimentVariant3),
+      this.getPrefetchedFlag(FeatureFlag.CodyAutocompleteContextExperimentVariant4),
+      this.getPrefetchedFlag(FeatureFlag.CodyAutocompleteContextExperimentControl)
+    ];
+    if (variant1) {
+      return "recent-edits-1m";
+    }
+    if (variant2) {
+      return "recent-edits-5m";
+    }
+    if (variant3) {
+      return "recent-edits-mixed";
+    }
+    if (variant4) {
+      return "none";
     }
+    if (control2) {
+      return defaultContextStrategy;
+    }
+    return defaultContextStrategy;
   }
   getPreloadingExperimentGroup() {
     if (this.getPrefetchedFlag(FeatureFlag.CodyAutocompletePreloadingExperimentBaseFeatureFlag)) {
@@ -42858,7 +42811,7 @@ function logError(error) {
   }
   captureException(error);
   const message = error.message;
-  const traceId = isNetworkError$1(error) ? error.traceId : void 0;
+  const traceId = isNetworkError(error) ? error.traceId : void 0;
   if (!errorCounts.has(message)) {
     errorCounts.set(message, 0);
     logCompletionErrorEvent({ message, traceId, count: 1 });
@@ -43289,13 +43242,6 @@ function getEditDefaultProvidedRange(document2, selection) {
   }
   return;
 }
-let cached;
-function isRunningInsideAgent() {
-  if (cached === void 0) {
-    cached = workspace.getConfiguration().get("cody.advanced.agent.running", false);
-  }
-  return cached;
-}
 class ContentProvider {
   constructor() {
     // This stores the content of the document for each task ID
@@ -43976,7 +43922,6 @@ class AgentWebviewPanel {
     __publicField2(this, "panelID", v4());
     __publicField2(this, "chatID");
     // also known as `sessionID` in some parts of the Cody codebase
-    __publicField2(this, "models");
     __publicField2(this, "remoteRepos");
     __publicField2(this, "isInitialized", false);
     __publicField2(this, "isMessageInProgress");
@@ -43988,6 +43933,7 @@ class AgentWebviewPanel {
     __publicField2(this, "postMessage", new AgentEventEmitter());
     __publicField2(this, "onDidPostMessage", this.postMessage.event);
     __publicField2(this, "attributionResults", /* @__PURE__ */ new Map());
+    __publicField2(this, "_extensionAPI");
     this.panel = defaultWebviewPanel({
       viewType,
       title,
@@ -44048,6 +43994,23 @@ class AgentWebviewPanel {
   get onDidChangeViewState() {
     return this.panel.onDidChangeViewState;
   }
+  /**
+   * Call an extension host API exposed to the "webview". See {@link WebviewToExtensionAPI}.
+   */
+  get extensionAPI() {
+    if (!this._extensionAPI) {
+      this._extensionAPI = createExtensionAPI(
+        createMessageAPIForWebview({
+          postMessage: (message) => this.receiveMessage.fire(message),
+          onMessage: (callback) => {
+            const disposable = this.onDidPostMessage(callback);
+            return () => disposable.dispose();
+          }
+        })
+      );
+    }
+    return this._extensionAPI;
+  }
   reveal() {
     this.panel.reveal();
   }
@@ -44853,6 +44816,8 @@ class AgentTextEditor {
     );
     return selection;
   }
+  set selection(newSelection) {
+  }
   get selections() {
     return [this.selection];
   }
@@ -46702,17 +46667,60 @@ var define_process_default$7 = { env: {} };
   }).call(this);
   LocalStorage_2 = LocalStorage2;
 }).call(commonjsGlobal);
+async function migrateChatHistoryCODY3538(storage) {
+  const hasMigrated = storage.get(MIGRATED_CHAT_HISTORY_KEY_CODY_3538);
+  if (hasMigrated) {
+    return;
+  }
+  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+  const history = storage.get(KEY_LOCAL_HISTORY, null);
+  for (const accountHistory of Object.values(history ?? {})) {
+    for (const [chatId, chat2] of Object.entries(accountHistory.chat)) {
+      if (uuidRegex.test(chatId) || uuidRegex.test(chat2.lastInteractionTimestamp)) {
+        let lastInteraction;
+        const timestamp = Date.parse(chat2.lastInteractionTimestamp);
+        if (Number.isNaN(timestamp)) {
+          lastInteraction = /* @__PURE__ */ new Date();
+        } else {
+          lastInteraction = new Date(timestamp);
+        }
+        const newId = lastInteraction.toUTCString();
+        chat2.id = newId;
+        chat2.lastInteractionTimestamp = newId;
+        delete accountHistory.chat[chatId];
+        accountHistory.chat[newId] = chat2;
+      }
+    }
+  }
+  await storage.update(KEY_LOCAL_HISTORY, history);
+  await storage.update(MIGRATED_CHAT_HISTORY_KEY_CODY_3538, true);
+}
+const MIGRATED_CHAT_HISTORY_KEY_CODY_3538 = "migrated-chat-history-cody-3538";
+const KEY_LOCAL_HISTORY = "cody-local-chatHistory-v2";
+async function migrate(storage) {
+  await migrateChatHistoryCODY3538(storage);
+}
 class AgentGlobalState {
-  constructor(ide, dir) {
+  constructor(ide, manager, dir) {
     __publicField2(this, "db");
+    this.manager = manager;
     if (dir) {
       this.db = new LocalStorageDB(ide, dir);
     } else {
       this.db = new InMemoryDB();
     }
-    this.set("notification.setupDismissed", "true");
-    this.set("completion.inline.hasAcceptedFirstCompletion", true);
-    this.set("extension.hasActivatedPreviously", "true");
+    if (manager === "client") {
+      this.set("notification.setupDismissed", "true");
+      this.set("completion.inline.hasAcceptedFirstCompletion", true);
+      this.set("extension.hasActivatedPreviously", "true");
+    }
+  }
+  static async initialize(ide, dir) {
+    const globalState = new AgentGlobalState(ide, dir ? "server" : "client", dir);
+    if (globalState.db instanceof LocalStorageDB) {
+      await migrate(globalState);
+    }
+    return globalState;
   }
   set(key, value) {
     this.db.set(key, value);
@@ -46723,9 +46731,15 @@ class AgentGlobalState {
     }
   }
   keys() {
+    if (this.manager === "server") {
+      return this.db.keys();
+    }
     return [localStorage.LAST_USED_ENDPOINT, localStorage.ANONYMOUS_USER_ID_KEY, ...this.db.keys()];
   }
   get(key, defaultValue) {
+    if (this.manager === "server") {
+      return this.db.get(key) ?? defaultValue;
+    }
     switch (key) {
       case localStorage.LAST_USED_ENDPOINT:
         return extensionConfiguration == null ? void 0 : extensionConfiguration.serverEndpoint;
@@ -46799,6 +46813,10 @@ class MessageHandler {
     __publicField2(this, "requestHandlers", /* @__PURE__ */ new Map());
     __publicField2(this, "notificationHandlers", /* @__PURE__ */ new Map());
     __publicField2(this, "disposables", []);
+    /*<M extends keyof WebviewToExtensionAPI>(
+        method: M,
+        ...args: Parameters<WebviewToExtensionAPI[M]>
+    ): ReturnType<WebviewToExtensionAPI[M]> {}*/
     __publicField2(this, "alive", true);
     this.conn = conn2;
     this.disposables.push(
@@ -47061,7 +47079,7 @@ class Agent extends MessageHandler {
         "*",
         new IndentationBasedFoldingRangeProvider()
       );
-      this.globalState = this.newGlobalState(clientInfo2);
+      this.globalState = await this.newGlobalState(clientInfo2);
       if (clientInfo2.capabilities && ((_a3 = clientInfo2.capabilities) == null ? void 0 : _a3.webview) === void 0) {
         clientInfo2.capabilities.webview = "agentic";
       }
@@ -47143,8 +47161,7 @@ class Agent extends MessageHandler {
         return {
           name: "cody-agent",
           authenticated: authStatus == null ? void 0 : authStatus.authenticated,
-          codyEnabled: authStatus == null ? void 0 : authStatus.siteHasCodyEnabled,
-          codyVersion: authStatus == null ? void 0 : authStatus.siteVersion,
+          codyVersion: (authStatus == null ? void 0 : authStatus.authenticated) ? authStatus.siteVersion : void 0,
           authStatus
         };
       } catch (error) {
@@ -47801,6 +47818,9 @@ class Agent extends MessageHandler {
     });
     this.registerAuthenticatedRequest("chat/restore", async ({ modelID, messages, chatID }) => {
       const authStatus = await commands$1.executeCommand("cody.auth.status");
+      if (!authStatus.authenticated) {
+        throw new Error("Not authenticated");
+      }
       modelID ?? (modelID = modelsService.instance.getDefaultChatModel() ?? "");
       const chatMessages = (messages == null ? void 0 : messages.map(PromptString.unsafe_deserializeChatMessage)) ?? [];
       const chatModel = new ChatModel(modelID, chatID, chatMessages);
@@ -47819,6 +47839,9 @@ class Agent extends MessageHandler {
     this.registerAuthenticatedRequest("chat/export", async (input) => {
       const { fullHistory = false } = input ?? {};
       const authStatus = await commands$1.executeCommand("cody.auth.status");
+      if (!authStatus.authenticated) {
+        throw new Error("Not authenticated");
+      }
       const localHistory = chatHistory.getLocalHistory(authStatus);
       if (localHistory != null) {
         return Object.entries(localHistory == null ? void 0 : localHistory.chat).filter(
@@ -47844,6 +47867,9 @@ class Agent extends MessageHandler {
         id: params2.chatId
       });
       const authStatus = await commands$1.executeCommand("cody.auth.status");
+      if (!authStatus.authenticated) {
+        throw new Error("Not authenticated");
+      }
       const localHistory = await chatHistory.getLocalHistory(authStatus);
       if (localHistory != null) {
         return Object.entries(localHistory == null ? void 0 : localHistory.chat).map(([chatID, chatTranscript]) => ({
@@ -47860,6 +47886,11 @@ class Agent extends MessageHandler {
       });
       return { remoteRepos: panel2.remoteRepos };
     });
+    this.registerAuthenticatedRequest("chat/setModel", async ({ id, model: model2 }) => {
+      const panel2 = this.webPanels.getPanelOrError(id);
+      await waitUntilComplete(panel2.extensionAPI.setChatModel(model2));
+      return null;
+    });
     const submitOrEditHandler = async ({ id, message }, token) => {
       if (message.command !== "submit" && message.command !== "edit") {
         throw new Error('Invalid message, must have a command of "submit"');
@@ -47985,18 +48016,18 @@ class Agent extends MessageHandler {
       pendingPromise.finally(() => this.pendingPromises.delete(pendingPromise));
     }
   }
-  newGlobalState(clientInfo2) {
+  async newGlobalState(clientInfo2) {
     var _a3;
     switch ((_a3 = clientInfo2.capabilities) == null ? void 0 : _a3.globalState) {
       case "server-managed":
-        return new AgentGlobalState(
+        return AgentGlobalState.initialize(
           clientInfo2.name,
           clientInfo2.globalStateDir ?? codyPaths().data
         );
       case "client-managed":
         throw new Error("client-managed global state is not supported");
       default:
-        return new AgentGlobalState(clientInfo2.name);
+        return AgentGlobalState.initialize(clientInfo2.name);
     }
   }
   createFixupControlApplicator(files) {
@@ -48029,6 +48060,10 @@ class Agent extends MessageHandler {
     var _a3;
     return ((_a3 = this.clientInfo) == null ? void 0 : _a3.name.toLowerCase()) || "uninitialized-agent";
   }
+  get httpClientNameForLegacyReasons() {
+    var _a3;
+    return ((_a3 = this.clientInfo) == null ? void 0 : _a3.legacyNameForServerIdentification) ?? void 0;
+  }
   get clientVersion() {
     var _a3;
     return ((_a3 = this.clientInfo) == null ? void 0 : _a3.version) || "0.0.0";
@@ -48175,8 +48210,6 @@ class Agent extends MessageHandler {
             panel2.isMessageInProgress = message.isMessageInProgress;
             panel2.messageInProgressChange.fire(message);
           }
-        } else if (message.type === "chatModels") {
-          panel2.models = message.models;
         } else if (message.type === "context/remote-repos") {
           panel2.remoteRepos = message.repos;
         } else if (message.type === "errors") {
@@ -49431,7 +49464,7 @@ class CommandsProvider {
    * Used for retreiving context for the command field in custom command
    */
   async runShell(shell2) {
-    const { getContextFileFromShell } = await import("./shell-CvNNoU2J.mjs");
+    const { getContextFileFromShell } = await import("./shell-CWTEC0Ll.mjs");
     return getContextFileFromShell(shell2);
   }
   /**
@@ -49442,7 +49475,7 @@ class CommandsProvider {
     if (!isFileURI(uri2)) {
       throw new Error("history only supported on local file paths");
     }
-    const { getContextFileFromGitLog } = await import("./git-log-CKjP84c8.mjs");
+    const { getContextFileFromGitLog } = await import("./git-log-PGCFF8k9.mjs");
     return getContextFileFromGitLog(uri2, options);
   }
   dispose() {
@@ -49526,6 +49559,66 @@ class ExtensionApi {
     this.extensionMode = extensionMode;
   }
 }
+async function showAccountMenu() {
+  const authStatus = authProvider.instance.statusAuthed;
+  const selected = await openAccountMenuFirstStep(authStatus);
+  if (selected === void 0) {
+    return;
+  }
+  switch (selected) {
+    case "Manage Account": {
+      const uri2 = Uri.parse(ACCOUNT_USAGE_URL.toString()).with({
+        query: `cody_client_user=${encodeURIComponent(authStatus.username)}`
+      });
+      void env.openExternal(uri2);
+      break;
+    }
+    case "Switch Account...":
+      await showSignInMenu();
+      break;
+    case "Sign Out":
+      await showSignOutMenu();
+      break;
+  }
+}
+async function openAccountMenuFirstStep(authStatus) {
+  const isOffline = !!authStatus.isOfflineMode;
+  const isDotComInstance = isDotCom(authStatus.endpoint) && !isOffline;
+  const displayName2 = authStatus.displayName || authStatus.username;
+  const email = authStatus.primaryEmail || "No Email";
+  const username = authStatus.username || authStatus.displayName;
+  const planDetail = `Plan: ${authStatus.userCanUpgrade ? "Cody Free" : "Cody Pro"}`;
+  const enterpriseDetail = `Enterprise Instance:
+${authStatus.endpoint}`;
+  const offlineDetail = "Use Cody offline with Ollama";
+  const options = isDotComInstance ? [
+    "Manage Account"
+    /* Manage */
+  ] : [];
+  options.push(
+    "Switch Account...",
+    "Sign Out"
+    /* SignOut */
+  );
+  const messageOptions = {
+    modal: true,
+    detail: isOffline ? offlineDetail : isDotComInstance ? planDetail : enterpriseDetail
+  };
+  const online = isDotComInstance ? `Signed in as ${displayName2} (${email})` : `Signed in as @${username}`;
+  const offline = "Offline Mode";
+  const message = isOffline ? offline : online;
+  const option = await window$1.showInformationMessage(message, messageOptions, ...options);
+  switch (option !== void 0) {
+    case (option == null ? void 0 : option.startsWith("Sign Out")):
+      return "Sign Out";
+    case (option == null ? void 0 : option.startsWith("Manage")):
+      return "Manage Account";
+    case (option == null ? void 0 : option.startsWith("Switch")):
+      return "Switch Account...";
+    default:
+      return void 0;
+  }
+}
 const executeSmartApply = async (args2) => {
   return commands$1.executeCommand("cody.command.smart-apply", args2);
 };
@@ -49602,13 +49695,16 @@ async function handleCodeFromInsertAtCursor(text) {
     throw new Error("No editor or selection found to insert text");
   }
   const edit2 = new AgentWorkspaceEdit();
-  edit2.insert(activeEditor.document.uri, selectionRange.start, `${text}
-`);
+  if (selectionRange.isEmpty) {
+    edit2.insert(activeEditor.document.uri, selectionRange.start, text.trimEnd());
+  } else {
+    edit2.replace(activeEditor.document.uri, selectionRange, text.trimEnd());
+  }
   setLastStoredCode(text, "insertButton");
   await workspace.applyEdit(edit2);
 }
 function getSmartApplyModel(authStatus) {
-  if (!authStatus.isDotCom) {
+  if (!isDotCom(authStatus)) {
     return;
   }
   return "anthropic/claude-3-5-sonnet-20240620";
@@ -52866,7 +52962,16 @@ async function getRepositoryMentions(query2, providerId) {
   }
   const repositories = dataOrError.search.results.repositories;
   const fzf = new Fzf(repositories, REPO_FZF_OPTIONS);
-  return fzf.find(cleanRegex(query2)).map((repository2) => createRepositoryMention(repository2.item, providerId));
+  const localRepos = await (workspaceReposMonitor == null ? void 0 : workspaceReposMonitor.getRepoMetadata()) || [];
+  return fzf.find(cleanRegex(query2)).map(
+    (repository2) => createRepositoryMention(
+      {
+        ...repository2.item,
+        current: !!localRepos.find(({ repoName }) => repoName === repository2.item.name)
+      },
+      providerId
+    )
+  );
 }
 function createRepositoryMention(repo, providerId) {
   return {
@@ -52876,7 +52981,7 @@ function createRepositoryMention(repo, providerId) {
     // By default, we show <title> <uri> in the mentions' menu.
     // As repo.url and repo.name are almost same, we do not want to show the uri.
     // So that is why we are setting the description to " " string.
-    description: " ",
+    description: repo.current ? "Current" : " ",
     data: {
       repoId: repo.id,
       repoName: repo.name,
@@ -52938,21 +53043,25 @@ function getMentionMenuData(query2, chatModel) {
 }
 async function getChatContextItemsForMention(options, _2) {
   const MAX_RESULTS = 20;
-  const { mentionQuery, telemetryRecorder: telemetryRecorder2, remoteRepositoriesNames, rangeFilter = true } = options;
+  const { mentionQuery, telemetryRecorder: telemetryRecorder2, rangeFilter = true } = options;
   switch (mentionQuery.provider) {
     case null:
       telemetryRecorder2 == null ? void 0 : telemetryRecorder2.empty();
       return getOpenTabsContextFile();
     case SYMBOL_CONTEXT_MENTION_PROVIDER.id:
       telemetryRecorder2 == null ? void 0 : telemetryRecorder2.withProvider(mentionQuery.provider);
-      return getSymbolContextFiles(mentionQuery.text, MAX_RESULTS, remoteRepositoriesNames);
+      return getSymbolContextFiles(
+        mentionQuery.text,
+        MAX_RESULTS,
+        mentionQuery.contextRemoteRepositoriesNames
+      );
     case FILE_CONTEXT_MENTION_PROVIDER.id: {
       telemetryRecorder2 == null ? void 0 : telemetryRecorder2.withProvider(mentionQuery.provider);
       const files = mentionQuery.text ? await getFileContextFiles({
         query: mentionQuery.text,
         range: mentionQuery.range,
         maxResults: MAX_RESULTS,
-        repositoriesNames: remoteRepositoriesNames
+        repositoriesNames: mentionQuery.contextRemoteRepositoriesNames
       }) : await getOpenTabsContextFile();
       if (mentionQuery.range && files.length > 0 && rangeFilter) {
         const item = await getContextFileFromUri(
@@ -52969,7 +53078,7 @@ async function getChatContextItemsForMention(options, _2) {
         return [];
       }
       const items = await openCtx.controller.mentions(
-        { query: mentionQuery.text },
+        { query: mentionQuery.text, ...await getActiveEditorContextForOpenCtxMentions() },
         // get mention items for the selected provider only.
         { providerUri: mentionQuery.provider }
       );
@@ -52979,6 +53088,13 @@ async function getChatContextItemsForMention(options, _2) {
     }
   }
 }
+async function getActiveEditorContextForOpenCtxMentions() {
+  var _a3, _b2, _c2;
+  const uri2 = (_b2 = (_a3 = window$1.activeTextEditor) == null ? void 0 : _a3.document.uri) == null ? void 0 : _b2.toString();
+  const activeWorkspaceURI = uri2 && (workspaceReposMonitor == null ? void 0 : workspaceReposMonitor.getFolderURIs().find((folderURI) => uri2 == null ? void 0 : uri2.startsWith(folderURI.toString())));
+  const codebase = activeWorkspaceURI && ((_c2 = (await fetchRepoMetadataForFolder(activeWorkspaceURI))[0]) == null ? void 0 : _c2.repoName);
+  return { uri: uri2, codebase };
+}
 function contextItemMentionFromOpenCtxItem(item) {
   var _a3;
   const isIgnored = (_a3 = item.data) == null ? void 0 : _a3.isIgnored;
@@ -53059,7 +53175,7 @@ function startClientStateBroadcaster({
   return Disposable.from(...disposables);
 }
 async function getCorpusContextItemsForEditorState(useRemote) {
-  var _a3;
+  var _a3, _b2, _c2;
   const items = [];
   if (useRemote && workspaceReposMonitor) {
     const repoMetadata = await workspaceReposMonitor.getRepoMetadata();
@@ -53103,7 +53219,27 @@ async function getCorpusContextItemsForEditorState(useRemote) {
       });
     }
   }
-  return items;
+  const providers = (_c2 = await ((_b2 = openCtx.controller) == null ? void 0 : _b2.meta({}))) == null ? void 0 : _c2.filter((meta) => {
+    var _a4;
+    return (_a4 = meta.mentions) == null ? void 0 : _a4.autoInclude;
+  });
+  if (!providers) {
+    return items;
+  }
+  const activeEditorContext = await getActiveEditorContextForOpenCtxMentions();
+  const openctxMentions = (await Promise.all(
+    providers.map(async (provider) => {
+      var _a4, _b3;
+      const mentions = await ((_b3 = (_a4 = openCtx) == null ? void 0 : _a4.controller) == null ? void 0 : _b3.mentions(activeEditorContext, provider)) || [];
+      return mentions.map((mention) => ({
+        ...mention,
+        provider: "openctx",
+        type: "openctx",
+        uri: URI.parse(mention.uri)
+      }));
+    })
+  )).flat();
+  return [...items, ...openctxMentions];
 }
 function idempotentPostMessage(rawPostMessage) {
   let lastMessage;
@@ -53363,7 +53499,7 @@ async function retrieveContextGracefully(promise, strategy) {
       logError$1("ChatController", `resolveContext > ${strategy}' (aborted)`);
       throw error;
     }
-    logError$1("ChatController", `resolveContext > ${strategy}' (error)`, error);
+    logError$1("ChatController", `resolveContext > ${strategy} (error)`, error);
     return [];
   } finally {
     logDebug("ChatController", `resolveContext > ${strategy} (end)`);
@@ -54055,7 +54191,7 @@ class AuthDependentRetrievers {
     return workspace.getConfiguration().get("cody.advanced.agent.ide") === CodyIDE.Web;
   }
   isConsumer() {
-    return authProvider.instance.getAuthStatus().isDotCom;
+    return isDotCom(authProvider.instance.status);
   }
   allowRemoteContext() {
     return this.isCodyWeb() || !this.isConsumer();
@@ -54080,7 +54216,8 @@ class ChatController {
     startTokenReceiver,
     contextAPIClient,
     contextRetriever,
-    extensionClient
+    extensionClient,
+    configWatcher
   }) {
     __publicField2(this, "chatModel");
     __publicField2(this, "chatClient");
@@ -54091,6 +54228,7 @@ class ChatController {
     __publicField2(this, "guardrails");
     __publicField2(this, "startTokenReceiver");
     __publicField2(this, "contextAPIClient");
+    __publicField2(this, "configWatcher");
     __publicField2(this, "disposables", []);
     __publicField2(this, "initDoer", new InitDoer());
     __publicField2(this, "submitOrEditOperation");
@@ -54107,6 +54245,7 @@ class ChatController {
     this.editor = editor;
     this.extensionClient = extensionClient;
     this.contextRetriever = contextRetriever;
+    this.configWatcher = configWatcher;
     this.chatModel = new ChatModel(getDefaultModelID());
     this.guardrails = guardrails;
     this.startTokenReceiver = startTokenReceiver;
@@ -54178,13 +54317,6 @@ class ChatController {
       case "abort":
         this.handleAbort();
         break;
-      case "chatModel":
-        await modelsService.instance.setSelectedModel(ModelUsage.Chat, message.model);
-        this.handleSetChatModel(message.model);
-        break;
-      case "get-chat-models":
-        this.postChatModels();
-        break;
       case "getUserContext": {
         const result = await getChatContextItemsForMention({
           mentionQuery: parseMentionQuery(message.query, null)
@@ -54205,7 +54337,7 @@ class ChatController {
         await handleSmartApply(
           message.id,
           message.code,
-          authProvider.instance.getAuthStatus(),
+          authProvider.instance.status,
           message.instruction,
           message.fileName
         );
@@ -54290,7 +54422,7 @@ class ChatController {
         break;
       case "auth": {
         if (message.authKind === "callback" && message.endpoint) {
-          authProvider.instance.redirectToEndpointLogin(message.endpoint);
+          redirectToEndpointLogin(message.endpoint);
           break;
         }
         if (message.authKind === "offline") {
@@ -54313,11 +54445,11 @@ class ChatController {
                 "succeeded",
                 {
                   metadata: {
-                    success: (authStatus == null ? void 0 : authStatus.isLoggedIn) ? 1 : 0
+                    success: (authStatus == null ? void 0 : authStatus.authenticated) ? 1 : 0
                   }
                 }
               );
-              if (!(authStatus == null ? void 0 : authStatus.isLoggedIn)) {
+              if (!(authStatus == null ? void 0 : authStatus.authenticated)) {
                 void window$1.showErrorMessage(
                   "Authentication failed. Please check your token and try again."
                 );
@@ -54343,7 +54475,7 @@ class ChatController {
           break;
         }
         if (message.authKind === "signout") {
-          await authProvider.instance.signoutMenu();
+          await showSignOutMenu();
           this.setWebviewView(View.Login);
           break;
         }
@@ -54360,7 +54492,7 @@ class ChatController {
               endpoint: DOTCOM_URL.href,
               token
             });
-            if (!(authStatus == null ? void 0 : authStatus.isLoggedIn)) {
+            if (!(authStatus == null ? void 0 : authStatus.authenticated)) {
               void window$1.showErrorMessage(
                 "Authentication failed. Please check your token and try again."
               );
@@ -54372,10 +54504,10 @@ class ChatController {
       }
       case "troubleshoot/reloadAuth": {
         await authProvider.instance.reloadAuthStatus();
-        const nextAuth = authProvider.instance.getAuthStatus();
+        const nextAuth = authProvider.instance.status;
         telemetryRecorder.recordEvent("cody.troubleshoot", "reloadAuth", {
           metadata: {
-            success: nextAuth.isLoggedIn ? 1 : 0
+            success: nextAuth.authenticated ? 1 : 0
           }
         });
         break;
@@ -54409,8 +54541,8 @@ class ChatController {
   // =======================================================================
   setAuthStatus(status) {
     void this.sendConfig();
-    if (status.isLoggedIn) {
-      this.handleSetChatModel(getDefaultModelID());
+    if (status.authenticated) {
+      this.chatModel.updateModel(getDefaultModelID());
     }
   }
   // When the webview sends the 'ready' message, respond by posting the view config
@@ -54419,7 +54551,7 @@ class ChatController {
   }
   async sendConfig() {
     var _a3;
-    const authStatus = authProvider.instance.getAuthStatus();
+    const authStatus = authProvider.instance.status;
     const configForWebview = await this.getConfigForWebview();
     const workspaceFolderUris = ((_a3 = workspace.workspaceFolders) == null ? void 0 : _a3.map((folder2) => folder2.uri.toString())) ?? [];
     const clientConfig = await ClientConfigSingleton.getInstance().getConfig();
@@ -54436,7 +54568,8 @@ class ChatController {
         chat: (clientConfig == null ? void 0 : clientConfig.chatEnabled) ?? true,
         attribution: (clientConfig == null ? void 0 : clientConfig.attributionEnabled) ?? false,
         serverSentModels: (clientConfig == null ? void 0 : clientConfig.modelsAPIEnabled) ?? false
-      }
+      },
+      isDotComUser: isDotCom(authStatus)
     });
     logDebug("ChatController", "updateViewConfig", {
       verbose: configForWebview
@@ -54450,7 +54583,7 @@ class ChatController {
       isMessageInProgress: false,
       chatID: this.chatModel.sessionID
     }));
-    this.handleSetChatModel(this.chatModel.modelID);
+    this.chatModel.updateModel(this.chatModel.modelID);
     await this.saveSession();
     this.initDoer.signalInitialized();
     await this.sendConfig();
@@ -54461,7 +54594,7 @@ class ChatController {
   async handleUserMessageSubmission(requestID, inputText, submitType, mentions, editorState, legacyAddEnhancedContext, signal2, source, command) {
     return tracer.startActiveSpan("chat.submit", async (span2) => {
       span2.setAttribute("sampled", true);
-      const authStatus = authProvider.instance.getAuthStatus();
+      const authStatus = authProvider.instance.statusAuthed;
       const sharedProperties = {
         requestID,
         chatModel: this.chatModel.modelID,
@@ -54526,6 +54659,7 @@ class ChatController {
             prompter2,
             signal2,
             requestID,
+            authStatus.codyApiVersion,
             contextAlternatives
           );
           void this.sendChatExecutedTelemetry(
@@ -54554,7 +54688,7 @@ class ChatController {
     });
   }
   async sendChatExecutedTelemetry(span2, firstTokenSpan, inputText, sharedProperties, context2) {
-    const authStatus = authProvider.instance.getAuthStatus();
+    const authStatus = authProvider.instance.status;
     const contextSummary = {};
     for (const { source } of context2.used) {
       if (!source) {
@@ -54578,7 +54712,7 @@ class ChatController {
         ...contextSummary,
         // Flag indicating this is a transcript event to go through ML data pipeline. Only for DotCom users
         // See https://github.com/sourcegraph/sourcegraph/pull/59524
-        recordsPrivateMetadataTranscript: authStatus.isDotCom ? 1 : 0
+        recordsPrivateMetadataTranscript: isDotCom(authStatus) ? 1 : 0
       },
       privateMetadata: {
         properties: properties2,
@@ -54586,7 +54720,7 @@ class ChatController {
         // 🚨 SECURITY: chat transcripts are to be included only for DotCom users AND for V2 telemetry
         // V2 telemetry exports privateMetadata only for DotCom users
         // the condition below is an additional safeguard measure
-        promptText: authStatus.isDotCom && truncatePromptString(inputText, CHAT_INPUT_TOKEN_BUDGET)
+        promptText: isDotCom(authStatus) && truncatePromptString(inputText, CHAT_INPUT_TOKEN_BUDGET)
       }
     });
   }
@@ -54612,7 +54746,7 @@ class ChatController {
     ]);
     const resolvedExplicitMentionsPromise = resolveContextItems(
       this.editor,
-      [structuredMentions.symbols, structuredMentions.files].flat(),
+      [structuredMentions.symbols, structuredMentions.files, structuredMentions.openCtx].flat(),
       text,
       signal2
     );
@@ -54710,10 +54844,6 @@ class ChatController {
     this.postViewTranscript();
     telemetryRecorder.recordEvent("cody.sidebar.abortButton", "clicked");
   }
-  handleSetChatModel(modelID) {
-    this.chatModel.updateModel(modelID);
-    this.postChatModels();
-  }
   async handleGetUserEditorContext(uri2) {
     var _a3;
     const selection = (_a3 = window$1.activeTextEditor) == null ? void 0 : _a3.selection;
@@ -54813,17 +54943,6 @@ class ChatController {
     void this.postMessage({ type: "errors", errors: error.message });
     captureException(error);
   }
-  postChatModels() {
-    const authStatus = authProvider.instance.getAuthStatus();
-    if (!(authStatus == null ? void 0 : authStatus.isLoggedIn)) {
-      return;
-    }
-    const models = modelsService.instance.getModels(ModelUsage.Chat);
-    void this.postMessage({
-      type: "chatModels",
-      models
-    });
-  }
   /**
    * Low-level utility to post a message to the webview, pending initialization.
    *
@@ -54843,20 +54962,16 @@ class ChatController {
   /**
    * Constructs the prompt and updates the UI with the context used in the prompt.
    */
-  async buildPrompt(prompter2, abortSignal, requestID, contextAlternatives) {
+  async buildPrompt(prompter2, abortSignal, requestID, codyApiVersion, contextAlternatives) {
     var _a3;
-    const { prompt, context: context2 } = await prompter2.makePrompt(
-      this.chatModel,
-      authProvider.instance.getAuthStatus().codyApiVersion
-    );
+    const { prompt, context: context2 } = await prompter2.makePrompt(this.chatModel, codyApiVersion);
     abortSignal.throwIfAborted();
     this.chatModel.setLastMessageContext([...context2.used, ...context2.ignored], contextAlternatives);
     (_a3 = this.contextAPIClient) == null ? void 0 : _a3.recordContext(requestID, context2.used, context2.ignored);
     return { prompt, context: context2 };
   }
   async buildPrivateContextSummary(context2) {
-    const isDotCom2 = authProvider.instance.getAuthStatus().isDotCom;
-    if (!isDotCom2) {
+    if (!isDotCom(authProvider.instance.status)) {
       return {};
     }
     if (!workspaceReposMonitor) {
@@ -54991,7 +55106,7 @@ class ChatController {
     this.chatModel.addBotMessage({ text: messageText });
     void this.saveSession();
     this.postViewTranscript();
-    const authStatus = authProvider.instance.getAuthStatus();
+    const authStatus = authProvider.instance.status;
     const generatedCode = countGeneratedCode(messageText.toString());
     const responseEventAction = generatedCode.charCount > 0 ? "hasCode" : "noCode";
     telemetryRecorder.recordEvent("cody.chatResponse", responseEventAction, {
@@ -55002,13 +55117,13 @@ class ChatController {
         ...generatedCode,
         // Flag indicating this is a transcript event to go through ML data pipeline. Only for dotcom users
         // See https://github.com/sourcegraph/sourcegraph/pull/59524
-        recordsPrivateMetadataTranscript: authStatus.isDotCom ? 1 : 0
+        recordsPrivateMetadataTranscript: isDotCom(authStatus) ? 1 : 0
       },
       privateMetadata: {
         // 🚨 SECURITY: chat transcripts are to be included only for DotCom users AND for V2 telemetry
         // V2 telemetry exports privateMetadata only for DotCom users
         // the condition below is an aditional safegaurd measure
-        responseText: authStatus.isDotCom && truncatePromptString(messageText, CHAT_OUTPUT_TOKEN_BUDGET),
+        responseText: isDotCom(authStatus) && truncatePromptString(messageText, CHAT_OUTPUT_TOKEN_BUDGET),
         chatModel: this.chatModel.modelID
       }
     });
@@ -55027,7 +55142,7 @@ class ChatController {
   // current in-progress completion. If the chat does not exist, then this
   // is a no-op.
   async restoreSession(sessionID) {
-    const oldTranscript = chatHistory.getChat(authProvider.instance.getAuthStatus(), sessionID);
+    const oldTranscript = chatHistory.getChat(authProvider.instance.statusAuthed, sessionID);
     if (!oldTranscript) {
       return;
     }
@@ -55037,15 +55152,18 @@ class ChatController {
     this.postViewTranscript();
   }
   async saveSession() {
-    const allHistory = await chatHistory.saveChat(
-      authProvider.instance.getAuthStatus(),
-      this.chatModel.toSerializedChatTranscript()
-    );
-    if (allHistory) {
-      void this.postMessage({
-        type: "history",
-        localHistory: allHistory
-      });
+    const authStatus = authProvider.instance.status;
+    if (authStatus.authenticated) {
+      const allHistory = await chatHistory.saveChat(
+        authStatus,
+        this.chatModel.toSerializedChatTranscript()
+      );
+      if (allHistory) {
+        void this.postMessage({
+          type: "history",
+          localHistory: allHistory
+        });
+      }
     }
   }
   async clearAndRestartSession() {
@@ -55066,7 +55184,7 @@ class ChatController {
       return this.webviewPanelOrView;
     }
     const viewType = CodyChatEditorViewType;
-    const panelTitle = ((_a3 = chatHistory.getChat(authProvider.instance.getAuthStatus(), this.chatModel.sessionID)) == null ? void 0 : _a3.chatTitle) || getChatPanelTitle(lastQuestion);
+    const panelTitle = ((_a3 = chatHistory.getChat(authProvider.instance.statusAuthed, this.chatModel.sessionID)) == null ? void 0 : _a3.chatTitle) || getChatPanelTitle(lastQuestion);
     const viewColumn = activePanelViewColumn || ViewColumn.Beside;
     const webviewPath = Uri.joinPath(this.extensionUri, "dist", "webviews");
     const panel2 = window$1.createWebviewPanel(
@@ -55140,7 +55258,19 @@ class ChatController {
           evaluatedFeatureFlag: (flag2) => featureFlagProvider.instance.evaluatedFeatureFlag(flag2),
           prompts: (query2) => promiseFactoryToObservable(
             (signal2) => mergedPromptsAndLegacyCommands(query2, signal2)
-          )
+          ),
+          models: () => combineLatest$1([
+            this.configWatcher.changes,
+            modelsService.instance.selectedOrDefaultModelChanges.pipe(
+              startWith$1(void 0)
+            )
+          ]).pipe(map$1(() => modelsService.instance.getModels(ModelUsage.Chat))),
+          setChatModel: (model2) => {
+            this.chatModel.updateModel(model2);
+            return promiseToObservable$1(
+              modelsService.instance.setSelectedModel(ModelUsage.Chat, model2)
+            );
+          }
         }
       )
     );
@@ -55180,7 +55310,7 @@ class ChatController {
     let gitMetadata = "";
     if (workspaceReposMonitor) {
       const { isPublic: isWorkspacePublic, repoMetadata } = await workspaceReposMonitor.getRepoMetadataIfPublic();
-      if (authStatus.isDotCom && legacyAddEnhancedContext && isWorkspacePublic) {
+      if (isDotCom(authStatus) && legacyAddEnhancedContext && isWorkspacePublic) {
         gitMetadata = JSON.stringify(repoMetadata);
       }
     }
@@ -55188,7 +55318,7 @@ class ChatController {
       metadata: {
         // Flag indicating this is a transcript event to go through ML data pipeline. Only for DotCom users
         // See https://github.com/sourcegraph/sourcegraph/pull/59524
-        recordsPrivateMetadataTranscript: authStatus.endpoint && authStatus.isDotCom ? 1 : 0,
+        recordsPrivateMetadataTranscript: authStatus.endpoint && isDotCom(authStatus) ? 1 : 0,
         addEnhancedContext: legacyAddEnhancedContext ? 1 : 0,
         // All mentions
         mentionsTotal: mentions.length,
@@ -55226,7 +55356,7 @@ class ChatController {
         // 🚨 SECURITY: chat transcripts are to be included only for DotCom users AND for V2 telemetry
         // V2 telemetry exports privateMetadata only for DotCom users
         // the condition below is an additional safeguard measure
-        promptText: authStatus.isDotCom && truncatePromptString(inputText, CHAT_INPUT_TOKEN_BUDGET),
+        promptText: isDotCom(authStatus) && truncatePromptString(inputText, CHAT_INPUT_TOKEN_BUDGET),
         gitMetadata
       }
     });
@@ -55303,7 +55433,7 @@ function combineContext(explicitMentions, openCtxContext, priorityContext, retri
 }
 const CodyChatEditorViewType = "cody.editorPanel";
 class ChatsController {
-  constructor(options, chatClient, enterpriseContext, localEmbeddings, symf, contextRetriever, guardrails, contextAPIClient, extensionClient) {
+  constructor(options, chatClient, enterpriseContext, localEmbeddings, symf, contextRetriever, guardrails, contextAPIClient, extensionClient, configWatcher) {
     // Chat view in the panel (typically in the sidebar)
     __publicField2(this, "panel");
     // Chat views in editor panels
@@ -55321,6 +55451,7 @@ class ChatsController {
     this.guardrails = guardrails;
     this.contextAPIClient = contextAPIClient;
     this.extensionClient = extensionClient;
+    this.configWatcher = configWatcher;
     logDebug("ChatsController:constructor", "init");
     this.panel = this.createChatController();
     this.disposables.push(
@@ -55330,17 +55461,12 @@ class ChatsController {
     );
   }
   async setAuthStatus(authStatus) {
-    const hasLoggedOut = !authStatus.isLoggedIn;
+    const hasLoggedOut = !authStatus.authenticated;
     const hasSwitchedAccount = this.currentAuthAccount && this.currentAuthAccount.endpoint !== authStatus.endpoint;
     if (hasLoggedOut || hasSwitchedAccount) {
       this.disposeAllChats();
     }
-    const endpoint = authStatus.endpoint ?? "";
-    this.currentAuthAccount = {
-      endpoint,
-      primaryEmail: authStatus.primaryEmail,
-      username: authStatus.username
-    };
+    this.currentAuthAccount = authStatus.authenticated ? { ...authStatus } : void 0;
     this.panel.setAuthStatus(authStatus);
   }
   async restoreToPanel(panel2, chatID) {
@@ -55560,8 +55686,8 @@ class ChatsController {
    */
   async exportHistory() {
     telemetryRecorder.recordEvent("cody.exportChatHistoryButton", "clicked");
-    const authStatus = authProvider.instance.getAuthStatus();
-    if (authStatus.isLoggedIn) {
+    const authStatus = authProvider.instance.status;
+    if (authStatus.authenticated) {
       try {
         const historyJson = chatHistory.getLocalHistory(authStatus);
         const exportPath = await window$1.showSaveDialog({
@@ -55585,7 +55711,7 @@ class ChatsController {
   async clearHistory(chatID) {
     const ClearWithoutConfirmID = "clear-all-no-confirm";
     const isClearAll = !chatID || chatID === ClearWithoutConfirmID;
-    const authStatus = authProvider.instance.getAuthStatus();
+    const authStatus = authProvider.instance.statusAuthed;
     if (isClearAll) {
       if (chatID !== ClearWithoutConfirmID) {
         const userConfirmation = await window$1.showWarningMessage(
@@ -55673,7 +55799,8 @@ class ChatsController {
       startTokenReceiver: this.options.startTokenReceiver,
       contextAPIClient: this.contextAPIClient,
       contextRetriever: this.contextRetriever,
-      extensionClient: this.extensionClient
+      extensionClient: this.extensionClient,
+      configWatcher: this.configWatcher
     });
   }
   disposeChat(chatID, includePanel) {
@@ -56133,7 +56260,7 @@ class GhostHintDecorator {
         trailing: true
       }
     );
-    const initialAuth = authProvider.instance.getAuthStatus();
+    const initialAuth = authProvider.instance.status;
     this.updateEnablement(initialAuth);
     this.permanentDisposables.push(
       subscriptionDisposable(
@@ -56143,7 +56270,7 @@ class GhostHintDecorator {
     this.permanentDisposables.push(
       workspace.onDidChangeConfiguration((e) => {
         if (e.affectsConfiguration("cody")) {
-          this.updateEnablement(authProvider.instance.getAuthStatus());
+          this.updateEnablement(authProvider.instance.status);
         }
       }),
       workspace.onDidChangeTextDocument((event) => {
@@ -56276,7 +56403,7 @@ class GhostHintDecorator {
   }
   async updateEnablement(authStatus) {
     const featureEnablement = await getGhostHintEnablement();
-    if (!authStatus.isLoggedIn || !(featureEnablement.Document || featureEnablement.EditOrChat || featureEnablement.Generate)) {
+    if (!authStatus.authenticated || !(featureEnablement.Document || featureEnablement.EditOrChat || featureEnablement.Generate)) {
       this.disposeActive();
       return;
     }
@@ -56365,8 +56492,9 @@ async function getContextFilesFromGitDiff(gitRepo) {
         continue;
       }
       const uri2 = (_a3 = diffFiles.find((p) => {
-        const diffPath = diff2.split("\n")[0];
-        return diffPath.split("").reverse().join("").startsWith(displayPath(p.uri).split("").reverse().join(""));
+        var _a4;
+        const diffPath = (_a4 = diff2.split("\n")) == null ? void 0 : _a4[0];
+        return diffPath ? diffPath.split("").reverse().join("").startsWith(displayPath(p.uri).split("").reverse().join("")) : p.uri;
       })) == null ? void 0 : _a3.uri;
       if (!uri2 || !await doesFileExist(uri2)) {
         continue;
@@ -56500,7 +56628,7 @@ class CodySourceControl {
   async generate(scm) {
     var _a3, _b2;
     telemetryRecorder.recordEvent("cody.command.generate-commit", "executed");
-    const currentWorkspaceUri = (_b2 = (_a3 = workspace.workspaceFolders) == null ? void 0 : _a3[0]) == null ? void 0 : _b2.uri;
+    const currentWorkspaceUri = (scm == null ? void 0 : scm.rootUri) ?? ((_b2 = (_a3 = workspace.workspaceFolders) == null ? void 0 : _a3[0]) == null ? void 0 : _b2.uri);
     if (!this.gitAPI || !currentWorkspaceUri) {
       window$1.showInformationMessage("Git is not available in the current workspace.");
       return;
@@ -56790,6 +56918,75 @@ function fuseResults(retrievedSets, rankingIdentities) {
   }
   return fusedResults;
 }
+class DefaultCompletionsContextRanker {
+  rankAndFuseContext(results) {
+    if (this.containsRecentEditsBasedContext(results)) {
+      return this.getRecentEditsBasedContextFusion(results);
+    }
+    return this.getRRFBasedContextFusion(results);
+  }
+  containsRecentEditsBasedContext(results) {
+    return results.some((result) => result.identifier.includes("recent-edits"));
+  }
+  getRecentEditsBasedContextFusion(results) {
+    const priorityBasedContextSnippets = this.splitPriorityBasedContextFusion(results, [
+      "recent-edits"
+    ]);
+    const priorityContextSnippets = this.getLinearContextFusion(
+      priorityBasedContextSnippets.priorityContext
+    );
+    const nonPriorityContextSnippets = this.getRRFBasedContextFusion(
+      priorityBasedContextSnippets.nonPriorityContext
+    );
+    return /* @__PURE__ */ new Set([...priorityContextSnippets, ...nonPriorityContextSnippets]);
+  }
+  /**
+   * Performs a split based on priority based retrievers and orders the the priority based retrievers based on the order of the retrieverPriority array.
+   *
+   * @param results - An array of RetrievedContextResults to be split.
+   * @param retrieverPriority - An ordered array of strings representing priority retrievers. Rest of the retrievers are ranked using RRF.
+   * @returns A seperate set of priority based and non-priority based context snippets.
+   */
+  splitPriorityBasedContextFusion(results, retrieverPriority) {
+    const priorityBasedRetrievedContext = results.filter(
+      (result) => retrieverPriority.includes(result.identifier)
+    );
+    const nonPriorityBasedRetrievedContext = results.filter(
+      (result) => !retrieverPriority.includes(result.identifier)
+    );
+    const priorityMap = new Map(retrieverPriority.map((priority, index2) => [priority, index2]));
+    const orderedPriorityBasedRetrievedContext = priorityBasedRetrievedContext.sort(
+      (a, b) => priorityMap.get(a.identifier) - priorityMap.get(b.identifier)
+    );
+    return {
+      priorityContext: orderedPriorityBasedRetrievedContext,
+      nonPriorityContext: nonPriorityBasedRetrievedContext
+    };
+  }
+  getRRFBasedContextFusion(results) {
+    const fusedResults = fuseResults(
+      results.map((r2) => r2.snippets),
+      (result) => {
+        if (typeof result.startLine === "undefined" || typeof result.endLine === "undefined") {
+          return [result.uri.toString()];
+        }
+        const lineIds = [];
+        for (let i = result.startLine; i <= result.endLine; i++) {
+          lineIds.push(`${result.uri.toString()}:${i}`);
+        }
+        return lineIds;
+      }
+    );
+    return fusedResults;
+  }
+  getLinearContextFusion(results) {
+    const linearResults = [];
+    for (const result of results) {
+      linearResults.push(...Array.from(result.snippets));
+    }
+    return new Set(linearResults);
+  }
+}
 class ContextMixer {
   constructor(strategyFactory) {
     this.strategyFactory = strategyFactory;
@@ -56832,19 +57029,8 @@ class ContextMixer {
         };
       })
     );
-    const fusedResults = fuseResults(
-      results.map((r2) => r2.snippets),
-      (result) => {
-        if (typeof result.startLine === "undefined" || typeof result.endLine === "undefined") {
-          return [result.uri.toString()];
-        }
-        const lineIds = [];
-        for (let i = result.startLine; i <= result.endLine; i++) {
-          lineIds.push(`${result.uri.toString()}:${i}`);
-        }
-        return lineIds;
-      }
-    );
+    const contextRanker = new DefaultCompletionsContextRanker();
+    const fusedResults = contextRanker.rankAndFuseContext(results);
     let totalChars = options.docContext.prefix.length + options.docContext.suffix.length;
     const mixedContext = [];
     const retrieverStats = {};
@@ -56919,7 +57105,11 @@ const htmlFamily = /* @__PURE__ */ new Set([
   // This omits vue and svelte as these languages usually do not
   // import CSS modules but define them in the same file instead.
 ]);
-function shouldBeUsedAsContext(enableExtendedLanguagePool, baseLanguageId, languageId) {
+function shouldBeUsedAsContext({
+  enableExtendedLanguagePool,
+  baseLanguageId,
+  languageId
+}) {
   if (baseLanguageId === languageId) {
     return true;
   }
@@ -56992,13 +57182,14 @@ class VSCodeDocumentHistory {
       if (ignoreSet.has(item.document.uri)) {
         continue;
       }
-      if (shouldBeUsedAsContext(
-        completionProviderConfig.getPrefetchedFlag(
+      const params = {
+        enableExtendedLanguagePool: completionProviderConfig.getPrefetchedFlag(
           FeatureFlag.CodyAutocompleteContextExtendLanguagePool
         ),
         baseLanguageId,
-        item.document.languageId
-      )) {
+        languageId: item.document.languageId
+      };
+      if (shouldBeUsedAsContext(params)) {
         continue;
       }
       ret2.push(item);
@@ -156269,13 +156460,14 @@ class JaccardSimilarityRetriever extends CachedRetriever {
       if (!["file", "vscode-userdata"].includes(document2.uri.scheme)) {
         return;
       }
-      if (!shouldBeUsedAsContext(
-        completionProviderConfig.getPrefetchedFlag(
+      const params = {
+        enableExtendedLanguagePool: completionProviderConfig.getPrefetchedFlag(
           FeatureFlag.CodyAutocompleteContextExtendLanguagePool
         ),
-        curLang,
-        document2.languageId
-      )) {
+        baseLanguageId: curLang,
+        languageId: document2.languageId
+      };
+      if (!shouldBeUsedAsContext(params)) {
         return;
       }
       const endLine = Math.min(document2.lineCount, 1e4);
@@ -157277,6 +157469,165 @@ class LspLightRetriever {
     invalidateDocumentCache(event.document);
   }
 }
+class RecentEditsRetriever {
+  constructor(maxAgeMs, workspace$1 = workspace) {
+    // We use a map from the document URI to the set of tracked completions inside that document to
+    // improve performance of the `onDidChangeTextDocument` event handler.
+    __publicField2(this, "trackedDocuments", /* @__PURE__ */ new Map());
+    __publicField2(this, "identifier", "recent-edits");
+    __publicField2(this, "disposables", []);
+    this.maxAgeMs = maxAgeMs;
+    this.workspace = workspace$1;
+    this.disposables.push(workspace$1.onDidChangeTextDocument(this.onDidChangeTextDocument.bind(this)));
+    this.disposables.push(workspace$1.onDidRenameFiles(this.onDidRenameFiles.bind(this)));
+    this.disposables.push(workspace$1.onDidDeleteFiles(this.onDidDeleteFiles.bind(this)));
+  }
+  async retrieve(options) {
+    const rawDiffs = await this.getDiffAcrossDocuments();
+    const diffs = this.filterCandidateDiffs(rawDiffs, options.document);
+    diffs.sort((a, b) => b.latestChangeTimestamp - a.latestChangeTimestamp);
+    const autocompleteContextSnippets = [];
+    for (const diff2 of diffs) {
+      const content = this.getCommentedPromptForCompletions(
+        diff2.languageId,
+        diff2.uri,
+        diff2.diff
+      ).toString();
+      const autocompleteSnippet = {
+        uri: diff2.uri,
+        content
+      };
+      autocompleteContextSnippets.push(autocompleteSnippet);
+    }
+    return autocompleteContextSnippets;
+  }
+  async getDiffAcrossDocuments() {
+    const diffs = [];
+    const diffPromises = Array.from(this.trackedDocuments.entries()).map(
+      async ([uri2, trackedDocument]) => {
+        const diff2 = await this.getDiff(Uri.parse(uri2));
+        if (diff2) {
+          return {
+            diff: diff2,
+            uri: trackedDocument.uri,
+            languageId: trackedDocument.languageId,
+            latestChangeTimestamp: Math.max(
+              ...trackedDocument.changes.map((c) => c.timestamp)
+            )
+          };
+        }
+        return null;
+      }
+    );
+    const results = await Promise.all(diffPromises);
+    diffs.push(...results.filter((result) => result !== null));
+    return diffs;
+  }
+  getCommentedPromptForCompletions(languageId, filename, diff2) {
+    const filePath = PromptString.fromDisplayPath(filename);
+    const languageConfig = getLanguageConfig(languageId);
+    const commentStart = languageConfig ? languageConfig.commentStart : ps`// `;
+    const prompt = psDedent`${commentStart} Here is git diff of the recent change made to the file ${filePath} which is used to provide context for the completion:\n${diff2}`;
+    return prompt;
+  }
+  filterCandidateDiffs(allDiffs, document2) {
+    const filterCandidateDiffs = [];
+    for (const diff2 of allDiffs) {
+      const currentDocumentLanguageId = document2.languageId;
+      const params = {
+        enableExtendedLanguagePool: false,
+        baseLanguageId: currentDocumentLanguageId,
+        languageId: diff2.languageId
+      };
+      if (shouldBeUsedAsContext(params)) {
+        filterCandidateDiffs.push(diff2);
+      }
+    }
+    return filterCandidateDiffs;
+  }
+  isSupportedForLanguageId() {
+    return true;
+  }
+  async getDiff(uri2) {
+    if (await contextFiltersProvider.instance.isUriIgnored(uri2)) {
+      return null;
+    }
+    const trackedDocument = this.trackedDocuments.get(uri2.toString());
+    if (!trackedDocument) {
+      return null;
+    }
+    const oldContent = trackedDocument.content;
+    const newContent = applyChanges(
+      oldContent,
+      trackedDocument.changes.map((c) => c.change)
+    );
+    return PromptString.fromGitDiff(uri2, oldContent, newContent);
+  }
+  onDidChangeTextDocument(event) {
+    let trackedDocument = this.trackedDocuments.get(event.document.uri.toString());
+    if (!trackedDocument) {
+      trackedDocument = this.trackDocument(event.document);
+    }
+    const now2 = Date.now();
+    for (const change of event.contentChanges) {
+      trackedDocument.changes.push({
+        timestamp: now2,
+        change
+      });
+    }
+    this.reconcileOutdatedChanges();
+  }
+  onDidRenameFiles(event) {
+    for (const file of event.files) {
+      const trackedDocument = this.trackedDocuments.get(file.oldUri.toString());
+      if (trackedDocument) {
+        this.trackedDocuments.set(file.newUri.toString(), trackedDocument);
+        this.trackedDocuments.delete(file.oldUri.toString());
+      }
+    }
+  }
+  onDidDeleteFiles(event) {
+    for (const uri2 of event.files) {
+      this.trackedDocuments.delete(uri2.toString());
+    }
+  }
+  dispose() {
+    this.trackedDocuments.clear();
+    for (const disposable of this.disposables) {
+      disposable.dispose();
+    }
+  }
+  trackDocument(document2) {
+    const trackedDocument = {
+      content: document2.getText(),
+      languageId: document2.languageId,
+      uri: document2.uri,
+      changes: []
+    };
+    this.trackedDocuments.set(document2.uri.toString(), trackedDocument);
+    return trackedDocument;
+  }
+  reconcileOutdatedChanges() {
+    const now2 = Date.now();
+    for (const [, trackedDocument] of this.trackedDocuments) {
+      const firstNonOutdatedChangeIndex = trackedDocument.changes.findIndex(
+        (c) => now2 - c.timestamp < this.maxAgeMs
+      );
+      const outdatedChanges = trackedDocument.changes.slice(0, firstNonOutdatedChangeIndex);
+      trackedDocument.content = applyChanges(
+        trackedDocument.content,
+        outdatedChanges.map((c) => c.change)
+      );
+      trackedDocument.changes = trackedDocument.changes.slice(firstNonOutdatedChangeIndex);
+    }
+  }
+}
+function applyChanges(content, changes) {
+  for (const change of changes) {
+    content = content.slice(0, change.rangeOffset) + change.text + content.slice(change.rangeOffset + change.rangeLength);
+  }
+  return content;
+}
 class DefaultContextStrategyFactory {
   constructor(contextStrategy, createBfgRetriever) {
     __publicField2(this, "disposables", []);
@@ -157286,6 +157637,24 @@ class DefaultContextStrategyFactory {
     switch (contextStrategy) {
       case "none":
         break;
+      case "recent-edits":
+        this.localRetriever = new RecentEditsRetriever(60 * 1e3);
+        this.disposables.push(this.localRetriever);
+        break;
+      case "recent-edits-1m":
+        this.localRetriever = new RecentEditsRetriever(60 * 1e3);
+        this.disposables.push(this.localRetriever);
+        break;
+      case "recent-edits-5m":
+        this.localRetriever = new RecentEditsRetriever(60 * 5 * 1e3);
+        this.disposables.push(this.localRetriever);
+        break;
+      case "recent-edits-mixed":
+        this.localRetriever = new RecentEditsRetriever(60 * 1e3);
+        this.graphRetriever = new JaccardSimilarityRetriever();
+        this.disposables.push(this.localRetriever);
+        this.disposables.push(this.graphRetriever);
+        break;
       case "tsc-mixed":
         this.localRetriever = new JaccardSimilarityRetriever();
         this.disposables.push(this.localRetriever);
@@ -157316,7 +157685,7 @@ class DefaultContextStrategyFactory {
     }
   }
   getStrategy(document2) {
-    var _a3, _b2, _c2;
+    var _a3, _b2, _c2, _d2;
     const retrievers = [];
     switch (this.contextStrategy) {
       case "none": {
@@ -157348,10 +157717,22 @@ class DefaultContextStrategyFactory {
           retrievers.push(this.localRetriever);
         }
         break;
-      case "jaccard-similarity": {
+      case "jaccard-similarity":
+      case "recent-edits":
+      case "recent-edits-1m":
+      case "recent-edits-5m": {
+        if (this.localRetriever) {
+          retrievers.push(this.localRetriever);
+        }
+        break;
+      }
+      case "recent-edits-mixed": {
         if (this.localRetriever) {
           retrievers.push(this.localRetriever);
         }
+        if ((_d2 = this.graphRetriever) == null ? void 0 : _d2.isSupportedForLanguageId(document2.languageId)) {
+          retrievers.push(this.graphRetriever);
+        }
         break;
       }
     }
@@ -160290,7 +160671,7 @@ function createFastPathClient(requestParams, abortController, params) {
     logResponseHeadersToSpan(span2, response);
     const traceId = (_f2 = getActiveTraceAndSpanId()) == null ? void 0 : _f2.traceId;
     if (response.status === 429) {
-      const upgradeIsAvailable = authStatus.userCanUpgrade;
+      const upgradeIsAvailable = !!authStatus.userCanUpgrade;
       throw recordErrorToSpan(
         span2,
         await createRateLimitErrorFromResponse(response, upgradeIsAvailable)
@@ -160491,7 +160872,7 @@ class FireworksProvider extends Provider {
     );
     const isNode = typeof define_process_default !== "undefined";
     this.fastPathAccessToken = config.accessToken && // Require the upstream to be dotcom
-    (this.authStatus.isDotCom || this.isLocalInstance) && define_process_default.env.CODY_DISABLE_FASTPATH !== "true" && // Used for testing
+    (isDotCom(this.authStatus) || this.isLocalInstance) && define_process_default.env.CODY_DISABLE_FASTPATH !== "true" && // Used for testing
     // The fast path client only supports Node.js style response streams
     isNode ? dotcomTokenToGatewayToken(config.accessToken) : void 0;
   }
@@ -160574,7 +160955,7 @@ function createProviderConfig$3({
   model: model2,
   ...otherOptions
 }) {
-  const clientModel = getClientModel(model2, otherOptions.authStatus.isDotCom);
+  const clientModel = getClientModel(model2, isDotCom(otherOptions.authStatus));
   const maxContextTokens = getMaxContextTokens(clientModel);
   return {
     create(options) {
@@ -161002,7 +161383,7 @@ async function createProviderConfigHelper(params) {
     case "anthropic": {
       let getAnthropicModel = function() {
         var _a4;
-        if (authStatus.isDotCom) {
+        if (isDotCom(authStatus)) {
           return DEFAULT_PLG_ANTHROPIC_MODEL;
         }
         if (((_a4 = authStatus.configOverwrites) == null ? void 0 : _a4.provider) === "sourcegraph") {
@@ -161041,20 +161422,19 @@ async function createProviderConfigHelper(params) {
       return null;
   }
 }
-async function manuallyGetCompletionItemsForProvider(completionsProviderConfig, document2, position, context2) {
+async function manuallyGetCompletionItemsForProvider(config, document2, position, context2) {
   var _a3;
-  const result = await completionsProviderConfig.completionsProvider.provideInlineCompletionItems(
+  const result = await config.completionsProvider.provideInlineCompletionItems(
     document2,
     position,
     context2,
     new CancellationTokenSource().token
   );
-  const model2 = completionsProviderConfig.modelName;
-  const provider = completionsProviderConfig.providerName;
   const completion = ((_a3 = result == null ? void 0 : result.items[0].insertText) == null ? void 0 : _a3.toString()) || "";
   return {
-    provider,
-    model: model2,
+    provider: config.providerName,
+    model: config.modelName,
+    contextStrategy: config.contextStrategy,
     completion
   };
 }
@@ -161078,7 +161458,7 @@ async function triggerMultiModelAutocompletionsForComparison(allCompletionsProvi
   const completions = await Promise.all(allPromises);
   let completionsOutput = "";
   for (const result of completions) {
-    completionsOutput += `Model: ${result.model}
+    completionsOutput += `Model: ${result.model}	 Context: ${result.contextStrategy} 
 ${result.completion}
 
 `;
@@ -161091,8 +161471,8 @@ async function createInlineCompletionItemFromMultipleProviders({
   statusBar,
   createBfgRetriever
 }) {
-  const authStatus = authProvider.instance.getAuthStatus();
-  if (!authStatus.isLoggedIn || config.autocompleteExperimentalMultiModelCompletions === void 0) {
+  const authStatus = authProvider.instance.status;
+  if (!authStatus.authenticated || config.autocompleteExperimentalMultiModelCompletions === void 0) {
     return {
       dispose: () => {
       }
@@ -161105,7 +161485,8 @@ async function createInlineCompletionItemFromMultipleProviders({
       multiModelConfigsList.push({
         provider: currentProviderConfig.provider,
         model: currentProviderConfig.model,
-        enableExperimentalFireworksOverrides: currentProviderConfig.enableExperimentalFireworksOverrides ?? false
+        enableExperimentalFireworksOverrides: currentProviderConfig.enableExperimentalFireworksOverrides ?? false,
+        context: currentProviderConfig.context
       });
     }
   }
@@ -161115,11 +161496,19 @@ async function createInlineCompletionItemFromMultipleProviders({
       }
     };
   }
-  const allPromises = multiModelConfigsList.map(async (currentProviderConfig) => {
-    const newConfig = _.cloneDeep(config);
-    newConfig.telemetryLevel = "off";
-    newConfig.autocompleteExperimentalFireworksOptions = currentProviderConfig.enableExperimentalFireworksOverrides ? config.autocompleteExperimentalFireworksOptions : void 0;
-    newConfig.autocompleteAdvancedModel = null;
+  const allCompletionsProviders = [];
+  for (const currentProviderConfig of multiModelConfigsList) {
+    const newConfig = {
+      ...lodashExports.cloneDeep(config),
+      // Override some config to ensure we are not logging extra events.
+      telemetryLevel: "off",
+      // We should only override the fireworks "cody.autocomplete.experimental.fireworksOptions" when added in the config.
+      autocompleteExperimentalFireworksOptions: currentProviderConfig.enableExperimentalFireworksOverrides ? config.autocompleteExperimentalFireworksOptions : void 0,
+      // Don't use the advanced provider config to get the model
+      autocompleteAdvancedModel: null,
+      autocompleteExperimentalGraphContext: currentProviderConfig.context
+    };
+    completionProviderConfig.setConfig(newConfig);
     const providerConfig = await createProviderConfigHelper({
       client,
       authStatus,
@@ -161128,7 +161517,7 @@ async function createInlineCompletionItemFromMultipleProviders({
       config: newConfig
     });
     if (providerConfig) {
-      const authStatus2 = authProvider.instance.getAuthStatus();
+      const authStatus2 = authProvider.instance.statusAuthed;
       const completionsProvider = new InlineCompletionItemProvider({
         authStatus: authStatus2,
         providerConfig,
@@ -161142,21 +161531,15 @@ async function createInlineCompletionItemFromMultipleProviders({
         isDotComUser: isDotCom(authStatus2.endpoint || ""),
         noInlineAccept: true
       });
-      return {
+      allCompletionsProviders.push({
         providerName: currentProviderConfig.provider,
         modelName: currentProviderConfig.model,
-        completionsProvider
-      };
-    }
-    return void 0;
-  });
-  const allProviders = await Promise.all(allPromises);
-  const allCompletionsProviders = [];
-  for (const provider of allProviders) {
-    if (provider) {
-      allCompletionsProviders.push(provider);
+        completionsProvider,
+        contextStrategy: currentProviderConfig.context
+      });
     }
   }
+  completionProviderConfig.setConfig(config);
   disposables.push(
     commands$1.registerCommand(
       "cody.multi-model-autocomplete.manual-trigger",
@@ -161721,172 +162104,6 @@ class EnterpriseContextFactory {
     return this.workspaceRepoMapper;
   }
 }
-const RemoteFileProvider = createRemoteFileProvider();
-function createRemoteFileProvider(customTitle) {
-  return {
-    providerUri: REMOTE_FILE_PROVIDER_URI,
-    meta() {
-      return {
-        name: customTitle ?? "Remote Files",
-        mentions: {}
-      };
-    },
-    async mentions({ query: query2 }) {
-      const [repoName, filePath] = (query2 == null ? void 0 : query2.split(":")) || [];
-      if (!(query2 == null ? void 0 : query2.includes(":")) || !repoName.trim()) {
-        return await getRepositoryMentions((query2 == null ? void 0 : query2.trim()) ?? "", REMOTE_FILE_PROVIDER_URI);
-      }
-      return await getFileMentions(repoName, filePath.trim());
-    },
-    async items({ mention }) {
-      var _a3, _b2;
-      if (!((_a3 = mention == null ? void 0 : mention.data) == null ? void 0 : _a3.repoName) || !((_b2 = mention == null ? void 0 : mention.data) == null ? void 0 : _b2.filePath)) {
-        return [];
-      }
-      return await getFileItem(
-        mention.data.repoName,
-        mention.data.filePath,
-        mention.data.rev
-      );
-    }
-  };
-}
-async function getFileMentions(repoName, filePath) {
-  const repoRe = `^${escapeRegExp(repoName)}$`;
-  const fileRe = filePath ? escapeRegExp(filePath) : "^.*$";
-  const query2 = `repo:${repoRe} file:${fileRe} type:file count:10`;
-  const dataOrError = await graphqlClient.searchFileMatches(query2);
-  if (isError$1(dataOrError) || dataOrError === null) {
-    return [];
-  }
-  return dataOrError.search.results.results.map((result) => {
-    if (result.__typename !== "FileMatch") {
-      return null;
-    }
-    const url = `${graphqlClient.endpoint.replace(/\/$/, "")}${result.file.url}`;
-    const basename2 = displayPathBasename(URI.parse(result.file.path));
-    return {
-      uri: url,
-      title: basename2,
-      description: result.file.path,
-      data: {
-        repoName: result.repository.name,
-        rev: result.file.commit.oid,
-        filePath: result.file.path
-      }
-    };
-  }).filter(isDefined);
-}
-async function getFileItem(repoName, filePath, rev2 = "HEAD") {
-  var _a3, _b2;
-  const dataOrError = await graphqlClient.getFileContents(repoName, filePath, rev2);
-  if (isError$1(dataOrError)) {
-    return [];
-  }
-  const file = (_b2 = (_a3 = dataOrError == null ? void 0 : dataOrError.repository) == null ? void 0 : _a3.commit) == null ? void 0 : _b2.file;
-  if (!file) {
-    return [];
-  }
-  const url = `${graphqlClient.endpoint.replace(/\/$/, "")}${file.url}`;
-  return [
-    {
-      url,
-      title: `${repoName}/${file.path}`,
-      ai: {
-        content: file.content
-      }
-    }
-  ];
-}
-function escapeRegExp(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-const CurrentRepositoryDirectoryProvider = createCurrentRepositoryDirectoryProvider();
-function createCurrentRepositoryDirectoryProvider(customTitle) {
-  return {
-    providerUri: CURRENT_REPOSITORY_DIRECTORY_PROVIDER_URI,
-    meta() {
-      return {
-        name: "Directories",
-        mentions: {}
-      };
-    },
-    async mentions({ query: query2 }) {
-      var _a3, _b2;
-      const currentFile = (_a3 = getEditor().active) == null ? void 0 : _a3.document.uri;
-      const workspace$1 = (_b2 = workspace.workspaceFolders) == null ? void 0 : _b2[0].uri;
-      if (currentFile || workspace$1) {
-        const remote = (await repoNameResolver.getRepoNamesFromWorkspaceUri(
-          currentFile || workspace$1
-        ))[0];
-        if (remote) {
-          const workspaceRepoMapper = new WorkspaceRepoMapper();
-          const currentRepo = await workspaceRepoMapper.repoForCodebase(remote);
-          if (currentRepo) {
-            return await getDirectoryMentions(currentRepo.name, query2 == null ? void 0 : query2.trim());
-          }
-        }
-      }
-      return [];
-    },
-    async items({ mention, message }) {
-      var _a3, _b2;
-      if (!((_a3 = mention == null ? void 0 : mention.data) == null ? void 0 : _a3.repoID) || !((_b2 = mention == null ? void 0 : mention.data) == null ? void 0 : _b2.directoryPath) || !message) {
-        return [];
-      }
-      return await getDirectoryItem(
-        message,
-        mention.data.repoID,
-        mention.data.directoryPath
-      );
-    }
-  };
-}
-async function getDirectoryMentions(repoName, directoryPath) {
-  const repoRe = `^${escapeRegExp(repoName)}$`;
-  const directoryRe = directoryPath ? escapeRegExp(directoryPath) : "";
-  const query2 = `repo:${repoRe} file:${directoryRe}.*/.* select:file.directory count:10`;
-  const dataOrError = await graphqlClient.searchFileMatches(query2);
-  if (isError$1(dataOrError) || dataOrError === null) {
-    return [];
-  }
-  return dataOrError.search.results.results.map((result) => {
-    if (result.__typename !== "FileMatch") {
-      return null;
-    }
-    const url = `${graphqlClient.endpoint.replace(/\/$/, "")}${result.file.url}`;
-    return {
-      uri: url,
-      title: result.file.path,
-      description: "",
-      data: {
-        repoName: result.repository.name,
-        repoID: result.repository.id,
-        rev: result.file.commit.oid,
-        directoryPath: result.file.path
-      }
-    };
-  }).filter(isDefined);
-}
-async function getDirectoryItem(query2, repoID, directoryPath) {
-  const dataOrError = await graphqlClient.contextSearch({
-    repoIDs: [repoID],
-    query: query2,
-    filePatterns: [directoryPath]
-  });
-  if (isError$1(dataOrError) || dataOrError === null) {
-    return [];
-  }
-  return dataOrError.map(
-    (node) => ({
-      url: node.uri.toString(),
-      title: node.path,
-      ai: {
-        content: node.content
-      }
-    })
-  );
-}
 const gitMentionsProvider = {
   meta() {
     return { name: "Git", mentions: {} };
@@ -163865,7 +164082,8 @@ async function linearApiRequest(query2, variables, settings) {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
-      Authorization: `Bearer ${accessToken}`
+      // API keys don't need Bearer prefix (unlike oauth)
+      Authorization: accessToken.startsWith("lin_api_") ? accessToken : `Bearer ${accessToken}`
     },
     body: JSON.stringify({ query: query2, variables })
   });
@@ -163989,6 +164207,86 @@ const LinearIssuesProvider = {
   providerUri: "internal-linear-issues",
   ...linear_issues_default
 };
+const RemoteFileProvider = createRemoteFileProvider();
+function createRemoteFileProvider(customTitle) {
+  return {
+    providerUri: REMOTE_FILE_PROVIDER_URI,
+    meta() {
+      return {
+        name: customTitle ?? "Remote Files",
+        mentions: {}
+      };
+    },
+    async mentions({ query: query2 }) {
+      const [repoName, filePath] = (query2 == null ? void 0 : query2.split(":")) || [];
+      if (!(query2 == null ? void 0 : query2.includes(":")) || !repoName.trim()) {
+        return await getRepositoryMentions((query2 == null ? void 0 : query2.trim()) ?? "", REMOTE_FILE_PROVIDER_URI);
+      }
+      return await getFileMentions(repoName, filePath.trim());
+    },
+    async items({ mention }) {
+      var _a3, _b2;
+      if (!((_a3 = mention == null ? void 0 : mention.data) == null ? void 0 : _a3.repoName) || !((_b2 = mention == null ? void 0 : mention.data) == null ? void 0 : _b2.filePath)) {
+        return [];
+      }
+      return await getFileItem(
+        mention.data.repoName,
+        mention.data.filePath,
+        mention.data.rev
+      );
+    }
+  };
+}
+async function getFileMentions(repoName, filePath) {
+  const repoRe = `^${escapeRegExp(repoName)}$`;
+  const fileRe = filePath ? escapeRegExp(filePath) : "^.*$";
+  const query2 = `repo:${repoRe} file:${fileRe} type:file count:10`;
+  const dataOrError = await graphqlClient.searchFileMatches(query2);
+  if (isError$1(dataOrError) || dataOrError === null) {
+    return [];
+  }
+  return dataOrError.search.results.results.map((result) => {
+    if (result.__typename !== "FileMatch") {
+      return null;
+    }
+    const url = `${graphqlClient.endpoint.replace(/\/$/, "")}${result.file.url}`;
+    const basename2 = displayPathBasename(URI.parse(result.file.path));
+    return {
+      uri: url,
+      title: basename2,
+      description: result.file.path,
+      data: {
+        repoName: result.repository.name,
+        rev: result.file.commit.oid,
+        filePath: result.file.path
+      }
+    };
+  }).filter(isDefined);
+}
+async function getFileItem(repoName, filePath, rev2 = "HEAD") {
+  var _a3, _b2;
+  const dataOrError = await graphqlClient.getFileContents(repoName, filePath, rev2);
+  if (isError$1(dataOrError)) {
+    return [];
+  }
+  const file = (_b2 = (_a3 = dataOrError == null ? void 0 : dataOrError.repository) == null ? void 0 : _a3.commit) == null ? void 0 : _b2.file;
+  if (!file) {
+    return [];
+  }
+  const url = `${graphqlClient.endpoint.replace(/\/$/, "")}${file.url}`;
+  return [
+    {
+      url,
+      title: `${repoName}/${file.path}`,
+      ai: {
+        content: file.content
+      }
+    }
+  ];
+}
+function escapeRegExp(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
 const RemoteDirectoryProvider = createRemoteDirectoryProvider();
 function createRemoteDirectoryProvider(customTitle) {
   return {
@@ -164019,6 +164317,51 @@ function createRemoteDirectoryProvider(customTitle) {
     }
   };
 }
+async function getDirectoryMentions(repoName, directoryPath) {
+  const repoRe = `^${escapeRegExp(repoName)}$`;
+  const directoryRe = directoryPath ? escapeRegExp(directoryPath) : "";
+  const query2 = `repo:${repoRe} file:${directoryRe}.*/.* select:file.directory count:10`;
+  const dataOrError = await graphqlClient.searchFileMatches(query2);
+  if (isError$1(dataOrError) || dataOrError === null) {
+    return [];
+  }
+  return dataOrError.search.results.results.map((result) => {
+    if (result.__typename !== "FileMatch") {
+      return null;
+    }
+    const url = `${graphqlClient.endpoint.replace(/\/$/, "")}${result.file.url}`;
+    return {
+      uri: url,
+      title: result.file.path,
+      description: " ",
+      data: {
+        repoName: result.repository.name,
+        repoID: result.repository.id,
+        rev: result.file.commit.oid,
+        directoryPath: result.file.path
+      }
+    };
+  }).filter(isDefined);
+}
+async function getDirectoryItem(query2, repoID, directoryPath) {
+  const dataOrError = await graphqlClient.contextSearch({
+    repoIDs: [repoID],
+    query: query2,
+    filePatterns: [`^${directoryPath}.*`]
+  });
+  if (isError$1(dataOrError) || dataOrError === null) {
+    return [];
+  }
+  return dataOrError.map(
+    (node) => ({
+      url: node.uri.toString(),
+      title: node.path,
+      ai: {
+        content: node.content
+      }
+    })
+  );
+}
 const RemoteRepositorySearch = createRemoteRepositoryProvider();
 function createRemoteRepositoryProvider(customTitle) {
   return {
@@ -164196,7 +164539,7 @@ function getOpenCtxProviders(configChanges, authStatusChanges, isValidSiteVersio
           providerUri: WEB_PROVIDER_URI
         }
       ];
-      if (!authStatus.isDotCom) {
+      if (!isDotCom(authStatus)) {
         providers.push({
           settings: true,
           provider: RemoteRepositorySearch,
@@ -164208,11 +164551,6 @@ function getOpenCtxProviders(configChanges, authStatusChanges, isValidSiteVersio
             provider: RemoteDirectoryProvider,
             providerUri: RemoteDirectoryProvider.providerUri
           });
-          providers.push({
-            settings: true,
-            provider: CurrentRepositoryDirectoryProvider,
-            providerUri: CURRENT_REPOSITORY_DIRECTORY_PROVIDER_URI
-          });
         }
         providers.push({
           settings: true,
@@ -164632,7 +164970,7 @@ const getInput = async (document2, initialValues, source) => {
   const initialCursorPosition = editor.selection.active;
   let activeRange = initialValues.initialExpandedRange || initialValues.initialRange;
   let activeRangeItem = initialValues.initialIntent === "add" ? CURSOR_RANGE_ITEM : initialValues.initialExpandedRange ? EXPANDED_RANGE_ITEM : SELECTION_RANGE_ITEM;
-  const authStatus = authProvider.instance.getAuthStatus();
+  const authStatus = authProvider.instance.statusAuthed;
   const isCodyPro = !authStatus.userCanUpgrade;
   const modelOptions = modelsService.instance.getModels(ModelUsage.Edit);
   const modelItems = getModelOptionItems(modelOptions, isCodyPro);
@@ -164921,7 +165259,7 @@ const getInput = async (document2, initialValues, source) => {
   });
 };
 function getOverridenModelForIntent(intent, currentModel, authStatus) {
-  if (!authStatus.isDotCom) {
+  if (!isDotCom(authStatus)) {
     return currentModel;
   }
   switch (intent) {
@@ -165890,7 +166228,7 @@ class FixupController {
     return task;
   }
   async createTask(document2, instruction, userContextFiles, selectionRange, intent, mode, model2, source, destinationFile, insertionPoint, telemetryMetadata, taskId) {
-    const authStatus = authProvider.instance.getAuthStatus();
+    const authStatus = authProvider.instance.status;
     const overridenModel = getOverridenModelForIntent(intent, model2, authStatus);
     const fixupFile = this.files.forUri(document2.uri);
     const task = new FixupTask(
@@ -167437,6 +167775,7 @@ class EditProvider {
       this.config.controller.startTask(this.config.task);
       const model2 = this.config.task.model;
       const contextWindow = modelsService.instance.getContextWindowByID(model2);
+      const authStatus = authProvider.instance.statusAuthed;
       const {
         messages,
         stopSequences,
@@ -167444,7 +167783,7 @@ class EditProvider {
         responsePrefix = ""
       } = await buildInteraction$1({
         model: model2,
-        codyApiVersion: authProvider.instance.getAuthStatus().codyApiVersion,
+        codyApiVersion: authStatus.codyApiVersion,
         contextWindow: contextWindow.input,
         task: this.config.task,
         editor: this.config.editor
@@ -167526,7 +167865,7 @@ class EditProvider {
               void this.handleResponse(text, false);
               return;
             }
-            if (isNetworkError(err2)) {
+            if (isNetworkLikeError(err2)) {
               err2 = new Error("Cody could not respond due to network error.");
             }
             this.handleError(err2);
@@ -167551,7 +167890,6 @@ class EditProvider {
     return this.handleResponse(response, false);
   }
   async handleResponse(response, isMessageInProgress) {
-    var _a3;
     if (!response && !isMessageInProgress) {
       this.handleError(new Error("Cody did not respond with any text"));
     }
@@ -167573,7 +167911,7 @@ class EditProvider {
         ...countCode(response)
       };
       const { metadata: metadata2, privateMetadata } = splitSafeMetadata(legacyMetadata);
-      const endpoint = (_a3 = authProvider.instance.getAuthStatus()) == null ? void 0 : _a3.endpoint;
+      const endpoint = authProvider.instance.status.endpoint;
       telemetryRecorder.recordEvent("cody.fixup.response", "hasCode", {
         metadata: metadata2,
         privateMetadata: {
@@ -167806,6 +168144,14 @@ class EditManager {
         model: task.model
       }
     });
+    if (editor.active && (intent === "doc" || intent === "test")) {
+      const newPosition = proposedRange.start;
+      editor.active.selection = new Selection(newPosition, newPosition);
+      editor.active.revealRange(
+        new Range(newPosition, newPosition),
+        TextEditorRevealType.InCenter
+      );
+    }
     const provider = this.getProviderForTask(task);
     await provider.startEdit();
     return task;
@@ -167864,6 +168210,7 @@ class EditManager {
     const documentRange = new Range(0, 0, document2.lineCount, 0);
     editor.setDecorations(SMART_APPLY_FILE_DECORATION, [documentRange]);
     const replacementCode = PromptString.unsafe_fromLLMResponse(configuration2.replacement);
+    const authStatus = authProvider.instance.statusAuthed;
     const selection = await getSmartApplySelection(
       configuration2.id,
       configuration2.instruction,
@@ -167871,7 +168218,7 @@ class EditManager {
       configuration2.document,
       model2,
       this.options.chat,
-      authProvider.instance.getAuthStatus().codyApiVersion
+      authStatus.codyApiVersion
     );
     editor.setDecorations(SMART_APPLY_FILE_DECORATION, []);
     if (!selection) {
@@ -168324,8 +168671,8 @@ async function configureExternalServices(context2, config, platform2) {
 Please check that the repository exists. You can override the repository with the "cody.codebase" setting.`
     );
   }
-  const localEmbeddings = authProvider.instance.getAuthStatus().isLoggedIn && authProvider.instance.getAuthStatus().isDotCom ? await ((_d2 = platform2.createLocalEmbeddingsController) == null ? void 0 : _d2.call(platform2, initialConfig)) : void 0;
-  const chatClient = new ChatClient(completionsClient, () => authProvider.instance.getAuthStatus());
+  const localEmbeddings = authProvider.instance.status.authenticated && isDotCom(authProvider.instance.status) ? await ((_d2 = platform2.createLocalEmbeddingsController) == null ? void 0 : _d2.call(platform2, initialConfig)) : void 0;
+  const chatClient = new ChatClient(completionsClient, () => authProvider.instance.statusAuthed);
   const guardrails = new SourcegraphGuardrailsClient(graphqlClient, initialConfig);
   const contextAPIClient = new ContextAPIClient(graphqlClient);
   return {
@@ -169345,7 +169692,7 @@ class MinionController extends ReactPanelController {
     }
   }
   async handleSetSession(id) {
-    const storedSessionState = await this.storage.load(authProvider.instance.getAuthStatus(), id);
+    const storedSessionState = await this.storage.load(authProvider.instance.status, id);
     if (!storedSessionState) {
       throw new Error(`session not found with id: ${id}`);
     }
@@ -169361,7 +169708,7 @@ class MinionController extends ReactPanelController {
     this.postUpdateSessionIds();
   }
   async handleClearHistory() {
-    await this.storage.clear(authProvider.instance.getAuthStatus());
+    await this.storage.clear(authProvider.instance.status);
     if (this.sessionState) {
       await this.save();
     }
@@ -169436,7 +169783,7 @@ class MinionController extends ReactPanelController {
     if (!this.sessionState) {
       throw new Error("no session to save");
     }
-    await this.storage.save(authProvider.instance.getAuthStatus(), {
+    await this.storage.save(authProvider.instance.status, {
       session: this.sessionState.session
     });
   }
@@ -169494,7 +169841,7 @@ class MinionController extends ReactPanelController {
     var _a3;
     this.postMessage({
       type: "update-session-ids",
-      sessionIds: await this.storage.listIds(authProvider.instance.getAuthStatus()),
+      sessionIds: await this.storage.listIds(authProvider.instance.status),
       currentSessionId: (_a3 = this.sessionState) == null ? void 0 : _a3.session.id
     });
   }
@@ -169618,8 +169965,8 @@ const _CodyProExpirationNotifications = class _CodyProExpirationNotifications {
         () => setTimeout(() => this.triggerExpirationCheck(), this.autoUpdateDelay)
       );
     }
-    const authStatus = authProvider.instance.getAuthStatus();
-    if (!authStatus.isLoggedIn || !authStatus.isDotCom) return;
+    const authStatus = authProvider.instance.status;
+    if (!authStatus.authenticated || !isDotCom(authStatus)) return;
     const useSscForCodySubscription = await featureFlagProvider.instance.evaluateFeatureFlag(
       FeatureFlag.UseSscForCodySubscription
     );
@@ -169847,7 +170194,7 @@ const showFeedbackSupportQuickPick = async () => {
 function groupCodyChats(authStatus) {
   var _a3, _b2, _c2, _d2;
   const chatHistoryGroups = /* @__PURE__ */ new Map();
-  if (!authStatus) {
+  if (!authStatus || !authStatus.authenticated) {
     return null;
   }
   const chats = (_a3 = chatHistory.getLocalHistory(authStatus)) == null ? void 0 : _a3.chat;
@@ -169873,16 +170220,10 @@ function groupCodyChats(authStatus) {
       if (!chatHistoryGroups.has(timeUnit)) {
         chatHistoryGroups.set(timeUnit, []);
       }
-      const chatItem = {
+      (_d2 = chatHistoryGroups.get(timeUnit)) == null ? void 0 : _d2.push({
         id,
-        title: chatTitle,
-        icon: "comment-discussion",
-        command: {
-          command: "cody.chat.panel.restore",
-          args: [id, chatTitle]
-        }
-      };
-      (_d2 = chatHistoryGroups.get(timeUnit)) == null ? void 0 : _d2.push(chatItem);
+        title: chatTitle
+      });
     }
   }
   return Object.fromEntries(chatHistoryGroups);
@@ -170126,9 +170467,9 @@ function createStatusBar() {
   let authStatus;
   const command = commands$1.registerCommand(STATUS_BAR_INTERACTION_COMMAND, async () => {
     telemetryRecorder.recordEvent("cody.statusbarIcon", "clicked", {
-      privateMetadata: { loggedIn: Boolean(authStatus == null ? void 0 : authStatus.isLoggedIn) }
+      privateMetadata: { loggedIn: Boolean(authStatus == null ? void 0 : authStatus.authenticated) }
     });
-    if (!(authStatus == null ? void 0 : authStatus.isLoggedIn)) {
+    if (!(authStatus == null ? void 0 : authStatus.authenticated)) {
       void commands$1.executeCommand("cody.chat.focus");
       return;
     }
@@ -170303,19 +170644,19 @@ function createStatusBar() {
       statusBarItem2.tooltip = isCodyIgnoredType ? DEFAULT_TOOLTIP_DISABLED : DEFAULT_TOOLTIP;
     }
     if (authStatus) {
-      if (authStatus.isOfflineMode) {
+      if (authStatus.authenticated && authStatus.isOfflineMode) {
         statusBarItem2.text = "$(cody-logo-heavy) Offline";
         statusBarItem2.tooltip = "Cody is in offline mode";
         statusBarItem2.backgroundColor = new ThemeColor("statusBarItem.warningBackground");
         return;
       }
-      if (authStatus.showNetworkError) {
+      if (!authStatus.authenticated && authStatus.showNetworkError) {
         statusBarItem2.text = "$(cody-logo-heavy) Connection Issues";
         statusBarItem2.tooltip = "Resolve network issues for Cody to work again";
         statusBarItem2.backgroundColor = new ThemeColor("statusBarItem.errorBackground");
         return;
       }
-      if (!authStatus.isLoggedIn) {
+      if (!authStatus.authenticated) {
         statusBarItem2.text = "$(cody-logo-heavy) Sign In";
         statusBarItem2.tooltip = "Sign in to get started with Cody";
         statusBarItem2.backgroundColor = new ThemeColor("statusBarItem.warningBackground");
@@ -170876,96 +171217,6 @@ function removeContextRows(document2, supercompletion) {
     updated: newUpdated
   };
 }
-class RecentEditsRetriever {
-  constructor(maxAgeMs, workspace$1 = workspace) {
-    __publicField2(this, "disposables", []);
-    // We use a map from the document URI to the set of tracked completions inside that document to
-    // improve performance of the `onDidChangeTextDocument` event handler.
-    __publicField2(this, "trackedDocuments", /* @__PURE__ */ new Map());
-    this.maxAgeMs = maxAgeMs;
-    this.workspace = workspace$1;
-    this.disposables.push(workspace$1.onDidChangeTextDocument(this.onDidChangeTextDocument.bind(this)));
-    this.disposables.push(workspace$1.onDidRenameFiles(this.onDidRenameFiles.bind(this)));
-    this.disposables.push(workspace$1.onDidDeleteFiles(this.onDidDeleteFiles.bind(this)));
-  }
-  async getDiff(uri2) {
-    if (await contextFiltersProvider.instance.isUriIgnored(uri2)) {
-      return null;
-    }
-    const trackedDocument = this.trackedDocuments.get(uri2.toString());
-    if (!trackedDocument) {
-      return null;
-    }
-    const oldContent = trackedDocument.content;
-    const newContent = applyChanges(
-      oldContent,
-      trackedDocument.changes.map((c) => c.change)
-    );
-    return PromptString.fromGitDiff(uri2, oldContent, newContent);
-  }
-  onDidChangeTextDocument(event) {
-    let trackedDocument = this.trackedDocuments.get(event.document.uri.toString());
-    if (!trackedDocument) {
-      trackedDocument = this.trackDocument(event.document);
-    }
-    const now2 = Date.now();
-    for (const change of event.contentChanges) {
-      trackedDocument.changes.push({
-        timestamp: now2,
-        change
-      });
-    }
-    this.reconcileOutdatedChanges();
-  }
-  onDidRenameFiles(event) {
-    for (const file of event.files) {
-      const trackedDocument = this.trackedDocuments.get(file.oldUri.toString());
-      if (trackedDocument) {
-        this.trackedDocuments.set(file.newUri.toString(), trackedDocument);
-        this.trackedDocuments.delete(file.oldUri.toString());
-      }
-    }
-  }
-  onDidDeleteFiles(event) {
-    for (const uri2 of event.files) {
-      this.trackedDocuments.delete(uri2.toString());
-    }
-  }
-  dispose() {
-    this.trackedDocuments.clear();
-    for (const disposable of this.disposables) {
-      disposable.dispose();
-    }
-  }
-  trackDocument(document2) {
-    const trackedDocument = {
-      content: document2.getText(),
-      changes: []
-    };
-    this.trackedDocuments.set(document2.uri.toString(), trackedDocument);
-    return trackedDocument;
-  }
-  reconcileOutdatedChanges() {
-    const now2 = Date.now();
-    for (const [, trackedDocument] of this.trackedDocuments) {
-      const firstNonOutdatedChangeIndex = trackedDocument.changes.findIndex(
-        (c) => now2 - c.timestamp < this.maxAgeMs
-      );
-      const outdatedChanges = trackedDocument.changes.slice(0, firstNonOutdatedChangeIndex);
-      trackedDocument.content = applyChanges(
-        trackedDocument.content,
-        outdatedChanges.map((c) => c.change)
-      );
-      trackedDocument.changes = trackedDocument.changes.slice(firstNonOutdatedChangeIndex);
-    }
-  }
-}
-function applyChanges(content, changes) {
-  for (const change of changes) {
-    content = content.slice(0, change.rangeOffset) + change.text + content.slice(change.rangeOffset + change.rangeLength);
-  }
-  return content;
-}
 const GHOST_TEXT_COLOR = new ThemeColor("editorGhostText.foreground");
 const reviewHintDecorationType = window$1.createTextEditorDecorationType({
   after: {
@@ -171330,7 +171581,10 @@ async function start(context2, platform2) {
 }
 const register = async (context2, configWatcher, platform2, isExtensionModeDevOrTest) => {
   const disposables = [];
-  setClientNameVersion(platform2.extensionClient.clientName, platform2.extensionClient.clientVersion);
+  setClientNameVersion(
+    platform2.extensionClient.httpClientNameForLegacyReasons ?? platform2.extensionClient.clientName,
+    platform2.extensionClient.clientVersion
+  );
   disposables.push(manageDisplayPathEnvInfoForExtension());
   await initializeSingletons(platform2, configWatcher, isExtensionModeDevOrTest, disposables);
   disposables.push(await initVSCodeGitApi());
@@ -171384,7 +171638,8 @@ const register = async (context2, configWatcher, platform2, isExtensionModeDevOr
       localEmbeddings,
       symfRunner,
       contextAPIClient,
-      contextRetriever
+      contextRetriever,
+      configWatcher
     },
     disposables
   );
@@ -171448,7 +171703,10 @@ async function initializeSingletons(platform2, configWatcher, isExtensionModeDev
           void localStorage.setConfig(config);
           graphqlClient.setConfig(config);
           void featureFlagProvider.instance.refresh();
-          contextFiltersProvider.instance.init(repoNameResolver.getRepoNamesFromWorkspaceUri);
+          contextFiltersProvider.instance.init(
+            repoNameResolver.getRepoNamesFromWorkspaceUri,
+            authProvider.instance
+          );
           void modelsService.instance.onConfigChange(config);
           upstreamHealthProvider.instance.onConfigurationChange(config);
         }
@@ -171586,7 +171844,7 @@ function registerChatCommands(disposables) {
       commands$1.executeCommand("workbench.action.moveEditorToNewWindow");
     }),
     commands$1.registerCommand("cody.chat.history.panel", async () => {
-      await displayHistoryQuickPick(authProvider.instance.getAuthStatus());
+      await displayHistoryQuickPick(authProvider.instance.status);
     }),
     commands$1.registerCommand(
       "cody.settings.extension.chat",
@@ -171602,13 +171860,16 @@ function registerChatCommands(disposables) {
 }
 function registerAuthCommands(disposables) {
   disposables.push(
-    commands$1.registerCommand("cody.auth.signin", () => authProvider.instance.signinMenu()),
-    commands$1.registerCommand("cody.auth.signout", () => authProvider.instance.signoutMenu()),
-    commands$1.registerCommand("cody.auth.account", () => authProvider.instance.accountMenu()),
+    commands$1.registerCommand("cody.auth.signin", () => showSignInMenu()),
+    commands$1.registerCommand("cody.auth.signout", () => showSignOutMenu()),
+    commands$1.registerCommand("cody.auth.account", () => showAccountMenu()),
     commands$1.registerCommand("cody.auth.support", () => showFeedbackSupportQuickPick()),
     commands$1.registerCommand(
       "cody.auth.status",
-      () => authProvider.instance.getAuthStatus()
+      () => {
+        var _a3;
+        return ((_a3 = authProvider.instance) == null ? void 0 : _a3.statusOrNotReadyYet) ?? null;
+      }
     ),
     // Used by the agent
     commands$1.registerCommand(
@@ -171636,14 +171897,14 @@ function registerUpgradeHandlers(configWatcher, disposables) {
       handleUri: async (uri2) => {
         if (uri2.path === "/app-done") ;
         else {
-          authProvider.instance.tokenCallbackHandler(uri2, configWatcher.get().customHeaders);
+          tokenCallbackHandler(uri2, configWatcher.get().customHeaders);
         }
       }
     }),
     // Check if user has just moved back from a browser window to upgrade cody pro
     window$1.onDidChangeWindowState(async (ws) => {
-      const authStatus = authProvider.instance.getAuthStatus();
-      if (ws.focused && authStatus.isDotCom && authStatus.isLoggedIn) {
+      const authStatus = authProvider.instance.status;
+      if (ws.focused && isDotCom(authStatus) && authStatus.authenticated) {
         const res = await graphqlClient.getCurrentUserCodyProEnabled();
         if (res instanceof Error) {
           logError$1("onDidChangeWindowState", "getCurrentUserCodyProEnabled", res);
@@ -171696,7 +171957,7 @@ async function registerDebugCommands(context2, disposables) {
 }
 async function tryRegisterTutorial(context2, disposables) {
   if (!isRunningInsideAgent()) {
-    const { registerInteractiveTutorial } = await import("./index-D6VgQlqI.mjs");
+    const { registerInteractiveTutorial } = await import("./index-CoR5ltqq.mjs");
     registerInteractiveTutorial(context2).then((disposable) => disposables.push(...disposable));
   }
 }
@@ -171789,7 +172050,8 @@ function registerChat({
   localEmbeddings,
   symfRunner,
   contextAPIClient,
-  contextRetriever
+  contextRetriever,
+  configWatcher
 }, disposables) {
   const messageProviderOptions = {
     chat: chatClient,
@@ -171809,7 +172071,8 @@ function registerChat({
     contextRetriever,
     guardrails,
     contextAPIClient || null,
-    platform2.extensionClient
+    platform2.extensionClient,
+    configWatcher
   );
   chatsController.registerViewsAndCommands();
   const ghostHintDecorator = new GhostHintDecorator();