@codexhost/cli-win32-x64 0.1.3 → 0.1.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.1.3
+npm install -g @codexhost/cli@0.1.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.1.3","distribution":"npm","target":"windows-x64"}
+{"schemaVersion":1,"version":"0.1.4","distribution":"npm","target":"windows-x64"}

package/app/desktop-controller.mjs

@@ -788,30 +788,12 @@ async function installRendererDraftPrewarmPolicy(inspector, rendererWebContentsI
 }
 
 // packages/desktop-control/src/renderer-control-session.ts
-var RendererCompatibilityError = class extends Error {
-  constructor(capability, reason, cause) {
-    super(`Renderer compatibility boundary unavailable: ${capability}`, { cause });
-    this.capability = capability;
-    this.reason = reason;
-    this.name = "RendererCompatibilityError";
-  }
-  capability;
-  reason;
-};
 function isRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function sleep(milliseconds) {
   return new Promise((resolve) => setTimeout(resolve, milliseconds));
 }
-async function requireCompatibilityBoundary(capability, reason, operation) {
-  try {
-    return await operation();
-  } catch (error) {
-    if (error instanceof RendererCompatibilityError) throw error;
-    throw new RendererCompatibilityError(capability, reason, error);
-  }
-}
 function sameAgents(actual, expected) {
   return actual.length === expected.length && actual.every((agent, index) => agent === expected[index]);
 }
@@ -1040,39 +1022,26 @@ var InstalledRendererControlSession = class {
     );
     const existing = await this.operations.readBinding(this.inspector, selected.id).catch(() => null);
     if (existing !== null) {
-      const binding2 = await requireCompatibilityBoundary(
-        "agent-routing",
-        "agent-routing-structure-unavailable",
-        () => validateBindingStatus(existing, this.enabledAgents)
-      );
+      const binding2 = validateBindingStatus(existing, this.enabledAgents);
       this.#snapshot = { ...this.#snapshot, renderer: selected, binding: binding2 };
       return this.#snapshot;
     }
-    const titlePolicyReadiness = await requireCompatibilityBoundary(
-      "title-isolation",
-      "title-isolation-structure-unavailable",
-      () => waitForRendererTitlePolicyReady(
-        () => this.operations.markTitlePolicyReady(this.inspector, selected.id),
-        { timeoutMs: this.timeoutMs, pollIntervalMs: this.pollIntervalMs }
-      )
+    const titlePolicyReadiness = await waitForRendererTitlePolicyReady(
+      () => this.operations.markTitlePolicyReady(this.inspector, selected.id),
+      { timeoutMs: this.timeoutMs, pollIntervalMs: this.pollIntervalMs }
     );
     await this.operations.execute(this.inspector, selected.id, this.rendererSource);
-    const binding = await requireCompatibilityBoundary(
-      "agent-routing",
-      "agent-routing-structure-unavailable",
-      () => waitForBinding(
-        this.inspector,
-        this.operations,
-        selected.id,
-        this.enabledAgents,
-        this.timeoutMs,
-        this.pollIntervalMs
-      )
+    const binding = await waitForBinding(
+      this.inspector,
+      this.operations,
+      selected.id,
+      this.enabledAgents,
+      this.timeoutMs,
+      this.pollIntervalMs
     );
-    const draftPrewarmPolicy = await requireCompatibilityBoundary(
-      "draft-routing",
-      "draft-routing-structure-unavailable",
-      () => this.operations.installDraftPrewarmPolicy(this.inspector, selected.id)
+    const draftPrewarmPolicy = await this.operations.installDraftPrewarmPolicy(
+      this.inspector,
+      selected.id
     );
     this.#snapshot = {
       ...this.#snapshot,
@@ -1124,41 +1093,28 @@ async function createRendererControlSession(options) {
   const pollIntervalMs = options.pollIntervalMs ?? 250;
   const operations = options.operations ?? defaultOperations;
   const initial = await waitForRenderer(options.inspector, operations, timeoutMs, pollIntervalMs);
-  const titlePolicy = await requireCompatibilityBoundary(
-    "title-isolation",
-    "title-isolation-structure-unavailable",
-    () => operations.installTitlePolicy(options.inspector, initial.id)
-  );
+  const titlePolicy = await operations.installTitlePolicy(options.inspector, initial.id);
   await operations.reload(options.inspector, initial.id);
   const selected = await waitForRenderer(options.inspector, operations, timeoutMs, pollIntervalMs);
-  const titlePolicyReadiness = await requireCompatibilityBoundary(
-    "title-isolation",
-    "title-isolation-structure-unavailable",
-    () => waitForRendererTitlePolicyReady(
-      () => operations.markTitlePolicyReady(options.inspector, selected.id),
-      {
-        timeoutMs,
-        pollIntervalMs
-      }
-    )
-  );
-  await operations.execute(options.inspector, selected.id, options.rendererSource);
-  const binding = await requireCompatibilityBoundary(
-    "agent-routing",
-    "agent-routing-structure-unavailable",
-    () => waitForBinding(
-      options.inspector,
-      operations,
-      selected.id,
-      enabledAgents,
+  const titlePolicyReadiness = await waitForRendererTitlePolicyReady(
+    () => operations.markTitlePolicyReady(options.inspector, selected.id),
+    {
       timeoutMs,
       pollIntervalMs
-    )
+    }
   );
-  const draftPrewarmPolicy = await requireCompatibilityBoundary(
-    "draft-routing",
-    "draft-routing-structure-unavailable",
-    () => operations.installDraftPrewarmPolicy(options.inspector, selected.id)
+  await operations.execute(options.inspector, selected.id, options.rendererSource);
+  const binding = await waitForBinding(
+    options.inspector,
+    operations,
+    selected.id,
+    enabledAgents,
+    timeoutMs,
+    pollIntervalMs
+  );
+  const draftPrewarmPolicy = await operations.installDraftPrewarmPolicy(
+    options.inspector,
+    selected.id
   );
   return new InstalledRendererControlSession(
     options.inspector,
@@ -1203,6 +1159,8 @@ var PRODUCTION_INSTALL_TIMEOUT_MS = 9e4;
 var DESKTOP_CONTROLLER_READINESS_MAX_BYTES = 512;
 var TRANSIENT_INSTALL_ATTEMPTS = 3;
 var TRANSIENT_INSTALL_RETRY_MS = 250;
+var RECOVERY_RETRY_INITIAL_MS = 3e4;
+var RECOVERY_RETRY_MAX_MS = 3e5;
 function validCompatibilityIssue(state, issue) {
   const keys = Object.keys(issue);
   if (state === "compatible-with-warning") {
@@ -1217,24 +1175,10 @@ function validCompatibilityIssue(state, issue) {
       "settings-surface"
     ].includes(issue.capability) && issue.reason === "capability-unavailable" && issue.observedIdentity === void 0 && keys.length === 2;
   }
-  if (state === "incompatible") {
-    const pair = `${issue.capability}:${issue.reason}`;
-    return [
-      "title-isolation:title-isolation-structure-unavailable",
-      "draft-routing:draft-routing-structure-unavailable",
-      "agent-routing:agent-routing-structure-unavailable"
-    ].includes(pair) && issue.observedIdentity === void 0 && keys.length === 2;
-  }
-  return state === "detection-failed" && issue.capability === "compatibility-detection" && issue.reason === "inspection-failed" && issue.observedIdentity === void 0 && keys.length === 2;
+  return false;
 }
 function serializeDesktopControllerReadiness(readiness) {
-  if (readiness.schemaVersion !== 2 || ![
-    "compatible",
-    "compatible-with-warning",
-    "degraded",
-    "incompatible",
-    "detection-failed"
-  ].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", "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) {
     throw new Error("Desktop Controller readiness is invalid");
   }
   const line = JSON.stringify(readiness);
@@ -1344,15 +1288,12 @@ function isTransientElectronInstallError(error) {
   }
   return false;
 }
-function shouldRetryInstallError(error) {
-  return !(error instanceof RendererCompatibilityError) || isTransientElectronInstallError(error);
-}
 async function installProductionSession(options, dependencies) {
   for (let attempt = 1; attempt <= TRANSIENT_INSTALL_ATTEMPTS; attempt += 1) {
     try {
       return await dependencies.install(options);
     } catch (error) {
-      if (attempt === TRANSIENT_INSTALL_ATTEMPTS || !shouldRetryInstallError(error)) {
+      if (attempt === TRANSIENT_INSTALL_ATTEMPTS || !isTransientElectronInstallError(error)) {
         throw error;
       }
       await dependencies.sleep(TRANSIENT_INSTALL_RETRY_MS);
@@ -1361,12 +1302,23 @@ async function installProductionSession(options, dependencies) {
   throw new Error("Desktop Controller exhausted Renderer installation attempts");
 }
 async function runDesktopController(options, signal, dependencies = defaultDependencies) {
+  const configuration = `Object.defineProperty(window, "__codexhostProductionConfigV1", { configurable: true, value: { defaultAgent: ${JSON.stringify(options.defaultAgent)} } });`;
+  const now = dependencies.now ?? Date.now;
   let session;
-  try {
+  let nextRecoveryAt = 0;
+  let recoveryDelayMs = RECOVERY_RETRY_INITIAL_MS;
+  const recordRecoveryFailure = () => {
+    nextRecoveryAt = now() + recoveryDelayMs;
+    recoveryDelayMs = Math.min(recoveryDelayMs * 2, RECOVERY_RETRY_MAX_MS);
+  };
+  const recordRecoverySuccess = () => {
+    nextRecoveryAt = 0;
+    recoveryDelayMs = RECOVERY_RETRY_INITIAL_MS;
+  };
+  const createSession = async () => {
     const rendererSource = await dependencies.readRenderer(options.rendererPath);
     if (rendererSource.trim().length === 0) throw new Error("production Renderer Bundle is empty");
-    const configuration = `Object.defineProperty(window, "__codexhostProductionConfigV1", { configurable: true, value: { defaultAgent: ${JSON.stringify(options.defaultAgent)} } });`;
-    session = await installProductionSession(
+    return installProductionSession(
       {
         inspectorEndpoint: options.inspectorEndpoint,
         rendererSource: `${configuration}
@@ -1376,19 +1328,13 @@ ${rendererSource}`,
       },
       dependencies
     );
-  } catch (error) {
-    dependencies.ready(
-      error instanceof RendererCompatibilityError && !isTransientElectronInstallError(error) ? {
-        schemaVersion: 2,
-        state: "incompatible",
-        issues: [{ capability: error.capability, reason: error.reason }]
-      } : {
-        schemaVersion: 2,
-        state: "detection-failed",
-        issues: [{ capability: "compatibility-detection", reason: "inspection-failed" }]
-      }
-    );
-    return;
+  };
+  try {
+    session = await createSession();
+    recordRecoverySuccess();
+  } catch {
+    session = void 0;
+    recordRecoveryFailure();
   }
   let operation = Promise.resolve(void 0);
   const useSession = (callback) => {
@@ -1399,22 +1345,45 @@ ${rendererSource}`,
     );
     return next;
   };
+  const resetSession = () => {
+    session?.close();
+    session = void 0;
+  };
+  const ensureSession = async () => {
+    if (!session) session = await createSession();
+    else await session.ensureInstalled();
+    return session;
+  };
+  const recoverSession = async () => {
+    try {
+      const current = await ensureSession();
+      recordRecoverySuccess();
+      return current;
+    } catch (error) {
+      resetSession();
+      recordRecoveryFailure();
+      throw error;
+    }
+  };
   let attachmentServer;
   try {
     attachmentServer = await dependencies.startAttachmentServer({
       port: options.attachmentPort,
       nonce: options.attachmentNonce,
       attach: () => useSession(async () => {
-        await session.ensureInstalled();
-        await session.activateDesktop();
+        const current = await recoverSession();
+        await current.activateDesktop();
       }),
       compatibilityUpdate: () => useSession(async () => {
-        await session.ensureInstalled();
-        return session.requestCompatibilityUpdate();
+        const current = await recoverSession();
+        return current.requestCompatibilityUpdate();
       }),
-      shutdown: () => useSession(() => session.quitDesktop())
+      shutdown: () => useSession(async () => {
+        const current = await recoverSession();
+        await current.quitDesktop();
+      })
     });
-    const issues = session.snapshot.titlePolicy.warnings;
+    const issues = session?.snapshot.titlePolicy.warnings ?? [];
     dependencies.ready({
       schemaVersion: 2,
       state: issues.length === 0 ? "compatible" : "compatible-with-warning",
@@ -1422,12 +1391,19 @@ ${rendererSource}`,
     });
     while (!signal.aborted) {
       await dependencies.sleep(dependencies.monitorIntervalMs);
-      if (!signal.aborted) await useSession(() => session.ensureInstalled());
+      if (signal.aborted) continue;
+      await useSession(async () => {
+        if (!session && now() < nextRecoveryAt) return;
+        try {
+          await recoverSession();
+        } catch {
+        }
+      });
     }
   } finally {
     await attachmentServer?.close();
     await operation;
-    session.close();
+    resetSession();
   }
 }
 

package/app/host-runtime.mjs

@@ -50582,7 +50582,7 @@ function isHostApprovalRequestId(value) {
 function isHostQuestionRequestId(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value >= HOST_QUESTION_REQUEST_ID_MIN && value <= HOST_QUESTION_REQUEST_ID_MAX;
 }
-function classifyCreateRequestRoute(request, defaultAgent) {
+function classifyCreateRequestRoute(request, defaultAgent2) {
   const route = decodeCreateRoute(request);
   if (!route) return null;
   if (route.harnessId !== "codex") {
@@ -50596,8 +50596,8 @@ function classifyCreateRequestRoute(request, defaultAgent) {
   return {
     requestMethod: "thread/start",
     modelCarrier: "official-model",
-    selectedHarness: defaultAgent,
-    selectionSource: defaultAgent === "pi" ? "default-agent" : "official-model"
+    selectedHarness: defaultAgent2,
+    selectionSource: defaultAgent2 === "pi" ? "default-agent" : "official-model"
   };
 }
 function requestObject(request) {
@@ -53164,20 +53164,6 @@ var ERROR_MAX_LENGTH = 500;
 var CONTROLLER_TIMEOUT_MS = 5e3;
 var UPDATER_READY_TIMEOUT_MS = 1e4;
 var UPDATER_READY_POLL_MS = 20;
-async function startCompatibilityUpdate(coordinator) {
-  try {
-    const check2 = await coordinator.check();
-    if (check2.updateAvailable && check2.installationAvailable) {
-      void coordinator.start().catch(() => void 0);
-      return "update-started";
-    }
-    if (check2.error === null && check2.latestVersion !== null && check2.currentVersion === check2.latestVersion) {
-      return "current";
-    }
-  } catch {
-  }
-  return "unavailable";
-}
 function boundedError(error52) {
   const message3 = error52 instanceof Error ? error52.message : String(error52);
   return message3.slice(0, ERROR_MAX_LENGTH) || "Update operation failed";
@@ -53428,31 +53414,25 @@ function createHostUpdateCoordinator(options) {
 // packages/host-runtime/src/release-main.ts
 var STOCK_CODEX_PATH_ENV = "CODEXHOST_STOCK_CODEX_PATH";
 var DEFAULT_AGENT_ENV = "CODEXHOST_DEFAULT_AGENT";
-var COMPATIBILITY_UPDATE_ARGUMENT = "--codexhost-compatibility-update";
 var arguments_ = process.argv.slice(2);
 var updateCoordinator = createHostUpdateCoordinator({
   hostRuntimePath: fileURLToPath(import.meta.url),
   environment: process.env
 });
-if (arguments_.length === 1 && arguments_[0] === COMPATIBILITY_UPDATE_ARGUMENT) {
-  process.stdout.write(`${await startCompatibilityUpdate(updateCoordinator)}
-`);
-} else {
-  const stockCodexPath = process.env[STOCK_CODEX_PATH_ENV];
-  if (!stockCodexPath) throw new Error(`${STOCK_CODEX_PATH_ENV} is required`);
-  const defaultAgent = process.env[DEFAULT_AGENT_ENV];
-  if (defaultAgent !== "codex" && defaultAgent !== "pi") {
-    throw new Error(`${DEFAULT_AGENT_ENV} must be 'codex' or 'pi'`);
-  }
-  const externalAdapters = createExternalHarnessAdapters(process.env);
-  const host = new AppServerHost({
-    stockCodexPath,
-    arguments: arguments_,
-    defaultAgent,
-    environment: process.env,
-    externalAdapters,
-    updateCoordinator
-  });
-  void prefetchClaudeCodeModelCatalog(externalAdapters);
-  process.exitCode = await host.run();
-}
+var stockCodexPath = process.env[STOCK_CODEX_PATH_ENV];
+if (!stockCodexPath) throw new Error(`${STOCK_CODEX_PATH_ENV} is required`);
+var defaultAgent = process.env[DEFAULT_AGENT_ENV];
+if (defaultAgent !== "codex" && defaultAgent !== "pi") {
+  throw new Error(`${DEFAULT_AGENT_ENV} must be 'codex' or 'pi'`);
+}
+var externalAdapters = createExternalHarnessAdapters(process.env);
+var host = new AppServerHost({
+  stockCodexPath,
+  arguments: arguments_,
+  defaultAgent,
+  environment: process.env,
+  externalAdapters,
+  updateCoordinator
+});
+void prefetchClaudeCodeModelCatalog(externalAdapters);
+process.exitCode = await host.run();

package/app/renderer-extension.js

@@ -17223,9 +17223,52 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   var THREAD_PERMISSION_MODE_SELECT_METHOD = "codexhost/thread/permission-mode/select";
   var THREAD_OWNERSHIP_LIST_METHOD = "codexhost/thread/ownership/list";
   var THREAD_USAGE_INSPECT_METHOD = "codexhost/thread/usage/inspect";
+  var THREAD_TOKEN_USAGE_UPDATED_METHOD = "thread/tokenUsage/updated";
   var UPDATE_CHECK_METHOD = "codexhost/update/check";
   var UPDATE_START_METHOD = "codexhost/update/start";
   var UPDATE_STATUS_METHOD = "codexhost/update/status";
+  function isRecord4(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+  }
+  function notifiedThreadId(notification) {
+    if (!isRecord4(notification) || notification.method !== THREAD_TOKEN_USAGE_UPDATED_METHOD) {
+      return null;
+    }
+    const params = notification.params;
+    if (!isRecord4(params)) return null;
+    const parsed = hostThreadIdSchema.safeParse(params.threadId);
+    return parsed.success ? parsed.data : null;
+  }
+  function createThreadUsageSubscriptionRelay() {
+    const listeners = /* @__PURE__ */ new Set();
+    let removeNotificationCallback = null;
+    return {
+      connect(client) {
+        if (removeNotificationCallback || listeners.size === 0) return;
+        try {
+          removeNotificationCallback = client.subscribeThreadUsage?.((update) => {
+            for (const listener of listeners) listener(update);
+          }) ?? null;
+        } catch {
+          removeNotificationCallback = null;
+        }
+      },
+      subscribe(listener) {
+        listeners.add(listener);
+        return () => {
+          listeners.delete(listener);
+          if (listeners.size > 0) return;
+          removeNotificationCallback?.();
+          removeNotificationCallback = null;
+        };
+      },
+      dispose() {
+        removeNotificationCallback?.();
+        removeNotificationCallback = null;
+        listeners.clear();
+      }
+    };
+  }
   function createRendererModelClient(candidates) {
     const managers = candidates.filter(
       (candidate) => typeof candidate.sendRequest === "function"
@@ -17279,6 +17322,29 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         return result;
       },
       inspectThreadUsage,
+      subscribeThreadUsage(listener) {
+        if (typeof manager.addNotificationCallback !== "function") return () => void 0;
+        let disposed = false;
+        const generations = /* @__PURE__ */ new Map();
+        const removeNotificationCallback = manager.addNotificationCallback(
+          THREAD_TOKEN_USAGE_UPDATED_METHOD,
+          (notification) => {
+            const threadId = notifiedThreadId(notification);
+            if (!threadId) return;
+            const generation = (generations.get(threadId) ?? 0) + 1;
+            generations.set(threadId, generation);
+            void inspectThreadUsage({ threadId }).then((update) => {
+              if (!disposed && generations.get(threadId) === generation) listener(update);
+            }).catch(() => void 0);
+          }
+        );
+        return () => {
+          if (disposed) return;
+          disposed = true;
+          generations.clear();
+          removeNotificationCallback();
+        };
+      },
       selectThreadModel,
       selectThreadThinking,
       selectThreadPermissionMode,
@@ -17331,7 +17397,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   function isTransportModelId(model) {
     return isPiTransportModelId(model) || isClaudeTransportModelId(model);
   }
-  function isRecord4(value) {
+  function isRecord5(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
   }
   function piTransportModelId(model, thinkingOptionId) {
@@ -17402,7 +17468,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     return (typeof value === "object" || typeof value === "function") && value !== null && typeof value.prewarmThreadStart === "function";
   }
   function isActiveRequestManager(value) {
-    if (!isRecord4(value) || typeof value.sendRequest !== "function") return false;
+    if (!isRecord5(value) || typeof value.sendRequest !== "function") return false;
     const source = Function.prototype.toString.call(value.sendRequest);
     return source.includes("send-cli-request-for-host") && hasPrewarmMethod(value.requestClient);
   }
@@ -17438,7 +17504,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       let hook = fiber.memoizedState;
       for (let hookIndex = 0; hook && hookIndex < 100; hookIndex += 1) {
         const hookState = hook.memoizedState;
-        if (isRecord4(hookState)) {
+        if (isRecord5(hookState)) {
           const requestClient = hookState.requestClient;
           if (isActiveRequestManager(hookState) && matchesCurrentPrewarmSignature(hookState)) {
             targets.add(hookState);
@@ -17455,10 +17521,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     return [...targets];
   }
   function isModelAtomState(value) {
-    return isRecord4(value) && isRecord4(value.atom) && typeof value.get === "function" && typeof value.set === "function";
+    return isRecord5(value) && isRecord5(value.atom) && typeof value.get === "function" && typeof value.set === "function";
   }
   function isModelSelection(value) {
-    return value === null || isRecord4(value) && "model" in value && "reasoningEffort" in value;
+    return value === null || isRecord5(value) && "model" in value && "reasoningEffort" in value;
   }
   function sameModelPowerSelection(left, right) {
     return left === right || left !== null && right !== null && left.model === right.model && left.reasoningEffort === right.reasoningEffort;
@@ -17470,7 +17536,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     const first = pairs[0];
     if (!first) return null;
     const value = first.optimistic.get();
-    if (isRecord4(value) && "modelSettings" in value) return first.optimistic;
+    if (isRecord5(value) && "modelSettings" in value) return first.optimistic;
     if (first.optimistic.atom === first.committed.atom) return null;
     if (!pairs.every(
       (pair) => pair.optimistic.atom === first.optimistic.atom && pair.committed.atom === first.committed.atom && sameTarget2(pair.target, first.target)
@@ -17504,7 +17570,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       let fiber = fiberName ? Object.getOwnPropertyDescriptor(button, fiberName)?.value : null;
       for (let depth = 0; fiber && depth < 60; depth += 1) {
         const props = fiber.memoizedProps;
-        if (isRecord4(props) && typeof props.onSelectModel === "function" && typeof props.onSelectReasoningEffort === "function" && "reasoningEffort" in props && isRecord4(props.fallbackPowerSelection)) {
+        if (isRecord5(props) && typeof props.onSelectModel === "function" && typeof props.onSelectReasoningEffort === "function" && "reasoningEffort" in props && isRecord5(props.fallbackPowerSelection)) {
           matches.push({ callback: props.onSelectModel, value: props.reasoningEffort });
         }
         const parent = fiber.return;
@@ -17529,9 +17595,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       let fiber = fiberName ? Object.getOwnPropertyDescriptor(button, fiberName)?.value : null;
       for (let depth = 0; fiber && depth < 60; depth += 1) {
         const props = fiber.memoizedProps;
-        if (!control && isRecord4(props) && "model" in props && "reasoningEffort" in props && typeof props.onSelectModel === "function") {
+        if (!control && isRecord5(props) && "model" in props && "reasoningEffort" in props && typeof props.onSelectModel === "function") {
           const selection = { model: props.model, reasoningEffort: props.reasoningEffort };
-          const fallbackSelection = isRecord4(props.fallbackPowerSelection) ? props.fallbackPowerSelection : null;
+          const fallbackSelection = isRecord5(props.fallbackPowerSelection) ? props.fallbackPowerSelection : null;
           control = {
             codexSelection: isTransportModelId(selection.model) ? fallbackSelection : selection,
             selection,
@@ -17557,8 +17623,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     let fiber = findComposerFiber(composer);
     for (let depth = 0; fiber && depth < 120; depth += 1) {
       const updateQueue = fiber.updateQueue;
-      const memoCache = isRecord4(updateQueue) ? updateQueue.memoCache : null;
-      const data = isRecord4(memoCache) && Array.isArray(memoCache.data) ? memoCache.data : [];
+      const memoCache = isRecord5(updateQueue) ? updateQueue.memoCache : null;
+      const data = isRecord5(memoCache) && Array.isArray(memoCache.data) ? memoCache.data : [];
       for (let index = 0; index + 1 < data.length; index += 1) {
         const compact = data[index];
         const resolved = data[index + 1];
@@ -17571,7 +17637,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         } catch {
           continue;
         }
-        if (!isRecord4(value) || !("modelSettings" in value)) continue;
+        if (!isRecord5(value) || !("modelSettings" in value)) continue;
         const target = resolved[2] === null || resolved[2].startsWith("client-new-thread:") ? ["default", resolved[2]] : ["conversation", resolved[2]];
         compactPairs.push({ optimistic: compact[1], committed: resolved[3], target });
       }
@@ -17633,7 +17699,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         reasoningEffort: reasoningEffort.value
       };
     }
-    if (!isRecord4(current) || !("modelSettings" in current)) return null;
+    if (!isRecord5(current) || !("modelSettings" in current)) return null;
     const picker = findModelPickerControl(composer);
     if (!picker.found) return null;
     return {
@@ -17648,10 +17714,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     };
   }
   function isMainProcessTitlePolicyReady(value) {
-    return isRecord4(value) && value.state === "ready";
+    return isRecord5(value) && value.state === "ready";
   }
   function isDraftPrewarmPolicyReady(value) {
-    return isRecord4(value) && value.state === "ready" && typeof value.clear === "function";
+    return isRecord5(value) && value.state === "ready" && typeof value.clear === "function";
   }
   async function waitForRendererDraftPrewarmPolicy(target) {
     const deadline = Date.now() + DRAFT_PREWARM_POLICY_WAIT_TIMEOUT_MS;
@@ -17695,9 +17761,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       dispose() {
       }
     });
+    const usageSubscription = createThreadUsageSubscriptionRelay();
     const currentModelClient = () => {
       const client = createRendererModelClient(findActivePrewarmTargets(document));
       if (!client) throw new Error("Renderer Model request manager is unavailable");
+      usageSubscription.connect(client);
       return client;
     };
     const modelControl = Object.freeze({
@@ -17705,6 +17773,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       inspectHarness: (input) => currentModelClient().inspectHarness(input),
       inspectThread: (input) => currentModelClient().inspectThread(input),
       inspectThreadUsage: (input) => currentModelClient().inspectThreadUsage(input),
+      subscribeThreadUsage: (listener) => usageSubscription.subscribe(listener),
       listThreadOwnership: (input) => currentModelClient().listThreadOwnership(input),
       selectThreadModel: (input) => currentModelClient().selectThreadModel(input),
       selectThreadThinking: (input) => currentModelClient().selectThreadThinking(input),
@@ -17783,6 +17852,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         disposed = true;
         observer.disconnect();
         forkControl.dispose();
+        usageSubscription.dispose();
         modelController = null;
         officialSelection = null;
         hasOfficialSelection = false;
@@ -17827,11 +17897,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       return null;
     }
   }
-  function isRecord5(value) {
+  function isRecord6(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
   }
   function parseExternalConfiguration(value) {
-    if (!isRecord5(value)) return void 0;
+    if (!isRecord6(value)) return void 0;
     const model = harnessModelRefSchema.safeParse(value.model);
     if (!model.success) return void 0;
     const thinkingOptionId = harnessThinkingOptionIdSchema.safeParse(value.thinkingOptionId);
@@ -17846,9 +17916,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       const raw = storage.getItem(RENDERER_NEW_THREAD_PREFERENCE_KEY);
       if (!raw) return void 0;
       const parsed = JSON.parse(raw);
-      if (!isRecord5(parsed) || parsed.version !== 1) return void 0;
+      if (!isRecord6(parsed) || parsed.version !== 1) return void 0;
       if (!KNOWN_RENDERER_AGENTS.some((agent) => agent === parsed.lastAgent)) return void 0;
-      const externalByAgent = isRecord5(parsed.externalByAgent) ? parsed.externalByAgent : {};
+      const externalByAgent = isRecord6(parsed.externalByAgent) ? parsed.externalByAgent : {};
       const pi = parseExternalConfiguration(externalByAgent.pi);
       const claudeCode = parseExternalConfiguration(externalByAgent["claude-code"]);
       return {
@@ -17918,7 +17988,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
   var GET_LOCALE_OVERRIDE_URL = "vscode://codex/get-setting";
   var GET_LOCALE_INFO_URL = "vscode://codex/locale-info";
   var DEFAULT_LOCALE_REQUEST_TIMEOUT_MS = 750;
-  function isRecord6(value) {
+  function isRecord7(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
   }
   function canonicalLocale(value) {
@@ -17940,7 +18010,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     return new DOMException("The operation was aborted", "AbortError");
   }
   function parseLocaleOverride(value) {
-    if (!isRecord6(value) || !("value" in value)) {
+    if (!isRecord7(value) || !("value" in value)) {
       throw new Error("Codex locale override response is malformed");
     }
     if (value.value === null) return { value: null };
@@ -17955,7 +18025,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     return locale;
   }
   function parseLocaleInfo(value) {
-    if (!isRecord6(value)) throw new Error("Codex locale info response is malformed");
+    if (!isRecord7(value)) throw new Error("Codex locale info response is malformed");
     return {
       ideLocale: optionalLocale(value.ideLocale, "IDE locale"),
       systemLocale: optionalLocale(value.systemLocale, "system locale")
@@ -17984,7 +18054,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       const onAbort = () => settle(() => reject(abortError()));
       const onMessage = (event) => {
         const message2 = event.data;
-        if (!isRecord6(message2) || message2.type !== "fetch-response") return;
+        if (!isRecord7(message2) || message2.type !== "fetch-response") return;
         if (message2.requestId !== requestId) return;
         if (message2.responseType !== "success" || typeof message2.status !== "number" || message2.status < 200 || message2.status >= 300 || typeof message2.bodyJsonString !== "string") {
           settle(() => reject(new Error("Codex locale request failed")));
@@ -19573,6 +19643,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     let adapterDispose = null;
     let applyAdapterAgent = null;
     let modelControl = null;
+    let usageNotificationDispose = null;
     const sidebarAgentIcons = installRendererSidebarAgentIcons({
       getClient: () => modelControl
     });
@@ -19629,6 +19700,15 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         mounted.usage
       );
     };
+    const applyThreadUsageUpdate = (update) => {
+      for (const mounted of mountedByComposer.values()) {
+        if (threadIdFromComposerModelTarget(mounted.modelTarget) !== update.threadId) continue;
+        mounted.usageRequestGeneration += 1;
+        mounted.usage = update.usage;
+        usageRefreshAttempts.delete(mounted.composer);
+        renderMounted(mounted);
+      }
+    };
     const refreshThreadUsage = async (mounted) => {
       const threadId = threadIdFromComposerModelTarget(mounted.modelTarget);
       if (!threadId || !modelControl || controller.get(mounted.composer).agent === "codex") {
@@ -19692,6 +19772,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         return;
       }
       const generation = controller.beginOwnershipRequest(mounted.composer);
+      const usageGeneration = mounted.usageRequestGeneration;
       mounted.ownershipStatus = "loading";
       renderMounted(mounted);
       try {
@@ -19701,7 +19782,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
           return;
         }
         const { agent, model, thinkingOptionId, permissionModeId } = restoredThreadOwnership(inspection);
-        mounted.usage = inspection.owner === "external" ? inspection.usage ?? null : null;
+        if (mounted.usageRequestGeneration === usageGeneration) {
+          mounted.usage = inspection.owner === "external" ? inspection.usage ?? null : null;
+        }
         const restored = controller.restore(
           mounted.composer,
           agent,
@@ -20602,15 +20685,6 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     };
     const mutationObserver = new MutationObserver((mutations) => {
       transferReplacedComposers(mutations);
-      for (const mounted of mountedByComposer.values()) {
-        const anchor = nativeContextUsageControlForComposer(mounted.composer);
-        if (!anchor) continue;
-        const changed = mutations.some((mutation) => {
-          const target = mutation.target instanceof Element ? mutation.target : mutation.target.parentElement;
-          return target === anchor || target === anchor.parentElement || anchor.contains(target);
-        });
-        if (changed) scheduleThreadUsageRefresh(mounted);
-      }
       scheduleScan(mutations.some(mutationMayChangeComposerTarget));
     });
     const onAdapterStatus = () => {
@@ -20682,10 +20756,17 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
         return startCompatibilityUpdate(modelControl);
       },
       setAdapter(status, dispose, applyAgent, nextModelControl) {
+        usageNotificationDispose?.();
+        usageNotificationDispose = null;
         adapterDispose?.();
         adapterDispose = dispose ?? null;
         applyAdapterAgent = applyAgent ?? null;
         modelControl = nextModelControl ?? null;
+        try {
+          usageNotificationDispose = modelControl?.subscribeThreadUsage?.(applyThreadUsageUpdate) ?? null;
+        } catch {
+          usageNotificationDispose = null;
+        }
         adapterStatus = status;
         const installedModelControl = modelControl;
         queueMicrotask(() => {
@@ -20716,6 +20797,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
       dispose() {
         if (disposed) return;
         disposed = true;
+        usageNotificationDispose?.();
+        usageNotificationDispose = null;
         adapterDispose?.();
         adapterDispose = null;
         applyAdapterAgent = null;

package/package.json

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