@codexhost/cli-win32-x64 0.2.3 → 0.2.4

package/README.md

@@ -7,7 +7,7 @@ Run Pi and Claude Code as first-class external harnesses inside Codex Desktop.
 ## Install
 
 ```bash
-npm install -g @codexhost/cli@0.2.3
+npm install -g @codexhost/cli@0.2.4
 ```
 
 Do not install this package directly. npm selects it through the optional dependencies of `@codexhost/cli`.

package/app/codexhost-distribution.json

@@ -1 +1 @@
-{"schemaVersion":1,"version":"0.2.3","distribution":"npm","target":"windows-x64"}
+{"schemaVersion":1,"version":"0.2.4","distribution":"npm","target":"windows-x64"}

package/app/desktop-controller.mjs

@@ -329,7 +329,6 @@ var ELECTRON_MODULE_EXPRESSION = `(() => {
   return createRequire(process.execPath)('electron');
 })()`;
 var CONNECT_APP_HOST_CHANNEL = "codex_desktop:connect-app-host";
-var REVIEWED_TITLE_SERVICE_IDENTITIES = ["Dhe", "Nye", "wbe", "nxe", "tTe"];
 var POLICY_STATE_SYMBOL = "codexhost.main-process-title-policy.v1";
 var SERVICE_OWNER_SYMBOL = "codexhost.main-process-title-policy.owner.v1";
 var RENDERER_READY_EXPRESSION = "(() => { Object.defineProperty(window, '__codexhostMainProcessTitlePolicyV1', { configurable: true, value: { state: 'ready' } }); return 'ready'; })()";
@@ -363,18 +362,6 @@ var INSTALL_POLICY_FUNCTION = `async function (rendererWebContentsId) {
   ) {
     throw new Error('ThreadMetadataGenerationService signature mismatch');
   }
-  const rawServiceClass = sampleService?.constructor?.name;
-  const serviceClass = typeof rawServiceClass === 'string' && /^[A-Za-z_$][A-Za-z0-9_$]{0,63}$/.test(rawServiceClass)
-    ? rawServiceClass
-    : 'unknown';
-  const warnings = ${JSON.stringify(REVIEWED_TITLE_SERVICE_IDENTITIES)}.includes(serviceClass)
-    ? []
-    : [{
-        capability: 'title-isolation',
-        reason: 'unreviewed-title-service-identity',
-        observedIdentity: serviceClass,
-      }];
-
   const counters = {
     codexTitleCalls: 0,
     piTitleSkips: 0,
@@ -448,7 +435,6 @@ var INSTALL_POLICY_FUNCTION = `async function (rendererWebContentsId) {
     state: 'ready',
     reason: 'ready',
     requiresRendererReload: true,
-    warnings,
   };
 }`;
 async function installMainProcessTitlePolicy(inspector, rendererWebContentsId) {
@@ -521,9 +507,7 @@ async function installMainProcessTitlePolicy(inspector, rendererWebContentsId) {
   );
   const remoteResult = installResponse.result;
   const value = isRecord2(remoteResult) ? remoteResult.value : null;
-  if (!isRecord2(value) || value.state !== "ready" || value.reason !== "ready" || value.requiresRendererReload !== true || !Array.isArray(value.warnings) || value.warnings.length > 1 || value.warnings.some(
-    (warning) => !isRecord2(warning) || warning.capability !== "title-isolation" || warning.reason !== "unreviewed-title-service-identity" || typeof warning.observedIdentity !== "string" || !/^[A-Za-z_$][A-Za-z0-9_$]{0,63}$/.test(warning.observedIdentity) || Object.keys(warning).length !== 3
-  )) {
+  if (!isRecord2(value) || value.state !== "ready" || value.reason !== "ready" || value.requiresRendererReload !== true || Object.keys(value).length !== 3) {
     throw new Error("Main-process title policy returned an invalid status");
   }
   return value;
@@ -574,10 +558,11 @@ async function readMainProcessTitlePolicyCounters(inspector) {
 }
 
 // packages/desktop-control/src/renderer-draft-prewarm-runtime.ts
-function installDraftPrewarmPolicyBridge(bridge, hostId, target) {
+function installDraftPrewarmPolicyBridge(bridge, hostId, target, prewarmedThreadManager) {
   const existing = target.__codexhostDraftPrewarmPolicyV1;
   existing?.dispose?.();
   const originalSend = bridge.sendRequest;
+  const originalPrewarm = bridge.prewarmThreadStart;
   let selectedModel = null;
   let clearInFlight = null;
   const isRecord5 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
@@ -598,15 +583,24 @@ function installDraftPrewarmPolicyBridge(bridge, hostId, target) {
   };
   const routeThreadStart = (method, parameters) => {
     if (selectedModel === null || !isRecord5(parameters)) return parameters;
-    const threadParams = method === "prewarm-thread-start-for-host" ? parameters.params : parameters.method === "thread/start" ? parameters.params : null;
+    const direct = method === "thread/start";
+    const wrapped = method === "prewarm-thread-start-for-host" || method === "send-cli-request-for-host";
+    if (!direct && !wrapped) return parameters;
+    const threadParams = direct ? parameters : parameters.params;
     if (!isRecord5(threadParams) || threadParams.ephemeral === true) return parameters;
+    if (direct) return { ...threadParams, model: selectedModel };
     return { ...parameters, params: { ...threadParams, model: selectedModel } };
   };
   const routedSend = (method, parameters, options) => {
-    const routedParameters = method === "start-conversation" || method === "prewarm-conversation-for-host" ? routeCollaborationMode(method, parameters) : method === "prewarm-thread-start-for-host" || method === "send-cli-request-for-host" ? routeThreadStart(method, parameters) : parameters;
+    const routedParameters = method === "start-conversation" || method === "prewarm-conversation-for-host" ? routeCollaborationMode(method, parameters) : routeThreadStart(method, parameters);
     return options === void 0 ? originalSend.call(bridge, method, routedParameters) : originalSend.call(bridge, method, routedParameters, options);
   };
+  const routedPrewarm = (parameters, options) => {
+    const routedParameters = routeThreadStart("thread/start", parameters);
+    return options === void 0 ? originalPrewarm?.call(bridge, routedParameters) : originalPrewarm?.call(bridge, routedParameters, options);
+  };
   bridge.sendRequest = routedSend;
+  if (originalPrewarm) bridge.prewarmThreadStart = routedPrewarm;
   const policy = Object.freeze({
     state: "ready",
     select(model) {
@@ -618,6 +612,10 @@ function installDraftPrewarmPolicyBridge(bridge, hostId, target) {
       return true;
     },
     clear() {
+      if (prewarmedThreadManager?.discardAllPrewarmedThreads) {
+        prewarmedThreadManager.discardAllPrewarmedThreads();
+        return Promise.resolve();
+      }
       if (clearInFlight === null) {
         clearInFlight = Promise.resolve(
           originalSend.call(bridge, "clear-prewarmed-threads-for-host", { hostId })
@@ -629,6 +627,10 @@ function installDraftPrewarmPolicyBridge(bridge, hostId, target) {
     },
     dispose() {
       if (bridge.sendRequest === routedSend) bridge.sendRequest = originalSend;
+      if (bridge.prewarmThreadStart === routedPrewarm) {
+        if (originalPrewarm) bridge.prewarmThreadStart = originalPrewarm;
+        else delete bridge.prewarmThreadStart;
+      }
       selectedModel = null;
     }
   });
@@ -667,77 +669,90 @@ async function installDraftPrewarmPolicyInRenderer(contents, findRequestManagerE
     const manager = managerProperties.result?.find(
       (property) => property.name === "manager"
     )?.value;
+    const prewarmedThreadManager = managerProperties.result?.find(
+      (property) => property.name === "prewarmedThreadManager"
+    )?.value;
     if (candidateCount !== 1 || hostId !== "local" || typeof manager?.objectId !== "string") {
       throw new Error("Renderer request manager is ambiguous");
     }
     const managerFunctions = await contents.debugger.sendCommand("Runtime.getProperties", {
       objectId: manager.objectId
     });
-    let managerSendRequestId = managerFunctions.result?.find(
-      (property) => property.name === "sendRequest"
-    )?.value?.objectId;
-    const managerPrototypeId = managerFunctions.internalProperties?.find(
-      (property) => property.name === "[[Prototype]]"
-    )?.value?.objectId;
-    if (typeof managerSendRequestId !== "string" && typeof managerPrototypeId === "string") {
-      const prototypeFunctions = await contents.debugger.sendCommand("Runtime.getProperties", {
-        objectId: managerPrototypeId,
-        ownProperties: true
-      });
-      managerSendRequestId = prototypeFunctions.result?.find(
+    const managerPropertyNames = new Set(
+      managerFunctions.result?.map((property) => String(property.name)) ?? []
+    );
+    let hostBridgeObjectId = managerPropertyNames.has("sendRequest") && managerPropertyNames.has("prewarmThreadStart") && managerPropertyNames.has("enqueueRequest") ? manager.objectId : void 0;
+    if (!hostBridgeObjectId) {
+      let managerSendRequestId = managerFunctions.result?.find(
         (property) => property.name === "sendRequest"
       )?.value?.objectId;
-    }
-    if (typeof managerSendRequestId !== "string") {
-      throw new Error("Renderer request manager sendRequest is unavailable");
-    }
-    const functionProperties = await contents.debugger.sendCommand("Runtime.getProperties", {
-      objectId: managerSendRequestId
-    });
-    const scopesId = functionProperties.internalProperties?.find(
-      (property) => property.name === "[[Scopes]]"
-    )?.value?.objectId;
-    const hostBridgeCandidates = [];
-    if (typeof scopesId === "string") {
-      const scopes = await contents.debugger.sendCommand("Runtime.getProperties", {
-        objectId: scopesId,
-        ownProperties: true
+      const managerPrototypeId = managerFunctions.internalProperties?.find(
+        (property) => property.name === "[[Prototype]]"
+      )?.value?.objectId;
+      if (typeof managerSendRequestId !== "string" && typeof managerPrototypeId === "string") {
+        const prototypeFunctions = await contents.debugger.sendCommand("Runtime.getProperties", {
+          objectId: managerPrototypeId,
+          ownProperties: true
+        });
+        managerSendRequestId = prototypeFunctions.result?.find(
+          (property) => property.name === "sendRequest"
+        )?.value?.objectId;
+      }
+      if (typeof managerSendRequestId !== "string") {
+        throw new Error("Renderer request manager sendRequest is unavailable");
+      }
+      const functionProperties = await contents.debugger.sendCommand("Runtime.getProperties", {
+        objectId: managerSendRequestId
       });
-      for (const scope of scopes.result ?? []) {
-        if (typeof scope.value?.objectId !== "string") continue;
-        const scopeProperties = await contents.debugger.sendCommand("Runtime.getProperties", {
-          objectId: scope.value.objectId,
+      const scopesId = functionProperties.internalProperties?.find(
+        (property) => property.name === "[[Scopes]]"
+      )?.value?.objectId;
+      const hostBridgeCandidates = [];
+      if (typeof scopesId === "string") {
+        const scopes = await contents.debugger.sendCommand("Runtime.getProperties", {
+          objectId: scopesId,
           ownProperties: true
         });
-        for (const property of scopeProperties.result ?? []) {
-          if (property.value?.type !== "object" || typeof property.value.objectId !== "string") {
-            continue;
-          }
-          const candidateSignature = await contents.debugger.sendCommand(
-            "Runtime.callFunctionOn",
-            {
-              objectId: property.value.objectId,
-              functionDeclaration: "function(){const send=this.sendRequest;return typeof send==='function'&&Function.prototype.toString.call(send).includes('messageHandler')}",
-              returnByValue: true
+        for (const scope of scopes.result ?? []) {
+          if (typeof scope.value?.objectId !== "string") continue;
+          const scopeProperties = await contents.debugger.sendCommand("Runtime.getProperties", {
+            objectId: scope.value.objectId,
+            ownProperties: true
+          });
+          for (const property of scopeProperties.result ?? []) {
+            if (property.value?.type !== "object" || typeof property.value.objectId !== "string") {
+              continue;
+            }
+            const candidateSignature = await contents.debugger.sendCommand(
+              "Runtime.callFunctionOn",
+              {
+                objectId: property.value.objectId,
+                functionDeclaration: "function(){const send=this.sendRequest;return typeof send==='function'&&Function.prototype.toString.call(send).includes('messageHandler')}",
+                returnByValue: true
+              }
+            );
+            if (candidateSignature.result?.value === true) {
+              hostBridgeCandidates.push({
+                name: String(property.name),
+                objectId: property.value.objectId
+              });
             }
-          );
-          if (candidateSignature.result?.value === true) {
-            hostBridgeCandidates.push({
-              name: String(property.name),
-              objectId: property.value.objectId
-            });
           }
         }
       }
-    }
-    const hostBridge = hostBridgeCandidates[0];
-    if (hostBridgeCandidates.length !== 1 || !hostBridge) {
-      throw new Error("Renderer Host request bridge is ambiguous");
+      const hostBridge = hostBridgeCandidates[0];
+      if (hostBridgeCandidates.length !== 1 || !hostBridge) {
+        throw new Error("Renderer Host request bridge is ambiguous");
+      }
+      hostBridgeObjectId = hostBridge.objectId;
     }
     const installed = await contents.debugger.sendCommand("Runtime.callFunctionOn", {
-      objectId: hostBridge.objectId,
+      objectId: hostBridgeObjectId,
       functionDeclaration: installRendererPolicyFunction,
-      arguments: [{ value: hostId }],
+      arguments: [
+        { value: hostId },
+        ...typeof prewarmedThreadManager?.objectId === "string" ? [{ objectId: prewarmedThreadManager.objectId }] : []
+      ],
       awaitPromise: true,
       returnByValue: true
     });
@@ -777,24 +792,31 @@ var FIND_REQUEST_MANAGER_EXPRESSION = `(() => {
         typeof value === 'object' &&
         value.requestClient != null &&
         typeof value.requestClient.prewarmThreadStart === 'function' &&
-        typeof value.sendRequest === 'function' &&
-        Function.prototype.toString.call(value.sendRequest).includes(
-          'send-cli-request-for-host',
-        )
+        typeof value.requestClient.sendRequest === 'function' &&
+        typeof value.requestClient.enqueueRequest === 'function' &&
+        typeof value.sendRequest === 'function'
       ) {
         managers.add(value);
       }
     }
   }
   const manager = managers.size === 1 ? managers.values().next().value : null;
+  const requestClient =
+    manager != null &&
+    typeof manager.requestClient?.sendRequest === 'function' &&
+    typeof manager.requestClient?.prewarmThreadStart === 'function' &&
+    typeof manager.requestClient?.enqueueRequest === 'function'
+      ? manager.requestClient
+      : manager;
   return {
     candidateCount: managers.size,
-    hostId: manager?.getHostId?.() ?? null,
-    manager,
+    hostId: manager?.getHostId?.() ?? requestClient?.hostId ?? null,
+    manager: requestClient,
+    prewarmedThreadManager: manager?.prewarmedThreadManager ?? null,
   };
 })()`;
-var INSTALL_RENDERER_POLICY_FUNCTION = `function(hostId) {
-  return (${installDraftPrewarmPolicyBridge.toString()})(this, hostId, window);
+var INSTALL_RENDERER_POLICY_FUNCTION = `function(hostId, prewarmedThreadManager) {
+  return (${installDraftPrewarmPolicyBridge.toString()})(this, hostId, window, prewarmedThreadManager);
 }`;
 var REQUEST_MANAGER_WAIT_TIMEOUT_MS = 6e4;
 var REQUEST_MANAGER_POLL_INTERVAL_MS = 25;
@@ -1252,9 +1274,6 @@ function startupTrace2(stage, detail) {
 }
 function validCompatibilityIssue(state, issue) {
   const keys = Object.keys(issue);
-  if (state === "compatible-with-warning") {
-    return issue.capability === "title-isolation" && issue.reason === "unreviewed-title-service-identity" && typeof issue.observedIdentity === "string" && /^[A-Za-z_$][A-Za-z0-9_$]{0,63}$/.test(issue.observedIdentity) && keys.length === 3;
-  }
   if (state === "degraded") {
     return [
       "permission-control",
@@ -1262,12 +1281,12 @@ function validCompatibilityIssue(state, issue) {
       "fork-control",
       "usage-surface",
       "settings-surface"
-    ].includes(issue.capability) && issue.reason === "capability-unavailable" && issue.observedIdentity === void 0 && keys.length === 2;
+    ].includes(issue.capability) && issue.reason === "capability-unavailable" && keys.length === 2;
   }
   return false;
 }
 function serializeDesktopControllerReadiness(readiness) {
-  if (readiness.schemaVersion !== 2 || !["compatible", "compatible-with-warning", "degraded"].includes(readiness.state) || !Array.isArray(readiness.issues) || readiness.issues.length > 1 || readiness.state === "compatible" && readiness.issues.length !== 0 || readiness.state !== "compatible" && (readiness.issues.length !== 1 || !readiness.issues[0] || !validCompatibilityIssue(readiness.state, readiness.issues[0])) || Object.keys(readiness).length !== 3) {
+  if (readiness.schemaVersion !== 2 || !["compatible", "degraded"].includes(readiness.state) || !Array.isArray(readiness.issues) || readiness.issues.length > 1 || readiness.state === "compatible" && readiness.issues.length !== 0 || readiness.state !== "compatible" && (readiness.issues.length !== 1 || !readiness.issues[0] || !validCompatibilityIssue(readiness.state, readiness.issues[0])) || Object.keys(readiness).length !== 3) {
     throw new Error("Desktop Controller readiness is invalid");
   }
   const line = JSON.stringify(readiness);
@@ -1476,12 +1495,11 @@ ${rendererSource}`,
       })
     });
     startupTrace2("attachment server ready");
-    const issues = session?.snapshot.titlePolicy.warnings ?? [];
     startupTrace2("publishing readiness");
     dependencies.ready({
       schemaVersion: 2,
-      state: issues.length === 0 ? "compatible" : "compatible-with-warning",
-      issues
+      state: "compatible",
+      issues: []
     });
     while (!signal.aborted) {
       await dependencies.sleep(dependencies.monitorIntervalMs);

package/app/host-runtime.mjs

@@ -45148,13 +45148,13 @@ function resolveExecutable(command, environment) {
 function resolveDeepSeekCommand(configured, environment) {
   if (configured) {
     const command = resolveExecutable(configured, environment);
-    return command ? { command, arguments: [] } : null;
+    return command ? { command, arguments: [], kind: "configured" } : null;
   }
   const dsh = resolveExecutable("dsh", environment);
   if (dsh)
-    return { command: dsh, arguments: [] };
+    return { command: dsh, arguments: [], kind: "dsh" };
   const npx = resolveExecutable(process.platform === "win32" ? "npx.cmd" : "npx", environment);
-  return npx ? { command: npx, arguments: ["--no-install", "@deepseek-ai/dsh"] } : null;
+  return npx ? { command: npx, arguments: ["--no-install", "@deepseek-ai/dsh"], kind: "npx" } : null;
 }
 function unwrap(response, operation) {
   if (response.result.ok)
@@ -45247,6 +45247,9 @@ var DeepSeekHostConnection = class {
         if (processError)
           throw processError;
         if (child.exitCode !== null || child.signalCode !== null) {
+          if (invocation.kind === "npx") {
+            throw new DeepSeekHarnessTransportError("notInstalled", "DeepSeek Harness package is not installed");
+          }
           throw new DeepSeekHarnessTransportError("processExited", "DeepSeek Harness Web exited during startup");
         }
         try {

package/app/renderer-extension.js

@@ -17275,14 +17275,28 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   var SIDEBAR_THREAD_ID_ATTRIBUTE = "data-app-action-sidebar-thread-id";
   var SIDEBAR_THREAD_HOST_ID_ATTRIBUTE = "data-app-action-sidebar-thread-host-id";
   var SIDEBAR_AGENT_ICON_ATTRIBUTE = "data-codexhost-sidebar-agent-icon";
+  var OWNERSHIP_RETRY_DELAYS_MS = [100, 300, 800, 1500, 3e3];
   function isRecord2(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
   }
-  function threadIdFromSidebarRowElement(element) {
+  function sidebarThreadAttributes(element) {
     const taskKey = element.getAttribute(SIDEBAR_THREAD_ID_ATTRIBUTE);
     const hostId = element.getAttribute(SIDEBAR_THREAD_HOST_ID_ATTRIBUTE);
     const rowMarker = element.getAttribute(SIDEBAR_THREAD_ROW_ATTRIBUTE);
     if (taskKey === null || hostId === null || rowMarker === null) return null;
+    return { taskKey, hostId, rowMarker };
+  }
+  function draftIdFromSidebarRowElement(element) {
+    const attributes = sidebarThreadAttributes(element);
+    if (!attributes) return null;
+    const hostPrefix = `${attributes.hostId}:`;
+    const taskKey = attributes.taskKey.startsWith(hostPrefix) ? attributes.taskKey.slice(hostPrefix.length) : attributes.taskKey;
+    return taskKey.startsWith("client-new-thread:") ? taskKey : null;
+  }
+  function threadIdFromSidebarRowElement(element) {
+    const attributes = sidebarThreadAttributes(element);
+    if (!attributes) return null;
+    const { taskKey, hostId, rowMarker } = attributes;
     const fiberNames = Object.getOwnPropertyNames(element).filter(
       (name) => name.startsWith("__reactFiber$")
     );
@@ -17324,6 +17338,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     threadId() {
       return threadIdFromSidebarRowElement(this.element);
     }
+    draftId() {
+      return draftIdFromSidebarRowElement(this.element);
+    }
     render(agent) {
       const titleTrigger = this.element.querySelector("[data-thread-title-trigger]");
       const title = titleTrigger?.querySelector("[data-thread-title]");
@@ -17403,6 +17420,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     const ownershipByThread = /* @__PURE__ */ new Map();
     const pending = /* @__PURE__ */ new Set();
     const failed = /* @__PURE__ */ new Set();
+    const provisionalCodex = /* @__PURE__ */ new Set();
+    const ownershipRetryAttempts = /* @__PURE__ */ new Map();
+    const ownershipRetryTimers = /* @__PURE__ */ new Map();
     let disposed = false;
     let scanScheduled = false;
     const scheduleScan = () => {
@@ -17410,6 +17430,30 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       scanScheduled = true;
       queueMicrotask(scan);
     };
+    const clearOwnershipRetry = (threadId) => {
+      const timer = ownershipRetryTimers.get(threadId);
+      if (timer !== void 0) clearTimeout(timer);
+      ownershipRetryTimers.delete(threadId);
+      ownershipRetryAttempts.delete(threadId);
+      provisionalCodex.delete(threadId);
+    };
+    const scheduleOwnershipRetry = (threadId) => {
+      if (disposed || !provisionalCodex.has(threadId) || pending.has(threadId) || ownershipRetryTimers.has(threadId)) {
+        return;
+      }
+      const attempt = ownershipRetryAttempts.get(threadId) ?? 0;
+      const delay = OWNERSHIP_RETRY_DELAYS_MS[attempt];
+      if (delay === void 0) return;
+      ownershipRetryAttempts.set(threadId, attempt + 1);
+      const timer = setTimeout(() => {
+        ownershipRetryTimers.delete(threadId);
+        if (disposed) return;
+        failed.delete(threadId);
+        ownershipByThread.delete(threadId);
+        scheduleScan();
+      }, delay);
+      ownershipRetryTimers.set(threadId, timer);
+    };
     const requestOwnership = (threadIds, client) => {
       for (const threadId of threadIds) pending.add(threadId);
       let succeeded = false;
@@ -17418,6 +17462,12 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         for (const ownership of threads) {
           ownershipByThread.set(ownership.threadId, rendererAgentForThreadOwnership(ownership));
           failed.delete(ownership.threadId);
+          if (ownership.owner === "codex") {
+            provisionalCodex.add(ownership.threadId);
+            scheduleOwnershipRetry(ownership.threadId);
+          } else {
+            clearOwnershipRetry(ownership.threadId);
+          }
         }
         succeeded = true;
       }).catch(() => {
@@ -17425,6 +17475,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         for (const threadId of threadIds) failed.add(threadId);
       }).finally(() => {
         for (const threadId of threadIds) pending.delete(threadId);
+        for (const threadId of threadIds) scheduleOwnershipRetry(threadId);
         if (succeeded) scheduleScan();
       });
     };
@@ -17433,8 +17484,25 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       if (disposed) return;
       const unresolved = /* @__PURE__ */ new Set();
       for (const row of dom.rows()) {
+        if (!row.isConnected()) {
+          row.clear();
+          continue;
+        }
         const threadId = hostThreadIdSchema.safeParse(row.threadId());
-        if (!row.isConnected() || !threadId.success) {
+        const localAgent = options.getLocalAgent?.({
+          threadId: threadId.success ? threadId.data : null,
+          draftId: row.draftId()
+        });
+        if (localAgent !== null && localAgent !== void 0) {
+          if (threadId.success) {
+            ownershipByThread.set(threadId.data, localAgent === "codex" ? null : localAgent);
+            clearOwnershipRetry(threadId.data);
+          }
+          if (localAgent === "codex") row.clear();
+          else row.render(localAgent);
+          continue;
+        }
+        if (!threadId.success) {
           row.clear();
           continue;
         }
@@ -17461,6 +17529,13 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     return {
       refresh() {
         failed.clear();
+        for (const threadId of provisionalCodex) {
+          const timer = ownershipRetryTimers.get(threadId);
+          if (timer !== void 0) clearTimeout(timer);
+          ownershipRetryTimers.delete(threadId);
+          ownershipRetryAttempts.delete(threadId);
+          ownershipByThread.delete(threadId);
+        }
         scheduleScan();
       },
       dispose() {
@@ -17471,6 +17546,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         ownershipByThread.clear();
         pending.clear();
         failed.clear();
+        provisionalCodex.clear();
+        for (const timer of ownershipRetryTimers.values()) clearTimeout(timer);
+        ownershipRetryTimers.clear();
+        ownershipRetryAttempts.clear();
       }
     };
   }
@@ -17916,6 +17995,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     return source.includes("send-cli-request-for-host") && hasPrewarmMethod(value.requestClient);
   }
   function matchesCurrentPrewarmSignature(target) {
+    const bridge = target.requestClient ?? target;
+    const stableApiShape = bridge.hostId === "local" && typeof bridge.sendRequest === "function" && typeof bridge.prewarmThreadStart === "function" && typeof bridge.enqueueRequest === "function";
+    if (stableApiShape) return true;
     const prewarm = target.prewarmThreadStart ?? target.requestClient?.prewarmThreadStart;
     if (!prewarm) return false;
     const source = Function.prototype.toString.call(prewarm);
@@ -20177,8 +20259,21 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     let applyAdapterAgent = null;
     let modelControl = null;
     let usageNotificationDispose = null;
+    const localAgentForSidebarThread = (input) => {
+      for (const mounted of mountedByComposer.values()) {
+        const target = mounted.modelTarget;
+        if (target?.[0] === "default" && input.draftId !== null && target[1] === input.draftId) {
+          return controller.get(mounted.composer).agent;
+        }
+        if (target?.[0] === "conversation" && input.threadId !== null && target[1] === input.threadId && mounted.ownershipStatus === "ready") {
+          return controller.get(mounted.composer).agent;
+        }
+      }
+      return null;
+    };
     const sidebarAgentIcons = installRendererSidebarAgentIcons({
-      getClient: () => modelControl
+      getClient: () => modelControl,
+      getLocalAgent: localAgentForSidebarThread
     });
     const settingsLifecycle = installRendererSettingsLifecycle(window, {
       getUpdateClient: () => modelControl
@@ -20194,6 +20289,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     );
     let availabilityRequestGeneration = 0;
     let availabilityRequest = null;
+    let availabilityRetryTimer = null;
+    let availabilityRetryAttempt = 0;
+    const availabilityRetryDelays = [500, 1e3, 2e3, 4e3, 8e3];
     const usageRefreshTimers = /* @__PURE__ */ new Map();
     const usageRefreshAttempts = /* @__PURE__ */ new Map();
     const isMountedComposer = (composer) => composer.isConnected && composer.matches(CODEX_COMPOSER_SELECTOR) && mountedByComposer.has(composer);
@@ -20366,6 +20464,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       } finally {
         if (isCurrentOwnershipRequest(mounted, generation)) {
           renderMounted(mounted);
+          sidebarAgentIcons.refresh();
           if (mounted.ownershipStatus !== "error" && shouldRetryExternalThreadUsage(
             controller.get(mounted.composer).agent,
             mounted.usage,
@@ -20411,6 +20510,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         if (previousTarget?.[0] === "conversation") renderMounted(mounted);
         void loadThreadOwnership(mounted);
       }
+      sidebarAgentIcons.refresh();
       return true;
     };
     const loadExternalCatalog = async (mounted) => {
@@ -20921,6 +21021,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
           mounted.modelView = { status: "idle" };
           mounted.permissionModeView = { status: "idle" };
         }
+        sidebarAgentIcons.refresh();
         return switched;
       } catch {
         adapterStatus = {
@@ -20940,7 +21041,26 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       const url2 = RENDERER_AGENT_INSTALL_URLS[agent];
       window.open(url2, "_blank", "noopener,noreferrer");
     };
-    const refreshHarnessAvailability = (refresh = false) => {
+    const resetHarnessAvailabilityRetry = () => {
+      if (availabilityRetryTimer !== null) {
+        window.clearTimeout(availabilityRetryTimer);
+        availabilityRetryTimer = null;
+      }
+      availabilityRetryAttempt = 0;
+    };
+    const scheduleHarnessAvailabilityRetry = () => {
+      if (disposed || availabilityRetryTimer !== null || availabilityRetryAttempt >= availabilityRetryDelays.length) {
+        return;
+      }
+      const delay = availabilityRetryDelays[availabilityRetryAttempt];
+      availabilityRetryAttempt += 1;
+      availabilityRetryTimer = window.setTimeout(() => {
+        availabilityRetryTimer = null;
+        void refreshHarnessAvailability(true, true);
+      }, delay);
+    };
+    const refreshHarnessAvailability = (refresh = false, retry = false) => {
+      if (!retry) resetHarnessAvailabilityRetry();
       if (!modelControl) return Promise.resolve();
       const client = modelControl;
       if (availabilityRequest?.client === client) return availabilityRequest.promise;
@@ -20982,6 +21102,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
             }
           })
         );
+        if (externalAgents.every((agent) => harnessAvailability[agent] === "ready")) {
+          resetHarnessAvailabilityRetry();
+        } else {
+          scheduleHarnessAvailabilityRetry();
+        }
       })();
       const request = { client, promise: promise2 };
       availabilityRequest = request;
@@ -21060,6 +21185,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         );
       }
       renderMounted(mounted);
+      sidebarAgentIcons.refresh();
       if (threadIdFromComposerModelTarget(modelTarget) && !inherited) {
         void loadThreadOwnership(mounted);
       } else if (threadIdFromComposerModelTarget(modelTarget) && inherited && shouldRetryExternalThreadUsage(state.agent, mounted.usage, mounted.accountCredits)) {
@@ -21384,6 +21510,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         document.removeEventListener("click", onClick, true);
         window.removeEventListener("codexhost:renderer-adapter-status", onAdapterStatus);
         window.removeEventListener("focus", onWindowFocus);
+        resetHarnessAvailabilityRetry();
         for (const timer of usageRefreshTimers.values()) window.clearTimeout(timer);
         usageRefreshTimers.clear();
         for (const mounted of mountedByComposer.values()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codexhost/cli-win32-x64",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Run Pi and Claude Code as first-class external harnesses inside Codex Desktop.",
   "type": "module",
   "files": [