@codexhost/cli-darwin-arm64 0.17.1 → 0.17.3

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.1
+npm install -g @codexhost/cli@0.17.3
 ```
 
 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.1","distribution":"npm","target":"macos-arm64"}
+{"schemaVersion":1,"version":"0.17.3","distribution":"npm","target":"macos-arm64"}

package/app/console-server.mjs

@@ -16381,6 +16381,21 @@ var threadSteeringInspectParamsSchema = external_exports.object({
   /** The text about to be steered; a Harness command always stops and restarts. */
   text: external_exports.string().optional()
 }).strict();
+var threadSteeringContextSchema = external_exports.object({
+  kind: external_exports.literal("application"),
+  value: external_exports.string().transform((text, context) => {
+    try {
+      return JSON.parse(text);
+    } catch {
+      context.addIssue({ code: "custom", message: "Invalid steering context JSON" });
+      return external_exports.NEVER;
+    }
+  }).pipe(external_exports.object({
+    expectedTurnId: hostTurnIdSchema,
+    clientUserMessageId: external_exports.string().min(1),
+    delivery: external_exports.enum(["newTurn", "activeTurn"])
+  }).strict())
+}).strict().transform((context) => context.value);
 var threadSteerDeliverySchema = external_exports.enum(["activeTurn", "newTurn"]);
 var threadSteeringInspectResultSchema = external_exports.object({
   delivery: external_exports.enum(["official", "activeTurn", "newTurn"])

package/app/console-web.js

@@ -15602,6 +15602,21 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
     /** The text about to be steered; a Harness command always stops and restarts. */
     text: external_exports.string().optional()
   }).strict();
+  var threadSteeringContextSchema = external_exports.object({
+    kind: external_exports.literal("application"),
+    value: external_exports.string().transform((text, context) => {
+      try {
+        return JSON.parse(text);
+      } catch {
+        context.addIssue({ code: "custom", message: "Invalid steering context JSON" });
+        return external_exports.NEVER;
+      }
+    }).pipe(external_exports.object({
+      expectedTurnId: hostTurnIdSchema,
+      clientUserMessageId: external_exports.string().min(1),
+      delivery: external_exports.enum(["newTurn", "activeTurn"])
+    }).strict())
+  }).strict().transform((context) => context.value);
   var threadSteerDeliverySchema = external_exports.enum(["activeTurn", "newTurn"]);
   var threadSteeringInspectResultSchema = external_exports.object({
     delivery: external_exports.enum(["official", "activeTurn", "newTurn"])

package/app/desktop-controller.mjs

@@ -15780,6 +15780,21 @@ var threadSteeringInspectParamsSchema = external_exports.object({
   /** The text about to be steered; a Harness command always stops and restarts. */
   text: external_exports.string().optional()
 }).strict();
+var threadSteeringContextSchema = external_exports.object({
+  kind: external_exports.literal("application"),
+  value: external_exports.string().transform((text, context) => {
+    try {
+      return JSON.parse(text);
+    } catch {
+      context.addIssue({ code: "custom", message: "Invalid steering context JSON" });
+      return external_exports.NEVER;
+    }
+  }).pipe(external_exports.object({
+    expectedTurnId: hostTurnIdSchema,
+    clientUserMessageId: external_exports.string().min(1),
+    delivery: external_exports.enum(["newTurn", "activeTurn"])
+  }).strict())
+}).strict().transform((context) => context.value);
 var threadSteerDeliverySchema = external_exports.enum(["activeTurn", "newTurn"]);
 var threadSteeringInspectResultSchema = external_exports.object({
   delivery: external_exports.enum(["official", "activeTurn", "newTurn"])
@@ -17663,7 +17678,8 @@ function findRendererHostRpcFamily(store) {
     if (!record3(definition) || definition.kind !== "signal-family") continue;
     if (!record3(members) || typeof members.get !== "function") continue;
     for (const [hostId2, member] of members) {
-      if (typeof hostId2 !== "string" || !record3(member)) continue;
+      if (typeof hostId2 !== "string" || !/^(?:local$|durable$|remote[-:])/u.test(hostId2)) continue;
+      if (!record3(member)) continue;
       const signal = member.value;
       if (!record3(signal) || typeof signal.get !== "function") continue;
       let value;
@@ -17714,20 +17730,23 @@ function installRendererHostRpcRouting(root, target, dependencies) {
     if (disposed) return null;
     try {
       const store = dependencies.findStore(root);
-      discovery = store ? dependencies.findFamily(store) : null;
+      const bound = store && discovery?.store === store ? [...store.familyBindings.values()].includes(discovery.family) : false;
+      if (!bound) discovery = store ? dependencies.findFamily(store) : null;
     } catch {
       discovery = null;
     }
     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;
@@ -17909,7 +17928,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;
@@ -17936,21 +17955,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?.() ?? []
         ])
       ];
     },
@@ -17960,7 +17983,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;
       }
@@ -17970,8 +17993,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;
       }
@@ -18054,17 +18078,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 ||
@@ -19019,6 +19040,117 @@ async function installNativeRpcRemoteControlDirect(renderer) {
   }
 }
 
+// packages/desktop-control/src/renderer-rpc-steering.ts
+var RETRY_BASE_MS = 5e3;
+var RETRY_MAX_MS = 3e5;
+var retries = /* @__PURE__ */ new WeakMap();
+async function installRendererRpcSteeringDirect(client, now = Date.now) {
+  try {
+    const needed = await client.evaluate(`(() => {
+      const steering = window.__codexhostRpcSteeringV1;
+      if (steering && steering.controller.forHost === steering.forHost) return false;
+      steering?.release();
+      const routing=window.__codexhostHostRoutingV1;
+      return ['local', ...(routing?.knownHostIds?.() ?? [])].some(id => routing?.forHost(id)?.manager.kind === 'main-process-rpc');
+    })()`);
+    if (!needed) return false;
+    const retry = retries.get(client);
+    if (retry && now() < retry.nextAt) return false;
+    try {
+      await discoverAndInstall(client);
+      retries.delete(client);
+      return true;
+    } catch (error51) {
+      const attempts = (retry?.attempts ?? 0) + 1;
+      const delay = Math.min(RETRY_BASE_MS * 2 ** (attempts - 1), RETRY_MAX_MS);
+      retries.set(client, { attempts, nextAt: now() + delay });
+      console.error(
+        `codexhost native steering discovery failed (attempt ${attempts}):`,
+        error51 instanceof Error ? error51.message : String(error51)
+      );
+      return false;
+    }
+  } catch {
+    return false;
+  }
+}
+async function discoverAndInstall(client) {
+  const group = `codexhost-rpc-steering-${crypto.randomUUID()}`;
+  const command = (method, params) => client.command(method, params);
+  const properties = (objectId) => command("Runtime.getProperties", { objectId, ownProperties: true });
+  const call = (objectId, functionDeclaration, args = []) => command("Runtime.callFunctionOn", {
+    objectId,
+    functionDeclaration,
+    arguments: args,
+    objectGroup: group,
+    returnByValue: true
+  });
+  try {
+    const proto = await command("Runtime.evaluate", {
+      expression: "Object.getPrototypeOf(async function(){})",
+      objectGroup: group
+    });
+    if (!proto.result.objectId) throw new Error("Native RPC steering discovery is unavailable");
+    const objects = await command("Runtime.queryObjects", {
+      prototypeObjectId: proto.result.objectId,
+      objectGroup: group
+    });
+    if (!objects.objects.objectId) throw new Error("Native RPC steering discovery is unavailable");
+    const filtered = await command("Runtime.callFunctionOn", {
+      objectId: objects.objects.objectId,
+      functionDeclaration: 'function(){return this.filter(fn=>fn.name==="collectAppStateSnapshot"&&String(fn).includes("collectSnapshot")).slice(0,9)}',
+      objectGroup: group
+    });
+    if (!filtered.result.objectId) throw new Error("Native RPC Controller is unavailable");
+    const snapshots = (await properties(filtered.result.objectId)).result.flatMap(
+      (entry) => entry.value?.type === "function" && entry.value.objectId ? [entry.value.objectId] : []
+    );
+    if (snapshots.length > 8) throw new Error("Native RPC Controller is ambiguous");
+    const controllers = [];
+    for (const snapshot of snapshots) {
+      const scopes = (await properties(snapshot)).internalProperties?.find(
+        (entry) => entry.name === "[[Scopes]]"
+      )?.value?.objectId;
+      if (!scopes) continue;
+      for (const scope of (await properties(scopes)).result) {
+        if (!scope.value?.objectId || !scope.value.description?.startsWith("Closure")) continue;
+        const bindings = (await properties(scope.value.objectId)).result;
+        const owners = [];
+        let rootScope;
+        for (const binding of bindings) {
+          if (binding.value?.type !== "object" || !binding.value.objectId) continue;
+          const id = binding.value.objectId;
+          const result2 = await call(
+            id,
+            `function(){return (${nativeRpcObjectShape.toString()})(this)}`
+          );
+          const shape = result2.result.value;
+          if (shape?.scope) rootScope = id;
+          if (shape?.controller && (await call(id, "function(fn){return this.collectAppStateSnapshot===fn}", [
+            { objectId: snapshot }
+          ])).result.value === true)
+            owners.push(id);
+        }
+        if (owners.length !== 1 || !rootScope) continue;
+        const root = await call(
+          rootScope,
+          `function(){let node=this.node;const seen=new Set();while(node?.parent&&!seen.has(node.parent)&&seen.size<100){seen.add(node);node=node.parent}return (${findRendererAppScopeStore.toString()})(document)===node}`
+        );
+        if (root.result.value === true) controllers.push(owners[0]);
+      }
+    }
+    if (controllers.length !== 1) throw new Error("Native RPC Controller is missing or ambiguous");
+    const result = await call(
+      controllers[0],
+      "function(){return window.__codexhostInstallRpcSteeringV1?.(this) === true}"
+    );
+    if (result.exceptionDetails || result.result.value !== true)
+      throw new Error("Native RPC steering installation failed");
+  } finally {
+    await client.command("Runtime.releaseObjectGroup", { objectGroup: group }).catch(() => void 0);
+  }
+}
+
 // packages/desktop-control/src/renderer-cdp-control-session.ts
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -19279,6 +19411,7 @@ var defaultOperations = {
   async installDraftPrewarmPolicy(renderer) {
     const status = await installRendererDraftPrewarmPolicyDirect(renderer);
     await installNativeRpcRemoteControlDirect(renderer);
+    await installRendererRpcSteeringDirect(renderer);
     return status;
   }
 };