@codexhost/cli-darwin-arm64 0.2.6 → 0.3.0-test.2

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.6
+npm install -g @codexhost/cli@0.3.0-test.2
 ```
 
 Do not install this package directly. npm selects it through the optional dependencies of `@codexhost/cli`.
@@ -21,6 +21,9 @@ codexhost
 codexhost --version
 codexhost inspect
 codexhost launch
+codexhost remote install
+codexhost remote status
+codexhost remote uninstall
 ```
 
 The `codexhost` command launches the packaged Rust launcher with:

package/THIRD_PARTY_NOTICES.txt

@@ -20,6 +20,10 @@ lucide 1.28.0
 License: ISC
 License text: licenses/lucide-LICENSE.txt
 
+ws 8.21.3
+License: MIT
+License text: licenses/ws-LICENSE.txt
+
 zod 4.4.3
 License: MIT
 License text: licenses/zod-LICENSE.txt

package/app/codexhost-distribution.json

@@ -1 +1 @@
-{"schemaVersion":1,"version":"0.2.6","distribution":"npm","target":"macos-arm64"}
+{"schemaVersion":1,"version":"0.3.0-test.2","distribution":"npm","target":"macos-arm64"}

package/app/desktop-controller.mjs

@@ -560,49 +560,36 @@ async function readMainProcessTitlePolicyCounters(inspector) {
 // packages/desktop-control/src/renderer-draft-prewarm-runtime.ts
 function installDraftPrewarmPolicyBridge(bridge, hostId, target, prewarmedThreadManager) {
   const existing = target.__codexhostDraftPrewarmPolicyV1;
+  if (existing?.owns?.length === 3 && existing.owns(bridge, hostId, prewarmedThreadManager) === true) {
+    return { state: "ready", reason: "owned-request-bridge" };
+  }
   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);
-  const routeCollaborationMode = (method, parameters) => {
-    if (selectedModel === null || !isRecord5(parameters)) return parameters;
-    const collaborationMode = parameters.collaborationMode;
-    const settings = isRecord5(collaborationMode) ? collaborationMode.settings : null;
-    if (!isRecord5(collaborationMode) || !isRecord5(settings)) {
-      throw new Error(`Codex ${method} omitted collaborationMode.settings`);
+  const routeThreadStart = (parameters) => {
+    if (selectedModel === null || !isRecord5(parameters) || parameters.ephemeral === true) {
+      return parameters;
     }
-    return {
-      ...parameters,
-      collaborationMode: {
-        ...collaborationMode,
-        settings: { ...settings, model: selectedModel }
-      }
-    };
-  };
-  const routeThreadStart = (method, parameters) => {
-    if (selectedModel === null || !isRecord5(parameters)) return parameters;
-    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 } };
+    return { ...parameters, model: selectedModel };
   };
   const routedSend = (method, parameters, options) => {
-    const routedParameters = method === "start-conversation" || method === "prewarm-conversation-for-host" ? routeCollaborationMode(method, parameters) : routeThreadStart(method, parameters);
+    const routedParameters = method === "thread/start" ? routeThreadStart(parameters) : 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);
+    const routedParameters = routeThreadStart(parameters);
+    return options === void 0 ? originalPrewarm.call(bridge, routedParameters) : originalPrewarm.call(bridge, routedParameters, options);
   };
   bridge.sendRequest = routedSend;
-  if (originalPrewarm) bridge.prewarmThreadStart = routedPrewarm;
+  bridge.prewarmThreadStart = routedPrewarm;
   const policy = Object.freeze({
     state: "ready",
+    hostId,
+    owns(candidate, candidateHostId, candidatePrewarmedThreadManager) {
+      return candidate === bridge && candidateHostId === hostId && candidatePrewarmedThreadManager === prewarmedThreadManager;
+    },
     select(model) {
       if (model !== null && (typeof model !== "string" || !model.startsWith("codexhost/"))) {
         throw new Error("Draft route Model must be a codexhost transport carrier");
@@ -612,24 +599,13 @@ function installDraftPrewarmPolicyBridge(bridge, hostId, target, prewarmedThread
       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 })
-        ).then(() => void 0).finally(() => {
-          clearInFlight = null;
-        });
-      }
-      return clearInFlight;
+      prewarmedThreadManager.discardAllPrewarmedThreads();
+      return Promise.resolve();
     },
     dispose() {
       if (bridge.sendRequest === routedSend) bridge.sendRequest = originalSend;
       if (bridge.prewarmThreadStart === routedPrewarm) {
-        if (originalPrewarm) bridge.prewarmThreadStart = originalPrewarm;
-        else delete bridge.prewarmThreadStart;
+        bridge.prewarmThreadStart = originalPrewarm;
       }
       selectedModel = null;
     }
@@ -638,6 +614,9 @@ function installDraftPrewarmPolicyBridge(bridge, hostId, target, prewarmedThread
     configurable: true,
     value: policy
   });
+  if (typeof target.dispatchEvent === "function" && typeof CustomEvent === "function") {
+    target.dispatchEvent(new CustomEvent("codexhost:draft-prewarm-policy-changed"));
+  }
   return { state: "ready", reason: "owned-request-bridge" };
 }
 async function installDraftPrewarmPolicyInRenderer(contents, findRequestManagerExpression, installRendererPolicyFunction) {
@@ -672,87 +651,16 @@ async function installDraftPrewarmPolicyInRenderer(contents, findRequestManagerE
     const prewarmedThreadManager = managerProperties.result?.find(
       (property) => property.name === "prewarmedThreadManager"
     )?.value;
-    if (candidateCount !== 1 || hostId !== "local" || typeof manager?.objectId !== "string") {
+    if (candidateCount !== 1 || typeof hostId !== "string" || hostId.length === 0 || typeof manager?.objectId !== "string") {
       throw new Error("Renderer request manager is ambiguous");
     }
-    const managerFunctions = await contents.debugger.sendCommand("Runtime.getProperties", {
-      objectId: manager.objectId
-    });
-    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;
-      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
-      });
-      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 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
-              });
-            }
-          }
-        }
-      }
-      const hostBridge = hostBridgeCandidates[0];
-      if (hostBridgeCandidates.length !== 1 || !hostBridge) {
-        throw new Error("Renderer Host request bridge is ambiguous");
-      }
-      hostBridgeObjectId = hostBridge.objectId;
+    if (typeof prewarmedThreadManager?.objectId !== "string") {
+      throw new Error("Renderer prewarmed Thread manager is unavailable");
     }
     const installed = await contents.debugger.sendCommand("Runtime.callFunctionOn", {
-      objectId: hostBridgeObjectId,
+      objectId: manager.objectId,
       functionDeclaration: installRendererPolicyFunction,
-      arguments: [
-        { value: hostId },
-        ...typeof prewarmedThreadManager?.objectId === "string" ? [{ objectId: prewarmedThreadManager.objectId }] : []
-      ],
+      arguments: [{ value: hostId }, { objectId: prewarmedThreadManager.objectId }],
       awaitPromise: true,
       returnByValue: true
     });
@@ -763,6 +671,19 @@ async function installDraftPrewarmPolicyInRenderer(contents, findRequestManagerE
 }
 
 // packages/desktop-control/src/renderer-draft-prewarm-policy.ts
+function selectRendererRequestManager(candidates, activeHostIds) {
+  const unique = /* @__PURE__ */ new Map();
+  for (const candidate of candidates) unique.set(candidate.manager, candidate);
+  const hosts = new Set(
+    activeHostIds.filter((value) => typeof value === "string" && value.length > 0)
+  );
+  if (hosts.size > 1) return null;
+  const activeHostId = hosts.values().next().value;
+  const eligible = [...unique.values()].filter(
+    (candidate) => activeHostId === void 0 || candidate.hostId === activeHostId
+  );
+  return eligible.length === 1 ? eligible[0] ?? null : null;
+}
 function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -783,7 +704,15 @@ var FIND_REQUEST_MANAGER_EXPRESSION = `(() => {
     element = element.parentElement;
   }
   const managers = new Set();
+  const activeHostIds = new Set();
   for (let depth = 0; fiber != null && depth < 200; depth += 1, fiber = fiber.return) {
+    const props = fiber.memoizedProps;
+    if (props != null && typeof props === 'object') {
+      for (const name of ['executionTargetHostId', 'permissionsHostId']) {
+        const value = props[name];
+        if (typeof value === 'string' && value.length > 0) activeHostIds.add(value);
+      }
+    }
     let hook = fiber.memoizedState;
     for (let index = 0; hook != null && index < 120; index += 1, hook = hook.next) {
       const value = hook.memoizedState;
@@ -794,25 +723,33 @@ var FIND_REQUEST_MANAGER_EXPRESSION = `(() => {
         typeof value.requestClient.prewarmThreadStart === 'function' &&
         typeof value.requestClient.sendRequest === 'function' &&
         typeof value.requestClient.enqueueRequest === 'function' &&
+        typeof value.prewarmedThreadManager?.discardAllPrewarmedThreads === '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;
+  const candidates = [...managers].map((manager) => {
+    const requestClient =
+      typeof manager.requestClient?.sendRequest === 'function' &&
+      typeof manager.requestClient?.prewarmThreadStart === 'function' &&
+      typeof manager.requestClient?.enqueueRequest === 'function'
+        ? manager.requestClient
+        : manager;
+    return {
+      manager,
+      requestClient,
+      hostId: manager?.getHostId?.() ?? requestClient?.hostId ?? null,
+      prewarmedThreadManager: manager?.prewarmedThreadManager ?? null,
+    };
+  });
+  const selected = (${selectRendererRequestManager.toString()})(candidates, [...activeHostIds]);
   return {
-    candidateCount: managers.size,
-    hostId: manager?.getHostId?.() ?? requestClient?.hostId ?? null,
-    manager: requestClient,
-    prewarmedThreadManager: manager?.prewarmedThreadManager ?? null,
+    candidateCount: selected == null ? candidates.length : 1,
+    hostId: selected?.hostId ?? null,
+    manager: selected?.requestClient ?? null,
+    prewarmedThreadManager: selected?.prewarmedThreadManager ?? null,
   };
 })()`;
 var INSTALL_RENDERER_POLICY_FUNCTION = `function(hostId, prewarmedThreadManager) {
@@ -1013,11 +950,6 @@ var defaultOperations = {
   installTitlePolicy: installMainProcessTitlePolicy,
   markTitlePolicyReady: markRendererTitlePolicyReady,
   installDraftPrewarmPolicy: installRendererDraftPrewarmPolicy,
-  readDraftPrewarmPolicy: (inspector, rendererWebContentsId) => executeInWebContents(
-    inspector,
-    rendererWebContentsId,
-    "window.__codexhostDraftPrewarmPolicyV1?.state ?? null"
-  ),
   reload: reloadRenderer,
   execute: executeInWebContents,
   readBinding: (inspector, rendererWebContentsId) => executeInWebContents(
@@ -1088,8 +1020,10 @@ var InstalledRendererControlSession = class {
     );
     const existing = await this.operations.readBinding(this.inspector, selected.id).catch(() => null);
     if (existing !== null) {
-      const policyState = await this.operations.readDraftPrewarmPolicy?.(this.inspector, selected.id).catch(() => null);
-      const draftPrewarmPolicy2 = policyState === "ready" ? this.#snapshot.draftPrewarmPolicy : await this.operations.installDraftPrewarmPolicy(this.inspector, selected.id);
+      const draftPrewarmPolicy2 = await this.operations.installDraftPrewarmPolicy(
+        this.inspector,
+        selected.id
+      );
       let binding2;
       try {
         binding2 = validateBindingStatus(existing, this.enabledAgents);