@codexhost/cli-darwin-arm64 0.17.2 → 0.17.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.17.2
+npm install -g @codexhost/cli@0.17.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.17.2","distribution":"npm","target":"macos-arm64"}
+{"schemaVersion":1,"version":"0.17.4","distribution":"npm","target":"macos-arm64"}

package/app/desktop-controller.mjs

@@ -65,6 +65,12 @@ async function openRendererLocalPage(execute, url2, targets) {
 }
 
 // packages/desktop-control/src/cdp-client.ts
+var CdpConnectionClosedError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "CdpConnectionClosedError";
+  }
+};
 function cdpExceptionMessage(details, fallback) {
   const exception = details.exception;
   if (isRecord(exception) && typeof exception.description === "string" && exception.description) {
@@ -152,8 +158,14 @@ var CdpClient = class _CdpClient {
     this.#socket = socket;
     this.#commandTimeoutMs = commandTimeoutMs;
     socket.addEventListener("message", (event) => this.#onMessage(event));
-    socket.addEventListener("error", () => this.#fail(new Error("CDP WebSocket failed")));
-    socket.addEventListener("close", () => this.#fail(new Error("CDP WebSocket closed")));
+    socket.addEventListener(
+      "error",
+      () => this.#disconnect(new CdpConnectionClosedError("CDP WebSocket failed"))
+    );
+    socket.addEventListener(
+      "close",
+      () => this.#disconnect(new CdpConnectionClosedError("CDP WebSocket closed"))
+    );
   }
   static async connect(url2, options = {}) {
     loopbackUrl(url2, ["ws:", "wss:"]);
@@ -201,7 +213,7 @@ var CdpClient = class _CdpClient {
     };
   }
   #send(method, params, sessionId) {
-    if (this.#closed) return Promise.reject(new Error("CDP client is closed"));
+    if (this.#closed) return Promise.reject(new CdpConnectionClosedError("CDP client is closed"));
     const id = this.#nextId++;
     return new Promise((resolve, reject) => {
       const timeout = setTimeout(() => {
@@ -255,9 +267,12 @@ var CdpClient = class _CdpClient {
     }
   }
   close() {
+    this.#disconnect(new CdpConnectionClosedError("CDP client closed"));
+  }
+  #disconnect(error51) {
     if (this.#closed) return;
     this.#closed = true;
-    this.#fail(new Error("CDP client closed"));
+    this.#fail(error51);
     this.#listeners.clear();
     this.#socket.close();
   }
@@ -17738,13 +17753,15 @@ function installRendererHostRpcRouting(root, target, dependencies) {
     return discovery;
   };
   if (!read()) return null;
-  const native = () => {
-    if (disposed) return null;
-    try {
-      nativeRouting ??= dependencies.nativeRouting?.() ?? null;
-    } catch {
+  const discoverComposer = (composer) => {
+    const owners = dependencies.discoverComposer(composer);
+    if (!nativeRouting && (owners.managers.length || owners.registries.length)) {
+      try {
+        nativeRouting = dependencies.installNativeRouting();
+      } catch {
+      }
     }
-    return nativeRouting;
+    return owners;
   };
   const connectionFor = (hostId2) => {
     if (!hostId2.startsWith("remote-control:")) return void 0;
@@ -17926,7 +17943,7 @@ function installRendererHostRpcRouting(root, target, dependencies) {
   const routeFor = (hostId2, nativeRoute) => {
     if (disposed) return null;
     const connection = connectionFor(hostId2);
-    const preferred = nativeRoute === void 0 ? native()?.forHost(hostId2) : nativeRoute;
+    const preferred = nativeRoute === void 0 ? nativeRouting?.forHost(hostId2) : nativeRoute;
     if (connection === null || preferred) {
       retire(hostId2);
       return connection === null ? null : preferred ?? null;
@@ -17953,21 +17970,25 @@ function installRendererHostRpcRouting(root, target, dependencies) {
       target.dispatchEvent(new CustomEvent("codexhost:draft-prewarm-policy-changed"));
     }
   };
-  const composerHostId = (composer) => {
-    const nativeHostId = native()?.hostIdForComposer(composer);
+  const composerHostId = (owners, composer) => {
+    const nativeHostId = nativeRouting?.hostIdForComposer(composer);
     if (nativeHostId) return nativeHostId;
-    const hostIds = new Set(dependencies.composerHostIds(composer).hostIds);
+    const hostIds = new Set((owners ?? discoverComposer(composer)).hostIds);
     const hostId2 = hostIds.size === 1 ? hostIds.values().next().value : null;
     return typeof hostId2 === "string" && hostId2 ? hostId2 : null;
   };
   const routing = {
     knownHostIds() {
       if (disposed) return [];
+      try {
+        if (!nativeRouting) discoverComposer();
+      } catch {
+      }
       const current = read();
       return [
         .../* @__PURE__ */ new Set([
           ...current ? dependencies.hostIds(current) : [],
-          ...native()?.knownHostIds?.() ?? []
+          ...nativeRouting?.knownHostIds?.() ?? []
         ])
       ];
     },
@@ -17977,7 +17998,7 @@ function installRendererHostRpcRouting(root, target, dependencies) {
     hostIdForComposer(composer) {
       if (disposed) return null;
       try {
-        return composerHostId(composer);
+        return composerHostId(nativeRouting ? null : discoverComposer(composer), composer);
       } catch {
         return null;
       }
@@ -17987,8 +18008,9 @@ function installRendererHostRpcRouting(root, target, dependencies) {
       let hostId2;
       let preferred = null;
       try {
-        preferred = native()?.forComposer(composer) ?? null;
-        hostId2 = preferred?.hostId ?? composerHostId(composer);
+        const owners = nativeRouting ? null : discoverComposer(composer);
+        preferred = nativeRouting?.forComposer(composer) ?? null;
+        hostId2 = preferred?.hostId ?? composerHostId(owners, composer);
       } catch {
         hostId2 = null;
       }
@@ -18071,17 +18093,14 @@ function directRendererInstaller() {
       findFamily: ${findRendererHostRpcFamily.toString()},
       resolve: ${resolveRendererHostRpc.toString()},
       hostIds: ${rendererHostRpcHostIds.toString()},
-      composerHostIds: (composer) => {
+      discoverComposer: (composer) => {
         const source = composer?.matches?.('[data-codex-composer], [contenteditable="true"][role="textbox"]')
           ? { querySelectorAll: () => [composer] }
           : (composer ?? document);
         return discover(source);
       },
       portPrototype: MessagePort.prototype,
-      nativeRouting: () => {
-        const native = discover(document);
-        return native.managers.length || native.registries.length ? installNative(false) : null;
-      },
+      installNativeRouting: () => installNative(false),
       readConnection: (hostId) => readRendererConnectionGeneration(findRendererAppScopeStore(document), hostId),
     });
     const connected = (routing) => routing.forComposer() !== null ||
@@ -19280,6 +19299,7 @@ async function waitForBinding(renderer, enabledAgents, timeoutMs, pollIntervalMs
       if (value !== null) return validateBindingStatus(value, enabledAgents);
     } catch (error51) {
       lastError = error51;
+      if (error51 instanceof CdpConnectionClosedError) throw error51;
       if (error51 instanceof RendererAdapterReadinessError && error51.state !== "installing") {
         throw error51;
       }
@@ -19557,6 +19577,7 @@ function parseDesktopControllerArguments(arguments_) {
 function isTransientRendererInstallError(error51) {
   let current = error51;
   for (let depth = 0; depth < 4; depth += 1) {
+    if (current instanceof CdpConnectionClosedError) return true;
     const message = current instanceof Error ? current.message : String(current);
     if (message.includes("Execution context was destroyed") || message.includes("Promise was collected")) {
       return true;

package/app/host-runtime.mjs

@@ -22113,6 +22113,12 @@ function createLocalPageOpener(environment) {
 }
 
 // packages/desktop-control/dist/cdp-client.js
+var CdpConnectionClosedError = class extends Error {
+  constructor(message2) {
+    super(message2);
+    this.name = "CdpConnectionClosedError";
+  }
+};
 function cdpExceptionMessage(details, fallback) {
   const exception = details.exception;
   if (isRecord(exception) && typeof exception.description === "string" && exception.description) {
@@ -22207,8 +22213,8 @@ var CdpClient = class _CdpClient {
     this.#socket = socket;
     this.#commandTimeoutMs = commandTimeoutMs;
     socket.addEventListener("message", (event) => this.#onMessage(event));
-    socket.addEventListener("error", () => this.#fail(new Error("CDP WebSocket failed")));
-    socket.addEventListener("close", () => this.#fail(new Error("CDP WebSocket closed")));
+    socket.addEventListener("error", () => this.#disconnect(new CdpConnectionClosedError("CDP WebSocket failed")));
+    socket.addEventListener("close", () => this.#disconnect(new CdpConnectionClosedError("CDP WebSocket closed")));
   }
   static async connect(url2, options = {}) {
     loopbackUrl(url2, ["ws:", "wss:"]);
@@ -22259,7 +22265,7 @@ var CdpClient = class _CdpClient {
   }
   #send(method, params, sessionId) {
     if (this.#closed)
-      return Promise.reject(new Error("CDP client is closed"));
+      return Promise.reject(new CdpConnectionClosedError("CDP client is closed"));
     const id2 = this.#nextId++;
     return new Promise((resolve, reject) => {
       const timeout = setTimeout(() => {
@@ -22302,10 +22308,13 @@ var CdpClient = class _CdpClient {
     }
   }
   close() {
+    this.#disconnect(new CdpConnectionClosedError("CDP client closed"));
+  }
+  #disconnect(error51) {
     if (this.#closed)
       return;
     this.#closed = true;
-    this.#fail(new Error("CDP client closed"));
+    this.#fail(error51);
     this.#listeners.clear();
     this.#socket.close();
   }
@@ -23624,14 +23633,15 @@ function installRendererHostRpcRouting(root, target, dependencies2) {
   };
   if (!read())
     return null;
-  const native = () => {
-    if (disposed)
-      return null;
-    try {
-      nativeRouting ??= dependencies2.nativeRouting?.() ?? null;
-    } catch {
+  const discoverComposer = (composer) => {
+    const owners = dependencies2.discoverComposer(composer);
+    if (!nativeRouting && (owners.managers.length || owners.registries.length)) {
+      try {
+        nativeRouting = dependencies2.installNativeRouting();
+      } catch {
+      }
     }
-    return nativeRouting;
+    return owners;
   };
   const connectionFor = (hostId2) => {
     if (!hostId2.startsWith("remote-control:"))
@@ -23833,7 +23843,7 @@ function installRendererHostRpcRouting(root, target, dependencies2) {
     if (disposed)
       return null;
     const connection = connectionFor(hostId2);
-    const preferred = nativeRoute === void 0 ? native()?.forHost(hostId2) : nativeRoute;
+    const preferred = nativeRoute === void 0 ? nativeRouting?.forHost(hostId2) : nativeRoute;
     if (connection === null || preferred) {
       retire(hostId2);
       return connection === null ? null : preferred ?? null;
@@ -23862,11 +23872,11 @@ function installRendererHostRpcRouting(root, target, dependencies2) {
       target.dispatchEvent(new CustomEvent("codexhost:draft-prewarm-policy-changed"));
     }
   };
-  const composerHostId = (composer) => {
-    const nativeHostId = native()?.hostIdForComposer(composer);
+  const composerHostId = (owners, composer) => {
+    const nativeHostId = nativeRouting?.hostIdForComposer(composer);
     if (nativeHostId)
       return nativeHostId;
-    const hostIds = new Set(dependencies2.composerHostIds(composer).hostIds);
+    const hostIds = new Set((owners ?? discoverComposer(composer)).hostIds);
     const hostId2 = hostIds.size === 1 ? hostIds.values().next().value : null;
     return typeof hostId2 === "string" && hostId2 ? hostId2 : null;
   };
@@ -23874,11 +23884,16 @@ function installRendererHostRpcRouting(root, target, dependencies2) {
     knownHostIds() {
       if (disposed)
         return [];
+      try {
+        if (!nativeRouting)
+          discoverComposer();
+      } catch {
+      }
       const current = read();
       return [
         .../* @__PURE__ */ new Set([
           ...current ? dependencies2.hostIds(current) : [],
-          ...native()?.knownHostIds?.() ?? []
+          ...nativeRouting?.knownHostIds?.() ?? []
         ])
       ];
     },
@@ -23889,7 +23904,7 @@ function installRendererHostRpcRouting(root, target, dependencies2) {
       if (disposed)
         return null;
       try {
-        return composerHostId(composer);
+        return composerHostId(nativeRouting ? null : discoverComposer(composer), composer);
       } catch {
         return null;
       }
@@ -23900,8 +23915,9 @@ function installRendererHostRpcRouting(root, target, dependencies2) {
       let hostId2;
       let preferred = null;
       try {
-        preferred = native()?.forComposer(composer) ?? null;
-        hostId2 = preferred?.hostId ?? composerHostId(composer);
+        const owners = nativeRouting ? null : discoverComposer(composer);
+        preferred = nativeRouting?.forComposer(composer) ?? null;
+        hostId2 = preferred?.hostId ?? composerHostId(owners, composer);
       } catch {
         hostId2 = null;
       }
@@ -23992,17 +24008,14 @@ function directRendererInstaller() {
       findFamily: ${findRendererHostRpcFamily.toString()},
       resolve: ${resolveRendererHostRpc.toString()},
       hostIds: ${rendererHostRpcHostIds.toString()},
-      composerHostIds: (composer) => {
+      discoverComposer: (composer) => {
         const source = composer?.matches?.('[data-codex-composer], [contenteditable="true"][role="textbox"]')
           ? { querySelectorAll: () => [composer] }
           : (composer ?? document);
         return discover(source);
       },
       portPrototype: MessagePort.prototype,
-      nativeRouting: () => {
-        const native = discover(document);
-        return native.managers.length || native.registries.length ? installNative(false) : null;
-      },
+      installNativeRouting: () => installNative(false),
       readConnection: (hostId) => readRendererConnectionGeneration(findRendererAppScopeStore(document), hostId),
     });
     const connected = (routing) => routing.forComposer() !== null ||
@@ -25181,6 +25194,8 @@ async function waitForBinding(renderer, enabledAgents, timeoutMs, pollIntervalMs
         return validateBindingStatus(value2, enabledAgents);
     } catch (error51) {
       lastError = error51;
+      if (error51 instanceof CdpConnectionClosedError)
+        throw error51;
       if (error51 instanceof RendererAdapterReadinessError && error51.state !== "installing") {
         throw error51;
       }
@@ -32617,7 +32632,6 @@ var NativeAccountObserver = class {
     this.#initialized = true;
     this.#lastGeneration = nativeGeneration ?? -1;
     this.#scheduleAccountUpdate();
-    if (nativeGeneration !== void 0) this.observe({ method: "account/updated" });
   }
   /** Called after forwarding the native frame. Identity read failure cannot alter its outcome. */
   observe(value2) {
@@ -47050,9 +47064,6 @@ async function prepareLocalCodex(input) {
     current = currentCodexAccountFromOfficialRead(response.result);
     return snapshot2();
   });
-  void accounts.refresh?.()?.catch(() => {
-    input.diagnosticOutput.write("codexhost: Codex Account identity could not be read\n");
-  });
   return {
     officialRuntimeScope: scope,
     accountControl: accounts,

package/package.json

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