@qwen-code/qwen-code 0.19.11-nightly.20260718.767a32484 → 0.19.11

package/chunks/{chunk-Y72B36CP.js → chunk-5CNYZ7TN.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   resolveChannelCwd
-} from "./chunk-FZRES4GK.js";
+} from "./chunk-FNX3LGAK.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -21,12 +21,12 @@ function ensureBuiltins() {
   if (!builtinsPromise) {
     builtinsPromise = (async () => {
       const labelled = [
-        { name: "telegram", promise: import("./dist-LQHDHBPP.js") },
-        { name: "weixin", promise: import("./dist-KEZ5JWH4.js") },
-        { name: "dingtalk", promise: import("./dist-G6QCGO2K.js") },
-        { name: "wecom", promise: import("./dist-ILVRL322.js") },
-        { name: "feishu", promise: import("./dist-SVHAGOLN.js") },
-        { name: "qqbot", promise: import("./dist-4W3UGU2A.js") }
+        { name: "telegram", promise: import("./dist-GXJVCOS7.js") },
+        { name: "weixin", promise: import("./dist-PX2ERZ6I.js") },
+        { name: "dingtalk", promise: import("./dist-V2YVLYOW.js") },
+        { name: "wecom", promise: import("./dist-4WCQEZIN.js") },
+        { name: "feishu", promise: import("./dist-DOPL5LSQ.js") },
+        { name: "qqbot", promise: import("./dist-VYWUKURL.js") }
       ];
       const results = await Promise.allSettled(labelled.map((l) => l.promise));
       for (let i = 0; i < results.length; i++) {

package/chunks/{chunk-DPSHAB47.js → chunk-5VWYKIMW.js}

@@ -8,7 +8,7 @@ import {
 } from "./chunk-TYAMGABM.js";
 import {
   createDebugLogger
-} from "./chunk-UE5TZ55T.js";
+} from "./chunk-7NFB7LBQ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-OXOEOOQU.js → chunk-5Z452MMD.js}

@@ -11,10 +11,9 @@ import {
   getCommandSourceBadge,
   getCommandSourceGroup,
   getCommandSubcommandNames,
-  parseCodeFenceInfo,
   splitMarkdownTableRow,
   useSessionStats
-} from "./chunk-ZTSDZQZO.js";
+} from "./chunk-BYB3GF2T.js";
 import {
   Colors,
   RowMouseController,
@@ -24,7 +23,7 @@ import {
   useMouseEvents,
   useSettings,
   useTerminalSize
-} from "./chunk-U2XBPBO3.js";
+} from "./chunk-FYQ22K62.js";
 import {
   CompactToolGroupDisplay,
   SCREEN_READER_MODEL_PREFIX,
@@ -49,11 +48,11 @@ import {
   useKeypress,
   wrapAnsi,
   wrapForMultiplexer
-} from "./chunk-CZSAIBUB.js";
+} from "./chunk-NVTQZXR7.js";
 import {
   MINIMUM_MAX_HEIGHT,
   MaxSizedBox
-} from "./chunk-EKG3BHQY.js";
+} from "./chunk-DOPUYNXO.js";
 import {
   Box_default,
   Static,
@@ -63,10 +62,10 @@ import {
   theme,
   use_is_screen_reader_enabled_default,
   use_stdin_default
-} from "./chunk-TVYM3Q3J.js";
+} from "./chunk-OWT2CAEQ.js";
 import {
   relaunchApp
-} from "./chunk-5O34IMY5.js";
+} from "./chunk-LS56TX3M.js";
 import {
   isTerminalGoalStatusKind
 } from "./chunk-7X7TEQNX.js";
@@ -76,7 +75,7 @@ import {
 import {
   resolveColor,
   themeManager
-} from "./chunk-XAAEDML2.js";
+} from "./chunk-Q6TUALBE.js";
 import {
   cpLen,
   cpSlice,
@@ -102,18 +101,18 @@ import {
 } from "./chunk-57OAHC2Y.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-LTD3CHGS.js";
+} from "./chunk-SQ5BK3GO.js";
 import {
   getPersistScopeForModelSelection
-} from "./chunk-C5NSOSF4.js";
+} from "./chunk-GNBBAQ6J.js";
 import {
   getCurrentLanguage,
   localizeToolDisplayName,
   t
-} from "./chunk-HIMIG6PI.js";
+} from "./chunk-4AGTGMCQ.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-LSFVUGXT.js";
+} from "./chunk-2OG646IN.js";
 import {
   ALL_PROVIDERS,
   IdeClient,
@@ -133,7 +132,7 @@ import {
   resolveBaseUrl,
   resolveMetadataKey,
   resolveOwnsModel
-} from "./chunk-3YJZ6WNY.js";
+} from "./chunk-NJOFRXTM.js";
 import {
   stripAnsi
 } from "./chunk-T4TZQJ7W.js";
@@ -142,17 +141,17 @@ import {
   formatVisionBridgeNoticeDisplay,
   getMCPServerStatus,
   isVisionBridgeNoticeDisplay
-} from "./chunk-66IT3EY2.js";
+} from "./chunk-MQOVXZAF.js";
 import {
   ToolDisplayNames,
   ToolNames,
   ToolNamesMigration
-} from "./chunk-ANRANWVE.js";
+} from "./chunk-JGUT3LWZ.js";
 import {
   createDebugLogger,
   escapePath,
   unescapePath
-} from "./chunk-UE5TZ55T.js";
+} from "./chunk-7NFB7LBQ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -2472,16 +2471,14 @@ function colorizeLine(line, language, theme2) {
   );
 }
 __name(colorizeLine, "colorizeLine");
-function colorizeCode(code, language, availableHeight, maxWidth, options = {}) {
-  const { theme: theme2, settings, tabWidth = 4, startLineNumber = 1 } = options;
-  const firstLineNumber = Math.max(1, Math.trunc(startLineNumber));
+function colorizeCode(code, language, availableHeight, maxWidth, theme2, settings, tabWidth = 4) {
   const codeToHighlight = code.replace(/\n$/, "").replace(/\t/g, " ".repeat(tabWidth));
   const activeTheme = theme2 || themeManager.getActiveTheme();
   const showLineNumbers = settings?.merged.ui?.showLineNumbers ?? true;
   const lowlight = ensureLowlightLoading();
   try {
     let lines = codeToHighlight.split("\n");
-    const padWidth = String(lines.length + firstLineNumber - 1).length;
+    const padWidth = String(lines.length).length;
     let hiddenLinesCount = 0;
     if (availableHeight !== void 0) {
       availableHeight = Math.max(availableHeight, MINIMUM_MAX_HEIGHT);
@@ -2506,9 +2503,10 @@ function colorizeCode(code, language, availableHeight, maxWidth, options = {}) {
             lowlight
           );
           return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { children: [
-            showLineNumbers && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: activeTheme.colors.Gray, children: `${String(
-              index + firstLineNumber + hiddenLinesCount
-            ).padStart(padWidth, " ")} ` }),
+            showLineNumbers && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: activeTheme.colors.Gray, children: `${String(index + 1 + hiddenLinesCount).padStart(
+              padWidth,
+              " "
+            )} ` }),
             /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: activeTheme.defaultColor, wrap: "wrap", children: contentToRender })
           ] }, index);
         })
@@ -2520,7 +2518,7 @@ function colorizeCode(code, language, availableHeight, maxWidth, options = {}) {
       error
     );
     const lines = codeToHighlight.split("\n");
-    const padWidth = String(lines.length + firstLineNumber - 1).length;
+    const padWidth = String(lines.length).length;
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
       MaxSizedBox,
       {
@@ -2528,7 +2526,7 @@ function colorizeCode(code, language, availableHeight, maxWidth, options = {}) {
         maxWidth,
         overflowDirection: "top",
         children: lines.map((line, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { children: [
-          showLineNumbers && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: activeTheme.defaultColor, children: `${String(index + firstLineNumber).padStart(padWidth, " ")} ` }),
+          showLineNumbers && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: activeTheme.defaultColor, children: `${String(index + 1).padStart(padWidth, " ")} ` }),
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: activeTheme.colors.Gray, children: line })
         ] }, index))
       }
@@ -5784,7 +5782,7 @@ function countMarkdownSourceBlocks(text) {
     }
     if (codeFenceMatch) {
       activeCodeFence = codeFenceMatch[1];
-      const lang = parseCodeFenceInfo(codeFenceMatch[2]).lang?.toLowerCase();
+      const lang = codeFenceMatch[2]?.trim().split(/\s+/)[0]?.toLowerCase() || null;
       if (lang) {
         codeBlockLanguageCounts.set(
           lang,
@@ -5919,7 +5917,6 @@ var MarkdownDisplayInternal = /* @__PURE__ */ __name(({
   let codeBlockIndex = 0;
   let currentCodeBlockIndex = 0;
   let currentCodeBlockLangIndex = 0;
-  let currentCodeBlockStartLine = 1;
   const codeBlockLanguageCounts = new Map(
     sourceCopyIndexOffsets?.codeBlockLanguageCounts
   );
@@ -5957,8 +5954,7 @@ var MarkdownDisplayInternal = /* @__PURE__ */ __name(({
               codeBlockLangIndex: currentCodeBlockLangIndex,
               isPending,
               availableTerminalHeight,
-              contentWidth,
-              startLineNumber: currentCodeBlockStartLine
+              contentWidth
             },
             key
           )
@@ -6011,9 +6007,7 @@ var MarkdownDisplayInternal = /* @__PURE__ */ __name(({
       codeBlockIndex += 1;
       currentCodeBlockIndex = codeBlockIndex;
       codeBlockFence = codeFenceMatch[1];
-      const fenceInfo = parseCodeFenceInfo(codeFenceMatch[2]);
-      codeBlockLang = fenceInfo.lang;
-      currentCodeBlockStartLine = fenceInfo.startLine;
+      codeBlockLang = codeFenceMatch[2]?.trim().split(/\s+/)[0] || null;
       if (codeBlockLang) {
         const normalizedLang = codeBlockLang.toLowerCase();
         const nextLangIndex = (codeBlockLanguageCounts.get(normalizedLang) ?? 0) + 1;
@@ -6237,8 +6231,7 @@ var MarkdownDisplayInternal = /* @__PURE__ */ __name(({
           codeBlockLangIndex: currentCodeBlockLangIndex,
           isPending,
           availableTerminalHeight,
-          contentWidth,
-          startLineNumber: currentCodeBlockStartLine
+          contentWidth
         },
         "line-eof"
       )
@@ -6299,8 +6292,7 @@ var RenderCodeBlockInternal = /* @__PURE__ */ __name(({
   codeBlockLangIndex,
   isPending,
   availableTerminalHeight,
-  contentWidth,
-  startLineNumber = 1
+  contentWidth
 }) => {
   const settings = useSettings();
   const { renderMode } = useRenderMode();
@@ -6344,7 +6336,8 @@ var RenderCodeBlockInternal = /* @__PURE__ */ __name(({
         lang,
         availableTerminalHeight,
         contentWidth - CODE_BLOCK_PREFIX_PADDING,
-        { settings, startLineNumber }
+        void 0,
+        settings
       );
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Box_default, { paddingLeft: CODE_BLOCK_PREFIX_PADDING, flexDirection: "column", children: colorizedTruncatedCode });
     }
@@ -6354,7 +6347,8 @@ var RenderCodeBlockInternal = /* @__PURE__ */ __name(({
     lang,
     availableTerminalHeight,
     contentWidth - CODE_BLOCK_PREFIX_PADDING,
-    { settings, startLineNumber }
+    void 0,
+    settings
   );
   return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
     Box_default,
@@ -6920,7 +6914,9 @@ var DiffRenderer = /* @__PURE__ */ __name(({
       language,
       availableTerminalHeight,
       contentWidth,
-      { theme: theme2, settings, tabWidth }
+      theme2,
+      settings,
+      tabWidth
     );
   } else {
     renderedOutput = renderDiffContent(
@@ -7191,7 +7187,6 @@ var Command = /* @__PURE__ */ ((Command2) => {
   Command2["COMPLETION_UP"] = "completionUp";
   Command2["COMPLETION_DOWN"] = "completionDown";
   Command2["SUBMIT"] = "submit";
-  Command2["QUEUE_MESSAGE"] = "queueMessage";
   Command2["NEWLINE"] = "newline";
   Command2["VOICE_PUSH_TO_TALK"] = "voicePushToTalk";
   Command2["OPEN_EXTERNAL_EDITOR"] = "openExternalEditor";
@@ -7285,9 +7280,6 @@ var defaultKeyBindings = {
       shift: false
     }
   ],
-  ["queueMessage" /* QUEUE_MESSAGE */]: [
-    { key: "q", ctrl: true, command: false, shift: false, paste: false }
-  ],
   // Split into multiple data-driven bindings
   // Now also includes shift+enter for multi-line input
   ["newline" /* NEWLINE */]: [
@@ -13858,7 +13850,6 @@ var GeneralHelp = /* @__PURE__ */ __name(({ width }) => {
     ["Tab", t("Accept ghost text or completion")],
     ["Esc Esc", t("Clear input or cancel operation")],
     ["Ctrl+L", t("Clear the screen")],
-    ["Ctrl+Q", t("Queue message for the next turn")],
     [
       process.platform === "win32" ? "Ctrl+Enter" : "Ctrl+J",
       t("Insert a newline")
@@ -16360,7 +16351,6 @@ var ClickableThinkMessage = /* @__PURE__ */ __name(({
   onToggle
 }) => {
   const ref = (0, import_react34.useRef)(null);
-  const pressRef = (0, import_react34.useRef)(null);
   const { rows: terminalHeight } = useTerminalSize();
   const settings = useSettings();
   const clickable = !!settings.merged.ui?.useTerminalBuffer;
@@ -16368,28 +16358,11 @@ var ClickableThinkMessage = /* @__PURE__ */ __name(({
   useMouseEvents(
     (0, import_react34.useCallback)(
       (event) => {
-        if (!ref.current) return;
-        if (event.name === "move") {
-          if (pressRef.current && (event.col !== pressRef.current.col || event.row !== pressRef.current.row)) {
-            pressRef.current = null;
-          }
-          return;
-        }
-        if (event.name !== "left-press" && event.name !== "left-release") {
-          pressRef.current = null;
-          return;
-        }
+        if (event.name !== "left-press" || !ref.current) return;
         const metrics = measureElementPosition(ref.current);
         const col = event.col - 1;
         const row = layoutRowForEvent(ref.current, event.row, terminalHeight);
-        const isInside = col >= metrics.x && col < metrics.x + metrics.width && row >= metrics.y && row < metrics.y + metrics.height;
-        if (event.name === "left-press") {
-          pressRef.current = isInside ? { col: event.col, row: event.row } : null;
-          return;
-        }
-        const press = pressRef.current;
-        pressRef.current = null;
-        if (isInside && press?.col === event.col && press.row === event.row) {
+        if (col >= metrics.x && col < metrics.x + metrics.width && row >= metrics.y && row < metrics.y + metrics.height) {
           onToggle();
         }
       },

package/chunks/{chunk-U6OPT4H2.js → chunk-6EDDYPI3.js}

@@ -3,17 +3,17 @@
 import {
   getGitVersion,
   getNpmVersion
-} from "./chunk-K2GBHL73.js";
+} from "./chunk-S63Z5V42.js";
 import {
   buildEnvStatusFromEnv,
   snapshotProcessEnv
-} from "./chunk-2YSZE74N.js";
+} from "./chunk-SY7NEYX4.js";
 import {
   mapDomainErrorToErrorKind
-} from "./chunk-URP6O2PP.js";
+} from "./chunk-VFX7EZIR.js";
 import {
   canUseRipgrep
-} from "./chunk-3YJZ6WNY.js";
+} from "./chunk-NJOFRXTM.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-XA7OKDWM.js → chunk-6WGZDD67.js}

@@ -21,7 +21,7 @@ import {
   isChannelWebhookTaskResultMessage,
   normalizeWorkerDiagnostic,
   sanitizeWorkerDiagnostic
-} from "./chunk-JDIUK2Y3.js";
+} from "./chunk-KSZKSE23.js";
 import {
   channelSelectionNames
 } from "./chunk-TJTKSVIV.js";
@@ -32,7 +32,7 @@ import {
 } from "./chunk-5HBA2Z7V.js";
 import {
   sanitizeLogText
-} from "./chunk-ATJ7H5AS.js";
+} from "./chunk-ZQIYGQCG.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-IENO2YAT.js → chunk-6WPJRYLZ.js}

@@ -2,11 +2,11 @@
 "use strict";
 import {
   createTask
-} from "./chunk-XSPFQQRE.js";
+} from "./chunk-KKRTYONM.js";
 import {
   getPlanRequiredTeammatePreApprovalMessage,
   isPlanRequiredTeammateAwaitingApproval
-} from "./chunk-VNN3JNYT.js";
+} from "./chunk-F333XEAU.js";
 import {
   resolveActiveTeamName
 } from "./chunk-6AM5D4ME.js";
@@ -15,7 +15,7 @@ import {
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-ANRANWVE.js";
+} from "./chunk-JGUT3LWZ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-PWYLF7SS.js → chunk-6Y6ORE2G.js}

@@ -3,7 +3,7 @@
 import {
   formatHistoryGapNotice,
   indexGapsByChild
-} from "./chunk-JBAQ5BYX.js";
+} from "./chunk-CF5VJRGC.js";
 import {
   sanitizeTerminalText
 } from "./chunk-SUARMD4Q.js";
@@ -15,18 +15,18 @@ import {
 } from "./chunk-YUZI3WAC.js";
 import {
   getActiveGoal
-} from "./chunk-3YJZ6WNY.js";
+} from "./chunk-NJOFRXTM.js";
 import {
   apiActivityTracker,
   formatVisionBridgeNoticeDisplay,
   isVisionBridgeNoticeDisplay
-} from "./chunk-66IT3EY2.js";
+} from "./chunk-MQOVXZAF.js";
 import {
   ToolNames
-} from "./chunk-ANRANWVE.js";
+} from "./chunk-JGUT3LWZ.js";
 import {
   createDebugLogger
-} from "./chunk-UE5TZ55T.js";
+} from "./chunk-7NFB7LBQ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -1539,7 +1539,10 @@ var HistoryReplayer = class {
     return "";
   }
   setActiveRecordId(recordId, timestamp) {
-    this.ctx.setActiveRecordId?.(recordId, timestamp);
+    const context = this.ctx;
+    if (typeof context.setActiveRecordId === "function") {
+      context.setActiveRecordId(recordId, timestamp);
+    }
   }
 };
 
@@ -1732,7 +1735,7 @@ async function extractMetadata(conversation, config) {
   const gitBranch = firstRecord?.gitBranch;
   let gitRepo;
   if (cwd) {
-    const { getGitRepoName } = await import("./src-7ZBIMTJZ.js");
+    const { getGitRepoName } = await import("./src-XPKFZ3RN.js");
     gitRepo = getGitRepoName(cwd);
   }
   let model;

package/chunks/{chunk-UE5TZ55T.js → chunk-7NFB7LBQ.js}

@@ -416,13 +416,6 @@ function makeRelative(targetPath, rootDirectory) {
   return relativePath || ".";
 }
 __name(makeRelative, "makeRelative");
-function formatDisplayPath(filePath, rootDirectory, maxLen = 80) {
-  const resolved = resolvePath(rootDirectory, filePath);
-  const relative2 = makeRelative(resolved, rootDirectory);
-  const display = path.isAbsolute(relative2) ? tildeifyPath(relative2) : relative2;
-  return shortenPath(display, maxLen);
-}
-__name(formatDisplayPath, "formatDisplayPath");
 function escapePath(filePath) {
   let result = "";
   for (let i = 0; i < filePath.length; i++) {
@@ -1116,7 +1109,6 @@ export {
   expandHomeDir,
   shortenPath,
   makeRelative,
-  formatDisplayPath,
   escapePath,
   unescapePath,
   getProjectHash,

package/chunks/{chunk-3CL5SEDT.js → chunk-7NMU22Q3.js}

@@ -2,28 +2,28 @@
 "use strict";
 import {
   getExtensionManager
-} from "./chunk-IVKLDHU6.js";
+} from "./chunk-YFVO2HOR.js";
 import {
   getPlugin,
   parseChannelConfig,
   registerPlugin
-} from "./chunk-Y72B36CP.js";
+} from "./chunk-5CNYZ7TN.js";
 import {
   sanitizeLogText
-} from "./chunk-ATJ7H5AS.js";
+} from "./chunk-ZQIYGQCG.js";
 import {
   loadSettings
-} from "./chunk-C5NSOSF4.js";
+} from "./chunk-GNBBAQ6J.js";
 import {
   writeStderrLine,
   writeStdoutLine
 } from "./chunk-YUZI3WAC.js";
 import {
   hashDaemonWorkspace
-} from "./chunk-66IT3EY2.js";
+} from "./chunk-MQOVXZAF.js";
 import {
   Storage
-} from "./chunk-UE5TZ55T.js";
+} from "./chunk-7NFB7LBQ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-ECZFTRTP.js → chunk-7ZYHLN67.js}

@@ -1,34 +1,34 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
-  buildAcpModelOptions,
+  formatAcpModelId,
   getAuthTypeFromEnv,
-  getCurrentAcpModelId,
   parseAcpBaseModelId,
   resolveCliGenerationConfig,
   sanitizeProviderBaseUrl
-} from "./chunk-6Z5NRZVU.js";
+} from "./chunk-ZIXOTAPZ.js";
 import {
   snapshotProcessEnv
-} from "./chunk-2YSZE74N.js";
+} from "./chunk-SY7NEYX4.js";
 import {
   STATUS_SCHEMA_VERSION
-} from "./chunk-URP6O2PP.js";
+} from "./chunk-VFX7EZIR.js";
 import {
   loadSettings
-} from "./chunk-C5NSOSF4.js";
+} from "./chunk-GNBBAQ6J.js";
 import {
-  ModelsConfig
-} from "./chunk-3YJZ6WNY.js";
+  ModelsConfig,
+  resolveProviderProtocol
+} from "./chunk-NJOFRXTM.js";
 import {
   APPROVAL_MODES
-} from "./chunk-VNN3JNYT.js";
+} from "./chunk-F333XEAU.js";
 import {
   tokenLimit
-} from "./chunk-CMVFTMRD.js";
+} from "./chunk-VRR65QYW.js";
 import {
   createDebugLogger
-} from "./chunk-UE5TZ55T.js";
+} from "./chunk-7NFB7LBQ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -75,24 +75,17 @@ function buildWorkspaceProvidersStatus(workspaceCwd, acpChannelLive, options) {
     const currentAuth = selectedAuthType;
     const currentModelId = (resolvedCliConfig.model || modelsConfig.getModel() || "").trim();
     const hasCurrentModel = currentModelId.length > 0;
-    const modelCameFromSettings = !argv.model && settings.model?.name?.trim() === currentModelId;
-    const currentBaseUrl = modelCameFromSettings && settings.model?.baseUrl !== void 0 ? settings.model.baseUrl || void 0 : resolvedCliConfig.sources["baseUrl"] ? resolvedCliConfig.baseUrl || void 0 : void 0;
-    const currentRegistryBaseUrl = modelCameFromSettings && currentAuth ? settings.model?.baseUrl !== void 0 ? settings.model.baseUrl || null : modelsConfig.getResolvedModel(currentAuth, currentModelId)?.registryBaseUrl ?? null : void 0;
-    const modelOptions = buildAcpModelOptions(
-      modelsConfig.getAllConfiguredModels()
-    );
-    const currentAcpModelId = hasCurrentModel ? getCurrentAcpModelId(
-      modelOptions,
-      currentModelId,
-      currentAuth,
-      currentRegistryBaseUrl
-    ) : void 0;
+    const currentAcpModelId = hasCurrentModel && currentAuth ? formatAcpModelId(currentModelId, currentAuth) : currentModelId || void 0;
+    const currentBaseUrl = resolvedCliConfig.sources["baseUrl"] ? resolvedCliConfig.baseUrl || void 0 : void 0;
     const fastModelId = typeof settings.fastModel === "string" && settings.fastModel.length > 0 ? settings.fastModel : void 0;
     const visionModelId = typeof settings.visionModel === "string" && settings.visionModel.length > 0 ? settings.visionModel : void 0;
     const approvalMode = resolveApprovalMode(settings);
     const providers = /* @__PURE__ */ new Map();
-    for (const option of modelOptions) {
-      const { model, effectiveModelId, modelId } = option;
+    const explicitModelBaseUrls = buildExplicitModelBaseUrls(
+      settings.modelProviders,
+      settings.providerProtocol
+    );
+    for (const model of modelsConfig.getAllConfiguredModels().filter(isMainSelectableModel)) {
       if (model.isRuntimeModel) continue;
       const authType = String(model.authType);
       let provider = providers.get(authType);
@@ -106,7 +99,15 @@ function buildWorkspaceProvidersStatus(workspaceCwd, acpChannelLive, options) {
         };
         providers.set(authType, provider);
       }
-      const isCurrent = currentAuth === model.authType && currentAcpModelId === modelId;
+      const effectiveModelId = model.id;
+      const modelId = formatAcpModelId(effectiveModelId, model.authType);
+      const isCurrent = currentAuth === model.authType && hasCurrentModel && matchesCurrentModel(currentModelId, effectiveModelId, modelId) && matchesCurrentBaseUrl(
+        currentBaseUrl,
+        model.baseUrl,
+        model.baseUrl !== void 0 && explicitModelBaseUrls.has(
+          modelBaseUrlKey(authType, effectiveModelId, model.baseUrl)
+        )
+      );
       const providerModel = {
         modelId,
         baseModelId: parseAcpBaseModelId(effectiveModelId),
@@ -181,6 +182,54 @@ function resolveApprovalMode(settings) {
   return "auto" /* AUTO */;
 }
 __name(resolveApprovalMode, "resolveApprovalMode");
+function isMainSelectableModel(model) {
+  return model.fastOnly !== true && model.voiceOnly !== true;
+}
+__name(isMainSelectableModel, "isMainSelectableModel");
+function matchesCurrentModel(currentModelId, baseModelId, acpModelId) {
+  return currentModelId === baseModelId || currentModelId === acpModelId;
+}
+__name(matchesCurrentModel, "matchesCurrentModel");
+function matchesCurrentBaseUrl(currentBaseUrl, modelBaseUrl, modelHasExplicitBaseUrl) {
+  if (!currentBaseUrl) return !modelHasExplicitBaseUrl;
+  return currentBaseUrl === modelBaseUrl;
+}
+__name(matchesCurrentBaseUrl, "matchesCurrentBaseUrl");
+function buildExplicitModelBaseUrls(modelProviders, providerProtocol) {
+  const baseUrls = /* @__PURE__ */ new Set();
+  if (!modelProviders) return baseUrls;
+  for (const [providerId, providerConfig] of Object.entries(modelProviders)) {
+    const authType = resolveProviderProtocol(providerId, providerProtocol);
+    if (!authType) continue;
+    const models = readProviderModels(providerConfig);
+    for (const model of models) {
+      if (typeof model.id === "string" && typeof model.baseUrl === "string" && model.baseUrl.length > 0) {
+        baseUrls.add(modelBaseUrlKey(authType, model.id, model.baseUrl));
+      }
+    }
+  }
+  return baseUrls;
+}
+__name(buildExplicitModelBaseUrls, "buildExplicitModelBaseUrls");
+function readProviderModels(providerConfig) {
+  if (Array.isArray(providerConfig)) {
+    return providerConfig.filter(isProviderModelBaseUrlConfig);
+  }
+  if (typeof providerConfig !== "object" || providerConfig === null) {
+    return [];
+  }
+  const { models } = providerConfig;
+  return Array.isArray(models) ? models.filter(isProviderModelBaseUrlConfig) : [];
+}
+__name(readProviderModels, "readProviderModels");
+function isProviderModelBaseUrlConfig(value) {
+  return typeof value === "object" && value !== null;
+}
+__name(isProviderModelBaseUrlConfig, "isProviderModelBaseUrlConfig");
+function modelBaseUrlKey(authType, modelId, baseUrl) {
+  return `${authType}\0${modelId}\0${baseUrl}`;
+}
+__name(modelBaseUrlKey, "modelBaseUrlKey");
 var URL_LIKE_PATTERN = /\b[A-Za-z][A-Za-z\d+.-]*:\/\/[^\s'"`<>]+/g;
 var URL_START_PATTERN = /\b[A-Za-z][A-Za-z\d+.-]*:\/\//g;
 function sanitizeProviderWarning(warning) {