@codexhost/cli-win32-arm64 0.2.2 → 0.2.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.2.2
+npm install -g @codexhost/cli@0.2.4
 ```
 
 Do not install this package directly. npm selects it through the optional dependencies of `@codexhost/cli`.
@@ -20,8 +20,7 @@ This package is platform-specific (`os=win32`, `cpu=arm64`).
 codexhost
 codexhost --version
 codexhost inspect
-codexhost launch --agent pi
-codexhost launch --agent codex
+codexhost launch
 ```
 
 The `codexhost` command launches the packaged Rust launcher with:

package/app/codexhost-distribution.json

@@ -1 +1 @@
-{"schemaVersion":1,"version":"0.2.2","distribution":"npm","target":"windows-arm64"}
+{"schemaVersion":1,"version":"0.2.4","distribution":"npm","target":"windows-arm64"}

package/app/desktop-controller.mjs

@@ -329,7 +329,6 @@ var ELECTRON_MODULE_EXPRESSION = `(() => {
   return createRequire(process.execPath)('electron');
 })()`;
 var CONNECT_APP_HOST_CHANNEL = "codex_desktop:connect-app-host";
-var REVIEWED_TITLE_SERVICE_IDENTITIES = ["Dhe", "Nye", "wbe", "nxe", "tTe"];
 var POLICY_STATE_SYMBOL = "codexhost.main-process-title-policy.v1";
 var SERVICE_OWNER_SYMBOL = "codexhost.main-process-title-policy.owner.v1";
 var RENDERER_READY_EXPRESSION = "(() => { Object.defineProperty(window, '__codexhostMainProcessTitlePolicyV1', { configurable: true, value: { state: 'ready' } }); return 'ready'; })()";
@@ -363,18 +362,6 @@ var INSTALL_POLICY_FUNCTION = `async function (rendererWebContentsId) {
   ) {
     throw new Error('ThreadMetadataGenerationService signature mismatch');
   }
-  const rawServiceClass = sampleService?.constructor?.name;
-  const serviceClass = typeof rawServiceClass === 'string' && /^[A-Za-z_$][A-Za-z0-9_$]{0,63}$/.test(rawServiceClass)
-    ? rawServiceClass
-    : 'unknown';
-  const warnings = ${JSON.stringify(REVIEWED_TITLE_SERVICE_IDENTITIES)}.includes(serviceClass)
-    ? []
-    : [{
-        capability: 'title-isolation',
-        reason: 'unreviewed-title-service-identity',
-        observedIdentity: serviceClass,
-      }];
-
   const counters = {
     codexTitleCalls: 0,
     piTitleSkips: 0,
@@ -448,7 +435,6 @@ var INSTALL_POLICY_FUNCTION = `async function (rendererWebContentsId) {
     state: 'ready',
     reason: 'ready',
     requiresRendererReload: true,
-    warnings,
   };
 }`;
 async function installMainProcessTitlePolicy(inspector, rendererWebContentsId) {
@@ -521,9 +507,7 @@ async function installMainProcessTitlePolicy(inspector, rendererWebContentsId) {
   );
   const remoteResult = installResponse.result;
   const value = isRecord2(remoteResult) ? remoteResult.value : null;
-  if (!isRecord2(value) || value.state !== "ready" || value.reason !== "ready" || value.requiresRendererReload !== true || !Array.isArray(value.warnings) || value.warnings.length > 1 || value.warnings.some(
-    (warning) => !isRecord2(warning) || warning.capability !== "title-isolation" || warning.reason !== "unreviewed-title-service-identity" || typeof warning.observedIdentity !== "string" || !/^[A-Za-z_$][A-Za-z0-9_$]{0,63}$/.test(warning.observedIdentity) || Object.keys(warning).length !== 3
-  )) {
+  if (!isRecord2(value) || value.state !== "ready" || value.reason !== "ready" || value.requiresRendererReload !== true || Object.keys(value).length !== 3) {
     throw new Error("Main-process title policy returned an invalid status");
   }
   return value;
@@ -574,10 +558,11 @@ async function readMainProcessTitlePolicyCounters(inspector) {
 }
 
 // packages/desktop-control/src/renderer-draft-prewarm-runtime.ts
-function installDraftPrewarmPolicyBridge(bridge, hostId, target) {
+function installDraftPrewarmPolicyBridge(bridge, hostId, target, prewarmedThreadManager) {
   const existing = target.__codexhostDraftPrewarmPolicyV1;
   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);
@@ -598,15 +583,24 @@ function installDraftPrewarmPolicyBridge(bridge, hostId, target) {
   };
   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;
+    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 } };
   };
   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;
+    const routedParameters = method === "start-conversation" || method === "prewarm-conversation-for-host" ? routeCollaborationMode(method, parameters) : routeThreadStart(method, 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);
+  };
   bridge.sendRequest = routedSend;
+  if (originalPrewarm) bridge.prewarmThreadStart = routedPrewarm;
   const policy = Object.freeze({
     state: "ready",
     select(model) {
@@ -618,6 +612,10 @@ function installDraftPrewarmPolicyBridge(bridge, hostId, target) {
       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 })
@@ -629,6 +627,10 @@ function installDraftPrewarmPolicyBridge(bridge, hostId, target) {
     },
     dispose() {
       if (bridge.sendRequest === routedSend) bridge.sendRequest = originalSend;
+      if (bridge.prewarmThreadStart === routedPrewarm) {
+        if (originalPrewarm) bridge.prewarmThreadStart = originalPrewarm;
+        else delete bridge.prewarmThreadStart;
+      }
       selectedModel = null;
     }
   });
@@ -667,77 +669,90 @@ async function installDraftPrewarmPolicyInRenderer(contents, findRequestManagerE
     const manager = managerProperties.result?.find(
       (property) => property.name === "manager"
     )?.value;
+    const prewarmedThreadManager = managerProperties.result?.find(
+      (property) => property.name === "prewarmedThreadManager"
+    )?.value;
     if (candidateCount !== 1 || hostId !== "local" || typeof manager?.objectId !== "string") {
       throw new Error("Renderer request manager is ambiguous");
     }
     const managerFunctions = await contents.debugger.sendCommand("Runtime.getProperties", {
       objectId: manager.objectId
     });
-    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(
+    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;
-    }
-    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
+      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
       });
-      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,
+      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 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
+        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
+              });
             }
-          );
-          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");
+      const hostBridge = hostBridgeCandidates[0];
+      if (hostBridgeCandidates.length !== 1 || !hostBridge) {
+        throw new Error("Renderer Host request bridge is ambiguous");
+      }
+      hostBridgeObjectId = hostBridge.objectId;
     }
     const installed = await contents.debugger.sendCommand("Runtime.callFunctionOn", {
-      objectId: hostBridge.objectId,
+      objectId: hostBridgeObjectId,
       functionDeclaration: installRendererPolicyFunction,
-      arguments: [{ value: hostId }],
+      arguments: [
+        { value: hostId },
+        ...typeof prewarmedThreadManager?.objectId === "string" ? [{ objectId: prewarmedThreadManager.objectId }] : []
+      ],
       awaitPromise: true,
       returnByValue: true
     });
@@ -777,24 +792,31 @@ var FIND_REQUEST_MANAGER_EXPRESSION = `(() => {
         typeof value === 'object' &&
         value.requestClient != null &&
         typeof value.requestClient.prewarmThreadStart === 'function' &&
-        typeof value.sendRequest === 'function' &&
-        Function.prototype.toString.call(value.sendRequest).includes(
-          'send-cli-request-for-host',
-        )
+        typeof value.requestClient.sendRequest === 'function' &&
+        typeof value.requestClient.enqueueRequest === '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;
   return {
     candidateCount: managers.size,
-    hostId: manager?.getHostId?.() ?? null,
-    manager,
+    hostId: manager?.getHostId?.() ?? requestClient?.hostId ?? null,
+    manager: requestClient,
+    prewarmedThreadManager: manager?.prewarmedThreadManager ?? null,
   };
 })()`;
-var INSTALL_RENDERER_POLICY_FUNCTION = `function(hostId) {
-  return (${installDraftPrewarmPolicyBridge.toString()})(this, hostId, window);
+var INSTALL_RENDERER_POLICY_FUNCTION = `function(hostId, prewarmedThreadManager) {
+  return (${installDraftPrewarmPolicyBridge.toString()})(this, hostId, window, prewarmedThreadManager);
 }`;
 var REQUEST_MANAGER_WAIT_TIMEOUT_MS = 6e4;
 var REQUEST_MANAGER_POLL_INTERVAL_MS = 25;
@@ -1252,9 +1274,6 @@ function startupTrace2(stage, detail) {
 }
 function validCompatibilityIssue(state, issue) {
   const keys = Object.keys(issue);
-  if (state === "compatible-with-warning") {
-    return issue.capability === "title-isolation" && issue.reason === "unreviewed-title-service-identity" && typeof issue.observedIdentity === "string" && /^[A-Za-z_$][A-Za-z0-9_$]{0,63}$/.test(issue.observedIdentity) && keys.length === 3;
-  }
   if (state === "degraded") {
     return [
       "permission-control",
@@ -1262,12 +1281,12 @@ function validCompatibilityIssue(state, issue) {
       "fork-control",
       "usage-surface",
       "settings-surface"
-    ].includes(issue.capability) && issue.reason === "capability-unavailable" && issue.observedIdentity === void 0 && keys.length === 2;
+    ].includes(issue.capability) && issue.reason === "capability-unavailable" && keys.length === 2;
   }
   return false;
 }
 function serializeDesktopControllerReadiness(readiness) {
-  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) {
+  if (readiness.schemaVersion !== 2 || !["compatible", "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);
@@ -1476,12 +1495,11 @@ ${rendererSource}`,
       })
     });
     startupTrace2("attachment server ready");
-    const issues = session?.snapshot.titlePolicy.warnings ?? [];
     startupTrace2("publishing readiness");
     dependencies.ready({
       schemaVersion: 2,
-      state: issues.length === 0 ? "compatible" : "compatible-with-warning",
-      issues
+      state: "compatible",
+      issues: []
     });
     while (!signal.aborted) {
       await dependencies.sleep(dependencies.monitorIntervalMs);