@sourcegraph/cody-web 0.7.3 → 0.7.4

package/dist/{agent.worker-7dUx4v7q.mjs → agent.worker-CiIPD-tv.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 base64Js, c7 as isDotCom, c8 as NetworkError, c9 as isRateLimitError, ca as isAuthError, cb as NoOpTelemetryRecorderProvider, cc as TimestampTelemetryProcessor_1, cd as updateGlobalTelemetryInstances, ce as TelemetryRecorderProvider, t as telemetryRecorder, cf as telemetryRecorderProvider, cg as convertGitCloneURLToCodebaseName, d as dedent$1, ch as uriExtname, ci as SUPPORTED_URI_SCHEMAS, cj as require$$1$4, ck as dedupeWith$1, cl as getEditorInsertSpaces, cm as TimeoutError, cn as getActiveTraceAndSpanId, co as isNetworkError$1, cp as trace, bj as isCodyProModel, b6 as CodyTaskState, be as isEqual, cq as getAugmentedNamespace, cr as main$1, cs as setUserAgent, ct as TESTING_TELEMETRY_EXPORTER, cu as dist, bm as isMacOS, bl as CustomCommandType, bx as setDisplayPathEnvInfo, T as TokenCounterUtils, C as ContextItemSource, cv as _root, cw as _baseGetTag, cx as isObjectLike_1, cy as isObject_1, bw as isErrorLike, au as displayPath, cz as DefaultChatCommands, cA as uriParseNameAndExtension, cB as uriDirname, cC as DefaultEditCommands, an as FILE_CONTEXT_MENTION_PROVIDER, ao as SYMBOL_CONTEXT_MENTION_PROVIDER, ap as REMOTE_REPOSITORY_PROVIDER_URI, cD as promiseFactoryToObservable, cE as webMentionProvidersMetadata, cF as allMentionProvidersMetadata, cG as combineLatest$1, cH as subscriptionDisposable, cI as expandToLineRange, am as displayPathBasename, av as displayLineRange, cJ as offlineModeAuthStatus, cK as unauthenticatedStatus, cL as semver, cM as truncateTextNearestLine, cN as TokenCounter, bq as View, aQ as parseMentionQuery, cO as tracer, bd as isAbortErrorOrSocketHangUp, cP as isContextWindowLimitError, cQ as truncatePromptString, cR as inputTextWithoutContextChipsFromPromptEditorState, bc as reformatBotMessageForChat, b1 as hydrateAfterPostMessage, cS as addMessageListenersForExtensionAPI, cT as createMessageAPIForExtension, cU as CODY_PASSTHROUGH_VSCODE_OPEN_COMMAND_ID, cV as editorStateFromPromptString, cW as getEditorTabSize$1, bi as pluralize, cX as AbortError, cY as getEditorIndentString, b9 as RateLimitError$1, cZ as logResponseHeadersToSpan, c_ as TracedError, c$ as isNodeResponse, d0 as SpanStatusCode, aq as REMOTE_FILE_PROVIDER_URI, as as CURRENT_REPOSITORY_DIRECTORY_PROVIDER_URI, d1 as assertFileURI, ar as REMOTE_DIRECTORY_PROVIDER_URI, at as WEB_PROVIDER_URI, d2 as setOpenCtx, d3 as GIT_OPENCTX_PROVIDER_URI, d4 as ACCOUNT_UPGRADE_URL, aZ as scanForMentionTriggerInUserTextInput, ay as LARGE_FILE_WARNING_LABEL, d5 as GENERAL_HELP_LABEL, d6 as diffLines, d7 as psDedent, d8 as defaultAuthStatus, bt as ACCOUNT_USAGE_URL, d9 as SourcegraphGraphQLAPIClient, da as networkErrorAuthStatus, 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-0yJ2hV_u.mjs";
+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";
 function _mergeNamespaces(n, m) {
   for (var i = 0; i < m.length; i++) {
     const e = m[i];
@@ -6635,6 +6635,16 @@ __publicField2(_RE2JS, "DISABLE_UNICODE_GROUPS", 8);
  */
 __publicField2(_RE2JS, "LONGEST_MATCH", 16);
 let RE2JS = _RE2JS;
+function singletonNotYetSet() {
+  return { instance: null };
+}
+function setSingleton(container, instance2) {
+  if (container.instance !== null) {
+    throw new Error("singleton already set");
+  }
+  container.instance = instance2;
+  return instance2;
+}
 var define_process_default$m = { env: {} };
 const REFETCH_INTERVAL_MAP = {
   durable: {
@@ -6822,7 +6832,8 @@ function parseContextFilterItem(item) {
   const filePathPatterns = item.filePathPatterns ? item.filePathPatterns.map((pattern) => RE2JS.compile(pattern)) : void 0;
   return { repoNamePattern, filePathPatterns };
 }
-const contextFiltersProvider = new ContextFiltersProvider();
+const contextFiltersProvider = singletonNotYetSet();
+setSingleton(contextFiltersProvider, new ContextFiltersProvider());
 var CompletionStopReason = /* @__PURE__ */ ((CompletionStopReason2) => {
   CompletionStopReason2["StreamingChunk"] = "cody-streaming-chunk";
   CompletionStopReason2["RequestAborted"] = "cody-request-aborted";
@@ -6837,7 +6848,7 @@ function createOllamaClient(ollamaOptions, logger2, logDebug2) {
     const log2 = logger2 == null ? void 0 : logger2.startCompletion(params, url);
     const { signal: signal2 } = abortController;
     try {
-      const prompt = await params.prompt.toFilteredString(contextFiltersProvider);
+      const prompt = await params.prompt.toFilteredString(contextFiltersProvider.instance);
       const res = await ollama.generate({
         model: model2,
         prompt,
@@ -6931,7 +6942,7 @@ async function ollamaChatClient({
         var _a3;
         return {
           role: msg.speaker === "human" ? "user" : "assistant",
-          content: await ((_a3 = msg.text) == null ? void 0 : _a3.toFilteredString(contextFiltersProvider)) ?? ""
+          content: await ((_a3 = msg.text) == null ? void 0 : _a3.toFilteredString(contextFiltersProvider.instance)) ?? ""
         };
       })
     );
@@ -7306,7 +7317,8 @@ const _ModelsService = class _ModelsService {
 };
 __publicField2(_ModelsService, "STORAGE_KEY", "model-preferences");
 let ModelsService = _ModelsService;
-const modelsService = new ModelsService();
+const modelsService = singletonNotYetSet();
+setSingleton(modelsService, new ModelsService());
 function capabilityToUsage(capability) {
   switch (capability) {
     case "autocomplete":
@@ -8653,7 +8665,8 @@ class FeatureFlagProvider {
   }
 }
 const NO_FLAGS = {};
-const featureFlagProvider = new FeatureFlagProvider(graphqlClient);
+const featureFlagProvider = singletonNotYetSet();
+setSingleton(featureFlagProvider, new FeatureFlagProvider(graphqlClient));
 function computeIfExistingFlagChanged(oldFlags, newFlags) {
   return Object.keys(oldFlags).some((key) => oldFlags[key] !== newFlags[key]);
 }
@@ -10793,7 +10806,7 @@ async function anthropicChatClient({
         var _a4;
         return {
           role: msg.speaker === "human" ? "user" : "assistant",
-          content: await ((_a4 = msg.text) == null ? void 0 : _a4.toFilteredString(contextFiltersProvider)) ?? ""
+          content: await ((_a4 = msg.text) == null ? void 0 : _a4.toFilteredString(contextFiltersProvider.instance)) ?? ""
         };
       })
     );
@@ -10839,7 +10852,7 @@ async function useCustomChatClient({
   logger: logger2,
   signal: signal2
 }) {
-  const model2 = modelsService.getModelByID(params.model ?? "");
+  const model2 = modelsService.instance.getModelByID(params.model ?? "");
   if (!model2 || !isCustomModel(model2)) {
     return false;
   }
@@ -10964,7 +10977,7 @@ async function serializePrompts(messages, modelID) {
       var _a4;
       return {
         ...m,
-        text: await ((_a4 = m.text) == null ? void 0 : _a4.toFilteredString(contextFiltersProvider))
+        text: await ((_a4 = m.text) == null ? void 0 : _a4.toFilteredString(contextFiltersProvider.instance))
       };
     })
   );
@@ -11182,7 +11195,7 @@ function tokensToChars(tokens) {
   return tokens * CHARACTERS_PER_TOKEN;
 }
 function getCompletionsModelConfig(modelID) {
-  const provider = modelsService.getModelByID(modelID);
+  const provider = modelsService.instance.getModelByID(modelID);
   if (!provider) {
     return void 0;
   }
@@ -11203,7 +11216,9 @@ async function constructGeminiChatMessages(messages) {
       var _a3;
       return {
         role: msg.speaker === "human" ? "user" : "model",
-        parts: [{ text: await ((_a3 = msg.text) == null ? void 0 : _a3.toFilteredString(contextFiltersProvider)) ?? "" }]
+        parts: [
+          { text: await ((_a3 = msg.text) == null ? void 0 : _a3.toFilteredString(contextFiltersProvider.instance)) ?? "" }
+        ]
       };
     })
   )).filter((_2, i, arr) => i !== arr.length - 1 || arr[i].role !== "model");
@@ -11321,7 +11336,7 @@ async function groqChatClient({
         var _a4;
         return {
           role: msg.speaker === "human" ? "user" : "assistant",
-          content: await ((_a4 = msg.text) == null ? void 0 : _a4.toFilteredString(contextFiltersProvider)) ?? ""
+          content: await ((_a4 = msg.text) == null ? void 0 : _a4.toFilteredString(contextFiltersProvider.instance)) ?? ""
         };
       })
     ),
@@ -16441,7 +16456,7 @@ class AgentTabGroups {
 const $schema = "package.schema.json";
 const name = "cody-ai";
 const displayName = "Cody: AI Coding Assistant with Autocomplete & Chat";
-const version$1 = "1.32.4";
+const version$1 = "1.32.5";
 const publisher = "sourcegraph";
 const license = "Apache-2.0";
 const icon = "resources/cody.png";
@@ -17844,7 +17859,6 @@ const capabilities = {
 };
 const dependencies = {
   "@anthropic-ai/sdk": "^0.20.8",
-  "@mdi/js": "^7.2.96",
   "@openctx/provider-linear-issues": "^0.0.6",
   "@openctx/vscode-lib": "^0.0.21",
   "@opentelemetry/api": "^1.7.0",
@@ -17853,7 +17867,6 @@ const dependencies = {
   "@opentelemetry/instrumentation": "^0.45.1",
   "@opentelemetry/instrumentation-http": "^0.45.1",
   "@opentelemetry/resources": "^1.18.1",
-  "@opentelemetry/sdk-node": "^0.45.1",
   "@opentelemetry/sdk-trace-base": "^1.18.1",
   "@opentelemetry/sdk-trace-node": "^1.18.1",
   "@opentelemetry/semantic-conventions": "^1.18.1",
@@ -17893,20 +17906,16 @@ const dependencies = {
   "http-proxy-agent": "^7.0.2",
   "https-proxy-agent": "^7.0.4",
   ini: "^4.1.2",
-  "isomorphic-fetch": "^3.0.0",
   "js-levenshtein": "^1.1.6",
   lexical: "^0.17.0",
   lodash: "^4.17.21",
   lowlight: "^3.1.0",
   "lru-cache": "^10.0.0",
-  lucide: "^0.381.0",
   "lucide-react": "^0.378.0",
   "mac-ca": "^2.0.3",
   marked: "^4.0.16",
   mkdirp: "^3.0.1",
   "os-browserify": "^0.3.0",
-  "parse-git-diff": "^0.0.14",
-  "proxy-agent": "^6.4.0",
   "react-markdown": "^9.0.1",
   "rehype-highlight": "^6.0.0",
   "rehype-sanitize": "^6.0.0",
@@ -17922,14 +17931,12 @@ const dependencies = {
   uuid: "^9.0.0",
   "vscode-languageserver-textdocument": "^1.0.8",
   "vscode-uri": "^3.0.8",
-  "web-tree-sitter": "^0.21.0",
   "wink-nlp-utils": "^2.1.0"
 };
 const devDependencies = {
   "@google-cloud/pubsub": "^3.7.3",
   "@npmcli/promise-spawn": "^7.0.2",
   "@playwright/test": "1.44.1",
-  "@pollyjs/adapter": "^6.0.6",
   "@pollyjs/adapter-node-http": "^6.0.6",
   "@pollyjs/core": "^6.0.6",
   "@pollyjs/persister": "^6.0.6",
@@ -17943,7 +17950,6 @@ const devDependencies = {
   "@types/glob": "^8.0.0",
   "@types/graceful-fs": "^4.1.9",
   "@types/ini": "^4.1.0",
-  "@types/isomorphic-fetch": "^0.0.39",
   "@types/js-levenshtein": "^1.1.1",
   "@types/lodash": "^4.14.195",
   "@types/marked": "^5.0.0",
@@ -17951,7 +17957,6 @@ const devDependencies = {
   "@types/node-fetch": "^2.6.4",
   "@types/npmcli__promise-spawn": "^6.0.3",
   "@types/pako": "^2.0.3",
-  "@types/progress": "^2.0.5",
   "@types/semver": "^7.5.0",
   "@types/signal-exit": "^3.0.4",
   "@types/unzipper": "^0.10.7",
@@ -17961,10 +17966,8 @@ const devDependencies = {
   "@vscode/test-web": "^0.0.47",
   "@vscode/vsce": "^2.22.0",
   ajv: "^8.14.0",
-  "ajv-errors": "^3.0.0",
   "ajv-formats": "^3.0.1",
   "buildkite-test-collector": "^1.7.2",
-  chokidar: "^3.6.0",
   concurrently: "^8.2.0",
   dedent: "^0.7.0",
   express: "^4.18.2",
@@ -17982,7 +17985,6 @@ const devDependencies = {
   playwright: "1.44.1",
   postcss: "^8.4.38",
   "postcss-nested": "^6.0.1",
-  progress: "^2.0.3",
   "react-head": "^3.4.2",
   "typescript-language-server": "^4.3.3",
   ulidx: "^2.3.0",
@@ -21720,11 +21722,11 @@ class ChatModel {
     this.messages = messages;
     this.customChatTitle = customChatTitle;
     this.selectedRepos = selectedRepos;
-    this.contextWindow = modelsService.getContextWindowByID(this.modelID);
+    this.contextWindow = modelsService.instance.getContextWindowByID(this.modelID);
   }
   updateModel(newModelID) {
     this.modelID = newModelID;
-    this.contextWindow = modelsService.getContextWindowByID(this.modelID);
+    this.contextWindow = modelsService.instance.getContextWindowByID(this.modelID);
   }
   isEmpty() {
     return this.messages.length === 0;
@@ -22817,7 +22819,7 @@ function requireBuffer() {
   if (hasRequiredBuffer) return buffer;
   hasRequiredBuffer = 1;
   (function(exports2) {
-    const base64 = base64Js;
+    const base64 = requireBase64Js();
     const ieee7542 = requireIeee754();
     const customInspectSymbol = typeof Symbol === "function" && typeof Symbol["for"] === "function" ? Symbol["for"]("nodejs.util.inspect.custom") : null;
     exports2.Buffer = Buffer2;
@@ -33543,6 +33545,836 @@ 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;
+  }
+  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;
+  }
+}
+let runningAuthProgressIndicator = null;
+function startAuthProgressIndicator() {
+  window$1.withProgress(
+    {
+      location: ProgressLocation.Notification,
+      title: "Signing in to Sourcegraph...",
+      cancellable: true
+    },
+    (progress, token) => {
+      token.onCancellationRequested(() => {
+        runningAuthProgressIndicator = null;
+      });
+      return new Promise((resolve2) => {
+        runningAuthProgressIndicator = resolve2;
+      });
+    }
+  );
+}
+function closeAuthProgressIndicator() {
+  runningAuthProgressIndicator == null ? void 0 : runningAuthProgressIndicator();
+  runningAuthProgressIndicator = null;
+}
+function newAuthStatus(options) {
+  var _a3;
+  const {
+    isOfflineMode,
+    endpoint,
+    siteHasCodyEnabled,
+    username,
+    authenticated,
+    isDotCom: isDotCom2,
+    siteVersion,
+    userOrganizations
+  } = options;
+  if (isOfflineMode) {
+    return { ...offlineModeAuthStatus, endpoint, username };
+  }
+  if (!authenticated) {
+    return { ...unauthenticatedStatus, endpoint };
+  }
+  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;
+  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"))
+  };
+}
+const countGeneratedCode = (text) => {
+  const codeBlockRegex = /```[\S\s]*?```/g;
+  const codeBlocks = text.match(codeBlockRegex);
+  if (!codeBlocks) {
+    return { charCount: 0, lineCount: 0 };
+  }
+  const count = { lineCount: 0, charCount: 0 };
+  const backticks = "```";
+  for (const block of codeBlocks) {
+    const lines2 = block.split("\n");
+    const codeLines = lines2.filter((line) => !line.startsWith(backticks));
+    const lineCount = codeLines.length;
+    const language = lines2[0].replace(backticks, "");
+    const charCount = block.length - language.length - backticks.length * 2 - 2;
+    count.charCount += charCount;
+    count.lineCount += lineCount;
+  }
+  return count;
+};
+function inferCodyApiVersion(version2, isDotCom2) {
+  const parsedVersion = semver.valid(version2);
+  if (isDotCom2) {
+    return 1;
+  }
+  if (parsedVersion == null) {
+    return 1;
+  }
+  if (semver.gte(parsedVersion, "5.4.0")) {
+    return 1;
+  }
+  if (parsedVersion === "0.0.0") {
+    return 1;
+  }
+  return 0;
+}
+function getEnterpriseContextWindow(chatModel, configOverwrites) {
+  const { chatModelMaxTokens, smartContextWindow } = configOverwrites;
+  let contextWindow = {
+    input: chatModelMaxTokens ?? CHAT_INPUT_TOKEN_BUDGET,
+    output: getEnterpriseOutputLimit(chatModel)
+  };
+  if (smartContextWindow && isModelWithExtendedContextWindowSupport(chatModel)) {
+    contextWindow = {
+      input: EXTENDED_CHAT_INPUT_TOKEN_BUDGET,
+      output: CHAT_OUTPUT_TOKEN_BUDGET,
+      context: { user: EXTENDED_USER_CONTEXT_TOKEN_BUDGET }
+    };
+  }
+  return applyLocalTokenLimitOverwrite(chatModel, contextWindow);
+}
+function applyLocalTokenLimitOverwrite(chatModel, contextWindow) {
+  var _a3;
+  const config = (_a3 = workspace.getConfiguration("cody")) == null ? void 0 : _a3.get("provider.limit.prompt");
+  if (config && config <= contextWindow.input) {
+    return { ...contextWindow, input: config };
+  }
+  if (config) {
+    logDebug$1("getEnterpriseContextWindow", `Invalid token limit configured for ${chatModel}`, config);
+  }
+  return contextWindow;
+}
+const modelWithExpandedWindowSubStrings = [
+  "claude-3-opus",
+  "claude-3-sonnet",
+  "claude-3-5-sonnet",
+  "gemini-1.5",
+  "gpt-4o",
+  "gpt-4-turbo"
+];
+function isModelWithExtendedContextWindowSupport(chatModel) {
+  return modelWithExpandedWindowSubStrings.some((keyword) => chatModel.toLowerCase().includes(keyword));
+}
+function getEnterpriseOutputLimit(model2) {
+  if (model2 && isModelWithExtendedContextWindowSupport(model2)) {
+    return CHAT_OUTPUT_TOKEN_BUDGET;
+  }
+  return ANSWER_TOKENS;
+}
+async function syncModels(authStatus) {
+  var _a3, _b2;
+  modelsService.instance.setAuthStatus(authStatus);
+  if (authStatus.isOfflineMode) {
+    modelsService.instance.setModels([]);
+    return;
+  }
+  if (!authStatus.authenticated) {
+    modelsService.instance.setModels([]);
+    return;
+  }
+  const clientConfig = await ClientConfigSingleton.getInstance().getConfig();
+  if (clientConfig == null ? void 0 : clientConfig.modelsAPIEnabled) {
+    logDebug("ModelsService", "new models API enabled");
+    const serverSideModels = await fetchServerSideModels(authStatus.endpoint || "");
+    if (serverSideModels) {
+      modelsService.instance.setServerSentModels(serverSideModels);
+      registerModelsFromVSCodeConfiguration();
+      return;
+    }
+  }
+  if (authStatus.isDotCom) {
+    modelsService.instance.setModels(getDotComDefaultModels());
+    registerModelsFromVSCodeConfiguration();
+    return;
+  }
+  if ((_a3 = authStatus == null ? void 0 : authStatus.configOverwrites) == null ? void 0 : _a3.chatModel) {
+    modelsService.instance.setModels([
+      new Model({
+        id: authStatus.configOverwrites.chatModel,
+        // TODO (umpox) Add configOverwrites.editModel for separate edit support
+        usage: [ModelUsage.Chat, ModelUsage.Edit],
+        contextWindow: getEnterpriseContextWindow(
+          (_b2 = authStatus == null ? void 0 : authStatus.configOverwrites) == null ? void 0 : _b2.chatModel,
+          authStatus == null ? void 0 : authStatus.configOverwrites
+        ),
+        tags: [ModelTag.Enterprise]
+      })
+    ]);
+  } else {
+    modelsService.instance.setModels([]);
+  }
+}
+function registerModelsFromVSCodeConfiguration() {
+  const codyConfig = workspace.getConfiguration("cody");
+  const modelsConfig = codyConfig == null ? void 0 : codyConfig.get("dev.models");
+  if (!(modelsConfig == null ? void 0 : modelsConfig.length)) {
+    return;
+  }
+  modelsService.instance.addModels(
+    modelsConfig.map(
+      (m) => new Model({
+        id: `${m.provider}/${m.model}`,
+        usage: [ModelUsage.Chat, ModelUsage.Edit],
+        contextWindow: {
+          input: m.inputTokens ?? CHAT_INPUT_TOKEN_BUDGET,
+          output: m.outputTokens ?? ANSWER_TOKENS
+        },
+        clientSideConfig: { apiKey: m.apiKey, apiEndpoint: m.apiEndpoint },
+        tags: [ModelTag.Local, ModelTag.BYOK, ModelTag.Experimental]
+      })
+    )
+  );
+}
+async function fetchServerSideModels(endpoint) {
+  if (!endpoint) {
+    throw new Error("authStatus has no endpoint available. Unable to fetch models.");
+  }
+  const userAccessToken = await secretStorage.getToken(endpoint);
+  const customHeaders = getConfiguration().customHeaders;
+  const client = new RestClient(endpoint, userAccessToken, customHeaders);
+  return await client.getAvailableModels();
+}
+function logFirstEnrollmentEvent(key, isEnabled) {
+  const isEnrolled = localStorage.getEnrollmentHistory(key);
+  const eventName = getFeatureFlagEventName(key);
+  if (isEnrolled || !eventName) {
+    return isEnrolled && !!eventName;
+  }
+  const args2 = { variant: isEnabled ? "treatment" : "control" };
+  telemetryRecorder.recordEvent(`cody.experiment.${eventName}`, "enrolled", {
+    privateMetadata: args2
+  });
+  return true;
+}
+function getFeatureFlagEventName(key) {
+  switch (key) {
+    case FeatureFlag.CodyInteractiveTutorial:
+      return "interactiveTutorial";
+    default:
+      return void 0;
+  }
+}
+let tutorialDocumentUri;
+const setTutorialUri = (context2) => {
+  const tutorialPath = path$1.join(context2.extensionUri.fsPath, "walkthroughs", "cody_tutorial.py");
+  tutorialDocumentUri = Uri.file(tutorialPath);
+  return tutorialDocumentUri;
+};
+const isInTutorial = (document2) => {
+  if (!tutorialDocumentUri) {
+    return false;
+  }
+  return document2.uri.toString() === tutorialDocumentUri.toString();
+};
+const maybeStartInteractiveTutorial = async () => {
+  telemetryRecorder.recordEvent("cody.interactiveTutorial", "attemptingStart");
+  await featureFlagProvider.instance.refresh();
+  const enabled = await featureFlagProvider.instance.evaluateFeatureFlag(
+    FeatureFlag.CodyInteractiveTutorial
+  );
+  logFirstEnrollmentEvent(FeatureFlag.CodyInteractiveTutorial, enabled);
+  if (!enabled) {
+    return;
+  }
+  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, "didChangeEvent", new AgentEventEmitter());
+    __publicField2(this, "disposables", [this.didChangeEvent]);
+    __publicField2(this, "changes", fromVSCodeEvent(
+      this.didChangeEvent.event,
+      this.getAuthStatus.bind(this)
+    ));
+    this.config = config;
+    this.status.endpoint = "init";
+    this.loadEndpointHistory();
+  }
+  dispose() {
+    for (const d2 of this.disposables) {
+      d2.dispose();
+    }
+    this.disposables = [];
+  }
+  // Sign into the last endpoint the user was signed into, if any
+  async init() {
+    const lastEndpoint = (localStorage == null ? void 0 : localStorage.getEndpoint()) || this.config.serverEndpoint;
+    const token = await secretStorage.get(lastEndpoint || "") || this.config.accessToken;
+    logDebug(
+      "AuthProvider:init:lastEndpoint",
+      (token == null ? void 0 : token.trim()) ? "Token recovered from secretStorage" : "No token found in secretStorage",
+      lastEndpoint
+    );
+    await this.auth({
+      endpoint: lastEndpoint,
+      token: token || null,
+      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;
+    const endpoint = config.serverEndpoint;
+    const token = config.accessToken;
+    const isCodyWeb = workspace.getConfiguration().get("cody.advanced.agent.ide") === CodyIDE.Web;
+    if (isOfflineMode) {
+      const lastUser = localStorage.getLastStoredUser();
+      return { ...offlineModeAuthStatus, ...lastUser };
+    }
+    if (isCodyWeb) {
+      if (!endpoint) {
+        return { ...defaultAuthStatus, endpoint };
+      }
+    } else {
+      if (!token || !endpoint) {
+        return { ...defaultAuthStatus, endpoint };
+      }
+    }
+    if (this.config !== config || !this.client) {
+      this.config = config;
+      this.client = new SourcegraphGraphQLAPIClient(config);
+    }
+    const [{ enabled: siteHasCodyEnabled, version: siteVersion }, codyLLMConfiguration, userInfo] = await Promise.all([
+      this.client.isCodyEnabled(),
+      this.client.getCodyLLMConfiguration(),
+      this.client.getCurrentUserInfo()
+    ]);
+    logDebug("CodyLLMConfiguration", JSON.stringify(codyLLMConfiguration));
+    if (isError$1(userInfo) && isNetworkError(userInfo)) {
+      return { ...networkErrorAuthStatus, endpoint };
+    }
+    if (!userInfo || isError$1(userInfo)) {
+      return { ...unauthenticatedStatus, endpoint };
+    }
+    const configOverwrites = isError$1(codyLLMConfiguration) ? void 0 : codyLLMConfiguration;
+    const isDotCom2 = this.client.isDotCom();
+    if (!isDotCom2) {
+      return newAuthStatus({
+        ...userInfo,
+        endpoint,
+        isDotCom: isDotCom2,
+        siteVersion,
+        configOverwrites,
+        authenticated: true,
+        hasVerifiedEmail: false,
+        siteHasCodyEnabled,
+        userCanUpgrade: false
+      });
+    }
+    const proStatus = await this.client.getCurrentUserCodySubscription();
+    const isActiveProUser = proStatus !== null && "plan" in proStatus && proStatus.plan === "PRO" && proStatus.status !== "PENDING";
+    return newAuthStatus({
+      ...userInfo,
+      endpoint,
+      isDotCom: isDotCom2,
+      siteHasCodyEnabled,
+      siteVersion,
+      configOverwrites,
+      authenticated: !!userInfo.id,
+      userCanUpgrade: !isActiveProUser,
+      primaryEmail: ((_a3 = userInfo.primaryEmail) == null ? void 0 : _a3.email) ?? ""
+    });
+  }
+  getAuthStatus() {
+    return this.status;
+  }
+  // It processes the authentication steps and stores the login info before sharing the auth status with chatview
+  async auth({
+    endpoint,
+    token,
+    customHeaders,
+    isExtensionStartup = false,
+    isOfflineMode = false
+  }) {
+    const config = {
+      serverEndpoint: formatURL(endpoint) ?? "",
+      accessToken: token,
+      customHeaders: customHeaders || this.config.customHeaders
+    };
+    try {
+      const authStatus = await this.makeAuthStatus(config, isOfflineMode);
+      if (!isOfflineMode) {
+        await this.storeAuthInfo(config.serverEndpoint, config.accessToken);
+      }
+      await commands$1.executeCommand("setContext", "cody.activated", authStatus.isLoggedIn);
+      await this.setAuthStatus(authStatus);
+      if (isExtensionStartup && authStatus.isLoggedIn) {
+        await this.setHasAuthenticatedBefore();
+      } else if (authStatus.isLoggedIn) {
+        this.handleFirstEverAuthentication();
+      }
+      return authStatus;
+    } catch (error) {
+      logDebug("AuthProvider:auth", "failed", error);
+      return await this.reloadAuthStatus().catch(() => unauthenticatedStatus);
+    }
+  }
+  // Set auth status in case of reload
+  async reloadAuthStatus() {
+    await commands$1.executeCommand("setContext", "cody.activated", false);
+    this.config = await getFullConfig();
+    return await this.auth({
+      endpoint: this.config.serverEndpoint,
+      token: this.config.accessToken,
+      customHeaders: this.config.customHeaders
+    });
+  }
+  // Set auth status and share it with chatview
+  async setAuthStatus(authStatus) {
+    if (this.status === authStatus) {
+      return;
+    }
+    this.status = authStatus;
+    if (authStatus.endpoint === "init") {
+      return;
+    }
+    await this.updateAuthStatus(authStatus);
+  }
+  async updateAuthStatus(authStatus) {
+    try {
+      graphqlClient.setConfig(await getFullConfig());
+      await ClientConfigSingleton.getInstance().setAuthStatus(authStatus);
+      await syncModels(authStatus);
+    } catch (error) {
+      logDebug("AuthProvider", "updateAuthStatus error", error);
+    } finally {
+      this.didChangeEvent.fire(this.getAuthStatus());
+      let eventValue;
+      if (authStatus.showNetworkError || authStatus.showInvalidAccessTokenError) {
+        eventValue = "failed";
+      } else if (authStatus.isLoggedIn) {
+        eventValue = "connected";
+      } 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) {
+      return;
+    }
+    await localStorage.saveEndpoint(endpoint);
+    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();
+  }
+  // Logs a telemetry event if the user has never authenticated to Sourcegraph.
+  handleFirstEverAuthentication() {
+    if (localStorage.get(HAS_AUTHENTICATED_BEFORE_KEY)) {
+      return;
+    }
+    telemetryRecorder.recordEvent("cody.auth.login", "firstEver");
+    this.setHasAuthenticatedBefore();
+    void maybeStartInteractiveTutorial();
+  }
+  setHasAuthenticatedBefore() {
+    return localStorage.set(HAS_AUTHENTICATED_BEFORE_KEY, "true");
+  }
+}
+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,
@@ -33553,7 +34385,7 @@ const getExtensionDetails = (config) => ({
 });
 const legacyBackcompatLogEventMode = "connected-instance-only";
 const debugLogLabel = "telemetry-v2";
-async function createOrUpdateTelemetryRecorderProvider(config, isExtensionModeDevOrTest, authStatusProvider) {
+async function createOrUpdateTelemetryRecorderProvider(config, isExtensionModeDevOrTest) {
   const extensionDetails = getExtensionDetails(config);
   const defaultNoOpProvider = new NoOpTelemetryRecorderProvider([new TimestampTelemetryProcessor_1()]);
   if (config.telemetryLevel === "off" || !extensionDetails.ide) {
@@ -33570,7 +34402,7 @@ async function createOrUpdateTelemetryRecorderProvider(config, isExtensionModeDe
       new TelemetryRecorderProvider(
         extensionDetails,
         config,
-        authStatusProvider,
+        authProvider.instance,
         anonymousUserID,
         legacyBackcompatLogEventMode
       )
@@ -33901,10 +34733,12 @@ async function gitLocallyModifiedFiles(uri2, signal2) {
   var _a3, _b2;
   const repo = vscodeGitAPI == null ? void 0 : vscodeGitAPI.getRepository(uri2);
   if (!repo) {
-    throw new Error(`repository does not exist at ${uri2.toString}`);
+    logDebug("gitLocallyModifiedFiles", "no git repository found at", uri2.toString());
+    return [];
   }
   if (!((_a3 = repo.state.HEAD) == null ? void 0 : _a3.commit)) {
-    throw new Error("could not get locally modified files, HEAD commit was undefined");
+    logDebug("gitLocallyModifiedFiles", "HEAD commit was undefined for git repo at", uri2.toString());
+    return [];
   }
   let diffBase = repo.state.HEAD.commit;
   if ((_b2 = repo.state.HEAD) == null ? void 0 : _b2.upstream) {
@@ -34205,7 +35039,6 @@ async function resolveGitConfigUri(uri2, signal2) {
 }
 class RepoNameResolver {
   constructor() {
-    __publicField2(this, "authProvider");
     __publicField2(this, "fsPathToRepoNameCache", new LRUCache$1({ max: 1e3 }));
     __publicField2(this, "remoteUrlToRepoNameCache", new LRUCache$1({ max: 1e3 }));
     /**
@@ -34253,19 +35086,18 @@ class RepoNameResolver {
       return [];
     });
   }
-  init(authProvider) {
-    this.authProvider = authProvider;
-    this.authProvider.changes.subscribe(() => {
+  init() {
+    authProvider.instance.changes.subscribe(() => {
       this.fsPathToRepoNameCache.clear();
       this.remoteUrlToRepoNameCache.clear();
     });
   }
   async getRepoNamesFromRemoteUrls(remoteUrls) {
-    if (!this.authProvider) {
+    if (!authProvider.instance) {
       throw new Error("RepoNameResolver not initialized");
     }
     const uniqueRemoteUrls = Array.from(new Set(remoteUrls));
-    if (this.authProvider.getAuthStatus().isDotCom) {
+    if (authProvider.instance.getAuthStatus().isDotCom) {
       return uniqueRemoteUrls.map(convertGitCloneURLToCodebaseName).filter(isDefined);
     }
     const repoNames = await Promise.all(
@@ -36219,11 +37051,6 @@ async function doRewrite(completionsClient, query2, signal2) {
   }
   return [...result];
 }
-var RepoInclusion = /* @__PURE__ */ ((RepoInclusion2) => {
-  RepoInclusion2["Automatic"] = "auto";
-  RepoInclusion2["Manual"] = "manual";
-  return RepoInclusion2;
-})(RepoInclusion || {});
 class RemoteSearch {
   constructor(completions) {
     // Repositories we are including automatically because of the workspace.
@@ -36420,7 +37247,7 @@ class WorkspaceRepoMapper {
   }
 }
 class WorkspaceReposMonitor {
-  constructor(authProvider) {
+  constructor() {
     __publicField2(this, "disposables", []);
     __publicField2(this, "repoMetadata", /* @__PURE__ */ new Map());
     __publicField2(this, "workspaceRepoMapper", new WorkspaceRepoMapper());
@@ -36430,12 +37257,15 @@ class WorkspaceReposMonitor {
     this.disposables.push(
       workspace.onDidChangeWorkspaceFolders((evt) => this.onDidChangeWorkspaceFolders(evt))
     );
-    const subscription = authProvider.changes.subscribe(() => {
-      for (const folderURI of this.getFolderURIs()) {
-        this.addWorkspaceFolder(folderURI);
-      }
-    });
-    this.disposables.push({ dispose: () => subscription.unsubscribe() });
+    this.disposables.push(
+      subscriptionDisposable(
+        authProvider.instance.changes.subscribe(() => {
+          for (const folderURI of this.getFolderURIs()) {
+            this.addWorkspaceFolder(folderURI);
+          }
+        })
+      )
+    );
   }
   dispose() {
     for (const disposable of this.disposables) {
@@ -36503,7 +37333,7 @@ class WorkspaceReposMonitor {
   }
 }
 let workspaceReposMonitor = void 0;
-function initWorkspaceReposMonitor(authProvider, disposables) {
+function initWorkspaceReposMonitor(disposables) {
   if (!vscodeGitAPI) {
     logDebug(
       "WorkspaceReposMonitor",
@@ -36511,7 +37341,7 @@ function initWorkspaceReposMonitor(authProvider, disposables) {
     );
     return void 0;
   }
-  workspaceReposMonitor = new WorkspaceReposMonitor(authProvider);
+  workspaceReposMonitor = new WorkspaceReposMonitor();
   disposables.push(workspaceReposMonitor);
   return workspaceReposMonitor;
 }
@@ -36729,7 +37559,8 @@ class UpstreamHealthProvider {
     }
   }
 }
-const upstreamHealthProvider = new UpstreamHealthProvider();
+const upstreamHealthProvider = singletonNotYetSet();
+setSingleton(upstreamHealthProvider, new UpstreamHealthProvider());
 function headersToObject(headers) {
   const result = {};
   for (const [key, value] of headers.entries()) {
@@ -37626,10 +38457,6 @@ const languages = {
 class CompletionProviderConfig {
   constructor() {
     __publicField2(this, "_config");
-    /**
-     * Use the injected feature flag provider to make testing easier.
-     */
-    __publicField2(this, "featureFlagProvider");
     __publicField2(this, "flagsToResolve", [
       FeatureFlag.CodyAutocompleteContextBfgMixed,
       FeatureFlag.CodyAutocompleteUserLatency,
@@ -37651,19 +38478,17 @@ class CompletionProviderConfig {
    * Should be called before `InlineCompletionItemProvider` instance is created, so that the singleton
    * with resolved values is ready for downstream use.
    */
-  async init(config, featureFlagProvider2) {
+  async init(config) {
     this._config = config;
-    this.featureFlagProvider = featureFlagProvider2;
-    await Promise.all(this.flagsToResolve.map((flag2) => featureFlagProvider2.evaluateFeatureFlag(flag2)));
+    await Promise.all(
+      this.flagsToResolve.map((flag2) => featureFlagProvider.instance.evaluateFeatureFlag(flag2))
+    );
   }
   setConfig(config) {
     this._config = config;
   }
   getPrefetchedFlag(flag2) {
-    if (!this.featureFlagProvider) {
-      throw new Error("CompletionProviderConfig is not initialized");
-    }
-    return Boolean(this.featureFlagProvider.getFromCache(flag2));
+    return Boolean(featureFlagProvider.instance.getFromCache(flag2));
   }
   get contextStrategy() {
     switch (this.config.autocompleteExperimentalGraphContext) {
@@ -42055,8 +42880,8 @@ function getSharedParams(event) {
     items: event.items.map((i) => ({ ...i })),
     otherCompletionProviderEnabled: otherCompletionProviders2.length > 0,
     otherCompletionProviders: otherCompletionProviders2,
-    upstreamLatency: upstreamHealthProvider.getUpstreamLatency(),
-    gatewayLatency: upstreamHealthProvider.getGatewayLatency(),
+    upstreamLatency: upstreamHealthProvider.instance.getUpstreamLatency(),
+    gatewayLatency: upstreamHealthProvider.instance.getGatewayLatency(),
     // 🚨 SECURITY: Do not include any context by default
     inlineCompletionItemContext: void 0
   };
@@ -46246,7 +47071,10 @@ class Agent extends MessageHandler {
           (_c2 = this.globalState) == null ? void 0 : _c2.update(key, value);
         }
       }
-      this.workspace.workspaceRootUri = Uri.parse(clientInfo2.workspaceRootUri);
+      this.workspace.workspaceRootUri = clientInfo2.workspaceRootUri ? Uri.parse(clientInfo2.workspaceRootUri).with({ scheme: "file" }) : Uri.from({
+        scheme: "file",
+        path: clientInfo2.workspaceRootPath ?? void 0
+      });
       setWorkspaceDocuments(this.workspace);
       if (((_d2 = clientInfo2.capabilities) == null ? void 0 : _d2.codeActions) === "enabled") {
         onDidRegisterNewCodeActionProvider((codeActionProvider) => {
@@ -46270,7 +47098,7 @@ class Agent extends MessageHandler {
         );
       }
       if (((_f2 = clientInfo2.capabilities) == null ? void 0 : _f2.ignore) === "enabled") {
-        contextFiltersProvider.onContextFiltersChanged(() => {
+        contextFiltersProvider.instance.onContextFiltersChanged(() => {
           this.notify("ignore/didChange", null);
         });
       }
@@ -46283,10 +47111,6 @@ class Agent extends MessageHandler {
       setClientInfo(clientInfo2);
       this.clientInfo = clientInfo2;
       setUserAgent(`${clientInfo2 == null ? void 0 : clientInfo2.name} / ${clientInfo2 == null ? void 0 : clientInfo2.version}`);
-      this.workspace.workspaceRootUri = clientInfo2.workspaceRootUri ? Uri.parse(clientInfo2.workspaceRootUri) : Uri.from({
-        scheme: "file",
-        path: clientInfo2.workspaceRootPath ?? void 0
-      });
       try {
         const secrets = ((_g2 = clientInfo2.capabilities) == null ? void 0 : _g2.secrets) === "client-managed" ? new AgentClientManagedSecretStorage(this, this.secretsDidChange.event) : new AgentStatelessSecretStorage();
         await initializeVscodeExtension(
@@ -46877,7 +47701,7 @@ class Agent extends MessageHandler {
     this.registerAuthenticatedRequest("editTask/retry", (params2) => {
       var _a3;
       const instruction = PromptString.unsafe_fromUserQuery(params2.instruction);
-      const models = getModelOptionItems(modelsService.getModels(ModelUsage.Edit), true);
+      const models = getModelOptionItems(modelsService.instance.getModels(ModelUsage.Edit), true);
       const previousInput = {
         instruction,
         userContextFiles: [],
@@ -46977,7 +47801,7 @@ class Agent extends MessageHandler {
     });
     this.registerAuthenticatedRequest("chat/restore", async ({ modelID, messages, chatID }) => {
       const authStatus = await commands$1.executeCommand("cody.auth.status");
-      modelID ?? (modelID = modelsService.getDefaultChatModel() ?? "");
+      modelID ?? (modelID = modelsService.instance.getDefaultChatModel() ?? "");
       const chatMessages = (messages == null ? void 0 : messages.map(PromptString.unsafe_deserializeChatMessage)) ?? [];
       const chatModel = new ChatModel(modelID, chatID, chatMessages);
       await chatHistory.saveChat(authStatus, chatModel.toSerializedChatTranscript());
@@ -46989,7 +47813,7 @@ class Agent extends MessageHandler {
       );
     });
     this.registerAuthenticatedRequest("chat/models", async ({ modelUsage }) => {
-      const models = modelsService.getModels(modelUsage);
+      const models = modelsService.instance.getModels(modelUsage);
       return { models };
     });
     this.registerAuthenticatedRequest("chat/export", async (input) => {
@@ -47104,7 +47928,7 @@ class Agent extends MessageHandler {
       this.secretsDidChange.fire({ key });
     });
     this.registerAuthenticatedRequest("featureFlags/getFeatureFlag", async ({ flagName }) => {
-      return featureFlagProvider.evaluateFeatureFlag(
+      return featureFlagProvider.instance.evaluateFeatureFlag(
         FeatureFlag[flagName]
       );
     });
@@ -47145,13 +47969,13 @@ class Agent extends MessageHandler {
     });
     this.registerAuthenticatedRequest("ignore/test", async ({ uri: uriString }) => {
       const uri2 = Uri.parse(uriString);
-      const isIgnored = await contextFiltersProvider.isUriIgnored(uri2);
+      const isIgnored = await contextFiltersProvider.instance.isUriIgnored(uri2);
       return {
         policy: isIgnored ? "ignore" : "use"
       };
     });
     this.registerAuthenticatedRequest("testing/ignore/overridePolicy", async (contextFilters) => {
-      contextFiltersProvider.setTestingContextFilters(contextFilters);
+      contextFiltersProvider.instance.setTestingContextFilters(contextFilters);
       return null;
     });
   }
@@ -47570,7 +48394,7 @@ async function showCodyIgnoreNotification(feature2, type2) {
   );
 }
 async function isUriIgnoredByContextFilterWithNotification(uri2, feature2) {
-  const isIgnored = await contextFiltersProvider.isUriIgnored(uri2);
+  const isIgnored = await contextFiltersProvider.instance.isUriIgnored(uri2);
   if (isIgnored) {
     showCodyIgnoreNotification(feature2, "context-filter");
   }
@@ -48607,7 +49431,7 @@ class CommandsProvider {
    * Used for retreiving context for the command field in custom command
    */
   async runShell(shell2) {
-    const { getContextFileFromShell } = await import("./shell-Dil0VopV.mjs");
+    const { getContextFileFromShell } = await import("./shell-CvNNoU2J.mjs");
     return getContextFileFromShell(shell2);
   }
   /**
@@ -48618,7 +49442,7 @@ class CommandsProvider {
     if (!isFileURI(uri2)) {
       throw new Error("history only supported on local file paths");
     }
-    const { getContextFileFromGitLog } = await import("./git-log-BEqqPp3D.mjs");
+    const { getContextFileFromGitLog } = await import("./git-log-CKjP84c8.mjs");
     return getContextFileFromGitLog(uri2, options);
   }
   dispose() {
@@ -48864,32 +49688,10 @@ async function onTextDocumentChange(newCode) {
     });
   }
 }
-let runningAuthProgressIndicator = null;
-function startAuthProgressIndicator() {
-  window$1.withProgress(
-    {
-      location: ProgressLocation.Notification,
-      title: "Signing in to Sourcegraph...",
-      cancellable: true
-    },
-    (progress, token) => {
-      token.onCancellationRequested(() => {
-        runningAuthProgressIndicator = null;
-      });
-      return new Promise((resolve2) => {
-        runningAuthProgressIndicator = resolve2;
-      });
-    }
-  );
-}
-function closeAuthProgressIndicator() {
-  runningAuthProgressIndicator == null ? void 0 : runningAuthProgressIndicator();
-  runningAuthProgressIndicator = null;
-}
 async function getContextFileFromUri(file, range2) {
   return wrapInActiveSpan("commands.context.filePath", async (span2) => {
     try {
-      if (await contextFiltersProvider.isUriIgnored(file)) {
+      if (await contextFiltersProvider.instance.isUriIgnored(file)) {
         return null;
       }
       const doc2 = await workspace.openTextDocument(file);
@@ -48931,7 +49733,7 @@ async function getContextFileFromCursor(newCursorPosition) {
       if (!(editor == null ? void 0 : editor.active) || !document2) {
         throw new Error("No active editor");
       }
-      if (await contextFiltersProvider.isUriIgnored(document2.uri)) {
+      if (await contextFiltersProvider.instance.isUriIgnored(document2.uri)) {
         return null;
       }
       const activeCursor = newCursorPosition && new Selection(newCursorPosition, newCursorPosition);
@@ -49007,7 +49809,7 @@ async function getSelectionOrFileContext() {
   });
 }
 async function shouldIgnore(uri2) {
-  return Boolean(await contextFiltersProvider.isUriIgnored(uri2) || isCodyIgnoredFile(uri2));
+  return Boolean(await contextFiltersProvider.instance.isUriIgnored(uri2) || isCodyIgnoredFile(uri2));
 }
 var fuzzysort$1 = { exports: {} };
 (function(module2) {
@@ -49755,7 +50557,7 @@ async function getFileContextFiles(options) {
       size: range2 ? 100 : item.file.byteSize,
       source: ContextItemSource.User,
       remoteRepositoryName: item.repository.name,
-      isIgnored: contextFiltersProvider.isRepoNameIgnored(item.repository.name),
+      isIgnored: contextFiltersProvider.instance.isRepoNameIgnored(item.repository.name),
       uri: URI.file(`${item.repository.name}/${item.file.path}`)
     }));
   }
@@ -49830,7 +50632,7 @@ async function getSymbolContextFiles(query2, maxResults = 20, remoteRepositories
         type: "symbol",
         remoteRepositoryName: item.repository.name,
         uri: URI.file(`${item.repository.name}/${symbol2.location.resource.path}`),
-        isIgnored: contextFiltersProvider.isRepoNameIgnored(item.repository.name),
+        isIgnored: contextFiltersProvider.instance.isRepoNameIgnored(item.repository.name),
         source: ContextItemSource.User,
         symbolName: symbol2.name,
         // TODO [VK] Support other symbols kind
@@ -49892,7 +50694,7 @@ async function createContextFileFromUri(uri2, source, type2, selectionRange, kin
       uri: uri2,
       range: range2,
       source,
-      isIgnored: Boolean(await contextFiltersProvider.isUriIgnored(uri2))
+      isIgnored: Boolean(await contextFiltersProvider.instance.isUriIgnored(uri2))
     } : {
       type: type2,
       symbolName,
@@ -50035,7 +50837,7 @@ function migrateAndNotifyForOutdatedModels(model2) {
     return model2;
   }
   const newModel = "anthropic/claude-3-5-sonnet-20240620";
-  if (modelsService.getModelByID(newModel)) {
+  if (modelsService.instance.getModelByID(newModel)) {
     showNotificationIfNotShownYet(
       "Claude 2 model support has been removed in favor of the newer Claude 3 models. All chats that used Claude 2 have been upgraded to Claude 3.",
       "claude2-migration-notification-shown"
@@ -50209,7 +51011,7 @@ async function getContextFileFromCurrentFile() {
       if (!document2) {
         throw new Error("No active editor");
       }
-      if (await contextFiltersProvider.isUriIgnored(document2.uri)) {
+      if (await contextFiltersProvider.instance.isUriIgnored(document2.uri)) {
         return null;
       }
       return {
@@ -50376,7 +51178,7 @@ async function getContextFileFromDirectory(directory) {
       }).sort((a, b) => a[0].localeCompare(b[0]));
       for (const [name2, _type] of filtered) {
         const fileUri = Utils$1.joinPath(dirUri, name2);
-        if (await contextFiltersProvider.isUriIgnored(fileUri)) {
+        if (await contextFiltersProvider.instance.isUriIgnored(fileUri)) {
           continue;
         }
         const fileSize = await workspace.fs.stat(fileUri);
@@ -50434,7 +51236,7 @@ async function getWorkspaceFilesContext(globalPattern, excludePattern, maxResult
       const results = (await workspace.findFiles(globalPattern, excluded, maxResults, token.token)).sort((a, b) => a.toString().localeCompare(b.toString()));
       return (await Promise.all(
         results.map(async (result) => {
-          if (await contextFiltersProvider.isUriIgnored(result)) {
+          if (await contextFiltersProvider.instance.isUriIgnored(result)) {
             return null;
           }
           const decoded = await getDocText(result);
@@ -51105,51 +51907,9 @@ async function mergedPromptsAndLegacyCommands(query2, signal2) {
     query: query2
   };
 }
-class AuthProviderSimplified {
-  async openExternalAuthUrl(classicAuthProvider, method, tokenReceiverUrl) {
-    if (!await openExternalAuthUrl(method, tokenReceiverUrl)) {
-      return false;
-    }
-    classicAuthProvider.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);
-}
 function recordExposedExperimentsToSpan(span2) {
   var _a3;
-  span2.setAttributes(featureFlagProvider.getExposedExperiments());
+  span2.setAttributes(featureFlagProvider.instance.getExposedExperiments());
   const extensionDetails = getExtensionDetails(getConfiguration(workspace.getConfiguration()));
   span2.setAttributes(extensionDetails);
   const extensionApi = (_a3 = extensions.getExtension("sourcegraph.cody-ai")) == null ? void 0 : _a3.exports;
@@ -52120,11 +52880,11 @@ function createRepositoryMention(repo, providerId) {
     data: {
       repoId: repo.id,
       repoName: repo.name,
-      isIgnored: contextFiltersProvider.isRepoNameIgnored(repo.name)
+      isIgnored: contextFiltersProvider.instance.isRepoNameIgnored(repo.name)
     }
   };
 }
-function getMentionMenuData(query2, remoteSearch, chatModel) {
+function getMentionMenuData(query2, chatModel) {
   const source = "chat";
   const atMentionSourceTelemetryMetadataMapping = {
     chat: 1
@@ -52149,23 +52909,19 @@ function getMentionMenuData(query2, remoteSearch, chatModel) {
   const { input, context: context2 } = chatModel.contextWindow;
   try {
     const items = promiseFactoryToObservable(
-      (signal2) => {
-        var _a3;
-        return getChatContextItemsForMention(
-          {
-            mentionQuery: query2,
-            telemetryRecorder: scopedTelemetryRecorder,
-            rangeFilter: !isCodyWeb,
-            remoteRepositoriesNames: query2.includeRemoteRepositories ? (_a3 = remoteSearch == null ? void 0 : remoteSearch.getRepos("all")) == null ? void 0 : _a3.map((repo) => repo.name) : void 0
-          },
-          signal2
-        ).then(
-          (items2) => items2.map((f) => ({
-            ...f,
-            isTooLarge: f.size ? f.size > ((context2 == null ? void 0 : context2.user) || input) : void 0
-          }))
-        );
-      }
+      (signal2) => getChatContextItemsForMention(
+        {
+          mentionQuery: query2,
+          telemetryRecorder: scopedTelemetryRecorder,
+          rangeFilter: !isCodyWeb
+        },
+        signal2
+      ).then(
+        (items2) => items2.map((f) => ({
+          ...f,
+          isTooLarge: f.size ? f.size > ((context2 == null ? void 0 : context2.user) || input) : void 0
+        }))
+      )
     );
     const queryLower = query2.text.toLowerCase();
     const providers = (query2.provider === null ? isCodyWeb ? webMentionProvidersMetadata() : allMentionProvidersMetadata() : Observable.of([])).pipe(map$1((providers2) => providers2.filter((p) => p.title.toLowerCase().includes(queryLower))));
@@ -52180,7 +52936,7 @@ function getMentionMenuData(query2, remoteSearch, chatModel) {
     throw new Error(`Error retrieving mentions: ${error}`);
   }
 }
-async function getChatContextItemsForMention(options, signal2) {
+async function getChatContextItemsForMention(options, _2) {
   const MAX_RESULTS = 20;
   const { mentionQuery, telemetryRecorder: telemetryRecorder2, remoteRepositoriesNames, rangeFilter = true } = options;
   switch (mentionQuery.provider) {
@@ -52250,15 +53006,13 @@ function contextItemMentionFromOpenCtxItem(item) {
   };
 }
 function startClientStateBroadcaster({
-  authProvider,
-  getRemoteSearch,
+  useRemoteSearch,
   postMessage: rawPostMessage,
   chatModel
 }) {
   const postMessage = idempotentPostMessage(rawPostMessage);
   async function rawSendClientState(signal2) {
     const items = [];
-    const remoteSearch = getRemoteSearch();
     const { input, context: context2 } = chatModel.contextWindow;
     const userContextSize = (context2 == null ? void 0 : context2.user) ?? input;
     const [contextFile] = await getSelectionOrFileContext();
@@ -52277,7 +53031,7 @@ function startClientStateBroadcaster({
       };
       items.push(item);
     }
-    const corpusItems = getCorpusContextItemsForEditorState({ remoteSearch });
+    const corpusItems = getCorpusContextItemsForEditorState(useRemoteSearch);
     items.push(...await corpusItems);
     postMessage({ type: "clientState", value: { initialContext: items } });
   }
@@ -52296,7 +53050,7 @@ function startClientStateBroadcaster({
   );
   disposables.push(
     subscriptionDisposable(
-      authProvider.changes.subscribe(async () => {
+      authProvider.instance.changes.subscribe(async () => {
         void sendClientState("immediate");
       })
     )
@@ -52304,15 +53058,13 @@ function startClientStateBroadcaster({
   void sendClientState("immediate");
   return Disposable.from(...disposables);
 }
-async function getCorpusContextItemsForEditorState({
-  remoteSearch
-}) {
+async function getCorpusContextItemsForEditorState(useRemote) {
   var _a3;
   const items = [];
-  if (remoteSearch && workspaceReposMonitor) {
+  if (useRemote && workspaceReposMonitor) {
     const repoMetadata = await workspaceReposMonitor.getRepoMetadata();
     for (const repo of repoMetadata) {
-      if (contextFiltersProvider.isRepoNameIgnored(repo.repoName)) {
+      if (contextFiltersProvider.instance.isRepoNameIgnored(repo.repoName)) {
         continue;
       }
       if (repo.remoteID === void 0) {
@@ -52393,147 +53145,6 @@ function debounced(fn) {
     );
   };
 }
-function newAuthStatus(options) {
-  var _a3;
-  const {
-    isOfflineMode,
-    endpoint,
-    siteHasCodyEnabled,
-    username,
-    authenticated,
-    isDotCom: isDotCom2,
-    siteVersion,
-    userOrganizations
-  } = options;
-  if (isOfflineMode) {
-    return { ...offlineModeAuthStatus, endpoint, username };
-  }
-  if (!authenticated) {
-    return { ...unauthenticatedStatus, endpoint };
-  }
-  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;
-  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"))
-  };
-}
-const countGeneratedCode = (text) => {
-  const codeBlockRegex = /```[\S\s]*?```/g;
-  const codeBlocks = text.match(codeBlockRegex);
-  if (!codeBlocks) {
-    return { charCount: 0, lineCount: 0 };
-  }
-  const count = { lineCount: 0, charCount: 0 };
-  const backticks = "```";
-  for (const block of codeBlocks) {
-    const lines2 = block.split("\n");
-    const codeLines = lines2.filter((line) => !line.startsWith(backticks));
-    const lineCount = codeLines.length;
-    const language = lines2[0].replace(backticks, "");
-    const charCount = block.length - language.length - backticks.length * 2 - 2;
-    count.charCount += charCount;
-    count.lineCount += lineCount;
-  }
-  return count;
-};
-function inferCodyApiVersion(version2, isDotCom2) {
-  const parsedVersion = semver.valid(version2);
-  if (isDotCom2) {
-    return 1;
-  }
-  if (parsedVersion == null) {
-    return 1;
-  }
-  if (semver.gte(parsedVersion, "5.4.0")) {
-    return 1;
-  }
-  if (parsedVersion === "0.0.0") {
-    return 1;
-  }
-  return 0;
-}
-async function resolveContext({
-  strategy,
-  editor,
-  input,
-  providers: { remoteSearch, symf, localEmbeddings },
-  signal: signal2
-}) {
-  return wrapInActiveSpan("chat.resolveCorpusContextMentions", async () => {
-    if (strategy === "none") {
-      logDebug("ChatController", "resolveContext > none");
-      return getVisibleEditorContext(editor);
-    }
-    const repoMentions = input.mentions.filter(
-      (item) => item.type === "repository"
-    );
-    const treeMentions = input.mentions.filter(
-      (item) => item.type === "tree"
-    );
-    const otherMentions = input.mentions.filter(
-      (item) => item.type !== "repository" && item.type !== "tree"
-    );
-    const repoContextSearchResults = remoteSearch && repoMentions.length > 0 ? retrieveContextGracefully(
-      searchRemote(
-        remoteSearch,
-        input.text,
-        repoMentions.map((m) => m.repoID),
-        signal2
-      ),
-      "remote-search"
-    ) : [];
-    const treeContextSymfSearchResults = symf && strategy !== "embeddings" && treeMentions.length > 0 ? Promise.all(
-      treeMentions.map(
-        (tree) => retrieveContextGracefully(
-          searchSymf(symf, editor, tree.uri, input.text),
-          `symf ${tree.name}`
-        )
-      )
-    ).then((v) => v.flat()) : Promise.resolve([]);
-    const treeContextEmbeddingsSearchResults = localEmbeddings && strategy !== "keyword" && treeMentions.length > 0 ? retrieveContextGracefully(
-      searchEmbeddingsLocal(localEmbeddings, input.text),
-      "local-embeddings"
-    ) : Promise.resolve([]);
-    const otherMentionsResolved = resolveContextItems(editor, otherMentions, input.text, signal2);
-    const allContext = (await Promise.all([
-      repoContextSearchResults,
-      treeContextSymfSearchResults,
-      treeContextEmbeddingsSearchResults,
-      otherMentionsResolved
-    ])).flat();
-    const priorityContext = await getPriorityContext(input.text, editor, allContext);
-    return priorityContext.concat(allContext);
-  });
-}
-async function searchRemote(remoteSearch, input, repoIDs, signal2) {
-  return wrapInActiveSpan("chat.context.search.remote", async () => {
-    if (!remoteSearch) {
-      return [];
-    }
-    return (await remoteSearch.query(input, repoIDs, signal2)).map((result) => {
-      return {
-        type: "file",
-        content: result.content,
-        range: new Range(result.startLine, 0, result.endLine, 0),
-        uri: result.uri,
-        source: ContextItemSource.Unified,
-        repoName: result.repoName,
-        title: result.path,
-        revision: result.commit
-      };
-    });
-  });
-}
 async function searchSymf(symf, editor, workspaceRoot, userText, blockOnIndex = false) {
   return wrapInActiveSpan("chat.context.symf", async () => {
     if (!symf) {
@@ -52812,9 +53423,10 @@ async function codebaseRootsFromMentions({ repos, trees }, signal2) {
     }))
   );
   const localRepoNames = treesToRepoNames.flatMap((t) => t.names);
-  const localRepoIDs = localRepoNames.length === 0 ? [] : await graphqlClient.getRepoIds(localRepoNames, localRepoNames.length, signal2);
+  let localRepoIDs = localRepoNames.length === 0 ? [] : await graphqlClient.getRepoIds(localRepoNames, localRepoNames.length, signal2);
   if (lodashExports.isError(localRepoIDs)) {
-    throw localRepoIDs;
+    logError$1("codebaseRootFromMentions", "Failed to get repo IDs from Sourcegraph", localRepoIDs);
+    localRepoIDs = [];
   }
   const uriToId = {};
   for (const r2 of localRepoIDs) {
@@ -52838,9 +53450,10 @@ async function codebaseRootsFromMentions({ repos, trees }, signal2) {
   return [...remoteRepos, ...localRoots];
 }
 class ContextRetriever {
-  constructor(editor, symf, llms) {
+  constructor(editor, symf, localEmbeddings, llms) {
     this.editor = editor;
     this.symf = symf;
+    this.localEmbeddings = localEmbeddings;
     this.llms = llms;
   }
   dispose() {
@@ -52848,8 +53461,13 @@ class ContextRetriever {
     (_a3 = this.symf) == null ? void 0 : _a3.dispose();
   }
   async retrieveContext(mentions, inputTextWithoutContextChips, span2, signal2) {
-    const roots = await codebaseRootsFromMentions(mentions, signal2);
-    return this._retrieveContext(roots, inputTextWithoutContextChips, span2, signal2);
+    try {
+      const roots = await codebaseRootsFromMentions(mentions, signal2);
+      return await this._retrieveContext(roots, inputTextWithoutContextChips, span2, signal2);
+    } catch (error) {
+      logError$1("ContextRetriever", "Unhandled error retrieving context", error);
+      return [];
+    }
   }
   async _retrieveContext(roots, query2, span2, signal2) {
     if (roots.length === 0) {
@@ -52867,10 +53485,20 @@ class ContextRetriever {
       }
       localRoots.push(root2.local);
     }
-    const changedFilesByRoot = await Promise.all(
-      localRoots.map((root2) => gitLocallyModifiedFiles(root2, signal2))
-    );
-    const changedFiles = changedFilesByRoot.flat();
+    let changedFilesByRoot = [];
+    let changedFiles = [];
+    try {
+      changedFilesByRoot = await Promise.all(
+        localRoots.map((root2) => gitLocallyModifiedFiles(root2, signal2))
+      );
+      changedFiles = changedFilesByRoot.flat();
+    } catch (error) {
+      logDebug(
+        "ContextRetriever",
+        "Failed to get locally modified files, falling back to indexed context only",
+        error
+      );
+    }
     const [liveContext, indexedContext] = await Promise.all([
       this.retrieveLiveContext(query2, rewrittenQuery.rewritten, changedFiles, signal2),
       this.retrieveIndexedContext(roots, query2, rewrittenQuery.rewritten, span2, signal2)
@@ -52920,22 +53548,43 @@ class ContextRetriever {
     )).flat();
   }
   async retrieveIndexedContext(roots, originalQuery, rewrittenQuery, span2, signal2) {
+    var _a3;
+    const preferServerContext = workspace.getConfiguration().get("cody.internal.serverSideContext", false);
     const repoIDsOnRemote = /* @__PURE__ */ new Set();
     const localRootURIs = /* @__PURE__ */ new Map();
-    for (const root2 of roots) {
-      if (root2.remoteRepos.length > 0) {
-        for (const rr of root2.remoteRepos) {
-          if (rr.id) {
-            repoIDsOnRemote.add(rr.id);
-            break;
+    if (preferServerContext) {
+      for (const root2 of roots) {
+        if (root2.remoteRepos.length > 0) {
+          for (const rr of root2.remoteRepos) {
+            if (rr.id) {
+              repoIDsOnRemote.add(rr.id);
+              break;
+            }
           }
+        } else if (root2.local && isFileURI(root2.local)) {
+          localRootURIs.set(root2.local.toString(), root2.local);
+        } else {
+          throw new Error(
+            `Codebase root ${JSON.stringify(root2)} is missing both remote and local root`
+          );
+        }
+      }
+    } else {
+      for (const root2 of roots) {
+        if (root2.local && isFileURI(root2.local)) {
+          localRootURIs.set((_a3 = root2.local) == null ? void 0 : _a3.toString(), root2.local);
+        } else if (root2.remoteRepos.length > 0) {
+          for (const rr of root2.remoteRepos) {
+            if (rr.id) {
+              repoIDsOnRemote.add(rr.id);
+              break;
+            }
+          }
+        } else {
+          throw new Error(
+            `Codebase root ${JSON.stringify(root2)} is missing both remote and local root`
+          );
         }
-      } else if (root2.local && isFileURI(root2.local)) {
-        localRootURIs.set(root2.local.toString(), root2.local);
-      } else {
-        throw new Error(
-          `Codebase root ${JSON.stringify(root2)} is missing both remote and local root`
-        );
       }
     }
     const remoteResultsPromise = this.retrieveIndexedContextFromRemote(
@@ -52977,8 +53626,9 @@ class ContextRetriever {
     const contextStrategy = config.useContext;
     span2.setAttribute("strategy", contextStrategy);
     const symf = this.symf;
+    let localSymfResults = Promise.resolve([]);
     if (symf && contextStrategy !== "embeddings" && localRootURIs.length > 0) {
-      const localRootResults = await Promise.all(
+      localSymfResults = Promise.all(
         localRootURIs.map(
           (rootURI) => (
             // TODO(beyang): retire searchSymf and retrieveContextGracefully
@@ -52989,10 +53639,17 @@ class ContextRetriever {
             )
           )
         )
+      ).then((r2) => r2.flat());
+    }
+    const localEmbeddings = this.localEmbeddings;
+    let localEmbeddingsResults = Promise.resolve([]);
+    if (localEmbeddings && contextStrategy !== "keyword" && localRootURIs.length > 0) {
+      localEmbeddingsResults = retrieveContextGracefully(
+        searchEmbeddingsLocal(localEmbeddings, originalQuery),
+        "local-embeddings"
       );
-      return localRootResults.flat();
     }
-    return [];
+    return (await Promise.all([localSymfResults, localEmbeddingsResults])).flat();
   }
 }
 function contextSearchResultToContextItem(result) {
@@ -53280,11 +53937,11 @@ class PromptBuilder {
     };
     contextItems = sortContextItemsIfInTest(contextItems);
     for (const item of contextItems) {
-      if (isCodyIgnoredFile(item.uri) || await contextFiltersProvider.isUriIgnored(item.uri)) {
+      if (isCodyIgnoredFile(item.uri) || await contextFiltersProvider.instance.isUriIgnored(item.uri)) {
         result.ignored.push(item);
         continue;
       }
-      if (item.type === "file" && (item.uri.scheme === "https" || item.uri.scheme === "http") && item.repoName && contextFiltersProvider.isRepoNameIgnored(item.repoName)) {
+      if (item.type === "file" && (item.uri.scheme === "https" || item.uri.scheme === "http") && item.repoName && contextFiltersProvider.instance.isRepoNameIgnored(item.repoName)) {
         result.ignored.push(item);
         continue;
       }
@@ -53389,8 +54046,7 @@ class DefaultPrompter {
   }
 }
 class AuthDependentRetrievers {
-  constructor(authProvider, _localEmbeddings, _symf, _enterpriseContext) {
-    this.authProvider = authProvider;
+  constructor(_localEmbeddings, _symf, _enterpriseContext) {
     this._localEmbeddings = _localEmbeddings;
     this._symf = _symf;
     this._enterpriseContext = _enterpriseContext;
@@ -53399,7 +54055,7 @@ class AuthDependentRetrievers {
     return workspace.getConfiguration().get("cody.advanced.agent.ide") === CodyIDE.Web;
   }
   isConsumer() {
-    return this.authProvider.getAuthStatus().isDotCom;
+    return authProvider.instance.getAuthStatus().isDotCom;
   }
   allowRemoteContext() {
     return this.isCodyWeb() || !this.isConsumer();
@@ -53417,7 +54073,6 @@ class AuthDependentRetrievers {
 class ChatController {
   constructor({
     extensionUri,
-    authProvider,
     chatClient,
     retrievers,
     editor,
@@ -53428,11 +54083,8 @@ class ChatController {
     extensionClient
   }) {
     __publicField2(this, "chatModel");
-    __publicField2(this, "authProvider");
     __publicField2(this, "chatClient");
     __publicField2(this, "retrievers");
-    __publicField2(this, "remoteSearch");
-    __publicField2(this, "repoPicker");
     __publicField2(this, "contextRetriever");
     __publicField2(this, "editor");
     __publicField2(this, "extensionClient");
@@ -53448,22 +54100,13 @@ class ChatController {
     // =======================================================================
     __publicField2(this, "extensionUri");
     __publicField2(this, "_webviewPanelOrView");
-    var _a3, _b2, _c2;
+    var _a3;
     this.extensionUri = extensionUri;
-    this.authProvider = authProvider;
     this.chatClient = chatClient;
     this.retrievers = retrievers;
     this.editor = editor;
     this.extensionClient = extensionClient;
     this.contextRetriever = contextRetriever;
-    this.repoPicker = ((_a3 = this.retrievers.enterpriseContext) == null ? void 0 : _a3.repoPicker) ?? null;
-    this.remoteSearch = ((_b2 = this.retrievers.enterpriseContext) == null ? void 0 : _b2.createRemoteSearch()) ?? null;
-    const authSubscription = this.authProvider.changes.subscribe(() => {
-      var _a4, _b3;
-      this.repoPicker = ((_a4 = this.retrievers.enterpriseContext) == null ? void 0 : _a4.repoPicker) ?? null;
-      this.remoteSearch = ((_b3 = this.retrievers.enterpriseContext) == null ? void 0 : _b3.createRemoteSearch()) ?? null;
-    });
-    this.disposables.push({ dispose: () => authSubscription.unsubscribe() });
     this.chatModel = new ChatModel(getDefaultModelID());
     this.guardrails = guardrails;
     this.startTokenReceiver = startTokenReceiver;
@@ -53471,16 +54114,15 @@ class ChatController {
     if (TestSupport.instance) {
       TestSupport.instance.chatPanelProvider.set(this);
     }
-    void ((_c2 = this.retrievers.localEmbeddings) == null ? void 0 : _c2.start());
+    void ((_a3 = this.retrievers.localEmbeddings) == null ? void 0 : _a3.start());
     this.disposables.push({
-      dispose: featureFlagProvider.onFeatureFlagChanged("", () => {
+      dispose: featureFlagProvider.instance.onFeatureFlagChanged("", () => {
         void this.sendConfig();
       })
     });
     this.disposables.push(
       startClientStateBroadcaster({
-        authProvider,
-        getRemoteSearch: () => this.remoteSearch,
+        useRemoteSearch: this.retrievers.enterpriseContext !== null,
         postMessage: (message) => this.postMessage(message),
         chatModel: this.chatModel
       })
@@ -53537,7 +54179,7 @@ class ChatController {
         this.handleAbort();
         break;
       case "chatModel":
-        await modelsService.setSelectedModel(ModelUsage.Chat, message.model);
+        await modelsService.instance.setSelectedModel(ModelUsage.Chat, message.model);
         this.handleSetChatModel(message.model);
         break;
       case "get-chat-models":
@@ -53563,7 +54205,7 @@ class ChatController {
         await handleSmartApply(
           message.id,
           message.code,
-          this.authProvider.getAuthStatus(),
+          authProvider.instance.getAuthStatus(),
           message.instruction,
           message.fileName
         );
@@ -53609,13 +54251,6 @@ class ChatController {
         });
         break;
       }
-      case "context/choose-remote-search-repo": {
-        await this.handleChooseRemoteSearchRepo(message.explicitRepos ?? void 0);
-        break;
-      }
-      case "context/remove-remote-search-repo":
-        void this.handleRemoveRemoteSearchRepo(message.repoId);
-        break;
       case "embeddings/index":
         void ((_a3 = this.retrievers.localEmbeddings) == null ? void 0 : _a3.index());
         break;
@@ -53655,11 +54290,11 @@ class ChatController {
         break;
       case "auth": {
         if (message.authKind === "callback" && message.endpoint) {
-          this.authProvider.redirectToEndpointLogin(message.endpoint);
+          authProvider.instance.redirectToEndpointLogin(message.endpoint);
           break;
         }
         if (message.authKind === "offline") {
-          this.authProvider.auth({ endpoint: "", token: "", isOfflineMode: true });
+          authProvider.instance.auth({ endpoint: "", token: "", isOfflineMode: true });
           break;
         }
         if (message.authKind === "simplified-onboarding") {
@@ -53672,7 +54307,7 @@ class ChatController {
             endpoint,
             async (token, endpoint2) => {
               closeAuthProgressIndicator();
-              const authStatus = await this.authProvider.auth({ endpoint: endpoint2, token });
+              const authStatus = await authProvider.instance.auth({ endpoint: endpoint2, token });
               telemetryRecorder.recordEvent(
                 "cody.auth.fromTokenReceiver.web",
                 "succeeded",
@@ -53692,7 +54327,6 @@ class ChatController {
           const authProviderSimplified = new AuthProviderSimplified();
           const authMethod = message.authMethod || "dotcom";
           const successfullyOpenedUrl = await authProviderSimplified.openExternalAuthUrl(
-            this.authProvider,
             authMethod,
             tokenReceiverUrl
           );
@@ -53702,11 +54336,14 @@ class ChatController {
           break;
         }
         if (message.authKind === "signin" && message.endpoint && message.value) {
-          await this.authProvider.auth({ endpoint: message.endpoint, token: message.value });
+          await authProvider.instance.auth({
+            endpoint: message.endpoint,
+            token: message.value
+          });
           break;
         }
         if (message.authKind === "signout") {
-          await this.authProvider.signoutMenu();
+          await authProvider.instance.signoutMenu();
           this.setWebviewView(View.Login);
           break;
         }
@@ -53719,7 +54356,7 @@ class ChatController {
             if (!token) {
               return;
             }
-            const authStatus = await this.authProvider.auth({
+            const authStatus = await authProvider.instance.auth({
               endpoint: DOTCOM_URL.href,
               token
             });
@@ -53734,8 +54371,8 @@ class ChatController {
         break;
       }
       case "troubleshoot/reloadAuth": {
-        await this.authProvider.reloadAuthStatus();
-        const nextAuth = this.authProvider.getAuthStatus();
+        await authProvider.instance.reloadAuthStatus();
+        const nextAuth = authProvider.instance.getAuthStatus();
         telemetryRecorder.recordEvent("cody.troubleshoot", "reloadAuth", {
           metadata: {
             success: nextAuth.isLoggedIn ? 1 : 0
@@ -53782,7 +54419,7 @@ class ChatController {
   }
   async sendConfig() {
     var _a3;
-    const authStatus = this.authProvider.getAuthStatus();
+    const authStatus = authProvider.instance.getAuthStatus();
     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();
@@ -53824,7 +54461,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 = this.authProvider.getAuthStatus();
+      const authStatus = authProvider.instance.getAuthStatus();
       const sharedProperties = {
         requestID,
         chatModel: this.chatModel.modelID,
@@ -53860,9 +54497,9 @@ class ChatController {
         (_a3 = this.contextAPIClient) == null ? void 0 : _a3.detectChatIntent(requestID, inputText.toString());
         mentions = mentions.map((m) => m.source ? m : { ...m, source: ContextItemSource.User });
         if (legacyAddEnhancedContext) {
-          const corpusMentions = await getCorpusContextItemsForEditorState({
-            remoteSearch: this.remoteSearch
-          });
+          const corpusMentions = await getCorpusContextItemsForEditorState(
+            this.retrievers.enterpriseContext !== null
+          );
           mentions = mentions.concat(corpusMentions);
           const selectionContext = source === "chat" ? await getContextFileFromSelection() : [];
           signal2.throwIfAborted();
@@ -53917,7 +54554,7 @@ class ChatController {
     });
   }
   async sendChatExecutedTelemetry(span2, firstTokenSpan, inputText, sharedProperties, context2) {
-    const authStatus = this.authProvider.getAuthStatus();
+    const authStatus = authProvider.instance.getAuthStatus();
     const contextSummary = {};
     for (const { source } of context2.used) {
       if (!source) {
@@ -53954,26 +54591,6 @@ class ChatController {
     });
   }
   async computeContext({ text, mentions }, requestID, editorState, span2, signal2) {
-    const legacyContextPromise = this.legacyComputeContext(
-      { text, mentions },
-      requestID,
-      editorState,
-      span2,
-      signal2
-    );
-    if (!workspace.getConfiguration().get("cody.internal.serverSideContext")) {
-      return legacyContextPromise;
-    }
-    const contextPromise = this._computeContext(
-      { text, mentions },
-      requestID,
-      editorState,
-      span2,
-      signal2
-    );
-    return (await Promise.all([contextPromise, legacyContextPromise])).flat();
-  }
-  async _computeContext({ text, mentions }, requestID, editorState, span2, signal2) {
     const inputTextWithoutContextChips = editorState ? PromptString.unsafe_fromUserQuery(
       inputTextWithoutContextChipsFromPromptEditorState(editorState)
     ) : text;
@@ -54000,7 +54617,8 @@ class ChatController {
       signal2
     );
     const rankedContext = [];
-    if (this.contextAPIClient && retrievedContext.length > 1) {
+    const useReranker = workspace.getConfiguration().get("cody.internal.useReranker") ?? false;
+    if (useReranker && this.contextAPIClient && retrievedContext.length > 1) {
       const response = await this.contextAPIClient.rankContext(
         requestID,
         inputTextWithoutContextChips.toString(),
@@ -54045,42 +54663,6 @@ class ChatController {
     });
     return rankedContext;
   }
-  async legacyComputeContext({ text, mentions }, requestID, editorState, span2, signal2) {
-    var _a3;
-    const config = getConfiguration();
-    const contextStrategy = config.useContext;
-    span2.setAttribute("strategy", contextStrategy);
-    const inputTextWithoutContextChips = editorState ? PromptString.unsafe_fromUserQuery(
-      inputTextWithoutContextChipsFromPromptEditorState(editorState)
-    ) : text;
-    const context2 = (await Promise.all([
-      resolveContext({
-        strategy: contextStrategy,
-        editor: this.editor,
-        input: { text: inputTextWithoutContextChips, mentions },
-        providers: {
-          localEmbeddings: this.retrievers.localEmbeddings,
-          symf: this.retrievers.symf,
-          remoteSearch: this.remoteSearch
-        },
-        signal: signal2
-      }),
-      getContextForChatMessage(text.toString(), signal2)
-    ])).flat();
-    if (context2.length > 0) {
-      void ((_a3 = this.contextAPIClient) == null ? void 0 : _a3.rankContext(
-        requestID,
-        inputTextWithoutContextChips.toString(),
-        context2
-      ));
-    }
-    return [
-      {
-        strategy: `(legacy)${contextStrategy}`,
-        items: context2.flat()
-      }
-    ];
-  }
   startNewSubmitOrEditOperation() {
     var _a3;
     (_a3 = this.submitOrEditOperation) == null ? void 0 : _a3.abort();
@@ -54189,21 +54771,6 @@ class ChatController {
       });
     }
   }
-  async handleChooseRemoteSearchRepo(explicitRepos) {
-    var _a3;
-    if (!this.remoteSearch) {
-      return;
-    }
-    const repos = explicitRepos ?? await ((_a3 = this.repoPicker) == null ? void 0 : _a3.show(this.remoteSearch.getRepos(RepoInclusion.Manual)));
-    if (repos) {
-      this.chatModel.setSelectedRepos(repos);
-      this.remoteSearch.setRepos(repos, RepoInclusion.Manual);
-    }
-  }
-  handleRemoveRemoteSearchRepo(repoId) {
-    var _a3;
-    (_a3 = this.remoteSearch) == null ? void 0 : _a3.removeRepo(repoId);
-  }
   // #endregion
   // =======================================================================
   // #region view updaters
@@ -54247,11 +54814,11 @@ class ChatController {
     captureException(error);
   }
   postChatModels() {
-    const authStatus = this.authProvider.getAuthStatus();
+    const authStatus = authProvider.instance.getAuthStatus();
     if (!(authStatus == null ? void 0 : authStatus.isLoggedIn)) {
       return;
     }
-    const models = modelsService.getModels(ModelUsage.Chat);
+    const models = modelsService.instance.getModels(ModelUsage.Chat);
     void this.postMessage({
       type: "chatModels",
       models
@@ -54280,7 +54847,7 @@ class ChatController {
     var _a3;
     const { prompt, context: context2 } = await prompter2.makePrompt(
       this.chatModel,
-      this.authProvider.getAuthStatus().codyApiVersion
+      authProvider.instance.getAuthStatus().codyApiVersion
     );
     abortSignal.throwIfAborted();
     this.chatModel.setLastMessageContext([...context2.used, ...context2.ignored], contextAlternatives);
@@ -54288,7 +54855,7 @@ class ChatController {
     return { prompt, context: context2 };
   }
   async buildPrivateContextSummary(context2) {
-    const isDotCom2 = this.authProvider.getAuthStatus().isDotCom;
+    const isDotCom2 = authProvider.instance.getAuthStatus().isDotCom;
     if (!isDotCom2) {
       return {};
     }
@@ -54424,7 +54991,7 @@ class ChatController {
     this.chatModel.addBotMessage({ text: messageText });
     void this.saveSession();
     this.postViewTranscript();
-    const authStatus = this.authProvider.getAuthStatus();
+    const authStatus = authProvider.instance.getAuthStatus();
     const generatedCode = countGeneratedCode(messageText.toString());
     const responseEventAction = generatedCode.charCount > 0 ? "hasCode" : "noCode";
     telemetryRecorder.recordEvent("cody.chatResponse", responseEventAction, {
@@ -54455,37 +55022,23 @@ class ChatController {
   get sessionID() {
     return this.chatModel.sessionID;
   }
-  // Sets the provider up for a new chat that is not being restored from a
-  // saved session.
-  async newSession() {
-    var _a3, _b2;
-    (_b2 = this.remoteSearch) == null ? void 0 : _b2.setRepos(
-      await ((_a3 = this.repoPicker) == null ? void 0 : _a3.getDefaultRepos()) || [],
-      RepoInclusion.Manual
-    );
-  }
   // Attempts to restore the chat to the given sessionID, if it exists in
   // history. If it does, then saves the current session and cancels the
   // current in-progress completion. If the chat does not exist, then this
   // is a no-op.
   async restoreSession(sessionID) {
-    var _a3;
-    const oldTranscript = chatHistory.getChat(this.authProvider.getAuthStatus(), sessionID);
+    const oldTranscript = chatHistory.getChat(authProvider.instance.getAuthStatus(), sessionID);
     if (!oldTranscript) {
-      return this.newSession();
+      return;
     }
     this.cancelSubmitOrEditOperation();
     const newModel = newChatModelFromSerializedChatTranscript(oldTranscript, this.chatModel.modelID);
     this.chatModel = newModel;
-    if (this.remoteSearch) {
-      const repos = this.chatModel.getSelectedRepos() || await ((_a3 = this.repoPicker) == null ? void 0 : _a3.getDefaultRepos()) || [];
-      this.remoteSearch.setRepos(repos, RepoInclusion.Manual);
-    }
     this.postViewTranscript();
   }
   async saveSession() {
     const allHistory = await chatHistory.saveChat(
-      this.authProvider.getAuthStatus(),
+      authProvider.instance.getAuthStatus(),
       this.chatModel.toSerializedChatTranscript()
     );
     if (allHistory) {
@@ -54513,7 +55066,7 @@ class ChatController {
       return this.webviewPanelOrView;
     }
     const viewType = CodyChatEditorViewType;
-    const panelTitle = ((_a3 = chatHistory.getChat(this.authProvider.getAuthStatus(), this.chatModel.sessionID)) == null ? void 0 : _a3.chatTitle) || getChatPanelTitle(lastQuestion);
+    const panelTitle = ((_a3 = chatHistory.getChat(authProvider.instance.getAuthStatus(), 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(
@@ -54583,8 +55136,8 @@ class ChatController {
           }
         }),
         {
-          mentionMenuData: (query2) => getMentionMenuData(query2, this.remoteSearch, this.chatModel),
-          evaluatedFeatureFlag: (flag2) => featureFlagProvider.evaluatedFeatureFlag(flag2),
+          mentionMenuData: (query2) => getMentionMenuData(query2, this.chatModel),
+          evaluatedFeatureFlag: (flag2) => featureFlagProvider.instance.evaluatedFeatureFlag(flag2),
           prompts: (query2) => promiseFactoryToObservable(
             (signal2) => mergedPromptsAndLegacyCommands(query2, signal2)
           )
@@ -54724,7 +55277,7 @@ function revealWebviewViewOrPanel(viewOrPanel) {
 function getDefaultModelID() {
   const pending = "";
   try {
-    return modelsService.getDefaultChatModel() || pending;
+    return modelsService.instance.getDefaultChatModel() || pending;
   } catch {
     return pending;
   }
@@ -54750,7 +55303,7 @@ function combineContext(explicitMentions, openCtxContext, priorityContext, retri
 }
 const CodyChatEditorViewType = "cody.editorPanel";
 class ChatsController {
-  constructor(options, chatClient, authProvider, enterpriseContext, localEmbeddings, symf, contextRetriever, guardrails, contextAPIClient, extensionClient) {
+  constructor(options, chatClient, enterpriseContext, localEmbeddings, symf, contextRetriever, guardrails, contextAPIClient, extensionClient) {
     // Chat view in the panel (typically in the sidebar)
     __publicField2(this, "panel");
     // Chat views in editor panels
@@ -54761,7 +55314,6 @@ class ChatsController {
     __publicField2(this, "disposables", []);
     this.options = options;
     this.chatClient = chatClient;
-    this.authProvider = authProvider;
     this.enterpriseContext = enterpriseContext;
     this.localEmbeddings = localEmbeddings;
     this.symf = symf;
@@ -54773,7 +55325,7 @@ class ChatsController {
     this.panel = this.createChatController();
     this.disposables.push(
       subscriptionDisposable(
-        this.authProvider.changes.subscribe((authStatus) => this.setAuthStatus(authStatus))
+        authProvider.instance.changes.subscribe((authStatus) => this.setAuthStatus(authStatus))
       )
     );
   }
@@ -55008,7 +55560,7 @@ class ChatsController {
    */
   async exportHistory() {
     telemetryRecorder.recordEvent("cody.exportChatHistoryButton", "clicked");
-    const authStatus = this.options.authProvider.getAuthStatus();
+    const authStatus = authProvider.instance.getAuthStatus();
     if (authStatus.isLoggedIn) {
       try {
         const historyJson = chatHistory.getLocalHistory(authStatus);
@@ -55033,7 +55585,7 @@ class ChatsController {
   async clearHistory(chatID) {
     const ClearWithoutConfirmID = "clear-all-no-confirm";
     const isClearAll = !chatID || chatID === ClearWithoutConfirmID;
-    const authStatus = this.options.authProvider.getAuthStatus();
+    const authStatus = authProvider.instance.getAuthStatus();
     if (isClearAll) {
       if (chatID !== ClearWithoutConfirmID) {
         const userConfirmation = await window$1.showWarningMessage(
@@ -55083,8 +55635,6 @@ class ChatsController {
     const chatController = this.createChatController();
     if (chatID) {
       await chatController.restoreSession(chatID);
-    } else {
-      await chatController.newSession();
     }
     if (panel2) {
       this.activeEditor = chatController;
@@ -55115,7 +55665,6 @@ class ChatsController {
       ...this.options,
       chatClient: this.chatClient,
       retrievers: new AuthDependentRetrievers(
-        this.authProvider,
         this.localEmbeddings,
         this.symf,
         this.enterpriseContext
@@ -55552,7 +56101,7 @@ const DOCUMENTABLE_SYMBOL_THROTTLE = 10;
 const GHOST_TEXT_THROTTLE = 250;
 const TELEMETRY_THROTTLE = 30 * 1e3;
 class GhostHintDecorator {
-  constructor(authProvider) {
+  constructor() {
     // permanentDisposables are disposed when this instance is disposed.
     __publicField2(this, "permanentDisposables", []);
     // activeDisposables are disposed when the ghost hint is inactive (e.g., due to sign out)
@@ -55584,17 +56133,17 @@ class GhostHintDecorator {
         trailing: true
       }
     );
-    const initialAuth = authProvider.getAuthStatus();
+    const initialAuth = authProvider.instance.getAuthStatus();
     this.updateEnablement(initialAuth);
     this.permanentDisposables.push(
       subscriptionDisposable(
-        authProvider.changes.subscribe((authStatus) => this.updateEnablement(authStatus))
+        authProvider.instance.changes.subscribe((authStatus) => this.updateEnablement(authStatus))
       )
     );
     this.permanentDisposables.push(
       workspace.onDidChangeConfiguration((e) => {
         if (e.affectsConfiguration("cody")) {
-          this.updateEnablement(authProvider.getAuthStatus());
+          this.updateEnablement(authProvider.instance.getAuthStatus());
         }
       }),
       workspace.onDidChangeTextDocument((event) => {
@@ -55683,7 +56232,7 @@ class GhostHintDecorator {
     }
   }
   async setGhostText(editor, position, variant, textPadding = 0) {
-    if (await contextFiltersProvider.isUriIgnored(editor.document.uri)) {
+    if (await contextFiltersProvider.instance.isUriIgnored(editor.document.uri)) {
       return;
     }
     this.fireThrottledDisplayEvent(variant);
@@ -56073,7 +56622,7 @@ class CodySourceControl {
     this.abortController = abortController;
   }
   setAuthStatus(_2) {
-    const models = modelsService.getModels(ModelUsage.Chat);
+    const models = modelsService.instance.getModels(ModelUsage.Chat);
     const preferredModel = models.find((p) => p.id.includes("claude-3-haiku"));
     this.model = preferredModel ?? models[0];
   }
@@ -56121,48 +56670,6 @@ function createInlineCompletionItemProvider() {
   return { dispose: () => {
   } };
 }
-function logFirstEnrollmentEvent(key, isEnabled) {
-  const isEnrolled = localStorage.getEnrollmentHistory(key);
-  const eventName = getFeatureFlagEventName(key);
-  if (isEnrolled || !eventName) {
-    return isEnrolled && !!eventName;
-  }
-  const args2 = { variant: isEnabled ? "treatment" : "control" };
-  telemetryRecorder.recordEvent(`cody.experiment.${eventName}`, "enrolled", {
-    privateMetadata: args2
-  });
-  return true;
-}
-function getFeatureFlagEventName(key) {
-  switch (key) {
-    case FeatureFlag.CodyInteractiveTutorial:
-      return "interactiveTutorial";
-    default:
-      return void 0;
-  }
-}
-let tutorialDocumentUri;
-const setTutorialUri = (context2) => {
-  const tutorialPath = path$1.join(context2.extensionUri.fsPath, "walkthroughs", "cody_tutorial.py");
-  tutorialDocumentUri = Uri.file(tutorialPath);
-  return tutorialDocumentUri;
-};
-const isInTutorial = (document2) => {
-  if (!tutorialDocumentUri) {
-    return false;
-  }
-  return document2.uri.toString() === tutorialDocumentUri.toString();
-};
-const maybeStartInteractiveTutorial = async () => {
-  telemetryRecorder.recordEvent("cody.interactiveTutorial", "attemptingStart");
-  await featureFlagProvider.refresh();
-  const enabled = await featureFlagProvider.evaluateFeatureFlag(FeatureFlag.CodyInteractiveTutorial);
-  logFirstEnrollmentEvent(FeatureFlag.CodyInteractiveTutorial, enabled);
-  if (!enabled) {
-    return;
-  }
-  return commands$1.executeCommand("cody.tutorial.start");
-};
 const defaultLatencies = {
   user: 50,
   lowPerformance: 1e3,
@@ -56390,7 +56897,7 @@ async function filter(snippets) {
       if (isCodyIgnoredFile(snippet.uri)) {
         return null;
       }
-      if (await contextFiltersProvider.isUriIgnored(snippet.uri)) {
+      if (await contextFiltersProvider.instance.isUriIgnored(snippet.uri)) {
         return null;
       }
       return snippet;
@@ -158562,7 +159069,7 @@ class InlineCompletionItemProvider {
         logIgnored(document2.uri, "cody-ignore", isManualCompletion);
         return null;
       }
-      if (await contextFiltersProvider.isUriIgnored(document2.uri)) {
+      if (await contextFiltersProvider.instance.isUriIgnored(document2.uri)) {
         logIgnored(document2.uri, "context-filter", isManualCompletion);
         return null;
       }
@@ -159570,7 +160077,7 @@ function createClient(config, logger2) {
       `POST ${url}`,
       async function* (span2) {
         var _a3;
-        const tracingFlagEnabled = await featureFlagProvider.evaluateFeatureFlag(
+        const tracingFlagEnabled = await featureFlagProvider.instance.evaluateFeatureFlag(
           FeatureFlag.CodyAutocompleteTracing
         );
         const headers = new Headers({
@@ -159601,7 +160108,7 @@ function createClient(config, logger2) {
               var _a4;
               return {
                 ...m,
-                text: await ((_a4 = m.text) == null ? void 0 : _a4.toFilteredString(contextFiltersProvider))
+                text: await ((_a4 = m.text) == null ? void 0 : _a4.toFilteredString(contextFiltersProvider.instance))
               };
             })
           )
@@ -159750,7 +160257,9 @@ function createFastPathClient(requestParams, abortController, params) {
         }
       };
     }
-    const prompt = await requestParams.messages[0].text.toFilteredString(contextFiltersProvider);
+    const prompt = await requestParams.messages[0].text.toFilteredString(
+      contextFiltersProvider.instance
+    );
     const fireworksRequest = {
       model: (fireworksConfig == null ? void 0 : fireworksConfig.model) || ((_a3 = requestParams.model) == null ? void 0 : _a3.replace(/^fireworks\//, "")),
       prompt,
@@ -159987,7 +160496,14 @@ class FireworksProvider extends Provider {
     isNode ? dotcomTokenToGatewayToken(config.accessToken) : void 0;
   }
   checkIfDirectRouteShouldBeEnabled() {
-    return this.model === DEEPSEEK_CODER_V2_LITE_BASE_DIRECT_ROUTE;
+    const directRouteModels = [
+      DEEPSEEK_CODER_V2_LITE_BASE_DIRECT_ROUTE,
+      DEEPSEEK_CODER_V2_LITE_BASE_WINDOW_4096,
+      FIREWORKS_DEEPSEEK_7B_LANG_ALL,
+      FIREWORKS_DEEPSEEK_7B_LANG_SPECIFIC_V0,
+      FIREWORKS_DEEPSEEK_7B_LANG_SPECIFIC_V1
+    ];
+    return directRouteModels.includes(this.model);
   }
   generateCompletions(abortSignal, snippets, tracer2) {
     const partialRequestParams = getCompletionParams({
@@ -160573,10 +161089,9 @@ async function createInlineCompletionItemFromMultipleProviders({
   config,
   client,
   statusBar,
-  authProvider,
   createBfgRetriever
 }) {
-  const authStatus = authProvider.getAuthStatus();
+  const authStatus = authProvider.instance.getAuthStatus();
   if (!authStatus.isLoggedIn || config.autocompleteExperimentalMultiModelCompletions === void 0) {
     return {
       dispose: () => {
@@ -160613,7 +161128,7 @@ async function createInlineCompletionItemFromMultipleProviders({
       config: newConfig
     });
     if (providerConfig) {
-      const authStatus2 = authProvider.getAuthStatus();
+      const authStatus2 = authProvider.instance.getAuthStatus();
       const completionsProvider = new InlineCompletionItemProvider({
         authStatus: authStatus2,
         providerConfig,
@@ -160668,7 +161183,7 @@ class BaseConfigWatcher {
     this.currentConfig = initialConfig;
     this.disposables.push(this.configChangeEvent);
   }
-  static async create(authProvider, disposables) {
+  static async create(disposables) {
     const w = new BaseConfigWatcher(await getFullConfig());
     disposables.push(w);
     disposables.push(
@@ -160681,7 +161196,7 @@ class BaseConfigWatcher {
     );
     disposables.push(
       subscriptionDisposable(
-        authProvider.changes.subscribe(async () => {
+        authProvider.instance.changes.subscribe(async () => {
           w.set(await getFullConfig());
         })
       )
@@ -161070,7 +161585,7 @@ class RemoteRepoPicker {
       id: repo.id,
       label: repo.name,
       name: repo.name,
-      isIgnored: contextFiltersProvider.isRepoNameIgnored(repo.name)
+      isIgnored: contextFiltersProvider.instance.isRepoNameIgnored(repo.name)
     }));
     this.handleRepoListChanged();
     void this.workspaceRepoMapper.start();
@@ -161120,7 +161635,7 @@ class RemoteRepoPicker {
         continue;
       }
       displayedRepos.add(repo.id);
-      const isIgnored = contextFiltersProvider.isRepoNameIgnored(repo.name);
+      const isIgnored = contextFiltersProvider.instance.isRepoNameIgnored(repo.name);
       const inWorkspace = workspaceRepos.has(repo.id);
       const shortName = repo.name.slice(repo.name.lastIndexOf("/") + 1);
       const item = {
@@ -163640,7 +164155,7 @@ function tryGetHTMLDocumentTitle(html2) {
   var _a3, _b2;
   return (_b2 = (_a3 = html2.match(/<title>(?<title>[^<]+)<\/title>/)) == null ? void 0 : _a3.groups) == null ? void 0 : _b2.title.replaceAll(/\s+/gm, " ").trim();
 }
-async function exposeOpenCtxClient(context2, config, authProvider, createOpenCtxController) {
+async function exposeOpenCtxClient(context2, config, createOpenCtxController) {
   await warnIfOpenCtxExtensionConflict();
   try {
     const isCodyWeb = config.get().agentIDE === CodyIDE.Web;
@@ -163652,7 +164167,11 @@ async function exposeOpenCtxClient(context2, config, authProvider, createOpenCtx
       secrets: context2.secrets,
       outputChannel,
       features: isCodyWeb ? {} : { annotations: true, statusBar: true },
-      providers: isCodyWeb ? Observable.of(getCodyWebOpenCtxProviders()) : getOpenCtxProviders(config.changes, authProvider.changes, isValidSiteVersion),
+      providers: isCodyWeb ? Observable.of(getCodyWebOpenCtxProviders()) : getOpenCtxProviders(
+        config.changes,
+        authProvider.instance.changes,
+        isValidSiteVersion
+      ),
       mergeConfiguration
     });
     setOpenCtx({
@@ -163667,7 +164186,7 @@ function getOpenCtxProviders(configChanges, authStatusChanges, isValidSiteVersio
   return combineLatest$1([
     configChanges,
     authStatusChanges,
-    featureFlagProvider.evaluatedFeatureFlag(FeatureFlag.GitMentionProvider)
+    featureFlagProvider.instance.evaluatedFeatureFlag(FeatureFlag.GitMentionProvider)
   ]).map(
     ([config, authStatus, gitMentionProvider]) => {
       const providers = [
@@ -163840,7 +164359,7 @@ function getLabelForContextItem(item) {
       throw new Error(`getLableForContextItem Error: Unexpected type ${item.type}`);
   }
 }
-function getItemLabel$1(item) {
+function getItemLabel(item) {
   return item.label.replace(QUICK_PICK_ITEM_EMPTY_INDENT_PREFIX$1, "").replace(QUICK_PICK_ITEM_CHECKED_PREFIX$1, "").trim();
 }
 async function fetchDocumentSymbols(document2) {
@@ -163897,8 +164416,8 @@ const getEditInputItems = (activeValue, activeRangeItem, activeModelItem, showMo
       label: "edit options",
       kind: QuickPickItemKind.Separator
     },
-    { ...RANGE_ITEM, detail: getItemLabel$1(activeRangeItem) },
-    showModelSelector ? { ...MODEL_ITEM, detail: activeModelItem ? getItemLabel$1(activeModelItem) : void 0 } : null
+    { ...RANGE_ITEM, detail: getItemLabel(activeRangeItem) },
+    showModelSelector ? { ...MODEL_ITEM, detail: activeModelItem ? getItemLabel(activeModelItem) : void 0 } : null
   ];
   const items = [...submitItems, ...editItems, ...commandItems].filter(
     Boolean
@@ -164099,7 +164618,7 @@ const PREVIEW_RANGE_DECORATION = window$1.createTextEditorDecorationType({
   borderWidth: "3px",
   borderStyle: "solid"
 });
-const getInput = async (document2, authProvider, initialValues, source) => {
+const getInput = async (document2, initialValues, source) => {
   const editor = getEditor().active;
   if (!editor) {
     return null;
@@ -164113,16 +164632,16 @@ const getInput = async (document2, authProvider, 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.getAuthStatus();
+  const authStatus = authProvider.instance.getAuthStatus();
   const isCodyPro = !authStatus.userCanUpgrade;
-  const modelOptions = modelsService.getModels(ModelUsage.Edit);
+  const modelOptions = modelsService.instance.getModels(ModelUsage.Edit);
   const modelItems = getModelOptionItems(modelOptions, isCodyPro);
   const showModelSelector = modelOptions.length > 1;
   let activeModel = initialValues.initialModel;
   let activeModelItem = modelItems.find((item) => item.model === initialValues.initialModel);
   const getContextWindowOnModelChange = (model2) => {
     var _a3;
-    const latestContextWindow = modelsService.getContextWindowByID(model2);
+    const latestContextWindow = modelsService.instance.getContextWindowByID(model2);
     return latestContextWindow.input + (((_a3 = latestContextWindow.context) == null ? void 0 : _a3.user) ?? 0);
   };
   let activeModelContextWindow = getContextWindowOnModelChange(activeModel);
@@ -164195,7 +164714,7 @@ const getInput = async (document2, authProvider, initialValues, source) => {
           }
           return;
         }
-        modelsService.setSelectedModel(ModelUsage.Edit, acceptedItem.model);
+        modelsService.instance.setSelectedModel(ModelUsage.Edit, acceptedItem.model);
         activeModelItem = acceptedItem;
         activeModel = acceptedItem.model;
         activeModelContextWindow = getContextWindowOnModelChange(acceptedItem.model);
@@ -165048,7 +165567,7 @@ const trackRejection = (document2, workspace2, { onAccepted, onRejected }, task)
   }
 };
 class FixupController {
-  constructor(authProvider, client) {
+  constructor(client) {
     __publicField2(this, "tasks", /* @__PURE__ */ new Map());
     __publicField2(this, "files");
     __publicField2(this, "editObserver");
@@ -165070,7 +165589,6 @@ class FixupController {
      */
     __publicField2(this, "undoCommandEvent", new AgentEventEmitter());
     __publicField2(this, "_disposables", []);
-    this.authProvider = authProvider;
     this.client = client;
     this.controlApplicator = client.createFixupControlApplicator(this);
     this.files = new FixupFileObserver();
@@ -165295,7 +165813,6 @@ class FixupController {
     const document2 = await workspace.openTextDocument(task.fixupFile.uri);
     const input = previousInput ?? await getInput(
       document2,
-      this.authProvider,
       {
         initialInputValue: task.instruction,
         initialRange: task.selectionRange,
@@ -165342,7 +165859,6 @@ class FixupController {
   async promptUserForTask(preInstruction, document2, range2, expandedRange, mode, model2, intent, source, telemetryMetadata) {
     const input = await getInput(
       document2,
-      this.authProvider,
       {
         initialRange: range2,
         initialExpandedRange: expandedRange,
@@ -165374,7 +165890,7 @@ class FixupController {
     return task;
   }
   async createTask(document2, instruction, userContextFiles, selectionRange, intent, mode, model2, source, destinationFile, insertionPoint, telemetryMetadata, taskId) {
-    const authStatus = this.authProvider.getAuthStatus();
+    const authStatus = authProvider.instance.getAuthStatus();
     const overridenModel = getOverridenModelForIntent(intent, model2, authStatus);
     const fixupFile = this.files.forUri(document2.uri);
     const task = new FixupTask(
@@ -165959,7 +166475,7 @@ const getPrompt = async (instruction, replacement, document2, model2, codyApiVer
   const documentRange = new Range(0, 0, document2.lineCount - 1, 0);
   const documentText = PromptString.fromDocumentText(document2, documentRange);
   const tokenCount = await TokenCounterUtils.countPromptString(documentText);
-  const contextWindow = modelsService.getContextWindowByID(model2);
+  const contextWindow = modelsService.instance.getContextWindowByID(model2);
   if (tokenCount > contextWindow.input) {
     throw new Error("The amount of text in this document exceeds Cody's current capacity.");
   }
@@ -165979,7 +166495,7 @@ const getPrompt = async (instruction, replacement, document2, model2, codyApiVer
 };
 async function promptModelForOriginalCode(instruction, replacement, document2, model2, client, codyApiVersion) {
   const multiplexer2 = new BotResponseMultiplexer();
-  const contextWindow = modelsService.getContextWindowByID(model2);
+  const contextWindow = modelsService.instance.getContextWindowByID(model2);
   let text = "";
   multiplexer2.sub(SMART_APPLY_TOPICS.REPLACE.toString(), {
     onResponse: async (content) => {
@@ -166090,669 +166606,6 @@ const SMART_APPLY_FILE_DECORATION = window$1.createTextEditorDecorationType({
   backgroundColor: new ThemeColor("diffEditor.unchangedCodeBackground"),
   rangeBehavior: DecorationRangeBehavior.ClosedClosed
 });
-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;
-  }
-  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;
-  }
-}
-function getEnterpriseContextWindow(chatModel, configOverwrites) {
-  const { chatModelMaxTokens, smartContextWindow } = configOverwrites;
-  let contextWindow = {
-    input: chatModelMaxTokens ?? CHAT_INPUT_TOKEN_BUDGET,
-    output: getEnterpriseOutputLimit(chatModel)
-  };
-  if (smartContextWindow && isModelWithExtendedContextWindowSupport(chatModel)) {
-    contextWindow = {
-      input: EXTENDED_CHAT_INPUT_TOKEN_BUDGET,
-      output: CHAT_OUTPUT_TOKEN_BUDGET,
-      context: { user: EXTENDED_USER_CONTEXT_TOKEN_BUDGET }
-    };
-  }
-  return applyLocalTokenLimitOverwrite(chatModel, contextWindow);
-}
-function applyLocalTokenLimitOverwrite(chatModel, contextWindow) {
-  var _a3;
-  const config = (_a3 = workspace.getConfiguration("cody")) == null ? void 0 : _a3.get("provider.limit.prompt");
-  if (config && config <= contextWindow.input) {
-    return { ...contextWindow, input: config };
-  }
-  if (config) {
-    logDebug$1("getEnterpriseContextWindow", `Invalid token limit configured for ${chatModel}`, config);
-  }
-  return contextWindow;
-}
-const modelWithExpandedWindowSubStrings = [
-  "claude-3-opus",
-  "claude-3-sonnet",
-  "claude-3-5-sonnet",
-  "gemini-1.5",
-  "gpt-4o",
-  "gpt-4-turbo"
-];
-function isModelWithExtendedContextWindowSupport(chatModel) {
-  return modelWithExpandedWindowSubStrings.some((keyword) => chatModel.toLowerCase().includes(keyword));
-}
-function getEnterpriseOutputLimit(model2) {
-  if (model2 && isModelWithExtendedContextWindowSupport(model2)) {
-    return CHAT_OUTPUT_TOKEN_BUDGET;
-  }
-  return ANSWER_TOKENS;
-}
-async function syncModels(authStatus) {
-  var _a3, _b2;
-  modelsService.setAuthStatus(authStatus);
-  if (authStatus.isOfflineMode) {
-    modelsService.setModels([]);
-    return;
-  }
-  if (!authStatus.authenticated) {
-    modelsService.setModels([]);
-    return;
-  }
-  const clientConfig = await ClientConfigSingleton.getInstance().getConfig();
-  if (clientConfig == null ? void 0 : clientConfig.modelsAPIEnabled) {
-    logDebug("ModelsService", "new models API enabled");
-    const serverSideModels = await fetchServerSideModels(authStatus.endpoint || "");
-    if (serverSideModels) {
-      modelsService.setServerSentModels(serverSideModels);
-      registerModelsFromVSCodeConfiguration();
-      return;
-    }
-  }
-  if (authStatus.isDotCom) {
-    modelsService.setModels(getDotComDefaultModels());
-    registerModelsFromVSCodeConfiguration();
-    return;
-  }
-  if ((_a3 = authStatus == null ? void 0 : authStatus.configOverwrites) == null ? void 0 : _a3.chatModel) {
-    modelsService.setModels([
-      new Model({
-        id: authStatus.configOverwrites.chatModel,
-        // TODO (umpox) Add configOverwrites.editModel for separate edit support
-        usage: [ModelUsage.Chat, ModelUsage.Edit],
-        contextWindow: getEnterpriseContextWindow(
-          (_b2 = authStatus == null ? void 0 : authStatus.configOverwrites) == null ? void 0 : _b2.chatModel,
-          authStatus == null ? void 0 : authStatus.configOverwrites
-        ),
-        tags: [ModelTag.Enterprise]
-      })
-    ]);
-  } else {
-    modelsService.setModels([]);
-  }
-}
-function registerModelsFromVSCodeConfiguration() {
-  const codyConfig = workspace.getConfiguration("cody");
-  const modelsConfig = codyConfig == null ? void 0 : codyConfig.get("dev.models");
-  if (!(modelsConfig == null ? void 0 : modelsConfig.length)) {
-    return;
-  }
-  modelsService.addModels(
-    modelsConfig.map(
-      (m) => new Model({
-        id: `${m.provider}/${m.model}`,
-        usage: [ModelUsage.Chat, ModelUsage.Edit],
-        contextWindow: {
-          input: m.inputTokens ?? CHAT_INPUT_TOKEN_BUDGET,
-          output: m.outputTokens ?? ANSWER_TOKENS
-        },
-        clientSideConfig: { apiKey: m.apiKey, apiEndpoint: m.apiEndpoint },
-        tags: [ModelTag.Local, ModelTag.BYOK, ModelTag.Experimental]
-      })
-    )
-  );
-}
-async function fetchServerSideModels(endpoint) {
-  if (!endpoint) {
-    throw new Error("authStatus has no endpoint available. Unable to fetch models.");
-  }
-  const userAccessToken = await secretStorage.getToken(endpoint);
-  const customHeaders = getConfiguration().customHeaders;
-  const client = new RestClient(endpoint, userAccessToken, customHeaders);
-  return await client.getAvailableModels();
-}
-function getItemLabel(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(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
-  }
-];
-const HAS_AUTHENTICATED_BEFORE_KEY = "has-authenticated-before";
-const _AuthProvider = class _AuthProvider {
-  constructor(config) {
-    __publicField2(this, "endpointHistory", []);
-    __publicField2(this, "client", null);
-    __publicField2(this, "status", defaultAuthStatus);
-    __publicField2(this, "didChangeEvent", new AgentEventEmitter());
-    __publicField2(this, "disposables", [this.didChangeEvent]);
-    __publicField2(this, "changes", fromVSCodeEvent(
-      this.didChangeEvent.event,
-      this.getAuthStatus.bind(this)
-    ));
-    this.config = config;
-    this.status.endpoint = "init";
-    this.loadEndpointHistory();
-  }
-  static get instance() {
-    return _AuthProvider._instance;
-  }
-  static create(config) {
-    if (!_AuthProvider._instance) {
-      _AuthProvider._instance = new _AuthProvider(config);
-    }
-    return _AuthProvider._instance;
-  }
-  dispose() {
-    for (const d2 of this.disposables) {
-      d2.dispose();
-    }
-    this.disposables = [];
-  }
-  // Sign into the last endpoint the user was signed into, if any
-  async init() {
-    const lastEndpoint = (localStorage == null ? void 0 : localStorage.getEndpoint()) || this.config.serverEndpoint;
-    const token = await secretStorage.get(lastEndpoint || "") || this.config.accessToken;
-    logDebug(
-      "AuthProvider:init:lastEndpoint",
-      (token == null ? void 0 : token.trim()) ? "Token recovered from secretStorage" : "No token found in secretStorage",
-      lastEndpoint
-    );
-    await this.auth({
-      endpoint: lastEndpoint,
-      token: token || null,
-      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;
-    const endpoint = config.serverEndpoint;
-    const token = config.accessToken;
-    const isCodyWeb = workspace.getConfiguration().get("cody.advanced.agent.ide") === CodyIDE.Web;
-    if (isOfflineMode) {
-      const lastUser = localStorage.getLastStoredUser();
-      return { ...offlineModeAuthStatus, ...lastUser };
-    }
-    if (isCodyWeb) {
-      if (!endpoint) {
-        return { ...defaultAuthStatus, endpoint };
-      }
-    } else {
-      if (!token || !endpoint) {
-        return { ...defaultAuthStatus, endpoint };
-      }
-    }
-    if (this.config !== config || !this.client) {
-      this.config = config;
-      this.client = new SourcegraphGraphQLAPIClient(config);
-    }
-    const [{ enabled: siteHasCodyEnabled, version: siteVersion }, codyLLMConfiguration, userInfo] = await Promise.all([
-      this.client.isCodyEnabled(),
-      this.client.getCodyLLMConfiguration(),
-      this.client.getCurrentUserInfo()
-    ]);
-    logDebug("CodyLLMConfiguration", JSON.stringify(codyLLMConfiguration));
-    if (isError$1(userInfo) && isNetworkError(userInfo)) {
-      return { ...networkErrorAuthStatus, endpoint };
-    }
-    if (!userInfo || isError$1(userInfo)) {
-      return { ...unauthenticatedStatus, endpoint };
-    }
-    const configOverwrites = isError$1(codyLLMConfiguration) ? void 0 : codyLLMConfiguration;
-    const isDotCom2 = this.client.isDotCom();
-    if (!isDotCom2) {
-      return newAuthStatus({
-        ...userInfo,
-        endpoint,
-        isDotCom: isDotCom2,
-        siteVersion,
-        configOverwrites,
-        authenticated: true,
-        hasVerifiedEmail: false,
-        siteHasCodyEnabled,
-        userCanUpgrade: false
-      });
-    }
-    const proStatus = await this.client.getCurrentUserCodySubscription();
-    const isActiveProUser = proStatus !== null && "plan" in proStatus && proStatus.plan === "PRO" && proStatus.status !== "PENDING";
-    return newAuthStatus({
-      ...userInfo,
-      endpoint,
-      isDotCom: isDotCom2,
-      siteHasCodyEnabled,
-      siteVersion,
-      configOverwrites,
-      authenticated: !!userInfo.id,
-      userCanUpgrade: !isActiveProUser,
-      primaryEmail: ((_a3 = userInfo.primaryEmail) == null ? void 0 : _a3.email) ?? ""
-    });
-  }
-  getAuthStatus() {
-    return this.status;
-  }
-  // It processes the authentication steps and stores the login info before sharing the auth status with chatview
-  async auth({
-    endpoint,
-    token,
-    customHeaders,
-    isExtensionStartup = false,
-    isOfflineMode = false
-  }) {
-    const config = {
-      serverEndpoint: formatURL(endpoint) ?? "",
-      accessToken: token,
-      customHeaders: customHeaders || this.config.customHeaders
-    };
-    try {
-      const authStatus = await this.makeAuthStatus(config, isOfflineMode);
-      if (!isOfflineMode) {
-        await this.storeAuthInfo(config.serverEndpoint, config.accessToken);
-      }
-      await commands$1.executeCommand("setContext", "cody.activated", authStatus.isLoggedIn);
-      await this.setAuthStatus(authStatus);
-      if (isExtensionStartup && authStatus.isLoggedIn) {
-        await this.setHasAuthenticatedBefore();
-      } else if (authStatus.isLoggedIn) {
-        this.handleFirstEverAuthentication();
-      }
-      return authStatus;
-    } catch (error) {
-      logDebug("AuthProvider:auth", "failed", error);
-      return await this.reloadAuthStatus().catch(() => unauthenticatedStatus);
-    }
-  }
-  // Set auth status in case of reload
-  async reloadAuthStatus() {
-    await commands$1.executeCommand("setContext", "cody.activated", false);
-    this.config = await getFullConfig();
-    return await this.auth({
-      endpoint: this.config.serverEndpoint,
-      token: this.config.accessToken,
-      customHeaders: this.config.customHeaders
-    });
-  }
-  // Set auth status and share it with chatview
-  async setAuthStatus(authStatus) {
-    if (this.status === authStatus) {
-      return;
-    }
-    this.status = authStatus;
-    if (authStatus.endpoint === "init") {
-      return;
-    }
-    await this.updateAuthStatus(authStatus);
-  }
-  async updateAuthStatus(authStatus) {
-    try {
-      graphqlClient.setConfig(await getFullConfig());
-      await ClientConfigSingleton.getInstance().setAuthStatus(authStatus);
-      await syncModels(authStatus);
-    } catch (error) {
-      logDebug("AuthProvider", "updateAuthStatus error", error);
-    } finally {
-      this.didChangeEvent.fire(this.getAuthStatus());
-      let eventValue;
-      if (authStatus.showNetworkError || authStatus.showInvalidAccessTokenError) {
-        eventValue = "failed";
-      } else if (authStatus.isLoggedIn) {
-        eventValue = "connected";
-      } 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) {
-      return;
-    }
-    await localStorage.saveEndpoint(endpoint);
-    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();
-  }
-  // Logs a telemetry event if the user has never authenticated to Sourcegraph.
-  handleFirstEverAuthentication() {
-    if (localStorage.get(HAS_AUTHENTICATED_BEFORE_KEY)) {
-      return;
-    }
-    telemetryRecorder.recordEvent("cody.auth.login", "firstEver");
-    this.setHasAuthenticatedBefore();
-    void maybeStartInteractiveTutorial();
-  }
-  setHasAuthenticatedBefore() {
-    return localStorage.set(HAS_AUTHENTICATED_BEFORE_KEY, "true");
-  }
-};
-__publicField2(_AuthProvider, "_instance", null);
-let AuthProvider = _AuthProvider;
-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.`
-  );
-}
 var he = { exports: {} };
 /*! https://mths.be/he v1.2.0 by @mathias | MIT license */
 he.exports;
@@ -167538,7 +167391,7 @@ const buildInteraction$1 = async ({
     instruction: task.instruction,
     document: document2
   });
-  const promptBuilder = await PromptBuilder.create(modelsService.getContextWindowByID(model2));
+  const promptBuilder = await PromptBuilder.create(modelsService.instance.getContextWindowByID(model2));
   const preamble = getSimplePreamble(model2, codyApiVersion, "Default", prompt.system);
   promptBuilder.tryAddToPrefix(preamble);
   const preInstruction = PromptString.fromConfig(
@@ -167583,7 +167436,7 @@ class EditProvider {
     return wrapInActiveSpan("command.edit.start", async (span2) => {
       this.config.controller.startTask(this.config.task);
       const model2 = this.config.task.model;
-      const contextWindow = modelsService.getContextWindowByID(model2);
+      const contextWindow = modelsService.instance.getContextWindowByID(model2);
       const {
         messages,
         stopSequences,
@@ -167591,7 +167444,7 @@ class EditProvider {
         responsePrefix = ""
       } = await buildInteraction$1({
         model: model2,
-        codyApiVersion: this.config.authProvider.getAuthStatus().codyApiVersion,
+        codyApiVersion: authProvider.instance.getAuthStatus().codyApiVersion,
         contextWindow: contextWindow.input,
         task: this.config.task,
         editor: this.config.editor
@@ -167698,7 +167551,7 @@ class EditProvider {
     return this.handleResponse(response, false);
   }
   async handleResponse(response, isMessageInProgress) {
-    var _a3, _b2;
+    var _a3;
     if (!response && !isMessageInProgress) {
       this.handleError(new Error("Cody did not respond with any text"));
     }
@@ -167720,7 +167573,7 @@ class EditProvider {
         ...countCode(response)
       };
       const { metadata: metadata2, privateMetadata } = splitSafeMetadata(legacyMetadata);
-      const endpoint = (_b2 = (_a3 = this.config.authProvider) == null ? void 0 : _a3.getAuthStatus()) == null ? void 0 : _b2.endpoint;
+      const endpoint = (_a3 = authProvider.instance.getAuthStatus()) == null ? void 0 : _a3.endpoint;
       telemetryRecorder.recordEvent("cody.fixup.response", "hasCode", {
         metadata: metadata2,
         privateMetadata: {
@@ -167827,7 +167680,7 @@ class EditManager {
     __publicField2(this, "disposables", []);
     __publicField2(this, "editProviders", /* @__PURE__ */ new WeakMap());
     this.options = options;
-    this.controller = new FixupController(options.authProvider, options.extensionClient);
+    this.controller = new FixupController(options.extensionClient);
     const editCommand = commands$1.registerCommand(
       "cody.command.edit-code",
       (args2) => this.executeEdit(args2)
@@ -167883,7 +167736,7 @@ class EditManager {
       return;
     }
     const range2 = getEditLineSelection(document2, proposedRange);
-    const model2 = configuration2.model || modelsService.getDefaultEditModel();
+    const model2 = configuration2.model || modelsService.instance.getDefaultEditModel();
     if (!model2) {
       throw new Error("No default edit model found. Please set one.");
     }
@@ -167970,7 +167823,7 @@ class EditManager {
     if (await isUriIgnoredByContextFilterWithNotification(document2.uri, "edit")) {
       return;
     }
-    const model2 = configuration2.model || modelsService.getDefaultEditModel();
+    const model2 = configuration2.model || modelsService.instance.getDefaultEditModel();
     if (!model2) {
       throw new Error("No default edit model found. Please set one.");
     }
@@ -168018,7 +167871,7 @@ class EditManager {
       configuration2.document,
       model2,
       this.options.chat,
-      this.options.authProvider.getAuthStatus().codyApiVersion
+      authProvider.instance.getAuthStatus().codyApiVersion
     );
     editor.setDecorations(SMART_APPLY_FILE_DECORATION, []);
     if (!selection) {
@@ -168421,9 +168274,8 @@ function notNull(value) {
   return value !== null && value !== void 0;
 }
 class ContextAPIClient {
-  constructor(apiClient, featureFlagProvider2) {
+  constructor(apiClient) {
     this.apiClient = apiClient;
-    this.featureFlagProvider = featureFlagProvider2;
   }
   async detectChatIntent(interactionID, query2) {
     if (!await this.isServerSideContextAPIEnabled()) {
@@ -168452,17 +168304,19 @@ class ContextAPIClient {
     if (workspace.getConfiguration().get("cody.internal.serverSideContext")) {
       return true;
     }
-    return await this.featureFlagProvider.evaluateFeatureFlag(FeatureFlag.CodyServerSideContextAPI);
+    return await featureFlagProvider.instance.evaluateFeatureFlag(
+      FeatureFlag.CodyServerSideContextAPI
+    );
   }
 }
-async function configureExternalServices(context2, config, platform2, authProvider) {
+async function configureExternalServices(context2, config, platform2) {
   var _a3, _b2, _c2, _d2;
   const initialConfig = config.get();
   const sentryService = (_a3 = platform2.createSentryService) == null ? void 0 : _a3.call(platform2, initialConfig);
   const openTelemetryService = (_b2 = platform2.createOpenTelemetryService) == null ? void 0 : _b2.call(platform2, initialConfig);
   const completionsClient = platform2.createCompletionsClient(initialConfig, logger$1);
   const codeCompletionsClient = createClient(initialConfig, logger$1);
-  const symfRunner = (_c2 = platform2.createSymfRunner) == null ? void 0 : _c2.call(platform2, context2, completionsClient, authProvider);
+  const symfRunner = (_c2 = platform2.createSymfRunner) == null ? void 0 : _c2.call(platform2, context2, completionsClient);
   if (initialConfig.codebase && isError$1(await graphqlClient.getRepoId(initialConfig.codebase))) {
     logDebug(
       "external-services:configureExternalServices",
@@ -168470,10 +168324,10 @@ async function configureExternalServices(context2, config, platform2, authProvid
 Please check that the repository exists. You can override the repository with the "cody.codebase" setting.`
     );
   }
-  const localEmbeddings = authProvider.getAuthStatus().isLoggedIn && authProvider.getAuthStatus().isDotCom ? await ((_d2 = platform2.createLocalEmbeddingsController) == null ? void 0 : _d2.call(platform2, initialConfig)) : void 0;
-  const chatClient = new ChatClient(completionsClient, () => authProvider.getAuthStatus());
+  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 guardrails = new SourcegraphGuardrailsClient(graphqlClient, initialConfig);
-  const contextAPIClient = new ContextAPIClient(graphqlClient, featureFlagProvider);
+  const contextAPIClient = new ContextAPIClient(graphqlClient);
   return {
     chatClient,
     completionsClient,
@@ -169317,7 +169171,7 @@ class MinionController extends ReactPanelController {
   //
   // Callbacks
   //
-  constructor(authProvider, symf, anthropic, assetRoot, onDidDisposePanel) {
+  constructor(symf, anthropic, assetRoot, onDidDisposePanel) {
     super(assetRoot, onDidDisposePanel);
     __publicField2(this, "storage", new MinionStorage());
     //
@@ -169325,7 +169179,6 @@ class MinionController extends ReactPanelController {
     //
     __publicField2(this, "sessionState");
     __publicField2(this, "planControllers", {});
-    this.authProvider = authProvider;
     this.symf = symf;
     this.anthropic = anthropic;
   }
@@ -169492,7 +169345,7 @@ class MinionController extends ReactPanelController {
     }
   }
   async handleSetSession(id) {
-    const storedSessionState = await this.storage.load(this.authProvider.getAuthStatus(), id);
+    const storedSessionState = await this.storage.load(authProvider.instance.getAuthStatus(), id);
     if (!storedSessionState) {
       throw new Error(`session not found with id: ${id}`);
     }
@@ -169508,7 +169361,7 @@ class MinionController extends ReactPanelController {
     this.postUpdateSessionIds();
   }
   async handleClearHistory() {
-    await this.storage.clear(this.authProvider.getAuthStatus());
+    await this.storage.clear(authProvider.instance.getAuthStatus());
     if (this.sessionState) {
       await this.save();
     }
@@ -169583,7 +169436,7 @@ class MinionController extends ReactPanelController {
     if (!this.sessionState) {
       throw new Error("no session to save");
     }
-    await this.storage.save(this.authProvider.getAuthStatus(), {
+    await this.storage.save(authProvider.instance.getAuthStatus(), {
       session: this.sessionState.session
     });
   }
@@ -169641,7 +169494,7 @@ class MinionController extends ReactPanelController {
     var _a3;
     this.postMessage({
       type: "update-session-ids",
-      sessionIds: await this.storage.listIds(this.authProvider.getAuthStatus()),
+      sessionIds: await this.storage.listIds(authProvider.instance.getAuthStatus()),
       currentSessionId: (_a3 = this.sessionState) == null ? void 0 : _a3.session.id
     });
   }
@@ -169665,12 +169518,11 @@ function makeDefaultStateMachine(cancellationToken) {
   );
 }
 class MinionOrchestrator {
-  constructor(extensionUri, authProvider, symf) {
+  constructor(extensionUri, symf) {
     __publicField2(this, "minions", []);
     __publicField2(this, "activeMinion");
     __publicField2(this, "disposables", []);
     this.extensionUri = extensionUri;
-    this.authProvider = authProvider;
     this.symf = symf;
     this.registerHumanListeners();
   }
@@ -169720,7 +169572,7 @@ class MinionOrchestrator {
     const anthropic = new Anthropic$1({ apiKey: anthropicKey });
     const minion = await ReactPanelController.createAndInit(
       () => {
-        return new MinionController(this.authProvider, this.symf, anthropic, assetRoot, () => {
+        return new MinionController(this.symf, anthropic, assetRoot, () => {
         });
       },
       panel2
@@ -169734,7 +169586,7 @@ const _CodyProExpirationNotifications = class _CodyProExpirationNotifications {
    * Set up a check (now and when auth status changes) whether to show the user a notification
    * about their Cody Pro subscription having expired (or expiring soon).
    */
-  constructor(apiClient, authProvider, featureFlagProvider2, showInformationMessage, openExternal, flagCheckDelayMs = 1e3 * 60 * 30, autoUpdateDelay = 1e3 * 3, checkImmediately = true) {
+  constructor(apiClient, showInformationMessage, openExternal, flagCheckDelayMs = 1e3 * 60 * 30, autoUpdateDelay = 1e3 * 3, checkImmediately = true) {
     /**
      * Current subscription to auth provider status changes that may trigger a check.
      */
@@ -169748,8 +169600,6 @@ const _CodyProExpirationNotifications = class _CodyProExpirationNotifications {
      */
     __publicField2(this, "isDisposed", false);
     this.apiClient = apiClient;
-    this.authProvider = authProvider;
-    this.featureFlagProvider = featureFlagProvider2;
     this.showInformationMessage = showInformationMessage;
     this.openExternal = openExternal;
     this.flagCheckDelayMs = flagCheckDelayMs;
@@ -169764,13 +169614,13 @@ const _CodyProExpirationNotifications = class _CodyProExpirationNotifications {
   async triggerExpirationCheck() {
     if (this.shouldSuppressNotifications()) return;
     if (!this.authProviderSubscription) {
-      this.authProviderSubscription = this.authProvider.changes.subscribe(
+      this.authProviderSubscription = authProvider.instance.changes.subscribe(
         () => setTimeout(() => this.triggerExpirationCheck(), this.autoUpdateDelay)
       );
     }
-    const authStatus = this.authProvider.getAuthStatus();
+    const authStatus = authProvider.instance.getAuthStatus();
     if (!authStatus.isLoggedIn || !authStatus.isDotCom) return;
-    const useSscForCodySubscription = await this.featureFlagProvider.evaluateFeatureFlag(
+    const useSscForCodySubscription = await featureFlagProvider.instance.evaluateFeatureFlag(
       FeatureFlag.UseSscForCodySubscription
     );
     if (this.shouldSuppressNotifications()) return;
@@ -169789,7 +169639,7 @@ const _CodyProExpirationNotifications = class _CodyProExpirationNotifications {
     await this.showNotification();
   }
   async showNotification() {
-    const codyProTrialEnded = await this.featureFlagProvider.evaluateFeatureFlag(
+    const codyProTrialEnded = await featureFlagProvider.instance.evaluateFeatureFlag(
       FeatureFlag.CodyProTrialEnded
     );
     if (this.shouldSuppressNotifications()) return;
@@ -170249,7 +170099,7 @@ function createStatusBar() {
     if (uri2.scheme === "file" && isCodyIgnoredFile(uri2)) {
       return "cody-ignore";
     }
-    if (await contextFiltersProvider.isUriIgnored(uri2)) {
+    if (await contextFiltersProvider.instance.isUriIgnored(uri2)) {
       return "context-filter";
     }
     return null;
@@ -170849,7 +170699,7 @@ async function* getSupercompletions({
   recentEditsRetriever,
   chat: chat2
 }) {
-  if (await contextFiltersProvider.isUriIgnored(document2.uri)) {
+  if (await contextFiltersProvider.instance.isUriIgnored(document2.uri)) {
     return null;
   }
   const diff2 = await recentEditsRetriever.getDiff(document2.uri);
@@ -171039,7 +170889,7 @@ class RecentEditsRetriever {
     this.disposables.push(workspace$1.onDidDeleteFiles(this.onDidDeleteFiles.bind(this)));
   }
   async getDiff(uri2) {
-    if (await contextFiltersProvider.isUriIgnored(uri2)) {
+    if (await contextFiltersProvider.instance.isUriIgnored(uri2)) {
       return null;
     }
     const trackedDocument = this.trackedDocuments.get(uri2.toString());
@@ -171454,16 +171304,16 @@ async function start(context2, platform2) {
   }
   setLogger({ logDebug, logError: logError$1 });
   const disposables = [];
-  const authProvider = AuthProvider.create(await getFullConfig());
-  const configWatcher = await BaseConfigWatcher.create(authProvider, disposables);
+  setSingleton(authProvider, new AuthProvider(await getFullConfig()));
+  const configWatcher = await BaseConfigWatcher.create(disposables);
   disposables.push(
     subscriptionDisposable(
       configWatcher.changes.subscribe({
-        next: (config) => configureEventsInfra(config, isExtensionModeDevOrTest, authProvider)
+        next: (config) => configureEventsInfra(config, isExtensionModeDevOrTest)
       })
     )
   );
-  await authProvider.init();
+  await authProvider.instance.init();
   disposables.push(
     subscriptionDisposable(
       configWatcher.changes.subscribe({
@@ -171475,24 +171325,16 @@ async function start(context2, platform2) {
       })
     )
   );
-  disposables.push(
-    await register(context2, authProvider, configWatcher, platform2, isExtensionModeDevOrTest)
-  );
+  disposables.push(await register(context2, configWatcher, platform2, isExtensionModeDevOrTest));
   return Disposable.from(...disposables);
 }
-const register = async (context2, authProvider, configWatcher, platform2, isExtensionModeDevOrTest) => {
+const register = async (context2, configWatcher, platform2, isExtensionModeDevOrTest) => {
   const disposables = [];
   setClientNameVersion(platform2.extensionClient.clientName, platform2.extensionClient.clientVersion);
   disposables.push(manageDisplayPathEnvInfoForExtension());
-  await initializeSingletons(
-    platform2,
-    authProvider,
-    configWatcher,
-    isExtensionModeDevOrTest,
-    disposables
-  );
+  await initializeSingletons(platform2, configWatcher, isExtensionModeDevOrTest, disposables);
   disposables.push(await initVSCodeGitApi());
-  initWorkspaceReposMonitor(authProvider, disposables);
+  initWorkspaceReposMonitor(disposables);
   registerParserListeners(disposables);
   registerChatListeners(disposables);
   const {
@@ -171504,7 +171346,7 @@ const register = async (context2, authProvider, configWatcher, platform2, isExte
     onConfigurationChange: externalServicesOnDidConfigurationChange,
     symfRunner,
     contextAPIClient
-  } = await configureExternalServices(context2, configWatcher, platform2, authProvider);
+  } = await configureExternalServices(context2, configWatcher, platform2);
   disposables.push(
     subscriptionDisposable(
       configWatcher.changes.subscribe({
@@ -171530,7 +171372,7 @@ const register = async (context2, authProvider, configWatcher, platform2, isExte
     )
   );
   const editor = new VSCodeEditor();
-  const contextRetriever = new ContextRetriever(editor, symfRunner, completionsClient);
+  const contextRetriever = new ContextRetriever(editor, symfRunner, localEmbeddings, completionsClient);
   const { chatsController } = registerChat(
     {
       context: context2,
@@ -171538,7 +171380,6 @@ const register = async (context2, authProvider, configWatcher, platform2, isExte
       chatClient,
       guardrails,
       editor,
-      authProvider,
       enterpriseContextFactory,
       localEmbeddings,
       symfRunner,
@@ -171554,7 +171395,7 @@ const register = async (context2, authProvider, configWatcher, platform2, isExte
     statusBar,
     sourceControl,
     subscriptionDisposable(
-      authProvider.changes.subscribe({
+      authProvider.instance.changes.subscribe({
         next: (authStatus) => {
           sourceControl.setAuthStatus(authStatus);
           statusBar.setAuthStatus(authStatus);
@@ -171565,29 +171406,23 @@ const register = async (context2, authProvider, configWatcher, platform2, isExte
   const autocompleteSetup = registerAutocomplete(
     configWatcher,
     platform2,
-    authProvider,
     statusBar,
     codeCompletionsClient,
     disposables
   );
   const tutorialSetup = tryRegisterTutorial(context2, disposables);
-  const openCtxSetup = exposeOpenCtxClient(
-    context2,
-    configWatcher,
-    authProvider,
-    platform2.createOpenCtxController
-  );
+  const openCtxSetup = exposeOpenCtxClient(context2, configWatcher, platform2.createOpenCtxController);
   registerCodyCommands(configWatcher, statusBar, sourceControl, chatClient, disposables);
-  registerAuthCommands(authProvider, disposables);
-  registerChatCommands(authProvider, disposables);
+  registerAuthCommands(disposables);
+  registerChatCommands(disposables);
   disposables.push(...registerSidebarCommands());
   disposables.push(...setUpCodyIgnore(configWatcher.get()));
   registerOtherCommands(disposables);
   if (isExtensionModeDevOrTest) {
-    await registerTestCommands(context2, authProvider, disposables);
+    await registerTestCommands(context2, disposables);
   }
   registerDebugCommands(context2, disposables);
-  registerUpgradeHandlers(configWatcher, authProvider, disposables);
+  registerUpgradeHandlers(configWatcher, disposables);
   disposables.push(new CharactersLogger());
   void showSetupNotification(configWatcher.get());
   const [extensionClientDispose] = await Promise.all([
@@ -171595,27 +171430,27 @@ const register = async (context2, authProvider, configWatcher, platform2, isExte
     autocompleteSetup,
     openCtxSetup,
     tutorialSetup,
-    registerMinion(context2, configWatcher, authProvider, symfRunner, disposables)
+    registerMinion(context2, configWatcher, symfRunner, disposables)
   ]);
   disposables.push(extensionClientDispose);
   return Disposable.from(...disposables);
 };
-async function initializeSingletons(platform2, authProvider, configWatcher, isExtensionModeDevOrTest, disposables) {
+async function initializeSingletons(platform2, configWatcher, isExtensionModeDevOrTest, disposables) {
   var _a3;
-  modelsService.setStorage(localStorage);
-  disposables.push(upstreamHealthProvider, contextFiltersProvider);
+  modelsService.instance.setStorage(localStorage);
+  disposables.push(upstreamHealthProvider.instance, contextFiltersProvider.instance);
   commandControllerInit((_a3 = platform2.createCommandsProvider) == null ? void 0 : _a3.call(platform2), platform2.extensionClient.capabilities);
-  repoNameResolver.init(authProvider);
+  repoNameResolver.init();
   disposables.push(
     subscriptionDisposable(
       configWatcher.changes.subscribe({
         next: (config) => {
           void localStorage.setConfig(config);
           graphqlClient.setConfig(config);
-          void featureFlagProvider.refresh();
-          contextFiltersProvider.init(repoNameResolver.getRepoNamesFromWorkspaceUri);
-          void modelsService.onConfigChange(config);
-          upstreamHealthProvider.onConfigurationChange(config);
+          void featureFlagProvider.instance.refresh();
+          contextFiltersProvider.instance.init(repoNameResolver.getRepoNamesFromWorkspaceUri);
+          void modelsService.instance.onConfigChange(config);
+          upstreamHealthProvider.instance.onConfigurationChange(config);
         }
       })
     )
@@ -171738,7 +171573,7 @@ function registerCodyCommands(config, statusBar, sourceControl, chatClient, disp
     // Generate Commit Message command
   );
 }
-function registerChatCommands(authProvider, disposables) {
+function registerChatCommands(disposables) {
   disposables.push(
     // Chat
     commands$1.registerCommand(
@@ -171751,7 +171586,7 @@ function registerChatCommands(authProvider, disposables) {
       commands$1.executeCommand("workbench.action.moveEditorToNewWindow");
     }),
     commands$1.registerCommand("cody.chat.history.panel", async () => {
-      await displayHistoryQuickPick(authProvider.getAuthStatus());
+      await displayHistoryQuickPick(authProvider.instance.getAuthStatus());
     }),
     commands$1.registerCommand(
       "cody.settings.extension.chat",
@@ -171765,13 +171600,16 @@ function registerChatCommands(authProvider, disposables) {
     )
   );
 }
-function registerAuthCommands(authProvider, disposables) {
+function registerAuthCommands(disposables) {
   disposables.push(
-    commands$1.registerCommand("cody.auth.signin", () => authProvider.signinMenu()),
-    commands$1.registerCommand("cody.auth.signout", () => authProvider.signoutMenu()),
-    commands$1.registerCommand("cody.auth.account", () => authProvider.accountMenu()),
+    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.support", () => showFeedbackSupportQuickPick()),
-    commands$1.registerCommand("cody.auth.status", () => authProvider.getAuthStatus()),
+    commands$1.registerCommand(
+      "cody.auth.status",
+      () => authProvider.instance.getAuthStatus()
+    ),
     // Used by the agent
     commands$1.registerCommand(
       "cody.agent.auth.authenticate",
@@ -171782,7 +171620,7 @@ function registerAuthCommands(authProvider, disposables) {
         if (typeof accessToken !== "string") {
           throw new TypeError("accessToken is required");
         }
-        return await authProvider.auth({
+        return await authProvider.instance.auth({
           endpoint: serverEndpoint,
           token: accessToken,
           customHeaders
@@ -171791,20 +171629,20 @@ function registerAuthCommands(authProvider, disposables) {
     )
   );
 }
-function registerUpgradeHandlers(configWatcher, authProvider, disposables) {
+function registerUpgradeHandlers(configWatcher, disposables) {
   disposables.push(
     // Register URI Handler (e.g. vscode://sourcegraph.cody-ai)
     window$1.registerUriHandler({
       handleUri: async (uri2) => {
         if (uri2.path === "/app-done") ;
         else {
-          authProvider.tokenCallbackHandler(uri2, configWatcher.get().customHeaders);
+          authProvider.instance.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.getAuthStatus();
+      const authStatus = authProvider.instance.getAuthStatus();
       if (ws.focused && authStatus.isDotCom && authStatus.isLoggedIn) {
         const res = await graphqlClient.getCurrentUserCodyProEnabled();
         if (res instanceof Error) {
@@ -171813,20 +171651,18 @@ function registerUpgradeHandlers(configWatcher, authProvider, disposables) {
         }
         const isCurrentCodyProUser = !authStatus.userCanUpgrade;
         if (res && res.codyProEnabled !== isCurrentCodyProUser) {
-          authProvider.reloadAuthStatus();
+          authProvider.instance.reloadAuthStatus();
         }
       }
     }),
     new CodyProExpirationNotifications(
       graphqlClient,
-      authProvider,
-      featureFlagProvider,
       window$1.showInformationMessage,
       env.openExternal
     )
   );
 }
-async function registerTestCommands(context2, authProvider, disposables) {
+async function registerTestCommands(context2, disposables) {
   await commands$1.executeCommand("setContext", "cody.devOrTest", true);
   disposables.push(
     commands$1.registerCommand("cody.test.set-context-filters", async () => {
@@ -171836,7 +171672,7 @@ async function registerTestCommands(context2, authProvider, disposables) {
       }
       try {
         const policy = JSON.parse(raw);
-        contextFiltersProvider.setTestingContextFilters(policy);
+        contextFiltersProvider.instance.setTestingContextFilters(policy);
       } catch (error) {
         window$1.showErrorMessage(
           "Failed to parse context filters policy. Please check your JSON syntax."
@@ -171846,7 +171682,7 @@ async function registerTestCommands(context2, authProvider, disposables) {
     // Access token - this is only used in configuration tests
     commands$1.registerCommand(
       "cody.test.token",
-      async (endpoint, token) => authProvider.auth({ endpoint, token })
+      async (endpoint, token) => authProvider.instance.auth({ endpoint, token })
     )
   );
 }
@@ -171860,11 +171696,11 @@ async function registerDebugCommands(context2, disposables) {
 }
 async function tryRegisterTutorial(context2, disposables) {
   if (!isRunningInsideAgent()) {
-    const { registerInteractiveTutorial } = await import("./index-D_qZ0Ahh.mjs");
+    const { registerInteractiveTutorial } = await import("./index-D6VgQlqI.mjs");
     registerInteractiveTutorial(context2).then((disposable) => disposables.push(...disposable));
   }
 }
-function registerAutocomplete(configWatcher, platform2, authProvider, statusBar, codeCompletionsClient, disposables) {
+function registerAutocomplete(configWatcher, platform2, statusBar, codeCompletionsClient, disposables) {
   let setupAutocompleteQueue = Promise.resolve();
   let autocompleteDisposables = [];
   function disposeAutocomplete() {
@@ -171892,7 +171728,7 @@ function registerAutocomplete(configWatcher, platform2, authProvider, statusBar,
         return;
       }
       disposeAutocomplete();
-      const autocompleteFeatureFlagChangeSubscriber = featureFlagProvider.onFeatureFlagChanged(
+      const autocompleteFeatureFlagChangeSubscriber = featureFlagProvider.instance.onFeatureFlagChanged(
         "cody-autocomplete",
         setupAutocomplete
       );
@@ -171904,7 +171740,6 @@ function registerAutocomplete(configWatcher, platform2, authProvider, statusBar,
           config,
           client: codeCompletionsClient,
           statusBar,
-          authProvider,
           createBfgRetriever: platform2.createBfgRetriever
         })
       );
@@ -171913,7 +171748,6 @@ function registerAutocomplete(configWatcher, platform2, authProvider, statusBar,
           config,
           client: codeCompletionsClient,
           statusBar,
-          authProvider,
           createBfgRetriever: platform2.createBfgRetriever
         }),
         autocompleteStageCounterLogger
@@ -171929,9 +171763,9 @@ function registerAutocomplete(configWatcher, platform2, authProvider, statusBar,
   return setupAutocomplete().catch(() => {
   });
 }
-async function registerMinion(context2, config, authProvider, symfRunner, disposables) {
+async function registerMinion(context2, config, symfRunner, disposables) {
   if (config.get().experimentalMinionAnthropicKey) {
-    const minionOrchestrator = new MinionOrchestrator(context2.extensionUri, authProvider, symfRunner);
+    const minionOrchestrator = new MinionOrchestrator(context2.extensionUri, symfRunner);
     disposables.push(minionOrchestrator);
     disposables.push(
       commands$1.registerCommand(
@@ -171951,7 +171785,6 @@ function registerChat({
   chatClient,
   guardrails,
   editor,
-  authProvider,
   enterpriseContextFactory,
   localEmbeddings,
   symfRunner,
@@ -171961,8 +171794,7 @@ function registerChat({
   const messageProviderOptions = {
     chat: chatClient,
     guardrails,
-    editor,
-    authProvider
+    editor
   };
   const chatsController = new ChatsController(
     {
@@ -171971,7 +171803,6 @@ function registerChat({
       startTokenReceiver: platform2.startTokenReceiver
     },
     chatClient,
-    authProvider,
     enterpriseContextFactory,
     localEmbeddings || null,
     symfRunner || null,
@@ -171981,12 +171812,11 @@ function registerChat({
     platform2.extensionClient
   );
   chatsController.registerViewsAndCommands();
-  const ghostHintDecorator = new GhostHintDecorator(authProvider);
+  const ghostHintDecorator = new GhostHintDecorator();
   const editorManager = new EditManager({
     chat: chatClient,
     editor,
     ghostHintDecorator,
-    authProvider,
     extensionClient: platform2.extensionClient
   });
   disposables.push(ghostHintDecorator, editorManager, new CodeActionProvider());
@@ -172005,8 +171835,8 @@ function registerChat({
   }
   return { chatsController };
 }
-async function configureEventsInfra(config, isExtensionModeDevOrTest, authProvider) {
-  await createOrUpdateTelemetryRecorderProvider(config, isExtensionModeDevOrTest, authProvider);
+async function configureEventsInfra(config, isExtensionModeDevOrTest) {
+  await createOrUpdateTelemetryRecorderProvider(config, isExtensionModeDevOrTest);
 }
 async function activate(context2, platformContext) {
   const api = new ExtensionApi(context2.extensionMode);