@codexhost/cli-darwin-x64 0.1.6 → 0.2.0

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

package/app/desktop-controller.mjs

@@ -579,17 +579,62 @@ async function readMainProcessTitlePolicyCounters(inspector) {
 }
 
 // packages/desktop-control/src/renderer-draft-prewarm-runtime.ts
-function installDraftPrewarmPolicyBridge(send, hostId, target) {
+function installDraftPrewarmPolicyBridge(bridge, hostId, target) {
+  const existing = target.__codexhostDraftPrewarmPolicyV1;
+  existing?.dispose?.();
+  const originalSend = bridge.sendRequest;
+  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`);
+    }
+    return {
+      ...parameters,
+      collaborationMode: {
+        ...collaborationMode,
+        settings: { ...settings, model: selectedModel }
+      }
+    };
+  };
+  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;
+    if (!isRecord5(threadParams) || threadParams.ephemeral === true) return parameters;
+    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;
+    return options === void 0 ? originalSend.call(bridge, method, routedParameters) : originalSend.call(bridge, method, routedParameters, options);
+  };
+  bridge.sendRequest = routedSend;
   const policy = Object.freeze({
     state: "ready",
+    select(model) {
+      if (model !== null && (typeof model !== "string" || !model.startsWith("codexhost/"))) {
+        throw new Error("Draft route Model must be a codexhost transport carrier");
+      }
+      if (selectedModel === model) return false;
+      selectedModel = model;
+      return true;
+    },
     clear() {
       if (clearInFlight === null) {
-        clearInFlight = Promise.resolve(send("clear-prewarmed-threads-for-host", { hostId })).then(() => void 0).finally(() => {
+        clearInFlight = Promise.resolve(
+          originalSend.call(bridge, "clear-prewarmed-threads-for-host", { hostId })
+        ).then(() => void 0).finally(() => {
           clearInFlight = null;
         });
       }
       return clearInFlight;
+    },
+    dispose() {
+      if (bridge.sendRequest === routedSend) bridge.sendRequest = originalSend;
+      selectedModel = null;
     }
   });
   Object.defineProperty(target, "__codexhostDraftPrewarmPolicyV1", {
@@ -712,16 +757,13 @@ function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 var FIND_REQUEST_MANAGER_EXPRESSION = `(() => {
-  const visibleEditors = [...document.querySelectorAll(
+  const editors = [...document.querySelectorAll(
     '[data-codex-composer], [contenteditable="true"][role="textbox"]',
-  )].filter((editor) => {
-    const bounds = editor.getBoundingClientRect();
-    return bounds.width > 0 && bounds.height > 0;
-  });
-  if (visibleEditors.length !== 1) {
+  )];
+  if (editors.length !== 1) {
     return { candidateCount: 0, hostId: null, sendRequest: null };
   }
-  let element = visibleEditors[0];
+  let element = editors[0];
   let fiber = null;
   while (element != null && fiber == null) {
     const key = Object.getOwnPropertyNames(element).find((name) =>
@@ -757,10 +799,10 @@ var FIND_REQUEST_MANAGER_EXPRESSION = `(() => {
   };
 })()`;
 var INSTALL_RENDERER_POLICY_FUNCTION = `function(hostId) {
-  const bridge = this;
-  const send = (method, parameters) => bridge.sendRequest(method, parameters);
-  return (${installDraftPrewarmPolicyBridge.toString()})(send, hostId, window);
+  return (${installDraftPrewarmPolicyBridge.toString()})(this, hostId, window);
 }`;
+var REQUEST_MANAGER_WAIT_TIMEOUT_MS = 6e4;
+var REQUEST_MANAGER_POLL_INTERVAL_MS = 25;
 function mainProcessInstaller(rendererWebContentsId) {
   return `async function () {
     const mainModule = process.mainModule;
@@ -780,11 +822,23 @@ async function installRendererDraftPrewarmPolicy(inspector, rendererWebContentsI
     throw new Error("Renderer webContents ID must be a positive integer");
   }
   const installer = mainProcessInstaller(rendererWebContentsId);
-  const value = await inspector.evaluate(`(${installer})()`);
-  if (!isRecord3(value) || value.state !== "ready" || value.reason !== "owned-request-bridge") {
-    throw new Error("Renderer draft prewarm policy returned an invalid status");
+  const deadline = Date.now() + REQUEST_MANAGER_WAIT_TIMEOUT_MS;
+  while (true) {
+    try {
+      const value = await inspector.evaluate(`(${installer})()`);
+      if (!isRecord3(value) || value.state !== "ready" || value.reason !== "owned-request-bridge") {
+        throw new Error("Renderer draft prewarm policy returned an invalid status");
+      }
+      return value;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      const remaining = deadline - Date.now();
+      if (!message.includes("Renderer request manager is ambiguous") || remaining <= 0) throw error;
+      await new Promise((resolve) => {
+        setTimeout(resolve, Math.min(REQUEST_MANAGER_POLL_INTERVAL_MS, remaining));
+      });
+    }
   }
-  return value;
 }
 
 // packages/desktop-control/src/renderer-control-session.ts
@@ -951,6 +1005,11 @@ 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(
@@ -1022,15 +1081,41 @@ var InstalledRendererControlSession = class {
     );
     const existing = await this.operations.readBinding(this.inspector, selected.id).catch(() => null);
     if (existing !== null) {
-      const binding2 = validateBindingStatus(existing, this.enabledAgents);
-      this.#snapshot = { ...this.#snapshot, renderer: selected, binding: binding2 };
+      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);
+      let binding2;
+      try {
+        binding2 = validateBindingStatus(existing, this.enabledAgents);
+      } catch (error) {
+        if (!(error instanceof RendererAdapterReadinessError)) throw error;
+        await this.operations.execute(this.inspector, selected.id, this.rendererSource);
+        binding2 = await waitForBinding(
+          this.inspector,
+          this.operations,
+          selected.id,
+          this.enabledAgents,
+          this.timeoutMs,
+          this.pollIntervalMs
+        );
+      }
+      this.#snapshot = {
+        ...this.#snapshot,
+        renderer: selected,
+        draftPrewarmPolicy: draftPrewarmPolicy2,
+        binding: binding2
+      };
       return this.#snapshot;
     }
     const titlePolicyReadiness = await waitForRendererTitlePolicyReady(
       () => this.operations.markTitlePolicyReady(this.inspector, selected.id),
       { timeoutMs: this.timeoutMs, pollIntervalMs: this.pollIntervalMs }
     );
+    await activateElectronDesktop(this.inspector);
     await this.operations.execute(this.inspector, selected.id, this.rendererSource);
+    const draftPrewarmPolicy = await this.operations.installDraftPrewarmPolicy(
+      this.inspector,
+      selected.id
+    );
     const binding = await waitForBinding(
       this.inspector,
       this.operations,
@@ -1039,10 +1124,6 @@ var InstalledRendererControlSession = class {
       this.timeoutMs,
       this.pollIntervalMs
     );
-    const draftPrewarmPolicy = await this.operations.installDraftPrewarmPolicy(
-      this.inspector,
-      selected.id
-    );
     this.#snapshot = {
       ...this.#snapshot,
       renderer: selected,
@@ -1117,6 +1198,11 @@ async function createRendererControlSession(options) {
   );
   startupTrace("injecting Renderer bundle");
   await operations.execute(options.inspector, selected.id, options.rendererSource);
+  startupTrace("installing draft routing policy");
+  const draftPrewarmPolicy = await operations.installDraftPrewarmPolicy(
+    options.inspector,
+    selected.id
+  );
   startupTrace("waiting for Renderer binding");
   const binding = await waitForBinding(
     options.inspector,
@@ -1126,11 +1212,6 @@ async function createRendererControlSession(options) {
     timeoutMs,
     pollIntervalMs
   );
-  startupTrace("installing draft prewarm policy");
-  const draftPrewarmPolicy = await operations.installDraftPrewarmPolicy(
-    options.inspector,
-    selected.id
-  );
   return new InstalledRendererControlSession(
     options.inspector,
     options.rendererSource,
@@ -1351,7 +1432,7 @@ async function runDesktopController(options, signal, dependencies = defaultDepen
         inspectorEndpoint: options.inspectorEndpoint,
         rendererSource: `${configuration}
 ${rendererSource}`,
-        enabledAgents: ["codex", "pi", "claude-code"],
+        enabledAgents: ["codex", "pi", "claude-code", "deepseek-harness", "grok"],
         timeoutMs: PRODUCTION_INSTALL_TIMEOUT_MS
       },
       dependencies