@codexhost/cli-win32-arm64 0.16.1 → 0.17.0

package/app/plugins/workbuddy/plugin.mjs

@@ -19048,6 +19048,16 @@ function snapshotFromHistory(contents, ref, cwd, profile = CODEBUDDY_RUNTIME_PRO
       continue;
     if (supportsNativeCommands && row.type === "message" && row.role === "user" && data.agent === "compact" && !manualCompactions.has(text(row.id)))
       continue;
+    if (row.type === "message" && row.role === "user" && data.startsNewUserRequest === false && !localCommand && data.agent !== "compact" && !isNativeCompactionSummary(row)) {
+      const contextOnly = body.trim().length > 0 && body.replace(/<system-reminder\b[^>]*\sdata-role=(["'])user-context\1[^>]*>[\s\S]*?<\/system-reminder>/gu, "").trim().length === 0;
+      if (data.isMeta === true || contextOnly)
+        continue;
+      if (current) {
+        if (body)
+          current.input.push({ type: "text", text: body });
+        continue;
+      }
+    }
     if (includeCompactionHistory && isNativeCompactionSummary(row)) {
       if (supportsNativeCommands && current) {
         const outcome = data.isCompacted === true ? { status: "succeeded" } : {

package/app/renderer-extension.js

@@ -16263,6 +16263,19 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     return `${HARNESS_COMMAND_MENTION_PATH_PREFIX}${encodeURIComponent(name).replace(/[()]/gu, (character) => `%${character.charCodeAt(0).toString(16).toUpperCase()}`)}`;
   }
 
+  // ../shared-contracts/dist/desktop-attachments.js
+  var ATTACHED_FILES_HEADING = /^\s*# Files mentioned by the user:[ \t]*(?:\r?\n|$)/u;
+  var REQUEST_HEADING = /(?:^|\n)## My request:[ \t]*(?:\r?\n|$)/u;
+  var IMAGE_ATTACHMENT_PATTERN = /(?:^|\n)## [^\r\n]+: ((?:\/|[A-Za-z]:[\\/]|\\\\)[^\r\n]+)\r?\nImage attachment: true(?=\r?\n|$)/gu;
+  var CONTROL_CHARACTER_PATTERN = /[\u0000-\u001f\u007f]/u;
+  function desktopImageAttachmentPaths(text) {
+    const end = text.search(REQUEST_HEADING);
+    const context = end < 0 ? text : text.slice(0, end);
+    if (!ATTACHED_FILES_HEADING.test(context))
+      return [];
+    return [...context.matchAll(IMAGE_ATTACHMENT_PATTERN)].map((match) => match[1] ?? "").filter((path) => path.length > 0 && !CONTROL_CHARACTER_PATTERN.test(path));
+  }
+
   // ../shared-contracts/dist/remote-runtime.js
   var RUNTIME_STATUS_METHOD = "codexhost/runtime/status";
   var REMOTE_UPDATE_METHOD = "codexhost/remote/update";
@@ -17371,12 +17384,15 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       if (!entry)
         return;
       entry.update((current) => {
+        const { original } = entry;
+        if (!original)
+          return current;
         const settings = current.modelSettings;
         return settings?.model === entry.model && current.modelSettingsPersistAsDefault === false ? {
           ...current,
-          modelSettings: entry.original.modelSettings,
-          modelSettingsPersistAsDefault: entry.original.modelSettingsPersistAsDefault,
-          isManuallyChanged: entry.original.isManuallyChanged
+          modelSettings: original.modelSettings,
+          modelSettingsPersistAsDefault: original.modelSettingsPersistAsDefault,
+          isManuallyChanged: original.isManuallyChanged
         } : current;
       });
       captured.delete(key);
@@ -17385,15 +17401,20 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       has(key) {
         return captured.has(key);
       },
+      /** The carrier last written to this draft, or null while it keeps its native setting. */
+      model(key) {
+        return captured.get(key)?.model ?? null;
+      },
       apply(key, binding, model2) {
         if (model2 === null) {
           restore(key);
           return;
         }
         const { update, usesAccountPreferences } = binding;
+        const previous = captured.get(key);
+        const entry = { update, model: model2 };
         update((current) => {
-          const previous = captured.get(key);
-          captured.set(key, { update, original: previous?.original ?? current, model: model2 });
+          entry.original ??= previous?.original ?? current;
           const settings = current.modelSettings;
           if (settings?.model === model2 && settings.usesAccountPreferences === usesAccountPreferences && current.modelSettingsPersistAsDefault === false)
             return current;
@@ -17410,6 +17431,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
             }
           };
         });
+        captured.set(key, entry);
       },
       dispose() {
         for (const key of captured.keys())
@@ -18663,6 +18685,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       loaded = true;
       show(value);
     }).catch(() => {
+      loaded = true;
       status.textContent = messages.launchPathLoadError;
     }).finally(() => {
       busy = false;
@@ -20242,7 +20265,7 @@ ${messages.harnessVersionLatest}: ${harnessVersionLabel(version2.state, messages
     launchPathAutomatic: "No saved override. Uses environment configuration, then automatic discovery.",
     launchPathSaving: "Saving\u2026",
     launchPathLoading: "Loading launch settings\u2026",
-    launchPathLoadError: "Could not load launch settings. Reopen this detail panel to retry.",
+    launchPathLoadError: "Could not load launch settings. Save an installation directory or reset to automatic discovery to replace them.",
     launchPathSaveError: "Could not save. Enter an existing absolute installation folder on this Host and check configuration permissions.",
     connectionOfficialWebsite: "Visit official website",
     connectionOpenHarnessWeb: "Open DeepSeek Harness Web",
@@ -20521,7 +20544,7 @@ ${messages.harnessVersionLatest}: ${harnessVersionLabel(version2.state, messages
     launchPathAutomatic: "\u672A\u8BBE\u7F6E\u81EA\u5B9A\u4E49\u8DEF\u5F84\uFF0C\u4F7F\u7528\u73AF\u5883\u53D8\u91CF\u914D\u7F6E\u6216\u81EA\u52A8\u53D1\u73B0\u3002",
     launchPathSaving: "\u6B63\u5728\u4FDD\u5B58\u2026",
     launchPathLoading: "\u6B63\u5728\u8BFB\u53D6\u542F\u52A8\u8BBE\u7F6E\u2026",
-    launchPathLoadError: "\u65E0\u6CD5\u8BFB\u53D6\u542F\u52A8\u8BBE\u7F6E\uFF0C\u8BF7\u91CD\u65B0\u6253\u5F00\u6B64\u8BE6\u60C5\u9762\u677F\u91CD\u8BD5\u3002",
+    launchPathLoadError: "\u65E0\u6CD5\u8BFB\u53D6\u542F\u52A8\u8BBE\u7F6E\u3002\u4FDD\u5B58\u5B89\u88C5\u76EE\u5F55\u6216\u6062\u590D\u81EA\u52A8\u53D1\u73B0\u5373\u53EF\u66FF\u6362\u3002",
     launchPathSaveError: "\u4FDD\u5B58\u5931\u8D25\u3002\u8BF7\u586B\u5199\u6B64 Host \u4E0A\u5B9E\u9645\u5B58\u5728\u7684\u5B89\u88C5\u76EE\u5F55\u7EDD\u5BF9\u8DEF\u5F84\uFF0C\u5E76\u786E\u8BA4\u914D\u7F6E\u76EE\u5F55\u53EF\u5199\u3002",
     connectionOfficialWebsite: "\u8BBF\u95EE\u5B98\u7F51",
     connectionOpenHarnessWeb: "\u6253\u5F00 DeepSeek Harness Web",
@@ -25766,10 +25789,16 @@ Codex Fast mode prioritizes requests and may increase usage.`
       const currentRole = manager.getStreamRole?.(threadId);
       if (isRecord7(currentRole) && currentRole.role === "follower")
         return originalSteer.apply(manager, args);
-      if (!Array.isArray(input) || input.length === 0 || input.some(
-        (item) => !isRecord7(item) || item.type !== "text" || typeof item.text !== "string"
-      ) || !input.some((item) => isRecord7(item) && typeof item.text === "string" && item.text.trim())) {
-        throw new Error("External steering requires non-empty text input");
+      if (!Array.isArray(input) || input.length === 0 || input.some((item) => {
+        if (!isRecord7(item)) return true;
+        if (item.type === "text") return typeof item.text !== "string";
+        if (item.type === "localImage") return typeof item.path !== "string" || !item.path;
+        if (item.type === "image") return typeof item.url !== "string" || !item.url;
+        return true;
+      }) || !input.some(
+        (item) => isRecord7(item) && (item.type !== "text" || typeof item.text === "string" && item.text.trim())
+      )) {
+        throw new Error("External steering requires non-empty text or image input");
       }
       if (toolOutput != null) throw new Error("External steering cannot replace a tool response");
       if (!isRecord7(restoreMessage) || !isRecord7(restoreMessage.context)) {
@@ -25890,16 +25919,6 @@ Codex Fast mode prioritizes requests and may increase usage.`
     for (let index = 0; index < decoded.length; index += 1) bytes[index] = decoded.charCodeAt(index);
     return { contents: new Blob([bytes], { type: mimeType }), extension };
   }
-  function nativeImagePaths(text) {
-    const context = text.split("## My request:")[0] ?? "";
-    const start = context.indexOf("# Files mentioned by the user:");
-    if (start < 0) return [];
-    return [
-      ...context.slice(start).matchAll(
-        /(?:^|\n)## [^\r\n]+: ((?:\/|[A-Za-z]:[\\/]|\\\\)[^\r\n]+)\r?\nImage attachment: true(?=\r?\n|$)/gu
-      )
-    ].map((match) => match[1]).filter(filePath);
-  }
   function createRemoteAttachmentSender(target, hostId2, isCurrent) {
     const prepared = /* @__PURE__ */ new WeakMap();
     return (params, send) => {
@@ -25924,7 +25943,7 @@ Codex Fast mode prioritizes requests and may increase usage.`
       if (cached2) return cached2.then(dispatch);
       const input = params.input;
       const text = input.filter((item) => isRecord8(item) && item.type === "text").map((item) => isRecord8(item) && typeof item.text === "string" ? item.text : "").join("\n");
-      const existingPaths = nativeImagePaths(text);
+      const existingPaths = desktopImageAttachmentPaths(text);
       const prepare = async () => {
         if (existingPaths.length === images.length) return params;
         if (images.length > 20) throw new Error("Too many remote image attachments (maximum 20)");
@@ -27433,8 +27452,18 @@ ${text.includes("## My request:") ? "" : "\n## My request:\n"}`,
         const draftKey = target[1];
         if (!binding || !route.policy.scopedCreation)
           return agent === "codex" && !draftModels.has(draftKey);
-        draftModels.apply(draftKey, binding, carrier ?? null);
-        if (route.policy.select(carrier ?? null, draftKey, binding.creationModes)) {
+        const previous = draftModels.model(draftKey);
+        const policyChanged = route.policy.select(carrier ?? null, draftKey, binding.creationModes);
+        try {
+          draftModels.apply(draftKey, binding, carrier ?? null);
+        } catch (error51) {
+          try {
+            route.policy.select(previous, draftKey, binding.creationModes);
+          } catch {
+          }
+          throw error51;
+        }
+        if (policyChanged) {
           modelUpdates += 1;
           liveStatus.modelUpdates = modelUpdates;
         }
@@ -30639,7 +30668,7 @@ ${detail}` : ""}`
     "codexhost was not detected over SSH. Install it on the remote computer or add it to the login shell PATH, then retry": "\u901A\u8FC7 SSH \u672A\u68C0\u6D4B\u5230 codexhost\u3002\u8BF7\u5728\u8FDC\u7A0B\u7535\u8111\u4E0A\u5B89\u88C5\uFF0C\u6216\u5C06\u5DF2\u5B89\u88C5\u7684 codexhost \u52A0\u5165\u767B\u5F55 shell \u7684 PATH \u540E\u91CD\u8BD5",
     "The active codexhost does not match the global npm installation. Uninstall only the remote service, or remove the package manually on the remote computer": "\u5F53\u524D codexhost \u4E0E npm \u5168\u5C40\u5B89\u88C5\u4F4D\u7F6E\u4E0D\u5339\u914D\u3002\u8BF7\u9009\u62E9\u4EC5\u5378\u8F7D\u8FDC\u7A0B\u670D\u52A1\uFF0C\u6216\u5728\u8FDC\u7A0B\u7535\u8111\u4E0A\u624B\u52A8\u5378\u8F7D\u8F6F\u4EF6\u5305",
     "The remote service was uninstalled, but removing the codexhost package failed. Check npm permissions on the remote computer and retry": "\u8FDC\u7A0B\u670D\u52A1\u5DF2\u5378\u8F7D\uFF0C\u4F46 codexhost \u8F6F\u4EF6\u5305\u5378\u8F7D\u5931\u8D25\u3002\u8BF7\u68C0\u67E5\u8FDC\u7A0B\u7535\u8111\u4E0A\u7684 npm \u6743\u9650\u540E\u91CD\u8BD5",
-    "Remote Node.js is unsupported. Select Node.js 22.19 or later in the 22.x series, or Node.js 24.x": "\u8FDC\u7A0B Node.js \u7248\u672C\u4E0D\u53D7\u652F\u6301\uFF0C\u8BF7\u9009\u62E9 Node.js 22.19 \u53CA\u4EE5\u4E0A\u7684 22.x \u7248\u672C\uFF0C\u6216 Node.js 24.x",
+    "Remote Node.js is unsupported. Select Node.js 22.19 or later, except 23.x": "\u8FDC\u7A0B Node.js \u7248\u672C\u4E0D\u53D7\u652F\u6301\uFF0C\u8BF7\u9009\u62E9 Node.js 22.19 \u53CA\u4EE5\u4E0A\u7248\u672C\uFF0C\u4F46\u4E0D\u5305\u62EC 23.x",
     "npm installation failed. Check network access and global installation permissions": "npm \u5B89\u88C5\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u7F51\u7EDC\u548C\u5168\u5C40\u5B89\u88C5\u6743\u9650",
     "Remote service configuration failed. Check Codex CLI and the remote desktop login": "\u8FDC\u7A0B\u670D\u52A1\u914D\u7F6E\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5 Codex CLI \u4EE5\u53CA\u8FDC\u7A0B\u7535\u8111\u7684\u684C\u9762\u767B\u5F55\u72B6\u6001",
     "Remote service could not stop. Check the remote service before retrying": "\u8FDC\u7A0B\u670D\u52A1\u65E0\u6CD5\u505C\u6B62\uFF0C\u8BF7\u68C0\u67E5\u8FDC\u7A0B\u670D\u52A1\u540E\u91CD\u8BD5",
@@ -32071,6 +32100,30 @@ ${detail}` : ""}`
     };
   }
 
+  // src/settings/session-import-sources.ts
+  async function loadSessionImportSources(client, diagnostics, signal, refresh) {
+    const { harnesses } = await client.listSessionImportSources();
+    signal.throwIfAborted();
+    if (!diagnostics || harnesses.length === 0) return harnesses;
+    const hostId2 = client.hostId ?? "local";
+    const readHost = () => diagnostics.snapshot().hosts.find((host2) => host2.hostId === hostId2);
+    let host = readHost();
+    const incomplete = () => !host || Boolean(host.directoryError) || harnesses.some(({ harnessId }) => {
+      const status = host?.agents.find(({ agent }) => agent === harnessId)?.availability;
+      return status === void 0 || status === "checking";
+    });
+    if (refresh || incomplete()) {
+      await diagnostics.refresh(hostId2);
+      signal.throwIfAborted();
+      host = readHost();
+    }
+    if (incomplete()) throw new Error("Harness installation diagnostics are incomplete");
+    const missing = new Set(
+      host?.agents.filter(({ availability }) => availability === "notInstalled").map(({ agent }) => agent)
+    );
+    return harnesses.filter(({ harnessId }) => !missing.has(harnessId));
+  }
+
   // src/settings/session-import-page.ts
   function shortSessionId(value) {
     return value.length <= 18 ? value : `${value.slice(0, 10)}\u2026${value.slice(-6)}`;
@@ -32140,7 +32193,7 @@ ${detail}` : ""}`
               ...getDiagnostics()?.snapshot().hosts.map(({ hostId: hostId2 }) => hostId2) ?? [],
               ...current ? [current] : []
             ])
-          ];
+          ].filter((hostId2) => hostId2 !== "durable");
           displayedHostId = current;
           const scrollLeft = hostOptions.scrollLeft;
           hostOptions.replaceChildren();
@@ -32484,10 +32537,14 @@ ${detail}` : ""}`
           content.append(list);
           updateImportActions();
         };
-        const load = () => {
+        const load = (refreshDiagnostics = false) => {
           if (importingId !== null || context.signal.aborted) return;
           loadedClient = null;
-          const client = getClient(selectedHostId);
+          let client = getClient(selectedHostId);
+          if (client?.hostId === "durable") {
+            selectedHostId = "local";
+            client = getClient(selectedHostId);
+          }
           renderHosts(client);
           listControls.setBusy(client !== null);
           refresh.disabled = client !== null;
@@ -32500,11 +32557,11 @@ ${detail}` : ""}`
           void context.runLatest(
             async (signal) => {
               if (!client) throw new RendererSessionImportUnavailableError();
-              const missing = new Set(
-                getDiagnostics()?.snapshot().hosts.find(({ hostId: hostId2 }) => hostId2 === (client.hostId ?? "local"))?.agents.filter(({ availability }) => availability === "notInstalled").map(({ agent }) => agent)
-              );
-              const harnesses = (await client.listSessionImportSources()).harnesses.filter(
-                ({ harnessId }) => !missing.has(harnessId)
+              const harnesses = await loadSessionImportSources(
+                client,
+                getDiagnostics(),
+                signal,
+                refreshDiagnostics
               );
               const selected = harnesses.find(({ harnessId }) => harnessId === requestedHarness)?.harnessId ?? harnesses[0]?.harnessId ?? null;
               if (signal.aborted) throw new Error("Session import selection changed");
@@ -32555,7 +32612,7 @@ ${detail}` : ""}`
           load();
           hostButtons.find((button2) => button2.dataset.sessionImportHost === hostId2)?.focus();
         };
-        refresh.addEventListener("click", load);
+        refresh.addEventListener("click", () => load(true));
         load();
         return void 0;
       }
@@ -42325,6 +42382,7 @@ ${usage_default}`;
     });
     const mountedByComposer = /* @__PURE__ */ new Map();
     const catalogRequests = /* @__PURE__ */ new WeakMap();
+    const draftUsageRequests = /* @__PURE__ */ new WeakMap();
     const pendingReplacements = /* @__PURE__ */ new Map();
     let disposed = false;
     const disposeReasoningSoftWrap = installReasoningTranscriptSoftWrap(document);
@@ -42451,7 +42509,7 @@ ${usage_default}`;
             for (const mounted of mountedByComposer.values()) {
               if (mounted.hostId !== hostId2) continue;
               renderMounted(mounted);
-              void refreshDraftCodexUsage(mounted);
+              if (controller.get(mounted.composer).agent === "codex") void refreshDraftUsage(mounted);
             }
           });
         });
@@ -42634,36 +42692,59 @@ ${usage_default}`;
         renderMounted(mounted);
       }
     };
-    const refreshDraftCodexUsage = async (mounted) => {
+    const refreshDraftUsage = async (mounted) => {
       const state = controller.get(mounted.composer);
-      if (state.agent !== "codex" || state.phase !== "draft" || controller.isSubmissionPending(mounted.composer) || threadIdFromComposerModelTarget(mounted.modelTarget))
+      if (state.phase !== "draft" || controller.isSwitching(mounted.composer) || controller.isSubmissionPending(mounted.composer) || threadIdFromComposerModelTarget(mounted.modelTarget))
         return;
-      const accounts = composerCodexAccounts(mounted.composer);
-      const client = accounts?.client;
+      const agent = state.agent;
+      const accounts = agent === "codex" ? composerCodexAccounts(mounted.composer) : null;
       const accountId = accounts?.readyAccountId;
+      const client = composerClient(mounted);
       const hostId2 = mounted.hostId;
+      const previous = draftUsageRequests.get(mounted);
+      if (agent !== "codex" && previous?.pending && previous.client === client && previous.generation === mounted.usageRequestGeneration)
+        return;
       const generation = ++mounted.usageRequestGeneration;
+      const request = { client, generation, pending: true };
+      draftUsageRequests.set(mounted, request);
+      mounted.draftUsageClient = null;
       mounted.usage = null;
       mounted.accountCredits = null;
+      mounted.accountCreditsSupported = false;
       renderMounted(mounted);
-      if (!accountId || !client?.inspectCodexAccountUsage) return;
+      const isCurrent = () => !disposed && mounted.hostId === hostId2 && composerClient(mounted) === client && mounted.composer.isConnected && mountedByComposer.get(mounted.composer) === mounted && mounted.usageRequestGeneration === generation && controller.get(mounted.composer).agent === agent && controller.get(mounted.composer).phase === "draft" && !controller.isSwitching(mounted.composer) && !controller.isSubmissionPending(mounted.composer) && !threadIdFromComposerModelTarget(mounted.modelTarget);
       try {
-        const result = await client.inspectCodexAccountUsage({ accountId });
-        if (disposed || mounted.hostId !== hostId2 || composerCodexAccounts(mounted.composer) !== accounts || !mounted.composer.isConnected || mountedByComposer.get(mounted.composer) !== mounted || mounted.usageRequestGeneration !== generation || controller.get(mounted.composer).agent !== "codex" || controller.get(mounted.composer).phase !== "draft" || controller.isSubmissionPending(mounted.composer) || threadIdFromComposerModelTarget(mounted.modelTarget) || accounts.readyAccountId !== accountId || result.accountId !== accountId)
-          return;
-        mounted.usage = result.usage;
-        mounted.accountCredits = result.accountCredits ?? null;
+        if (!client) return;
+        if (agent === "codex") {
+          if (!accountId || !client.inspectCodexAccountUsage) return;
+          const result = await client.inspectCodexAccountUsage({ accountId });
+          if (!isCurrent() || composerCodexAccounts(mounted.composer) !== accounts || accounts?.readyAccountId !== accountId || result.accountId !== accountId)
+            return;
+          mounted.usage = result.usage;
+          mounted.accountCredits = result.accountCredits ?? null;
+        } else {
+          if (!client.inspectHarnessAccount) return;
+          const result = await client.inspectHarnessAccount({
+            harnessId: harnessIdSchema.parse(agent),
+            refresh: true
+          });
+          if (!isCurrent() || result.harnessId !== agent) return;
+          mounted.accountCredits = result.account?.credits ?? null;
+        }
+        mounted.draftUsageClient = client;
         renderMounted(mounted);
       } catch {
+      } finally {
+        request.pending = false;
       }
     };
     const refreshThreadUsage = async (mounted, refresh) => {
       const threadId = threadIdFromComposerModelTarget(mounted.modelTarget);
-      if (!threadId && controller.get(mounted.composer).agent === "codex") {
-        await refreshDraftCodexUsage(mounted);
+      if (!threadId) {
+        await refreshDraftUsage(mounted);
         return;
       }
-      if (!threadId || !modelControl) {
+      if (!modelControl) {
         mounted.usage = null;
         mounted.accountCredits = null;
         usageRefreshAttempts.delete(mounted.composer);
@@ -43458,8 +43539,23 @@ ${usage_default}`;
       if (agent !== "codex" && composerAvailability(mounted)[agent] !== "ready") {
         return false;
       }
+      const state = controller.get(mounted.composer);
+      if (state.phase !== "draft" || controller.isSwitching(mounted.composer)) return false;
       controller.clearPendingSubmission(mounted.composer);
-      const composerId = controller.get(mounted.composer).composerId;
+      const composerId = state.composerId;
+      for (const candidate of mountedByComposer.values()) {
+        if (controller.get(candidate.composer).composerId !== composerId) continue;
+        candidate.usageRequestGeneration += 1;
+        candidate.usage = null;
+        candidate.accountCredits = null;
+        candidate.accountCreditsSupported = false;
+        usageRefreshAttempts.delete(candidate.composer);
+        const timer = usageRefreshTimers.get(candidate.composer);
+        if (timer !== void 0) {
+          window.clearTimeout(timer);
+          usageRefreshTimers.delete(candidate.composer);
+        }
+      }
       controller.invalidateModelRequests(mounted.composer);
       const switching = controller.switchAgent(mounted.composer, agent, {
         applyAgent: (nextAgent) => applyDraftAgentCarrier(mounted.composer, nextAgent),
@@ -43487,7 +43583,9 @@ ${usage_default}`;
         return false;
       } finally {
         for (const candidate of mountedByComposer.values()) {
-          if (controller.get(candidate.composer).composerId === composerId) renderMounted(candidate);
+          if (controller.get(candidate.composer).composerId !== composerId) continue;
+          renderMounted(candidate);
+          void refreshDraftUsage(candidate);
         }
       }
     };
@@ -43502,7 +43600,7 @@ ${usage_default}`;
           for (const mounted of mountedByComposer.values()) {
             if (mounted.hostId !== hostId2) continue;
             renderMounted(mounted);
-            void refreshDraftCodexUsage(mounted);
+            if (controller.get(mounted.composer).agent === "codex") void refreshDraftUsage(mounted);
           }
         })
       );
@@ -43716,6 +43814,7 @@ ${usage_default}`;
             void clearDraftPrewarm(mounted.composer).catch(() => void 0);
           }
           void loadExternalCatalog(mounted);
+          void refreshDraftUsage(mounted);
           continue;
         }
         const target = controllerTarget(mounted.modelTarget, hostId2);
@@ -43744,11 +43843,18 @@ ${usage_default}`;
       }
       if (changed) sidebarAgentIcons.refresh();
     };
-    function reconcileHarnessAvailabilityHost() {
+    function reconcileHarnessAvailabilityHost(retryDraftUsage = false) {
       for (const hostId3 of modelControl?.knownHostIds?.() ?? []) {
         hostHarnessAvailabilityState(hostId3);
       }
       reloadMountedOwnershipForHost();
+      for (const mounted of mountedByComposer.values()) {
+        const client = composerClient(mounted);
+        const request = draftUsageRequests.get(mounted);
+        if (controller.get(mounted.composer).agent !== "codex" && mounted.draftUsageClient !== client && (!request || request.client !== client || request.generation !== mounted.usageRequestGeneration || retryDraftUsage && !request.pending)) {
+          void refreshDraftUsage(mounted);
+        }
+      }
       let connectionsChanged = false;
       for (const target of new Set([...mountedByComposer.values()].map((m) => m.hostId))) {
         if (!target) continue;
@@ -43955,6 +44061,7 @@ ${usage_default}`;
         accountCreditsSupported: inherited?.accountCreditsSupported ?? false,
         hostId: inherited?.hostId ?? hostId2,
         usageRequestGeneration: 0,
+        draftUsageClient: null,
         commandRequestGeneration: 0
       };
       mountedByComposer.set(composer, mounted);
@@ -43974,7 +44081,7 @@ ${usage_default}`;
       } else if (state.agent !== "codex" && !isExternalConfigurationStable(mounted.modelView, mounted.permissionModeView)) {
         void loadExternalCatalog(mounted);
       }
-      if (!threadIdFromComposerModelTarget(modelTarget)) void refreshDraftCodexUsage(mounted);
+      if (!threadIdFromComposerModelTarget(modelTarget)) void refreshDraftUsage(mounted);
       void refreshCommands(mounted);
     };
     const scan = () => {
@@ -44254,7 +44361,7 @@ ${usage_default}`;
     document.addEventListener("keydown", onKeyDown, true);
     document.addEventListener("click", onClick, true);
     const onWindowFocus = () => {
-      reconcileHarnessAvailabilityHost();
+      reconcileHarnessAvailabilityHost(true);
       void loadCodexAccounts();
       for (const mounted of mountedByComposer.values()) {
         if (mounted.hostId === activeModelHostId(mounted.composer) && mounted.ownershipStatus === "error") {
@@ -44438,6 +44545,7 @@ ${usage_default}`;
         for (const mounted of mountedByComposer.values()) {
           renderMounted(mounted);
           void refreshCommands(mounted);
+          if (controller.get(mounted.composer).agent !== "codex") void refreshDraftUsage(mounted);
         }
       },
       dispose() {