@sourcegraph/cody-web 0.6.1 → 0.7.0

package/dist/{agent.worker-DVKzbHSN.mjs → agent.worker-Cjx_iNtn.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, ba as isError$1, bd as isDefined, bH as onAbort, bI as CHAT_OUTPUT_TOKEN_BUDGET, bm as ModelTag, b5 as CodyIDE, bJ as isEnterpriseUser, b4 as isCodyProUser, bu as CHAT_INPUT_TOKEN_BUDGET, bK as getModelInfo, bL as EXTENDED_CHAT_INPUT_TOKEN_BUDGET, bM as EXTENDED_USER_CONTEXT_TOKEN_BUDGET, j 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, b7 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, b9 as cryptoJsExports, c0 as openCtx, c1 as extensionForLanguage, c2 as isSourcegraphToken, c3 as toRangeData, c4 as DOTCOM_URL, c5 as base64Js, c6 as isDotCom, c7 as NetworkError, c8 as isRateLimitError, c9 as isAuthError, ca as NoOpTelemetryRecorderProvider, cb as TimestampTelemetryProcessor_1, cc as updateGlobalTelemetryInstances, cd as TelemetryRecorderProvider, t as telemetryRecorder, ce as telemetryRecorderProvider, d as dedent$1, cf as uriExtname, cg as SUPPORTED_URI_SCHEMAS, ch as convertGitCloneURLToCodebaseName, ci as require$$1$4, cj as dedupeWith$1, ck as getEditorInsertSpaces, cl as TimeoutError, cm as getActiveTraceAndSpanId, cn as isNetworkError$1, co as trace, bl as isCodyProModel, b8 as CodyTaskState, bg as isEqual, cp as getAugmentedNamespace, cq as main$1, cr as setUserAgent, cs as TESTING_TELEMETRY_EXPORTER, ct as dist, bo as isMacOS, bn as CustomCommandType, bx as setDisplayPathEnvInfo, T as TokenCounterUtils, C as ContextItemSource, cu as _root, cv as _baseGetTag, cw as isObjectLike_1, cx as isObject_1, b3 as isErrorLike, au as displayPath, cy as DefaultChatCommands, cz as uriParseNameAndExtension, cA as uriDirname, cB as DefaultEditCommands, an as FILE_CONTEXT_MENTION_PROVIDER, ao as SYMBOL_CONTEXT_MENTION_PROVIDER, ap as REMOTE_REPOSITORY_PROVIDER_URI, cC as promiseFactoryToObservable, cD as webMentionProvidersMetadata, cE as allMentionProvidersMetadata, cF as combineLatest$1, cG as expandToLineRange, am as displayPathBasename, av as displayLineRange, cH as offlineModeAuthStatus, cI as unauthenticatedStatus, cJ as semver, cK as truncateTextNearestLine, cL as TokenCounter, bs as View, aQ as parseMentionQuery, cM as tracer, bf as isAbortErrorOrSocketHangUp, cN as isContextWindowLimitError, cO as inputTextWithoutContextChipsFromPromptEditorState, be as reformatBotMessageForChat, cP as truncatePromptString, b1 as hydrateAfterPostMessage, cQ as addMessageListenersForExtensionAPI, cR as createMessageAPIForExtension, cS as subscriptionDisposable, cT as CODY_PASSTHROUGH_VSCODE_OPEN_COMMAND_ID, cU as editorStateFromPromptString, cV as getEditorTabSize$1, bk as pluralize, cW as AbortError, cX as getEditorIndentString, bb as RateLimitError$1, cY as logResponseHeadersToSpan, cZ as TracedError, c_ as isNodeResponse, c$ as SpanStatusCode, d0 as _, 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, bv 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, bc as CODY_FEEDBACK_URL, dg as DISCORD_URL, dh as CODY_SUPPORT_URL, bw as getRelativeChatPeriod, di as SG_BLOG_URL, dj as ACCOUNT_LIMITS_INFO_URL, dk as setLogger, dl as CODY_OLLAMA_DOCS_URL, b2 as browser$3 } from "./time-date-5mt-Pcg3.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 toRangeData, c4 as DOTCOM_URL, c5 as base64Js, c6 as isDotCom, c7 as NetworkError, c8 as isRateLimitError, c9 as isAuthError, ca as NoOpTelemetryRecorderProvider, cb as TimestampTelemetryProcessor_1, cc as updateGlobalTelemetryInstances, cd as TelemetryRecorderProvider, t as telemetryRecorder, ce as telemetryRecorderProvider, d as dedent$1, cf as uriExtname, cg as SUPPORTED_URI_SCHEMAS, ch as convertGitCloneURLToCodebaseName, ci as require$$1$4, cj as dedupeWith$1, ck as getEditorInsertSpaces, cl as TimeoutError, cm as getActiveTraceAndSpanId, cn as isNetworkError$1, co as trace, bj as isCodyProModel, b6 as CodyTaskState, be as isEqual, cp as getAugmentedNamespace, cq as main$1, cr as setUserAgent, cs as TESTING_TELEMETRY_EXPORTER, ct as dist, bm as isMacOS, bl as CustomCommandType, bx as setDisplayPathEnvInfo, T as TokenCounterUtils, C as ContextItemSource, cu as _root, cv as _baseGetTag, cw as isObjectLike_1, cx as isObject_1, bw as isErrorLike, au as displayPath, cy as DefaultChatCommands, cz as uriParseNameAndExtension, cA as uriDirname, cB as DefaultEditCommands, an as FILE_CONTEXT_MENTION_PROVIDER, ao as SYMBOL_CONTEXT_MENTION_PROVIDER, ap as REMOTE_REPOSITORY_PROVIDER_URI, cC as promiseFactoryToObservable, cD as webMentionProvidersMetadata, cE as allMentionProvidersMetadata, cF as combineLatest$1, cG as expandToLineRange, am as displayPathBasename, av as displayLineRange, cH as offlineModeAuthStatus, cI as unauthenticatedStatus, cJ as semver, cK as truncateTextNearestLine, cL as TokenCounter, bq as View, aQ as parseMentionQuery, cM as tracer, bd as isAbortErrorOrSocketHangUp, cN as isContextWindowLimitError, cO as inputTextWithoutContextChipsFromPromptEditorState, bc as reformatBotMessageForChat, cP as truncatePromptString, b1 as hydrateAfterPostMessage, cQ as addMessageListenersForExtensionAPI, cR as createMessageAPIForExtension, cS as subscriptionDisposable, cT as CODY_PASSTHROUGH_VSCODE_OPEN_COMMAND_ID, cU as editorStateFromPromptString, cV as getEditorTabSize$1, bi as pluralize, cW as AbortError, cX as getEditorIndentString, b9 as RateLimitError$1, cY as logResponseHeadersToSpan, cZ as TracedError, c_ as isNodeResponse, c$ as SpanStatusCode, d0 as _, 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-BpZhCiRU.mjs";
 function _mergeNamespaces(n, m) {
   for (var i = 0; i < m.length; i++) {
     const e = m[i];
@@ -7326,7 +7326,7 @@ const expandedContextWindow = {
 };
 const DEFAULT_DOT_COM_MODELS = [
   // --------------------------------
-  // Anthropic models
+  // Powerful models
   // --------------------------------
   {
     title: "Claude 3.5 Sonnet",
@@ -7334,7 +7334,7 @@ const DEFAULT_DOT_COM_MODELS = [
     provider: "Anthropic",
     usage: [ModelUsage.Chat, ModelUsage.Edit],
     contextWindow: expandedContextWindow,
-    tags: [ModelTag.Gateway, ModelTag.Balanced, ModelTag.Recommended, ModelTag.Free]
+    tags: [ModelTag.Gateway, ModelTag.Power, ModelTag.Recommended, ModelTag.Free]
   },
   {
     title: "Claude 3 Opus",
@@ -7344,27 +7344,24 @@ const DEFAULT_DOT_COM_MODELS = [
     contextWindow: expandedContextWindow,
     tags: [ModelTag.Gateway, ModelTag.Pro, ModelTag.Power]
   },
-  {
-    title: "Claude 3 Haiku",
-    id: "anthropic/claude-3-haiku-20240307",
-    provider: "Anthropic",
-    usage: [ModelUsage.Chat, ModelUsage.Edit],
-    contextWindow: basicContextWindow,
-    tags: [ModelTag.Gateway, ModelTag.Speed]
-  },
-  // --------------------------------
-  // OpenAI models
-  // --------------------------------
   {
     title: "GPT-4o",
     id: "openai/gpt-4o",
     provider: "OpenAI",
     usage: [ModelUsage.Chat, ModelUsage.Edit],
     contextWindow: expandedContextWindow,
-    tags: [ModelTag.Gateway, ModelTag.Pro, ModelTag.Balanced]
+    tags: [ModelTag.Gateway, ModelTag.Power, ModelTag.Pro]
+  },
+  {
+    title: "Gemini 1.5 Pro",
+    id: "google/gemini-1.5-pro-latest",
+    provider: "Google",
+    usage: [ModelUsage.Chat, ModelUsage.Edit],
+    contextWindow: expandedContextWindow,
+    tags: [ModelTag.Gateway, ModelTag.Power]
   },
   // --------------------------------
-  // Google models
+  // Faster models
   // --------------------------------
   {
     title: "Gemini 1.5 Flash",
@@ -7375,14 +7372,13 @@ const DEFAULT_DOT_COM_MODELS = [
     tags: [ModelTag.Gateway, ModelTag.Speed]
   },
   {
-    title: "Gemini 1.5 Pro",
-    id: "google/gemini-1.5-pro-latest",
-    provider: "Google",
+    title: "Claude 3 Haiku",
+    id: "anthropic/claude-3-haiku-20240307",
+    provider: "Anthropic",
     usage: [ModelUsage.Chat, ModelUsage.Edit],
-    contextWindow: expandedContextWindow,
-    tags: [ModelTag.Gateway, ModelTag.Power]
+    contextWindow: basicContextWindow,
+    tags: [ModelTag.Gateway, ModelTag.Speed]
   },
-  // TODO (tom) Improve prompt for Mixtral + Edit to see if we can use it there too.
   {
     title: "Mixtral 8x7B",
     id: "fireworks/accounts/fireworks/models/mixtral-8x7b-instruct",
@@ -7390,14 +7386,6 @@ const DEFAULT_DOT_COM_MODELS = [
     usage: [ModelUsage.Chat],
     contextWindow: basicContextWindow,
     tags: [ModelTag.Gateway, ModelTag.Speed]
-  },
-  {
-    title: "Mixtral 8x22B",
-    id: "fireworks/accounts/fireworks/models/mixtral-8x22b-instruct",
-    provider: "Mistral",
-    usage: [ModelUsage.Chat],
-    contextWindow: basicContextWindow,
-    tags: [ModelTag.Gateway, ModelTag.Power]
   }
 ];
 function getDotComDefaultModels() {
@@ -8087,8 +8075,12 @@ const ignores = new IgnoreHelper();
 function isCodyIgnoredFile(uri2) {
   return ignores.isIgnored(uri2);
 }
-function getSimplePreamble(model2, apiVersion, preInstruction) {
-  const intro = ps`You are Cody, an AI coding assistant from Sourcegraph. ${preInstruction ?? ""}`.trim();
+const DEFAULT_PREAMBLE = ps`You are Cody, an AI coding assistant from Sourcegraph.`;
+const SMART_APPLY_PREAMBLE = ps`If your answer contains fenced code blocks in Markdown, include the relevant full file path in the code block tag using this structure: \`\`\`$LANGUAGE:$FILEPATH\`\`\`.`;
+const CHAT_PREAMBLE = DEFAULT_PREAMBLE.concat(SMART_APPLY_PREAMBLE);
+function getSimplePreamble(model2, apiVersion, type2, preInstruction) {
+  const preamble = type2 === "Chat" ? CHAT_PREAMBLE : DEFAULT_PREAMBLE;
+  const intro = ps`${preamble}\n\n${preInstruction ?? ""}`.trim();
   if (apiVersion >= 1 && (model2 == null ? void 0 : model2.includes("claude-3"))) {
     return [
       {
@@ -8697,7 +8689,6 @@ const SURROUNDING_LINES = 50;
 const NUM_CODE_RESULTS = 12;
 const NUM_TEXT_RESULTS = 3;
 const MAX_BYTES_PER_FILE = 4096;
-const CODEBLOCK_PREMAMBLE = ps`When generating fenced code blocks in Markdown, ensure you include the full file path in the tag. The structure should be \`\`\`language:path/to/file\n\`\`\`. You should only do this when generating a code block, the user does not need to be made aware of this in any other way.`;
 const CONTEXT_PREAMBLE = ps`You have access to the provided codebase context. `;
 const HEDGES_PREVENTION = ps`Answer positively without apologizing. `;
 const _PromptMixin = class _PromptMixin {
@@ -8713,9 +8704,7 @@ const _PromptMixin = class _PromptMixin {
    */
   static mixInto(humanMessage, modelID) {
     let mixins = PromptString.join(
-      [..._PromptMixin.mixins, _PromptMixin.codeBlockMixin, _PromptMixin.contextMixin].map(
-        (mixin) => mixin.prompt
-      ),
+      [..._PromptMixin.mixins, _PromptMixin.contextMixin].map((mixin) => mixin.prompt),
       ps`\n\n`
     );
     if (modelID.includes("claude-3-5-sonnet")) {
@@ -8731,12 +8720,12 @@ const _PromptMixin = class _PromptMixin {
   }
 };
 __publicField2(_PromptMixin, "mixins", []);
-__publicField2(_PromptMixin, "codeBlockMixin", new _PromptMixin(CODEBLOCK_PREMAMBLE));
 __publicField2(_PromptMixin, "contextMixin", new _PromptMixin(CONTEXT_PREAMBLE));
 let PromptMixin = _PromptMixin;
 function populateCodeContextTemplate(code, fileUri, repoName, type2 = "chat") {
-  const template2 = type2 === "edit" ? ps`Codebase context from file {filePath}{inRepo}:\n{text}` : ps`Codebase context from file {filePath}{inRepo}:\n\`\`\`{languageID}\n{text}\`\`\``;
-  return template2.replaceAll("{inRepo}", repoName ? ps` in repository ${repoName}` : ps``).replaceAll("{filePath}", PromptString.fromDisplayPath(fileUri)).replaceAll("{languageID}", PromptString.fromMarkdownCodeBlockLanguageIDForFilename(fileUri)).replaceAll("{text}", code);
+  const template2 = type2 === "edit" ? ps`Codebase context from file {filePath}{inRepo}:\n{text}` : ps`Codebase context from file {filePath}{inRepo}:\n\`\`\`{languageID}{filePathToParse}\n{text}\`\`\``;
+  const filePath = PromptString.fromDisplayPath(fileUri);
+  return template2.replaceAll("{inRepo}", repoName ? ps` in repository ${repoName}` : ps``).replaceAll("{filePath}", filePath).replaceAll("{filePathToParse}", ps`:${filePath}`).replaceAll("{languageID}", PromptString.fromMarkdownCodeBlockLanguageIDForFilename(fileUri)).replaceAll("{text}", code);
 }
 const DIAGNOSTICS_CONTEXT_TEMPLATE = ps`Use the following {type} from the code snippet in the file: {filePath}:
 {prefix}: {message}
@@ -16456,7 +16445,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.0";
+const version$1 = "1.32.1";
 const publisher = "sourcegraph";
 const license = "Apache-2.0";
 const icon = "resources/cody.png";
@@ -17109,11 +17098,6 @@ const contributes = {
       key: "alt+/",
       when: "cody.activated && editorTextFocus && editorHasSelection"
     },
-    {
-      command: "cody.mention.selection",
-      key: "alt+l",
-      when: "cody.activated && editorTextFocus && editorHasSelection"
-    },
     {
       command: "cody.tutorial.chat",
       key: "alt+l",
@@ -17920,7 +17904,7 @@ const dependencies = {
   "parse-git-diff": "^0.0.14",
   "proxy-agent": "^6.4.0",
   "react-markdown": "^9.0.1",
-  "rehype-highlight": "^7.0.0",
+  "rehype-highlight": "^6.0.0",
   "rehype-sanitize": "^6.0.0",
   "remark-gfm": "^4.0.0",
   semver: "^7.5.4",
@@ -39898,12 +39882,13 @@ const getModelProviderIcon = (provider) => {
 const getModelOptionItems = (modelOptions, isCodyPro) => {
   const allOptions = modelOptions.map((modelOption) => {
     const icon2 = getModelProviderIcon(modelOption.provider);
+    const title = modelOption.title || modelOption.id;
     return {
-      label: `${QUICK_PICK_ITEM_EMPTY_INDENT_PREFIX$1} ${icon2} ${modelOption.title}`,
+      label: `${QUICK_PICK_ITEM_EMPTY_INDENT_PREFIX$1} ${icon2} ${title}`,
       description: `by ${modelOption.provider}`,
       alwaysShow: true,
       model: modelOption.id,
-      modelTitle: modelOption.title,
+      modelTitle: title,
       codyProOnly: isCodyProModel(modelOption)
     };
   }).filter(isDefined);
@@ -46282,7 +46267,7 @@ class CommandsProvider {
    * Used for retreiving context for the command field in custom command
    */
   async runShell(shell2) {
-    const { getContextFileFromShell } = await import("./shell-C6EMKtG-.mjs");
+    const { getContextFileFromShell } = await import("./shell-DvMNfs3M.mjs");
     return getContextFileFromShell(shell2);
   }
   /**
@@ -46293,7 +46278,7 @@ class CommandsProvider {
     if (!isFileURI(uri2)) {
       throw new Error("history only supported on local file paths");
     }
-    const { getContextFileFromGitLog } = await import("./git-log-D98vF6zD.mjs");
+    const { getContextFileFromGitLog } = await import("./git-log-BWpOPYwA.mjs");
     return getContextFileFromGitLog(uri2, options);
   }
   dispose() {
@@ -48568,7 +48553,7 @@ async function rewriteKeywordQuery(completionsClient, query2, signal2) {
 }
 async function doRewrite(completionsClient, query2, signal2) {
   var _a3;
-  const preamble = getSimplePreamble(void 0, 0);
+  const preamble = getSimplePreamble(void 0, 0, "Default");
   const stream = completionsClient.stream(
     {
       messages: [
@@ -53297,7 +53282,12 @@ class DefaultPrompter {
         "preInstruction",
         void 0
       );
-      const preambleMessages = getSimplePreamble(chat2.modelID, codyApiVersion, preInstruction);
+      const preambleMessages = getSimplePreamble(
+        chat2.modelID,
+        codyApiVersion,
+        "Chat",
+        preInstruction
+      );
       if (!promptBuilder.tryAddToPrefix(preambleMessages)) {
         throw new Error(`Preamble length exceeded context window ${chat2.contextWindow.input}`);
       }
@@ -53470,6 +53460,7 @@ class ChatController {
         break;
       case "initialized":
         await this.handleInitialized();
+        this.setWebviewView(View.Chat);
         break;
       case "submit": {
         await this.handleUserMessageSubmission(
@@ -53736,14 +53727,15 @@ class ChatController {
   // =======================================================================
   // #region top-level view action handlers
   // =======================================================================
-  setAuthStatus(_2) {
+  setAuthStatus(status) {
     void this.sendConfig();
-    this.handleSetChatModel(getDefaultModelID());
+    if (status.isLoggedIn) {
+      this.handleSetChatModel(getDefaultModelID());
+    }
   }
   // When the webview sends the 'ready' message, respond by posting the view config
   async handleReady() {
     await this.sendConfig();
-    this.handleSetChatModel(this.chatModel.modelID);
   }
   async sendConfig() {
     var _a3;
@@ -53778,7 +53770,7 @@ class ChatController {
       isMessageInProgress: false,
       chatID: this.chatModel.sessionID
     }));
-    this.postChatModels();
+    this.handleSetChatModel(this.chatModel.modelID);
     await this.saveSession();
     this.initDoer.signalInitialized();
     await this.sendConfig();
@@ -54579,7 +54571,6 @@ class ChatController {
         }
       )
     );
-    void this.sendConfig();
     return viewOrPanel;
   }
   async setWebviewView(view) {
@@ -55990,7 +55981,7 @@ class CodySourceControl {
       const { id: model2, contextWindow } = this.model;
       const { prompt, ignoredContext } = await this.buildPrompt(
         contextWindow,
-        getSimplePreamble(model2, 1, COMMIT_COMMAND_PROMPTS.intro),
+        getSimplePreamble(model2, 1, "Default", COMMIT_COMMAND_PROMPTS.intro),
         await getContextFilesFromGitApi(repository2, commitTemplate).catch(() => [])
       ).catch((error) => {
         sourceControlInputbox.value = `${error}`;
@@ -156986,6 +156977,234 @@ function completionMatchesPrefix(completion, document2, positions) {
   const latestPrefix = document2.getText(latestLine.range.with({ end: positions.latestPosition }));
   return intendedCompletion.startsWith(latestPrefix);
 }
+class DefaultModel {
+  constructor() {
+    __publicField2(this, "stopSequences", ["<PRE>", "<SUF>", "<MID>", " <EOT>"]);
+  }
+  getOllamaPrompt(promptContext) {
+    const { context: context2, currentFileNameComment, prefix } = promptContext;
+    return context2.concat(currentFileNameComment, prefix);
+  }
+  getOllamaRequestOptions(isMultiline) {
+    const params = {
+      stop: ["\n", ...this.stopSequences],
+      temperature: 0.2,
+      top_k: -1,
+      top_p: -1,
+      num_predict: 256
+    };
+    if (isMultiline) {
+      params.stop = ["\n\n", ...this.stopSequences];
+    }
+    return params;
+  }
+  getFireworksRequestParams(params) {
+    return {
+      ...params,
+      stopSequences: [...params.stopSequences || [], ...this.stopSequences]
+    };
+  }
+  formatIntroSnippets(params) {
+    const { intro, languageConfig } = params;
+    const commentedOutSnippets = PromptString.join(intro, ps`\n\n`).split("\n").map((line) => ps`${languageConfig ? languageConfig.commentStart : ps`// `}${line}`);
+    return ps`${PromptString.join(commentedOutSnippets, ps`\n`)}\n`;
+  }
+  getFireworksPrompt(params) {
+    const { snippets, docContext, document: document2, promptChars, gitContext } = params;
+    const { prefix, suffix } = PromptString.fromAutocompleteDocumentContext(docContext, document2.uri);
+    const introSnippets = this.getDefaultIntroSnippets(document2);
+    let currentPrompt = ps``;
+    const languageConfig = getLanguageConfig(document2.languageId);
+    const fileName = PromptString.fromDisplayPath(document2.uri);
+    const repoName = gitContext ? PromptString.fromAutocompleteGitContext(gitContext, document2.uri).repoName : void 0;
+    const suffixAfterFirstNewline = getSuffixAfterFirstNewline(suffix);
+    for (let snippetsToInclude = 0; snippetsToInclude < snippets.length + 1; snippetsToInclude++) {
+      if (snippetsToInclude > 0) {
+        const snippet = snippets[snippetsToInclude - 1];
+        if ("symbol" in snippet) {
+          introSnippets.push(symbolSnippetToPromptString(snippet));
+        } else {
+          introSnippets.push(this.fileSnippetToPromptString(snippet));
+        }
+      }
+      const intro = this.formatIntroSnippets({ intro: introSnippets, languageConfig });
+      const nextPrompt = this.formatFireworksPrompt({
+        fileName,
+        repoName,
+        intro,
+        prefix,
+        suffix: suffixAfterFirstNewline
+      });
+      if (nextPrompt.length >= promptChars) {
+        return currentPrompt;
+      }
+      currentPrompt = nextPrompt;
+    }
+    return currentPrompt;
+  }
+  postProcess(content) {
+    return content.replace(" <EOT>", "");
+  }
+  getDefaultIntroSnippets(document2) {
+    return [];
+  }
+  fileSnippetToPromptString(snippet) {
+    const { uri: uri2 } = snippet;
+    const { content } = PromptString.fromAutocompleteContextSnippet(snippet);
+    const uriPromptString = PromptString.fromDisplayPath(uri2);
+    return ps`Here is a reference snippet of code from ${uriPromptString}:\n\n${content}`;
+  }
+  formatFireworksPrompt(param) {
+    return ps`${param.intro}${param.prefix}`;
+  }
+}
+function symbolSnippetToPromptString(snippet) {
+  const { content, symbol: symbol2 } = PromptString.fromAutocompleteContextSnippet(snippet);
+  return ps`Additional documentation for \`${symbol2}\`:\n\n${content}`;
+}
+class CodeGemma extends DefaultModel {
+  constructor() {
+    super(...arguments);
+    __publicField2(this, "stopSequences", [
+      "<|fim_prefix|>",
+      "<|fim_suffix|>",
+      "<|fim_middle|>",
+      "<|file_separator|>",
+      "<end_of_turn>"
+    ]);
+  }
+  getOllamaPrompt(promptContext) {
+    const { context: context2, currentFileNameComment, prefix, suffix } = promptContext;
+    return ps`${currentFileNameComment}<|fim_prefix|>${context2}${prefix}<|fim_suffix|>${suffix}<|fim_middle|>`;
+  }
+  getOllamaRequestOptions(isMultiline) {
+    const params = {
+      stop: ["\n", ...this.stopSequences],
+      temperature: 0.2,
+      repeat_penalty: 1,
+      top_k: -1,
+      top_p: -1,
+      num_predict: 256
+    };
+    if (isMultiline) {
+      params.stop = ["\n\n", ...this.stopSequences];
+    }
+    return params;
+  }
+  formatFireworksPrompt(param) {
+    return ps`${param.intro}<|fim_prefix|>${param.prefix}<|fim_suffix|>${param.suffix}<|fim_middle|>`;
+  }
+}
+class CodeLlama extends DefaultModel {
+  getOllamaPrompt(promptContext) {
+    const { context: context2, currentFileNameComment, prefix, suffix, isInfill } = promptContext;
+    if (isInfill) {
+      const infillPrefix = context2.concat(currentFileNameComment, prefix);
+      return ps`<PRE> ${infillPrefix} <SUF>${suffix} <MID>`;
+    }
+    return context2.concat(currentFileNameComment, prefix);
+  }
+  postProcess(content) {
+    return content.replace(" <EOT>", "");
+  }
+  getDefaultIntroSnippets(document2) {
+    return [ps`Path: ${PromptString.fromDisplayPath(document2.uri)}`];
+  }
+  formatFireworksPrompt(params) {
+    const { intro, prefix, suffix } = params;
+    return ps`<PRE> ${intro}${prefix} <SUF>${suffix} <MID>`;
+  }
+}
+class DeepseekCoder extends DefaultModel {
+  constructor() {
+    super(...arguments);
+    __publicField2(this, "stopSequences", ["<｜fim▁begin｜>", "<｜fim▁hole｜>", "<｜fim▁end｜>, <|eos_token|>"]);
+  }
+  getOllamaPrompt(promptContext) {
+    const { context: context2, currentFileNameComment, prefix, suffix } = promptContext;
+    const infillPrefix = context2.concat(currentFileNameComment, prefix);
+    return ps`<｜fim▁begin｜>${infillPrefix}<｜fim▁hole｜>${suffix}<｜fim▁end｜>`;
+  }
+  getOllamaRequestOptions(isMultiline) {
+    const params = {
+      stop: ["\n", ...this.stopSequences],
+      temperature: 0.6,
+      top_k: 30,
+      top_p: 0.2,
+      num_predict: 256,
+      num_gpu: 99,
+      repeat_penalty: 1.1
+    };
+    if (isMultiline) {
+      params.stop = ["\n\n", ...this.stopSequences];
+    }
+    return params;
+  }
+  postProcess(content) {
+    return content.replace("<|eos_token|>", "");
+  }
+  formatIntroSnippets(params) {
+    return ps`${PromptString.join(params.intro, ps`\n\n`)}\n`;
+  }
+  fileSnippetToPromptString(snippet) {
+    const { content } = PromptString.fromAutocompleteContextSnippet(snippet);
+    return ps`#${PromptString.fromDisplayPath(snippet.uri)}\n${content}`;
+  }
+  formatFireworksPrompt(params) {
+    const { intro, prefix, suffix, repoName, fileName } = params;
+    const prompt = ps`${intro}\n#${fileName}\n<｜fim▁begin｜>${prefix}<｜fim▁hole｜>${suffix}<｜fim▁end｜>`;
+    if (repoName) {
+      return ps`<repo_name>${repoName}\n${prompt}`;
+    }
+    return prompt;
+  }
+}
+class StarCoder extends DefaultModel {
+  constructor() {
+    super(...arguments);
+    __publicField2(this, "stopSequences", ["<fim_prefix>", "<fim_suffix>", "<fim_middle>", "<|endoftext|>", "<file_sep>"]);
+  }
+  getOllamaPrompt(promptContext) {
+    const { context: context2, prefix, suffix } = promptContext;
+    const infillPrefix = context2.concat(prefix);
+    return ps`<fim_prefix>${infillPrefix}<fim_suffix>${suffix}<fim_middle>`;
+  }
+  getOllamaRequestOptions(isMultiline) {
+    const params = {
+      stop: ["\n", ...this.stopSequences],
+      temperature: 0.2,
+      top_k: -1,
+      top_p: -1,
+      num_predict: 256
+    };
+    if (isMultiline) {
+      params.stop = ["\n\n", ...this.stopSequences];
+    }
+    return params;
+  }
+  postProcess(content) {
+    return content.replace("<|endoftext|>", "");
+  }
+  formatFireworksPrompt(params) {
+    const { intro, fileName, prefix, suffix } = params;
+    return ps`<filename>${fileName}<fim_prefix>${intro}${prefix}<fim_suffix>${suffix}<fim_middle>`;
+  }
+}
+function getModelHelpers(model2) {
+  if (model2.includes("codellama") || model2.includes("llama-code")) {
+    return new CodeLlama();
+  }
+  if (model2.includes("deepseek")) {
+    return new DeepseekCoder();
+  }
+  if (model2.includes("starcoder")) {
+    return new StarCoder();
+  }
+  if (model2.includes("codegemma")) {
+    return new CodeGemma();
+  }
+  return new DefaultModel();
+}
 const INDENT_REGEX = /^(?:( )+|\t+)/;
 const INDENT_TYPE_SPACE = "space";
 const INDENT_TYPE_TAB = "tab";
@@ -157465,122 +157684,6 @@ async function* fetchAndProcessDynamicMultilineCompletions(params) {
   }
   return void 0;
 }
-class DefaultOllamaModel {
-  getPrompt(ollamaPrompt) {
-    const { context: context2, currentFileNameComment, prefix } = ollamaPrompt;
-    return context2.concat(currentFileNameComment, prefix);
-  }
-  getRequestOptions(isMultiline) {
-    const stop2 = ["<PRE>", "<SUF>", "<MID>", "<EOT>"];
-    const params = {
-      stop: ["\n", ...stop2],
-      temperature: 0.2,
-      top_k: -1,
-      top_p: -1,
-      num_predict: 256
-    };
-    if (isMultiline) {
-      params.stop = ["\n\n", ...stop2];
-    }
-    return params;
-  }
-}
-class DeepseekCoder extends DefaultOllamaModel {
-  getPrompt(ollamaPrompt) {
-    const { context: context2, currentFileNameComment, prefix, suffix } = ollamaPrompt;
-    const infillPrefix = context2.concat(currentFileNameComment, prefix);
-    return ps`<｜fim▁begin｜>${infillPrefix}<｜fim▁hole｜>${suffix}<｜fim▁end｜>`;
-  }
-  getRequestOptions(isMultiline) {
-    const stop2 = ["<｜fim▁begin｜>", "<｜fim▁hole｜>", "<｜fim▁end｜>"];
-    const params = {
-      stop: ["\n", ...stop2],
-      temperature: 0.6,
-      top_k: 30,
-      top_p: 0.2,
-      num_predict: 256,
-      num_gpu: 99,
-      repeat_penalty: 1.1
-    };
-    if (isMultiline) {
-      params.stop = ["\n\n", ...stop2];
-    }
-    return params;
-  }
-}
-class CodeLlama extends DefaultOllamaModel {
-  getPrompt(ollamaPrompt) {
-    const { context: context2, currentFileNameComment, prefix, suffix, isInfill } = ollamaPrompt;
-    if (isInfill) {
-      const infillPrefix = context2.concat(currentFileNameComment, prefix);
-      return ps`<PRE> ${infillPrefix} <SUF>${suffix} <MID>`;
-    }
-    return context2.concat(currentFileNameComment, prefix);
-  }
-}
-class StarCoder2 extends DefaultOllamaModel {
-  getPrompt(ollamaPrompt) {
-    const { context: context2, prefix, suffix } = ollamaPrompt;
-    const infillPrefix = context2.concat(prefix);
-    return ps`<fim_prefix>${infillPrefix}<fim_suffix>${suffix}<fim_middle>`;
-  }
-  getRequestOptions(isMultiline) {
-    const stop2 = ["<fim_prefix>", "<fim_suffix>", "<fim_middle>", "<|endoftext|>", "<file_sep>"];
-    const params = {
-      stop: ["\n", ...stop2],
-      temperature: 0.2,
-      top_k: -1,
-      top_p: -1,
-      num_predict: 256
-    };
-    if (isMultiline) {
-      params.stop = ["\n\n", ...stop2];
-    }
-    return params;
-  }
-}
-class CodeGemma extends DefaultOllamaModel {
-  getPrompt(ollamaPrompt) {
-    const { context: context2, currentFileNameComment, prefix, suffix } = ollamaPrompt;
-    return ps`${currentFileNameComment}<|fim_prefix|>${context2}${prefix}<|fim_suffix|>${suffix}<|fim_middle|>`;
-  }
-  getRequestOptions(isMultiline) {
-    const stop2 = [
-      "<|fim_prefix|>",
-      "<|fim_suffix|>",
-      "<|fim_middle|>",
-      "<|file_separator|>",
-      "<end_of_turn>"
-    ];
-    const params = {
-      stop: ["\n", ...stop2],
-      temperature: 0.2,
-      repeat_penalty: 1,
-      top_k: -1,
-      top_p: -1,
-      num_predict: 256
-    };
-    if (isMultiline) {
-      params.stop = ["\n\n", ...stop2];
-    }
-    return params;
-  }
-}
-function getModelHelpers(model2) {
-  if (model2.includes("codellama")) {
-    return new CodeLlama();
-  }
-  if (model2.includes("deepseek-coder")) {
-    return new DeepseekCoder();
-  }
-  if (model2.includes("starcoder2")) {
-    return new StarCoder2();
-  }
-  if (model2.includes("codegemma")) {
-    return new CodeGemma();
-  }
-  return new DefaultOllamaModel();
-}
 function standardContextSizeHints(maxContextTokens) {
   return {
     totalChars: Math.floor(tokensToChars(0.9 * maxContextTokens)),
@@ -157603,7 +157706,7 @@ class ExperimentalOllamaProvider extends Provider {
     super(options);
     this.ollamaOptions = ollamaOptions;
   }
-  createPromptContext(snippets, isInfill, modelHelpers) {
+  createPromptContext(snippets, isInfill, modelHelper) {
     const { languageId, uri: uri2 } = this.options.document;
     const config = getLanguageConfig(languageId);
     const commentStart = (config == null ? void 0 : config.commentStart) || ps`// `;
@@ -157638,7 +157741,7 @@ class ExperimentalOllamaProvider extends Provider {
       const maxPromptChars = 1234;
       for (const snippet of snippets) {
         const extendedSnippets = [...prompt.snippets, snippet];
-        const promptLengthWithSnippet = modelHelpers.getPrompt({
+        const promptLengthWithSnippet = modelHelper.getOllamaPrompt({
           ...prompt,
           snippets: extendedSnippets
         }).length;
@@ -157657,10 +157760,10 @@ class ExperimentalOllamaProvider extends Provider {
     const modelHelpers = getModelHelpers(this.ollamaOptions.model);
     const promptContext = this.createPromptContext(snippets, useInfill, modelHelpers);
     const requestParams = {
-      prompt: modelHelpers.getPrompt(promptContext),
+      prompt: modelHelpers.getOllamaPrompt(promptContext),
       template: "{{ .Prompt }}",
       model: this.ollamaOptions.model,
-      options: modelHelpers.getRequestOptions(isMultiline)
+      options: modelHelpers.getOllamaRequestOptions(isMultiline)
     };
     if (this.ollamaOptions.parameters) {
       Object.assign(requestParams.options, this.ollamaOptions.parameters);
@@ -159172,8 +159275,8 @@ function isAllowlistedModel(model2) {
 }
 const PROVIDER_IDENTIFIER$4 = "experimental-openaicompatible";
 const EOT_STARCHAT = "<|end|>";
-const EOT_STARCODER$1 = "<|endoftext|>";
-const EOT_LLAMA_CODE$1 = " <EOT>";
+const EOT_STARCODER = "<|endoftext|>";
+const EOT_LLAMA_CODE = " <EOT>";
 const MODEL_MAP$1 = {
   starchat: "openaicompatible/starchat-16b-beta",
   "starchat-16b-beta": "openaicompatible/starchat-16b-beta",
@@ -159217,14 +159320,14 @@ let OpenAICompatibleProvider$1 = class OpenAICompatibleProvider2 extends Provide
     __publicField2(this, "client");
     __publicField2(this, "timeouts");
     __publicField2(this, "postProcess", (content) => {
-      if (isStarCoderFamily$1(this.model)) {
-        return content.replace(EOT_STARCODER$1, "");
+      if (isStarCoderFamily(this.model)) {
+        return content.replace(EOT_STARCODER, "");
       }
       if (isStarChatFamily(this.model)) {
         return content.replace(EOT_STARCHAT, "");
       }
-      if (isLlamaCode$1(this.model)) {
-        return content.replace(EOT_LLAMA_CODE$1, "");
+      if (isLlamaCode(this.model)) {
+        return content.replace(EOT_LLAMA_CODE, "");
       }
       return content;
     });
@@ -159241,7 +159344,7 @@ let OpenAICompatibleProvider$1 = class OpenAICompatibleProvider2 extends Provide
     const intro = [];
     let prompt = ps``;
     const languageConfig = getLanguageConfig(this.options.document.languageId);
-    if (!isStarCoderFamily$1(this.model)) {
+    if (!isStarCoderFamily(this.model)) {
       intro.push(ps`Path: ${PromptString.fromDisplayPath(this.options.document.uri)}`);
     }
     for (let snippetsToInclude = 0; snippetsToInclude < snippets.length + 1; snippetsToInclude++) {
@@ -159324,10 +159427,10 @@ let OpenAICompatibleProvider$1 = class OpenAICompatibleProvider2 extends Provide
     return zipGenerators(completionsGenerators);
   }
   createInfillingPrompt(filename, intro, prefix, suffix) {
-    if (isStarCoderFamily$1(this.model) || isStarChatFamily(this.model)) {
+    if (isStarCoderFamily(this.model) || isStarChatFamily(this.model)) {
       return ps`<filename>${filename}<fim_prefix>${intro}${prefix}<fim_suffix>${suffix}<fim_middle>`;
     }
-    if (isLlamaCode$1(this.model)) {
+    if (isLlamaCode(this.model)) {
       return ps`<PRE> ${intro}${prefix} <SUF>${suffix} <MID>`;
     }
     if (this.model === "mistral-7b-instruct-4k") {
@@ -159382,10 +159485,10 @@ function createProviderConfig$4({
 function isStarChatFamily(model2) {
   return model2.startsWith("starchat");
 }
-function isStarCoderFamily$1(model2) {
+function isStarCoderFamily(model2) {
   return model2.startsWith("starcoder");
 }
-function isLlamaCode$1(model2) {
+function isLlamaCode(model2) {
   return model2.startsWith("llama-code");
 }
 function fileNameLine$1(uri2, commentStart) {
@@ -159410,47 +159513,6 @@ function promptString$1(prompt, infill, model2) {
   }
   return context2.concat(currentFileNameComment, prompt.prefix);
 }
-class StarcoderPromptExtractor {
-  getContextPrompt(param) {
-    return getDefaultContextPrompt(param.filename, param.content);
-  }
-  getInfillingPrompt(param) {
-    return ps`<filename>${param.filename}<fim_prefix>${param.intro}${param.prefix}<fim_suffix>${param.suffix}<fim_middle>`;
-  }
-}
-class CodeLlamaPromptExtractor {
-  getContextPrompt(param) {
-    return getDefaultContextPrompt(param.filename, param.content);
-  }
-  getInfillingPrompt(param) {
-    return ps`<PRE> ${param.intro}${param.prefix} <SUF>${param.suffix} <MID>`;
-  }
-}
-class DeepSeekPromptExtractor {
-  getContextPrompt(param) {
-    return ps`#${PromptString.fromDisplayPath(param.filename)}\n${param.content}`;
-  }
-  getInfillingPrompt(param) {
-    const prompt = ps`${param.intro}\n#${param.filename}\n<｜fim▁begin｜>${param.prefix}<｜fim▁hole｜>${param.suffix}<｜fim▁end｜>`;
-    if (param.repoName) {
-      return ps`<repo_name>${param.repoName}\n${prompt}`;
-    }
-    return prompt;
-  }
-}
-class DefaultModelPromptExtractor {
-  getContextPrompt(param) {
-    return getDefaultContextPrompt(param.filename, param.content);
-  }
-  getInfillingPrompt(param) {
-    return ps`${param.intro}${param.prefix}`;
-  }
-}
-function getDefaultContextPrompt(filename, content) {
-  return ps`Here is a reference snippet of code from ${PromptString.fromDisplayPath(
-    filename
-  )}:\n\n${content}`;
-}
 var define_process_default$1 = { env: {} };
 function createClient(config, logger2) {
   function complete({ timeoutMs, ...params }, abortController, providerOptions) {
@@ -159772,9 +159834,6 @@ function createFastPathClient(requestParams, abortController, params) {
 }
 var define_process_default = { env: {} };
 const PROVIDER_IDENTIFIER$3 = "fireworks";
-const EOT_STARCODER = "<|endoftext|>";
-const EOT_LLAMA_CODE = " <EOT>";
-const EOT_DEEPSEEK_CODE = "<|eos_token|>";
 const FIREWORKS_DEEPSEEK_7B_LANG_STACK_FINETUNED = "fim-lang-specific-model-deepseek-stack-trained";
 const FIREWORKS_DEEPSEEK_7B_LANG_LOG_FINETUNED = "fim-lang-specific-model-deepseek-logs-trained";
 const DEEPSEEK_CODER_V2_LITE_BASE = "deepseek-coder-v2-lite-base";
@@ -159848,26 +159907,14 @@ class FireworksProvider extends Provider {
     __publicField2(this, "authStatus");
     __publicField2(this, "isLocalInstance");
     __publicField2(this, "fireworksConfig");
-    __publicField2(this, "promptExtractor");
+    __publicField2(this, "modelHelper");
     __publicField2(this, "anonymousUserID");
-    __publicField2(this, "postProcess", (content) => {
-      if (isStarCoderFamily(this.model)) {
-        return content.replace(EOT_STARCODER, "");
-      }
-      if (isLlamaCode(this.model)) {
-        return content.replace(EOT_LLAMA_CODE, "");
-      }
-      if (isDeepSeekModelFamily(this.model)) {
-        return content.replace(EOT_DEEPSEEK_CODE, "");
-      }
-      return content;
-    });
     __publicField2(this, "getCustomHeaders", () => {
       return this.authStatus.isFireworksTracingEnabled ? { "X-Fireworks-Genie": "true" } : {};
     });
     this.timeouts = timeouts;
     this.model = model2;
-    this.promptExtractor = this.getFIMPromptExtractorForModel();
+    this.modelHelper = getModelHelpers(model2);
     this.promptChars = tokensToChars(maxContextTokens - MAX_RESPONSE_TOKENS);
     this.client = client;
     this.authStatus = authStatus;
@@ -159881,78 +159928,6 @@ class FireworksProvider extends Provider {
     // The fast path client only supports Node.js style response streams
     isNode ? dotcomTokenToGatewayToken(config.accessToken) : void 0;
   }
-  getFIMPromptExtractorForModel() {
-    if (isStarCoderFamily(this.model)) {
-      return new StarcoderPromptExtractor();
-    }
-    if (isLlamaCode(this.model)) {
-      return new CodeLlamaPromptExtractor();
-    }
-    if (isDeepSeekModelFamily(this.model)) {
-      return new DeepSeekPromptExtractor();
-    }
-    console.error(
-      "Using default model prompt extractor, could not get prompt extractor for",
-      this.model
-    );
-    return new DefaultModelPromptExtractor();
-  }
-  createPrompt(snippets) {
-    const { prefix, suffix } = PromptString.fromAutocompleteDocumentContext(
-      this.options.docContext,
-      this.options.document.uri
-    );
-    const intro = [];
-    let prompt = ps``;
-    const languageConfig = getLanguageConfig(this.options.document.languageId);
-    if (isLlamaCode(this.model)) {
-      intro.push(ps`Path: ${PromptString.fromDisplayPath(this.options.document.uri)}`);
-    }
-    for (let snippetsToInclude = 0; snippetsToInclude < snippets.length + 1; snippetsToInclude++) {
-      if (snippetsToInclude > 0) {
-        const snippet = snippets[snippetsToInclude - 1];
-        const contextPrompts = PromptString.fromAutocompleteContextSnippet(snippet);
-        if (contextPrompts.symbol) {
-          intro.push(
-            ps`Additional documentation for \`${contextPrompts.symbol}\`:\n\n${contextPrompts.content}`
-          );
-        } else {
-          intro.push(
-            this.promptExtractor.getContextPrompt({
-              filename: snippet.uri,
-              content: contextPrompts.content
-            })
-          );
-        }
-      }
-      const introString = this.getIntroString(intro, languageConfig);
-      const suffixAfterFirstNewline = getSuffixAfterFirstNewline(suffix);
-      const nextPrompt = this.promptExtractor.getInfillingPrompt({
-        repoName: this.options.gitContext ? PromptString.fromAutocompleteGitContext(
-          this.options.gitContext,
-          this.options.document.uri
-        ).repoName : void 0,
-        filename: PromptString.fromDisplayPath(this.options.document.uri),
-        intro: introString,
-        prefix,
-        suffix: suffixAfterFirstNewline
-      });
-      if (nextPrompt.length >= this.promptChars) {
-        return prompt;
-      }
-      prompt = nextPrompt;
-    }
-    return prompt;
-  }
-  getIntroString(intro, languageConfig) {
-    if (isDeepSeekModelFamily(this.model)) {
-      return ps`${PromptString.join(intro, ps`\n\n`)}\n`;
-    }
-    return ps`${PromptString.join(
-      PromptString.join(intro, ps`\n\n`).split("\n").map((line) => ps`${languageConfig ? languageConfig.commentStart : ps`// `}${line}`),
-      ps`\n`
-    )}\n`;
-  }
   generateCompletions(abortSignal, snippets, tracer2) {
     const partialRequestParams = getCompletionParams({
       providerOptions: this.options,
@@ -159962,22 +159937,19 @@ class FireworksProvider extends Provider {
     const { multiline } = this.options;
     const useMultilineModel = multiline || this.options.triggerKind !== TriggerKind.Automatic;
     const model2 = this.model === "starcoder-hybrid" ? MODEL_MAP[useMultilineModel ? "starcoder-16b" : "starcoder-7b"] : MODEL_MAP[this.model];
-    const requestParams = {
+    const prompt = this.modelHelper.getFireworksPrompt({
+      snippets,
+      docContext: this.options.docContext,
+      document: this.options.document,
+      promptChars: this.promptChars
+    });
+    const requestParams = this.modelHelper.getFireworksRequestParams({
       ...partialRequestParams,
-      messages: [{ speaker: "human", text: this.createPrompt(snippets) }],
+      messages: [{ speaker: "human", text: prompt }],
       temperature: 0.2,
       topK: 0,
       model: model2
-    };
-    if (isDeepSeekModelFamily(requestParams.model)) {
-      requestParams.stopSequences = [
-        ...requestParams.stopSequences || [],
-        "<｜fim▁begin｜>",
-        "<｜fim▁hole｜>",
-        "<｜fim▁end｜>",
-        "<|eos_token|>"
-      ];
-    }
+    });
     tracer2 == null ? void 0 : tracer2.params(requestParams);
     const completionsGenerators = Array.from({ length: this.options.n }).map(() => {
       const abortController = forkSignal(abortSignal);
@@ -159989,7 +159961,7 @@ class FireworksProvider extends Provider {
       return fetchAndProcessDynamicMultilineCompletions({
         completionResponseGenerator,
         abortController,
-        providerSpecificPostProcess: this.postProcess,
+        providerSpecificPostProcess: this.modelHelper.postProcess,
         providerOptions: this.options
       });
     });
@@ -160013,15 +159985,21 @@ class FireworksProvider extends Provider {
     });
   }
 }
+function getClientModel(model2, isDotCom2) {
+  if (model2 === null || model2 === "") {
+    return isDotCom2 ? DEEPSEEK_CODER_V2_LITE_BASE : "starcoder-hybrid";
+  }
+  if (model2 === "starcoder-hybrid" || Object.prototype.hasOwnProperty.call(MODEL_MAP, model2)) {
+    return model2;
+  }
+  throw new Error(`Unknown model: \`${model2}\``);
+}
 function createProviderConfig$3({
   model: model2,
   timeouts,
   ...otherOptions
 }) {
-  const clientModel = model2 === null || model2 === "" ? otherOptions.authStatus.isDotCom ? DEEPSEEK_CODER_V2_LITE_BASE : "starcoder-hybrid" : ["starcoder-hybrid"].includes(model2) ? model2 : Object.prototype.hasOwnProperty.call(MODEL_MAP, model2) ? model2 : null;
-  if (clientModel === null) {
-    throw new Error(`Unknown model: \`${model2}\``);
-  }
+  const clientModel = getClientModel(model2, otherOptions.authStatus.isDotCom);
   const maxContextTokens = getMaxContextTokens(clientModel);
   return {
     create(options) {
@@ -160043,19 +160021,6 @@ function createProviderConfig$3({
     model: clientModel
   };
 }
-function isStarCoderFamily(model2) {
-  return model2.startsWith("starcoder");
-}
-function isLlamaCode(model2) {
-  return model2.startsWith("llama-code");
-}
-function isDeepSeekModelFamily(model2) {
-  return [
-    DEEPSEEK_CODER_V2_LITE_BASE,
-    FIREWORKS_DEEPSEEK_7B_LANG_STACK_FINETUNED,
-    FIREWORKS_DEEPSEEK_7B_LANG_LOG_FINETUNED
-  ].includes(model2);
-}
 const DEFAULT_GEMINI_MODEL = "google/gemini-1.5-flash";
 const SUPPORTED_GEMINI_MODELS = ["gemini-1.5-flash", "gemini-pro", "gemini-1.0-pro"];
 const MARKERS = {
@@ -164335,7 +164300,7 @@ const getInput = async (document2, authProvider, initialValues, source) => {
   const isCodyPro = !authStatus.userCanUpgrade;
   const modelOptions = modelsService.getModels(ModelUsage.Edit);
   const modelItems = getModelOptionItems(modelOptions, isCodyPro);
-  const showModelSelector = modelOptions.length > 1 && authStatus.isDotCom;
+  const showModelSelector = modelOptions.length > 1;
   let activeModel = initialValues.initialModel;
   let activeModelItem = modelItems.find((item) => item.model === initialValues.initialModel);
   const getContextWindowOnModelChange = (model2) => {
@@ -166182,7 +166147,12 @@ const getPrompt = async (instruction, replacement, document2, model2, codyApiVer
     throw new Error("The amount of text in this document exceeds Cody's current capacity.");
   }
   const promptBuilder = await PromptBuilder.create(contextWindow);
-  const preamble = getSimplePreamble(model2, codyApiVersion, SMART_APPLY_SELECTION_PROMPT.system);
+  const preamble = getSimplePreamble(
+    model2,
+    codyApiVersion,
+    "Default",
+    SMART_APPLY_SELECTION_PROMPT.system
+  );
   promptBuilder.tryAddToPrefix(preamble);
   const text = SMART_APPLY_SELECTION_PROMPT.instruction.replaceAll("{instruction}", instruction).replaceAll("{incomingText}", replacement).replaceAll("{fileContents}", documentText).replaceAll("{filePath}", PromptString.fromDisplayPath(document2.uri));
   const transcript = [{ speaker: "human", text }];
@@ -167752,7 +167722,7 @@ const buildInteraction$1 = async ({
     document: document2
   });
   const promptBuilder = await PromptBuilder.create(modelsService.getContextWindowByID(model2));
-  const preamble = getSimplePreamble(model2, codyApiVersion, prompt.system);
+  const preamble = getSimplePreamble(model2, codyApiVersion, "Default", prompt.system);
   promptBuilder.tryAddToPrefix(preamble);
   const preInstruction = PromptString.fromConfig(
     workspace.getConfiguration("cody.edit"),
@@ -171195,7 +171165,7 @@ function buildInteraction(document2, diff2) {
     workspace,
     window$1
   );
-  const preamble = getSimplePreamble(MODEL, 1, SYSTEM.replaceAll("____", indentation2));
+  const preamble = getSimplePreamble(MODEL, 1, "Default", SYSTEM.replaceAll("____", indentation2));
   const prompt = PROMPT.replaceAll("{filename}", PromptString.fromDisplayPath(document2.uri)).replaceAll("{source}", PromptString.fromDocumentText(document2)).replaceAll("{git-diff}", diff2).replaceAll("____", indentation2);
   return [
     ...preamble,
@@ -172076,7 +172046,7 @@ async function registerDebugCommands(context2, disposables) {
 }
 async function tryRegisterTutorial(context2, disposables) {
   if (!isRunningInsideAgent()) {
-    const { registerInteractiveTutorial } = await import("./index-AVrhN4Ic.mjs");
+    const { registerInteractiveTutorial } = await import("./index-D2gpkgry.mjs");
     registerInteractiveTutorial(context2).then((disposable) => disposables.push(...disposable));
   }
 }