@codexhost/cli-darwin-x64 0.16.0 → 0.17.0

package/app/renderer-extension.js

@@ -15858,7 +15858,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     harnessId: harnessPluginIdSchema,
     model: harnessModelRefSchema.optional(),
     thinkingOptionId: harnessThinkingOptionIdSchema.optional(),
-    permissionModeId: harnessPermissionModeIdSchema.optional()
+    permissionModeId: harnessPermissionModeIdSchema.optional(),
+    /** A draft prewarm create: stays unsubmitted until the user's first Turn.
+     * Desktop forwards only the Model of a main-process prewarm to thread/start. */
+    prewarm: external_exports.literal(true).optional()
   }).strict();
   function encodeHarnessPluginRoute(route) {
     const parsed = harnessPluginRouteSchema.parse(route);
@@ -16260,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";
@@ -16350,8 +16366,24 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     if (!ownerWindow.document || !ownerWindow.location) return null;
     const page = new URL(ownerWindow.location.href);
     const urls = /* @__PURE__ */ new Set();
-    for (const link of ownerWindow.document.querySelectorAll('link[rel="modulepreload"][href]')) {
-      const url2 = new URL(link.getAttribute("href") ?? "", page);
+    const catalog = Reflect.get(ownerWindow, "__codexhostLoadedModulesV1");
+    let sources;
+    if (catalog !== void 0) {
+      if (typeof catalog !== "object" || catalog === null || !("complete" in catalog) || catalog.complete !== true || !("documentUrl" in catalog) || catalog.documentUrl !== page.href || !("urls" in catalog) || !Array.isArray(catalog.urls) || catalog.urls.length > 4096 || catalog.urls.some((url2) => typeof url2 !== "string"))
+        throw new Error("Codex loaded module catalog is unavailable in this window");
+      sources = catalog.urls;
+    } else {
+      sources = [...ownerWindow.document.querySelectorAll('link[rel="modulepreload"][href]')].map(
+        (link) => link.getAttribute("href") ?? ""
+      );
+    }
+    for (const source of sources) {
+      let url2;
+      try {
+        url2 = new URL(source, page);
+      } catch {
+        continue;
+      }
       if (url2.protocol === page.protocol && url2.host === page.host && url2.pathname.endsWith(".js") && !url2.search && !url2.hash)
         urls.add(url2.href);
     }
@@ -16369,6 +16401,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       for (const value of Object.values(module).filter(matchesServices)) matches.add(value);
       if (matches.size > 1) throw new Error("Codex native services are unavailable in this window");
     }
+    if (catalog !== void 0 && Reflect.get(ownerWindow, "__codexhostLoadedModulesV1") !== catalog)
+      throw new Error("Codex loaded module catalog changed during discovery. Try again once ready.");
     return [...matches][0] ?? null;
   }
 
@@ -17350,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);
@@ -17364,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;
@@ -17389,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())
@@ -17463,14 +17506,14 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 
   // ../desktop-control/dist/renderer-host-discovery.js
   function requestManagerFromHookState(value, hostId2) {
-    const record8 = (candidate) => typeof candidate === "object" && candidate !== null;
+    const record10 = (candidate) => typeof candidate === "object" && candidate !== null;
     const manager = (candidate) => {
-      if (!record8(candidate) || !record8(candidate.requestClient) || !record8(candidate.prewarmedThreadManager))
+      if (!record10(candidate) || !record10(candidate.requestClient) || !record10(candidate.prewarmedThreadManager))
         return null;
       const bridge = candidate.requestClient;
       return typeof candidate.sendRequest === "function" && typeof bridge.sendRequest === "function" && typeof bridge.prewarmThreadStart === "function" && typeof bridge.enqueueRequest === "function" && typeof candidate.prewarmedThreadManager.discardAllPrewarmedThreads === "function" ? candidate : null;
     };
-    if (!record8(value))
+    if (!record10(value))
       return null;
     const direct = manager(value) ?? manager(value.manager);
     if (direct)
@@ -17531,14 +17574,197 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     };
   }
 
-  // ../desktop-control/dist/renderer-schedule-workspace.js
+  // ../desktop-control/dist/renderer-host-rpc-discovery.js
+  function findRendererHostRpcFamily(store) {
+    const record10 = (value) => typeof value === "object" && value !== null;
+    const families = /* @__PURE__ */ new Set();
+    for (const [definition, members] of store.familyBindings) {
+      if (!record10(definition) || definition.kind !== "signal-family")
+        continue;
+      if (!record10(members) || typeof members.get !== "function")
+        continue;
+      for (const [hostId2, member] of members) {
+        if (typeof hostId2 !== "string" || !record10(member))
+          continue;
+        const signal = member.value;
+        if (!record10(signal) || typeof signal.get !== "function")
+          continue;
+        let value;
+        try {
+          value = signal.get();
+        } catch {
+          continue;
+        }
+        if (record10(value) && Object.keys(value).length === 2 && typeof value.status === "string" && record10(value.client) && value.client.hostId === hostId2 && "rpc" in value.client) {
+          families.add(members);
+          break;
+        }
+      }
+    }
+    if (families.size !== 1)
+      return null;
+    return { store, family: families.values().next().value };
+  }
+  function resolveRendererHostRpc(discovery, hostId2) {
+    const record10 = (value2) => typeof value2 === "object" && value2 !== null;
+    const signal = discovery.family.get(hostId2)?.value;
+    if (!record10(signal) || typeof signal.get !== "function")
+      return null;
+    let value;
+    try {
+      value = signal.get();
+    } catch {
+      return null;
+    }
+    if (!record10(value) || value.status !== "ready" || !record10(value.client) || value.client.hostId !== hostId2)
+      return null;
+    const rpc = value.client.rpc;
+    return typeof rpc === "function" || record10(rpc) ? rpc : null;
+  }
+
+  // ../desktop-control/dist/renderer-schedule-workspace-rpc.js
   var record5 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+  function localAppScope(root) {
+    const scopes = /* @__PURE__ */ new Map();
+    const seen = /* @__PURE__ */ new Set();
+    for (const main of root.querySelectorAll("main")) {
+      const keys = Object.getOwnPropertyNames(main).filter((key2) => key2.startsWith("__reactFiber$"));
+      const key = keys[0];
+      if (keys.length !== 1 || !key)
+        continue;
+      for (const fiber of committedReactAncestors(Reflect.get(main, key))) {
+        if (seen.has(fiber))
+          break;
+        seen.add(fiber);
+        let hook = fiber.memoizedState;
+        for (let n = 0; record5(hook) && "next" in hook && n < 150; n++, hook = hook.next) {
+          const handle = record5(hook.memoizedState) ? hook.memoizedState.current : null;
+          if (!record5(handle) || !record5(handle.node) || handle.node.parent != null || !("chain" in handle) || !("scope" in handle) || typeof handle.get !== "function" || typeof handle.set !== "function" || typeof handle.watch !== "function" || !(handle.node.familyBindings instanceof Map))
+            continue;
+          scopes.set(handle.node, { handle, store: handle.node });
+        }
+      }
+    }
+    const scope = scopes.values().next().value;
+    if (scopes.size !== 1 || !scope)
+      throw new Error("Native local app scope is missing or ambiguous");
+    const discovery = findRendererHostRpcFamily(scope.store);
+    const rpc = discovery && resolveRendererHostRpc(discovery, "local");
+    if (!discovery || !rpc)
+      throw new Error("Native local app RPC is unavailable");
+    return { ...scope, discovery, rpc };
+  }
+  async function createRpcScheduleWorkspaceThread(root, routing, route, createThread, input, signal) {
+    if (!route.policy.scopedCreation)
+      throw new Error("Native local chat creation is unavailable");
+    const scope = localAppScope(root);
+    const assertConnection = () => {
+      if (routing.forHost("local")?.manager !== route.manager || resolveRendererHostRpc(scope.discovery, "local") !== scope.rpc)
+        throw new Error("The local connection changed. Reopen the task dialog.");
+    };
+    const assertCurrent = () => {
+      signal.throwIfAborted();
+      assertConnection();
+    };
+    const request = async (method, params) => {
+      assertConnection();
+      return route.manager.sendRequest(method, params);
+    };
+    const readEmpty = async (threadId) => {
+      const read = await request("thread/read", { threadId, includeTurns: false });
+      if (!record5(read) || !record5(read.thread) || read.thread.id !== threadId || !record5(read.thread.status))
+        throw new Error("The created chat could not be read");
+      const turns = await request("thread/turns/list", { threadId, cursor: null, limit: 1 });
+      const queue = await request("thread/queue/list", { threadId, cursor: null, limit: 1 });
+      if (!record5(turns) || !Array.isArray(turns.data) || !("nextCursor" in turns) || !record5(queue) || !Array.isArray(queue.data) || !("nextCursor" in queue))
+        throw new Error("The created chat's history or queue could not be confirmed");
+      return {
+        thread: read.thread,
+        empty: read.thread.status.type === "idle" && turns.data.length === 0 && turns.nextCursor === null && queue.data.length === 0 && queue.nextCursor === null
+      };
+    };
+    assertCurrent();
+    let createdId = null;
+    let retained = false;
+    let failed = false;
+    let cleanup;
+    const discard = () => {
+      if (!createdId || retained)
+        return Promise.resolve();
+      const threadId = createdId;
+      return cleanup ??= (async () => {
+        const { empty } = await readEmpty(threadId);
+        if (!empty || retained)
+          return;
+        await request("thread/archive", { threadId });
+      })();
+    };
+    const discardAfterDismissal = () => {
+      void discard().catch((error51) => {
+        console.error("Could not discard the unsubmitted schedule chat. Check the chat list.", error51);
+      });
+    };
+    signal.addEventListener("abort", discardAfterDismissal, { once: true });
+    const remember = (result) => {
+      if (!record5(result) || result.status !== "created")
+        return;
+      const id = hostThreadIdSchema.safeParse(result.conversationId);
+      if (!id.success)
+        return;
+      if (createdId && createdId !== id.data)
+        throw new Error("Chat creation returned conflicting identities");
+      createdId = id.data;
+      if (signal.aborted || failed)
+        discardAfterDismissal();
+    };
+    try {
+      const output = await createThread({
+        scope: scope.handle,
+        target: { type: "project", projectId: input.workspace.id, environment: { type: "local" } },
+        model: input.model,
+        title: input.title,
+        prompt: "",
+        startWithoutFirstTurn: true,
+        assertRequestCurrent: assertCurrent,
+        onSettled: remember
+      });
+      const result = record5(output) && output.kind === "creation" ? output.result : null;
+      remember(result);
+      assertCurrent();
+      if (!record5(result) || result.status !== "created" || !createdId || !record5(result.firstTurn) || result.firstTurn.status !== "not-requested")
+        throw new Error("Chat creation was not confirmed. Check the chat list before creating another task.");
+      const { thread, empty } = await readEmpty(createdId);
+      const inspection = threadInspectionSchema.parse(await request("codexhost/thread/inspect", { threadId: createdId }));
+      assertCurrent();
+      if (!empty || thread.cwd !== input.workspace.cwd || inspection.owner !== "external" || inspection.transportModelId !== input.model)
+        throw new Error("The created chat's workspace, Model or empty state could not be confirmed");
+      return {
+        threadId: createdId,
+        discard,
+        retain() {
+          retained = true;
+          signal.removeEventListener("abort", discardAfterDismissal);
+        }
+      };
+    } catch (error51) {
+      failed = true;
+      try {
+        await discard();
+      } catch (cleanupError) {
+        throw new Error(`${error51 instanceof Error ? error51.message : String(error51)}; Chat cleanup failed: ${cleanupError instanceof Error ? cleanupError.message : String(cleanupError)}. Check the chat list.`);
+      }
+      throw error51;
+    }
+  }
+
+  // ../desktop-control/dist/renderer-schedule-workspace.js
+  var record6 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
   function readNativeScheduleWorkspaces(root) {
     const projects = /* @__PURE__ */ new Map();
     const ambiguous = /* @__PURE__ */ new Set();
     const seen = /* @__PURE__ */ new Set();
     const add = (value) => {
-      if (!record5(value) || value.source !== "codex" || !record5(value.group))
+      if (!record6(value) || value.source !== "codex" || !record6(value.group))
         return;
       const group = value.group;
       if (group.projectKind !== "local" || group.hostId != null && group.hostId !== "local" || typeof group.projectId !== "string" || !group.projectId || typeof group.label !== "string" || typeof group.path !== "string" || !Array.isArray(group.rootPaths) || !group.rootPaths.includes(group.path) || !/^(?:\/|[A-Za-z]:[\\/]|\\\\)/u.test(group.path) || group.path.includes("\0"))
@@ -17560,7 +17786,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
           break;
         seen.add(fiber);
         const props = fiber.memoizedProps;
-        if (!record5(props))
+        if (!record6(props))
           continue;
         add(props.project);
         if (props.projectByKey instanceof Map)
@@ -17571,15 +17797,24 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     return [...projects.values()].filter(({ id }) => !ambiguous.has(id));
   }
   function isNativeProjectThreadCreator(value) {
-    if (typeof value !== "function" || value.length !== 1)
+    try {
+      if (typeof value !== "function" || value.length !== 1)
+        return false;
+      const source = Function.prototype.toString.call(value);
+      return /^async function/u.test(source) && source.includes("startWithoutFirstTurn:") && source.includes("onSettled:") && source.includes("createThread config is not supported for delegated thread creation") && source.includes("createThread serviceName is only supported for local Electron root threads outside worktrees");
+    } catch {
       return false;
-    const source = Function.prototype.toString.call(value);
-    return /^async function/u.test(source) && source.includes("startWithoutFirstTurn:") && source.includes("onSettled:") && source.includes("createThread config is not supported for delegated thread creation") && source.includes("createThread serviceName is only supported for local Electron root threads outside worktrees");
+    }
   }
   async function createNativeScheduleWorkspaceThread(root, routing, createThread, input, signal) {
     if (!decodeHarnessPluginRoute(input.model))
       throw new Error("An external Harness is required");
     const route = routing.forHost("local");
+    if (route && Reflect.get(route.manager, "kind") === "main-process-rpc") {
+      if (!readNativeScheduleWorkspaces(root).some(({ id, cwd }) => id === input.workspace.id && cwd === input.workspace.cwd))
+        throw new Error("The selected workspace is no longer available");
+      return createRpcScheduleWorkspaceThread(root, routing, route, createThread, input, signal);
+    }
     const manager = route?.manager;
     if (!route?.policy.scopedCreation || !manager || typeof manager.getConversation !== "function" || typeof manager.archiveConversation !== "function")
       throw new Error("Native local chat creation is unavailable");
@@ -17594,7 +17829,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       }
     }));
     const scope = scopes.values().next().value;
-    if (scopes.size !== 1 || !record5(scope) || typeof scope.get !== "function")
+    if (scopes.size !== 1 || !record6(scope) || typeof scope.get !== "function")
       throw new Error("Native local chat scope is missing or ambiguous");
     if (!readNativeScheduleWorkspaces(root).some(({ id, cwd }) => id === input.workspace.id && cwd === input.workspace.cwd))
       throw new Error("The selected workspace is no longer available");
@@ -17607,7 +17842,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       const id = createdId;
       released = true;
       const conversation2 = manager.getConversation(id);
-      if (!record5(conversation2) || !Array.isArray(conversation2.turns) || conversation2.turns.length || Array.isArray(conversation2.requests) && conversation2.requests.length > 0 || conversation2.pendingRequest != null)
+      if (!record6(conversation2) || !Array.isArray(conversation2.turns) || conversation2.turns.length || Array.isArray(conversation2.requests) && conversation2.requests.length > 0 || conversation2.pendingRequest != null)
         return;
       void Promise.resolve().then(() => manager.archiveConversation(id, {
         useAppServerPins: false,
@@ -17616,7 +17851,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     };
     signal.addEventListener("abort", discard, { once: true });
     const remember = (result2) => {
-      if (!record5(result2) || result2.status !== "created")
+      if (!record6(result2) || result2.status !== "created")
         return;
       const id = hostThreadIdSchema.safeParse(result2.conversationId);
       if (id.success)
@@ -17633,16 +17868,16 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       startWithoutFirstTurn: true,
       onSettled: remember
     });
-    const result = record5(output) && output.kind === "creation" ? output.result : null;
+    const result = record6(output) && output.kind === "creation" ? output.result : null;
     remember(result);
     signal.throwIfAborted();
-    if (!record5(result) || result.status !== "created" || !createdId || !record5(result.firstTurn) || result.firstTurn.status !== "not-requested")
+    if (!record6(result) || result.status !== "created" || !createdId || !record6(result.firstTurn) || result.firstTurn.status !== "not-requested")
       throw new Error("Chat creation was not confirmed. Check the chat list before creating another task.");
     if (routing.forHost("local")?.manager !== route.manager)
       throw new Error("The local connection changed. Reopen the task dialog.");
     const conversation = manager.getConversation(createdId);
-    const mode = record5(conversation) ? conversation.latestCollaborationMode : null;
-    if (!record5(conversation) || conversation.cwd !== input.workspace.cwd || !record5(mode) || !record5(mode.settings) || mode.settings.model !== input.model)
+    const mode = record6(conversation) ? conversation.latestCollaborationMode : null;
+    if (!record6(conversation) || conversation.cwd !== input.workspace.cwd || !record6(mode) || !record6(mode.settings) || mode.settings.model !== input.model)
       throw new Error("The created chat's workspace or Model could not be confirmed");
     return {
       threadId: createdId,
@@ -18450,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;
@@ -20029,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",
@@ -20308,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",
@@ -25553,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)) {
@@ -25677,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) => {
@@ -25711,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)");
@@ -25792,10 +26024,72 @@ ${text.includes("## My request:") ? "" : "\n## My request:\n"}`,
     };
   }
 
+  // src/renderer-thread-reference-persistence.ts
+  var record7 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+  var SYNC_TIMEOUT_MS = 2e3;
+  function restoreRpcThreadReferenceCapability(client, messages, isCurrent) {
+    if (!record7(messages) || !record7(messages.electronBridge)) return client;
+    const bridge = messages.electronBridge;
+    const send = bridge.sendMessageFromView;
+    if (typeof send !== "function") return client;
+    const inspect = client.inspectThread.bind(client);
+    const checked = /* @__PURE__ */ new Set();
+    const isMissing = (key) => new Promise((resolve) => {
+      const finish = (missing) => {
+        clearTimeout(timer);
+        messages.removeEventListener("message", listener);
+        resolve(missing);
+      };
+      const listener = (event) => {
+        if (event.source != null && event.source !== messages) return;
+        const message2 = event.data;
+        if (!record7(message2) || message2.type !== "persisted-atom-sync" || !record7(message2.state))
+          return;
+        finish(!Object.hasOwn(message2.state, key));
+      };
+      const timer = setTimeout(() => finish(false), SYNC_TIMEOUT_MS);
+      messages.addEventListener("message", listener);
+      try {
+        Promise.resolve(
+          send.call(bridge, { type: "persisted-atom-sync-request", responsePriority: "critical" })
+        ).catch(() => finish(false));
+      } catch {
+        finish(false);
+      }
+    });
+    const inspectThread = async (input) => {
+      if (!isCurrent() || checked.has(input.threadId)) return inspect(input);
+      checked.add(input.threadId);
+      const key = `thread-reference-capability:${input.threadId}`;
+      if (!await isMissing(key) || !isCurrent()) return inspect(input);
+      let proven = true;
+      const result = await inspect({ ...input, includeReferenceCapability: true }).catch(() => {
+        proven = false;
+        return inspect(input);
+      });
+      if (proven && result.owner === "codex" && result.supportsThreadReferences === true && isCurrent() && await isMissing(key) && isCurrent()) {
+        try {
+          await send.call(bridge, {
+            type: "persisted-atom-update",
+            key,
+            value: true,
+            deleted: false
+          });
+        } catch {
+        }
+      }
+      return result;
+    };
+    return Object.freeze({ ...client, inspectThread });
+  }
+
   // src/renderer-thread-reference-capability.ts
-  var record6 = (value) => typeof value === "object" && value !== null;
-  function restoreThreadReferenceCapability(client, manager, isCurrent) {
-    if (!record6(manager) || !record6(manager.storage)) return client;
+  var record8 = (value) => typeof value === "object" && value !== null;
+  function restoreThreadReferenceCapability(client, manager, isCurrent, messages = null) {
+    if (record8(manager) && manager.kind === "main-process-rpc") {
+      return restoreRpcThreadReferenceCapability(client, messages, isCurrent);
+    }
+    if (!record8(manager) || !record8(manager.storage)) return client;
     const storage = manager.storage;
     const read = storage.readValue;
     const write = storage.writeValue;
@@ -25830,14 +26124,14 @@ ${text.includes("## My request:") ? "" : "\n## My request:\n"}`,
   }
 
   // src/renderer-thread-reference-context.ts
-  var record7 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+  var record9 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
   function createThreadReferenceContext(manager, hostId2, isCurrent) {
     const prepared = /* @__PURE__ */ new WeakMap();
     return (params) => {
-      if (hostId2 === "local" || !record7(manager) || typeof manager.getConversation !== "function" || !record7(params) || typeof params.threadId !== "string")
+      if (hostId2 === "local" || !record9(manager) || typeof manager.getConversation !== "function" || !record9(params) || typeof params.threadId !== "string")
         return params;
       const conversation = manager.getConversation.call(manager, params.threadId);
-      if (!record7(conversation) || conversation.id !== params.threadId || conversation.modelProvider !== "codexhost")
+      if (!record9(conversation) || conversation.id !== params.threadId || conversation.modelProvider !== "codexhost")
         return params;
       if (!isCurrent()) throw new Error("Thread reference connection is no longer available");
       const cached2 = prepared.get(params);
@@ -25943,7 +26237,8 @@ ${text.includes("## My request:") ? "" : "\n## My request:\n"}`,
       const client = restoreThreadReferenceCapability(
         nativeClient,
         target,
-        () => !disposed && readRouting()?.forHost(route.hostId) === route
+        () => !disposed && readRouting()?.forHost(route.hostId) === route,
+        messages
       );
       entries.set(route.hostId, { route, client, cleanups });
       try {
@@ -27157,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;
         }
@@ -30363,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",
@@ -31795,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)}`;
@@ -31864,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();
@@ -32208,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;
@@ -32224,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");
@@ -32279,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;
       }
@@ -32772,7 +33105,7 @@ ${detail}` : ""}`
   }
   function defaultImportName(source, existing) {
     const base = source.provider === "openai-codex" ? "codex" : "grok";
-    const used = new Set(existing.map((record8) => record8.name));
+    const used = new Set(existing.map((record10) => record10.name));
     const valid = (name) => credentialImportNameSchema.safeParse(name).success;
     if (!used.has(base)) return base;
     const local = source.label.includes("@") ? source.label.split("@")[0] ?? "" : "";
@@ -32795,7 +33128,7 @@ ${detail}` : ""}`
     const shown = (text) => accountDisplayText(text, hideEmails);
     const targetButtons = /* @__PURE__ */ new Map();
     const importedRecords = () => snapshot.targets.find((target) => target.harnessId === TARGET_HARNESS_ID)?.imports ?? [];
-    const sourceOf = (record8) => snapshot.sources.find((source) => source.id === record8.source.id);
+    const sourceOf = (record10) => snapshot.sources.find((source) => source.id === record10.source.id);
     const piTarget = () => snapshot.targets.find((candidate) => candidate.harnessId === TARGET_HARNESS_ID);
     const compatibleSources = () => {
       const target = piTarget();
@@ -32833,7 +33166,7 @@ ${detail}` : ""}`
     sectionImport.addEventListener("click", () => {
       const sources = compatibleSources();
       const free = sources.find(
-        (source2) => !importedRecords().some((record8) => record8.source.id === source2.id)
+        (source2) => !importedRecords().some((record10) => record10.source.id === source2.id)
       );
       const source = free ?? sources[0];
       if (source) openDialog("add", { source, choose: true }, SECTION_IMPORT_KEY);
@@ -32883,30 +33216,30 @@ ${detail}` : ""}`
       mark.append(createRendererAgentIcon(agent ?? "pi", 26, document2, pluginFor(agent ?? "pi")));
       return mark;
     };
-    const renderRow = (record8) => {
+    const renderRow = (record10) => {
       const row = document2.createElement("div");
       row.className = "settings-pi-accounts__row";
       row.tabIndex = -1;
-      row.dataset.importName = record8.name;
-      row.setAttribute("aria-label", shown(record8.source.label));
-      const agent = record8.source.harnessId;
+      row.dataset.importName = record10.name;
+      row.setAttribute("aria-label", shown(record10.source.label));
+      const agent = record10.source.harnessId;
       const mark = createMark(agent);
       const identity = document2.createElement("div");
       identity.className = "settings-pi-accounts__identity";
       const label = document2.createElement("strong");
       label.className = "settings-account-email";
-      label.textContent = shown(record8.source.label);
+      label.textContent = shown(record10.source.label);
       label.title = label.textContent;
       label.translate = false;
       const meta3 = document2.createElement("div");
       meta3.className = "settings-account-metadata";
-      const source = sourceOf(record8);
+      const source = sourceOf(record10);
       const parts = [
         metaPart(rendererAgentLabel(agent, pluginFor(agent)), "settings-pi-accounts__agent"),
-        metaPart(`${record8.name}/\u2026`, void 0, true),
+        metaPart(`${record10.name}/\u2026`, void 0, true),
         metaPart(messages.copied)
       ];
-      const time3 = formatImportedAt(record8.importedAt);
+      const time3 = formatImportedAt(record10.importedAt);
       if (time3) parts.push(metaPart(time3));
       parts.forEach((part, index) => {
         if (index > 0) {
@@ -32923,23 +33256,23 @@ ${detail}` : ""}`
       reimport.type = "button";
       reimport.className = "settings-account-action";
       reimport.textContent = messages.rowReimport;
-      reimport.setAttribute("aria-label", `${messages.reimport}: ${shown(record8.source.label)}`);
+      reimport.setAttribute("aria-label", `${messages.reimport}: ${shown(record10.source.label)}`);
       reimport.disabled = busy || !source;
       reimport.title = messages.reimport;
       reimport.addEventListener("click", () => {
-        if (source) openDialog("reimport", { source, record: record8 }, `row:${record8.name}`);
+        if (source) openDialog("reimport", { source, record: record10 }, `row:${record10.name}`);
       });
       const remove = document2.createElement("button");
       remove.type = "button";
       remove.className = "settings-account-action settings-pi-accounts__remove";
       remove.textContent = messages.rowRemove;
-      remove.setAttribute("aria-label", `${messages.remove}: ${shown(record8.source.label)}`);
+      remove.setAttribute("aria-label", `${messages.remove}: ${shown(record10.source.label)}`);
       remove.disabled = busy;
-      remove.addEventListener("click", () => openDialog("remove", { record: record8 }, `row:${record8.name}`));
+      remove.addEventListener("click", () => openDialog("remove", { record: record10 }, `row:${record10.name}`));
       if (source) actions.append(reimport);
       actions.append(remove);
       row.append(mark, identity, actions);
-      rows.set(record8.name, row);
+      rows.set(record10.name, row);
       return row;
     };
     const loginTypeLabel = (type) => type === "oauth" ? messages.typeOauth : type === "api_key" ? messages.typeApiKey : messages.typeOther;
@@ -33092,7 +33425,7 @@ ${detail}` : ""}`
           const label = document2.createElement("strong");
           label.textContent = shown(choice.label);
           label.translate = false;
-          const existing = importedRecords().find((record8) => record8.source.id === choice.id);
+          const existing = importedRecords().find((record10) => record10.source.id === choice.id);
           const agent = choice.harnessId;
           const detail = document2.createElement("span");
           detail.textContent = [
@@ -33133,7 +33466,7 @@ ${detail}` : ""}`
           const name = request.action === "list" ? void 0 : request.name;
           state = {
             source: state.source,
-            record: importedRecords().find((record8) => record8.name === name) ?? state.record
+            record: importedRecords().find((record10) => record10.name === name) ?? state.record
           };
           show(next);
         } else {
@@ -33147,12 +33480,12 @@ ${detail}` : ""}`
         sourceRadios = [];
         body.replaceChildren();
         controls.replaceChildren();
-        const { source, record: record8 } = state;
+        const { source, record: record10 } = state;
         const close = () => modal.close();
         if (mode === "add" || mode === "reimport") {
           title.textContent = mode === "add" ? messages.add : messages.reimport;
           modal.setAttribute("aria-label", title.textContent);
-          const active = source ?? record8?.source;
+          const active = source ?? record10?.source;
           const choices = mode === "add" && state.choose ? compatibleSources() : [];
           if (choices.length > 1) body.append(sourcePicker(choices));
           else if (active) body.append(line(messages.source, shown(active.label)));
@@ -33161,8 +33494,8 @@ ${detail}` : ""}`
           input.maxLength = 48;
           input.autocomplete = "off";
           input.spellcheck = false;
-          input.value = record8?.name ?? (source ? defaultImportName(source, importedRecords()) : "codex");
-          input.readOnly = Boolean(record8);
+          input.value = record10?.name ?? (source ? defaultImportName(source, importedRecords()) : "codex");
+          input.readOnly = Boolean(record10);
           input.addEventListener("input", () => {
             nameEdited = true;
           });
@@ -33196,7 +33529,7 @@ ${detail}` : ""}`
                   {
                     action: mode === "reimport" ? "reimport" : "import",
                     sourceId: source2.id,
-                    name: record8?.name ?? input.value,
+                    name: record10?.name ?? input.value,
                     confirmed: true
                   },
                   "done"
@@ -33206,16 +33539,16 @@ ${detail}` : ""}`
             )
           );
           (mode === "add" ? input : controls.children[0]).focus();
-        } else if (mode === "remove" && record8) {
+        } else if (mode === "remove" && record10) {
           title.textContent = messages.remove;
           modal.setAttribute("aria-label", title.textContent);
-          body.append(note(messages.removeWarning.replace("{name}", record8.name)));
+          body.append(note(messages.removeWarning.replace("{name}", record10.name)));
           const cancel = command(messages.cancel, close);
           controls.append(
             cancel,
             command(
               messages.remove,
-              () => submit({ action: "remove", name: record8.name, confirmed: true }, null),
+              () => submit({ action: "remove", name: record10.name, confirmed: true }, null),
               "danger"
             )
           );
@@ -33223,7 +33556,7 @@ ${detail}` : ""}`
         } else {
           title.textContent = messages.doneTitle;
           modal.setAttribute("aria-label", title.textContent);
-          const name = record8?.name;
+          const name = record10?.name;
           if (name) body.append(line(messages.entry, `${name}/\u2026`, true));
           body.append(note(messages.done));
           const done = command(messages.close, close, "primary");
@@ -33270,21 +33603,21 @@ ${detail}` : ""}`
           (candidate) => candidate.harnessId === TARGET_HARNESS_ID && source && candidate.providers.includes(source.provider)
         );
         if (!source || !target) return null;
-        const record8 = target.imports.find((candidate) => candidate.source.id === source.id);
+        const record10 = target.imports.find((candidate) => candidate.source.id === source.id);
         const key = `${harnessId}:${accountLabel}:import`;
         const button2 = document2.createElement("button");
         button2.type = "button";
         button2.className = "settings-account-pi-import";
         button2.dataset.accountFocus = key;
         button2.disabled = busy;
-        const hint = record8 ? messages.importedHint.replace("{name}", record8.name) : messages.add;
+        const hint = record10 ? messages.importedHint.replace("{name}", record10.name) : messages.add;
         button2.title = hint;
         button2.setAttribute("aria-label", hint);
         button2.append(createRendererAgentIcon("pi", 12, document2, pluginFor("pi")));
-        if (record8) {
+        if (record10) {
           button2.dataset.state = "imported";
           const name = document2.createElement("code");
-          name.textContent = `${record8.name}/\u2026`;
+          name.textContent = `${record10.name}/\u2026`;
           name.translate = false;
           button2.append(name, createRendererSettingsIcon("check", 12));
         } else {
@@ -33292,7 +33625,7 @@ ${detail}` : ""}`
           button2.append(messages.add);
         }
         button2.addEventListener("click", () => {
-          if (!record8) {
+          if (!record10) {
             openDialog("add", { source }, key);
             return;
           }
@@ -33301,7 +33634,7 @@ ${detail}` : ""}`
             renderSection();
             sectionToggle.setAttribute("aria-expanded", "true");
           }
-          const row = rows.get(record8.name);
+          const row = rows.get(record10.name);
           row?.scrollIntoView({ block: "nearest", behavior: "smooth" });
           row?.focus();
         });
@@ -41619,7 +41952,19 @@ ${usage_default}`;
           update();
           form.requestSubmit();
         } catch (cause) {
-          attempt.error = `${cause instanceof Error ? cause.message : text("\u4F1A\u8BDD\u521B\u5EFA\u5931\u8D25\u3002", "Chat creation failed.")} ${text("\u8BF7\u5148\u68C0\u67E5\u4F1A\u8BDD\u5217\u8868\uFF0C\u52FF\u91CD\u590D\u521B\u5EFA\u3002", "Check the chat list before creating another task.")}`;
+          let cleanupError = "";
+          if (attempt.thread?.discard) {
+            if (readNativeScheduleForm(form)?.targetThreadId === attempt.thread.threadId)
+              attempt.thread.retain();
+            else {
+              try {
+                await attempt.thread.discard();
+              } catch (error52) {
+                cleanupError = ` ${text("\u4F1A\u8BDD\u6E05\u7406\u5931\u8D25\uFF1A", "Chat cleanup failed:")} ${error52 instanceof Error ? error52.message : String(error52)}`;
+              }
+            }
+          }
+          attempt.error = `${cause instanceof Error ? cause.message : text("\u4F1A\u8BDD\u521B\u5EFA\u5931\u8D25\u3002", "Chat creation failed.")}${cleanupError} ${text("\u8BF7\u5148\u68C0\u67E5\u4F1A\u8BDD\u5217\u8868\uFF0C\u52FF\u91CD\u590D\u521B\u5EFA\u3002", "Check the chat list before creating another task.")}`;
         } finally {
           attempt.pending = false;
           if (!retired) update();
@@ -42037,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);
@@ -42163,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);
             }
           });
         });
@@ -42346,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);
@@ -43170,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),
@@ -43199,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);
         }
       }
     };
@@ -43214,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);
           }
         })
       );
@@ -43428,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);
@@ -43456,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;
@@ -43667,6 +44061,7 @@ ${usage_default}`;
         accountCreditsSupported: inherited?.accountCreditsSupported ?? false,
         hostId: inherited?.hostId ?? hostId2,
         usageRequestGeneration: 0,
+        draftUsageClient: null,
         commandRequestGeneration: 0
       };
       mountedByComposer.set(composer, mounted);
@@ -43686,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 = () => {
@@ -43966,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") {
@@ -44150,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() {