@codexhost/cli-win32-arm64 0.9.1 → 0.10.0

package/app/desktop-controller.mjs

@@ -29,6 +29,7 @@ async function startControllerAttachmentServer(options) {
     throw new Error("attachment nonce must be 32 lowercase hexadecimal characters");
   }
   const sockets = /* @__PURE__ */ new Set();
+  let attachment;
   const server = createServer((socket) => {
     sockets.add(socket);
     socket.once("close", () => sockets.delete(socket));
@@ -49,10 +50,19 @@ async function startControllerAttachmentServer(options) {
       handled = true;
       const line = request.slice(0, newline).replace(/\r$/, "");
       if (line === `ATTACH ${options.nonce}`) {
-        void options.attach().then(
+        if (attachment) {
+          respond(socket, "busy");
+          return;
+        }
+        socket.setTimeout(0);
+        const current = Promise.resolve().then(() => options.attach());
+        attachment = current;
+        void current.then(
           () => respond(socket, "ready"),
           () => respond(socket, "failed")
-        );
+        ).finally(() => {
+          if (attachment === current) attachment = void 0;
+        });
         return;
       }
       respond(socket, "rejected");
@@ -81,12 +91,6 @@ async function startControllerAttachmentServer(options) {
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function nonEmptyString(value, field) {
-  if (typeof value !== "string" || value.length === 0) {
-    throw new Error(`CDP target '${field}' must be non-empty text`);
-  }
-  return value;
-}
 function loopbackUrl(value, protocols) {
   const url = new URL(value);
   if (!protocols.includes(url.protocol)) {
@@ -97,17 +101,24 @@ function loopbackUrl(value, protocols) {
   }
   return url;
 }
+function optionalText(value) {
+  return typeof value === "string" && value.length > 0 ? value : null;
+}
 function parseTarget(value) {
   if (!isRecord(value)) throw new Error("CDP target must be an object");
-  const target = {
-    id: nonEmptyString(value.id, "id"),
-    type: nonEmptyString(value.type, "type"),
+  const id = optionalText(value.id);
+  const type = optionalText(value.type);
+  const url = optionalText(value.url);
+  const webSocketDebuggerUrl = optionalText(value.webSocketDebuggerUrl);
+  if (webSocketDebuggerUrl) loopbackUrl(webSocketDebuggerUrl, ["ws:", "wss:"]);
+  if (!id || !type || !url || !webSocketDebuggerUrl) return null;
+  return {
+    id,
+    type,
     title: typeof value.title === "string" ? value.title : "",
-    url: nonEmptyString(value.url, "url"),
-    webSocketDebuggerUrl: nonEmptyString(value.webSocketDebuggerUrl, "webSocketDebuggerUrl")
+    url,
+    webSocketDebuggerUrl
   };
-  loopbackUrl(target.webSocketDebuggerUrl, ["ws:", "wss:"]);
-  return target;
 }
 function defaultFetch(url) {
   return fetch(url);
@@ -144,7 +155,7 @@ async function listCdpTargets(endpoint, fetchImpl = defaultFetch) {
   if (!response.ok) throw new Error(`CDP target discovery failed with HTTP ${response.status}`);
   const value = await response.json();
   if (!Array.isArray(value)) throw new Error("CDP target discovery did not return an array");
-  return value.map(parseTarget);
+  return value.map(parseTarget).filter((target) => target !== null);
 }
 var CdpClient = class _CdpClient {
   #commandTimeoutMs;
@@ -329,7 +340,7 @@ function retainRendererHostResponses(client, hostId, target) {
   if (typeof client.addRequestLifecycleListener !== "function" || typeof target.addEventListener !== "function" || typeof target.removeEventListener !== "function")
     return () => {
     };
-  const isRecord4 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+  const isRecord3 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
   const pending = /* @__PURE__ */ new Set();
   let retired = false;
   let unsubscribe = () => {
@@ -343,12 +354,12 @@ function retainRendererHostResponses(client, hostId, target) {
     if (source != null && source !== target) return;
     const ownOrigin = target.location?.origin;
     if (source === target && ownOrigin && ownOrigin !== "null" && origin !== ownOrigin) return;
-    if (!isRecord4(data) || data.type !== "mcp-response" || data.hostId !== hostId) return;
+    if (!isRecord3(data) || data.type !== "mcp-response" || data.hostId !== hostId) return;
     const message = data.message;
-    if (!isRecord4(message)) return;
+    if (!isRecord3(message)) return;
     const id = message.id;
     if (typeof id !== "string" && typeof id !== "number" || !pending.has(id)) return;
-    const hasError = isRecord4(message.error);
+    const hasError = isRecord3(message.error);
     if (!hasError && !Object.prototype.hasOwnProperty.call(message, "result")) return;
     queueMicrotask(() => {
       if (!pending.has(id)) return;
@@ -358,7 +369,7 @@ function retainRendererHostResponses(client, hostId, target) {
   };
   target.addEventListener("message", receive);
   unsubscribe = client.addRequestLifecycleListener((event) => {
-    if (!isRecord4(event) || event.hostId !== hostId) return;
+    if (!isRecord3(event) || event.hostId !== hostId) return;
     const id = event.id;
     if (typeof id !== "string" && typeof id !== "number") return;
     if (!retired && event.type === "started" && typeof event.method === "string" && event.method.startsWith("codexhost/"))
@@ -375,24 +386,21 @@ function retainRendererHostResponses(client, hostId, target) {
 }
 
 // packages/desktop-control/src/renderer-draft-prewarm-runtime.ts
-function installDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewarmedThreadManager, isCurrentManager, retainResponses = retainRendererHostResponses) {
-  const existing = target.__codexhostDraftPrewarmPolicyV1;
-  if (existing?.owns?.length === 5 && existing.owns(manager, bridge, hostId, prewarmedThreadManager, !!isCurrentManager) === true) {
-    return { state: "ready", reason: "owned-request-bridge" };
-  }
-  existing?.dispose?.();
+function createDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewarmedThreadManager, isCurrentManager, retainResponses = retainRendererHostResponses) {
+  let disposed = false;
   const originalSend = bridge.sendRequest;
   const originalPrewarm = bridge.prewarmThreadStart;
   const originalOnNotification = manager.onNotification;
   const originalDispatchAppServerResponse = manager.dispatchAppServerResponse;
   let selectedModel = null;
-  const isRecord4 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+  let prewarmGeneration = 0;
+  const isRecord3 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
   const isUnsupportedPosixBridgeSpawn = (value) => {
     const marker = "AbsolutePathBuf deserialized without a base path";
     if (typeof value === "string") {
       return value.startsWith("Invalid request:") && value.includes(marker);
     }
-    if (!isRecord4(value)) return false;
+    if (!isRecord3(value)) return false;
     if (typeof value.message === "string" && value.message.includes(marker)) {
       if (value.code === -32600 || value.message.startsWith("Invalid request:")) return true;
     }
@@ -483,14 +491,14 @@ function installDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewar
     bridgeState = "idle";
   };
   const rememberExternalThread = (value) => {
-    if (!isRecord4(value) || typeof value.id !== "string") return;
+    if (!isRecord3(value) || typeof value.id !== "string") return;
     if (value.modelProvider === "codexhost" || value.cliVersion === "codexhost") {
       knownExternalThreadIds.add(value.id);
       knownOfficialThreadIds.delete(value.id);
     }
   };
   const observeBridgeResult = (request, result) => {
-    if (!request || !isRecord4(result)) return;
+    if (!request || !isRecord3(result)) return;
     if (request.method === "thread/list" && Array.isArray(result.data)) {
       for (const thread of result.data) rememberExternalThread(thread);
       return;
@@ -499,7 +507,7 @@ function installDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewar
       rememberExternalThread(result.thread);
       return;
     }
-    if (request.method === "codexhost/thread/inspect" && isRecord4(request.parameters) && typeof request.parameters.threadId === "string") {
+    if (request.method === "codexhost/thread/inspect" && isRecord3(request.parameters) && typeof request.parameters.threadId === "string") {
       if (result.owner === "external") {
         knownExternalThreadIds.add(request.parameters.threadId);
         knownOfficialThreadIds.delete(request.parameters.threadId);
@@ -509,18 +517,18 @@ function installDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewar
       }
       return;
     }
-    if (request.method === "thread/delete" && isRecord4(request.parameters) && typeof request.parameters.threadId === "string") {
+    if (request.method === "thread/delete" && isRecord3(request.parameters) && typeof request.parameters.threadId === "string") {
       knownExternalThreadIds.delete(request.parameters.threadId);
       knownOfficialThreadIds.delete(request.parameters.threadId);
     }
   };
   const handleBridgeFrame = (value) => {
-    if (!isRecord4(value)) {
+    if (!isRecord3(value)) {
       failBridge("received a non-object app-server frame");
       return;
     }
     if (value.method === bridgeReadyMethod && value.id === void 0) {
-      if (isRecord4(value.params) && value.params.protocolVersion === 1) {
+      if (isRecord3(value.params) && value.params.protocolVersion === 1) {
         bridgeState = "ready";
         if (bridgeReadyTimeout !== null) globalThis.clearTimeout(bridgeReadyTimeout);
         bridgeReadyTimeout = null;
@@ -533,7 +541,7 @@ function installDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewar
       return;
     }
     if (typeof value.method === "string" && value.id === void 0) {
-      if (value.method === "thread/started" && isRecord4(value.params)) {
+      if (value.method === "thread/started" && isRecord3(value.params)) {
         rememberExternalThread(value.params.thread);
       }
       originalOnNotification.call(manager, value.method, value.params);
@@ -584,7 +592,7 @@ function installDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewar
     }
   };
   const handleOuterNotification = (method, parameters) => {
-    if (method === "process/exited" && isRecord4(parameters) && parameters.processHandle === bridgeProcessHandle) {
+    if (method === "process/exited" && isRecord3(parameters) && parameters.processHandle === bridgeProcessHandle) {
       const exitCode = typeof parameters.exitCode === "number" ? parameters.exitCode : "unknown";
       const stderr = typeof parameters.stderr === "string" ? parameters.stderr.trim() : "";
       failBridge(
@@ -593,7 +601,7 @@ function installDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewar
       );
       return true;
     }
-    if (method !== "process/outputDelta" || !isRecord4(parameters) || parameters.processHandle !== bridgeProcessHandle || parameters.stream !== "stdout" && parameters.stream !== "stderr" || typeof parameters.deltaBase64 !== "string") {
+    if (method !== "process/outputDelta" || !isRecord3(parameters) || parameters.processHandle !== bridgeProcessHandle || parameters.stream !== "stdout" && parameters.stream !== "stderr" || typeof parameters.deltaBase64 !== "string") {
       return false;
     }
     if (parameters.capReached === true) {
@@ -698,7 +706,7 @@ function installDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewar
     return bridgeInitialization;
   };
   const threadIdFromParameters = (parameters) => {
-    if (!isRecord4(parameters)) return null;
+    if (!isRecord3(parameters)) return null;
     const value = parameters.threadId ?? parameters.conversationId;
     return typeof value === "string" ? value : null;
   };
@@ -713,9 +721,9 @@ function installDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewar
         threadIds: [threadId]
       })
     ).then((value) => {
-      const ownerships = isRecord4(value) && Array.isArray(value.threads) ? value.threads : null;
+      const ownerships = isRecord3(value) && Array.isArray(value.threads) ? value.threads : null;
       const ownership = ownerships?.[0];
-      if (!ownerships || !isRecord4(ownership) || ownerships.length !== 1 || ownership.threadId !== threadId || ownership.owner !== "external" && ownership.owner !== "codex") {
+      if (!ownerships || !isRecord3(ownership) || ownerships.length !== 1 || ownership.threadId !== threadId || ownership.owner !== "external" && ownership.owner !== "codex") {
         throw transportError("Thread ownership lookup returned an invalid result");
       }
       if (ownership.owner === "external") {
@@ -751,7 +759,7 @@ function installDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewar
     if (method.startsWith("codexhost/")) return true;
     if (method === "thread/list") return true;
     if (method === "thread/start") {
-      return isRecord4(parameters) && typeof parameters.model === "string" && parameters.model.startsWith("codexhost/");
+      return isRecord3(parameters) && typeof parameters.model === "string" && parameters.model.startsWith("codexhost/");
     }
     const threadId = threadIdFromParameters(parameters);
     if (threadId && knownExternalThreadIds.has(threadId)) return true;
@@ -759,7 +767,7 @@ function installDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewar
     return selectedModel !== null && (method.startsWith("thread/") || method.startsWith("turn/") || method.startsWith("review/"));
   };
   const routeThreadStart = (parameters) => {
-    if (!isRecord4(parameters) || parameters.ephemeral === true) {
+    if (!isRecord3(parameters) || parameters.ephemeral === true) {
       return parameters;
     }
     return {
@@ -791,18 +799,43 @@ function installDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewar
     }
     return shouldUseBridge(method, routedParameters) ? sendBridged() : sendDirect();
   };
+  const publishDraftWorkspace = (parameters) => {
+    if (!isRecord3(parameters) || parameters.ephemeral === true) return;
+    const cwd = parameters.cwd;
+    if (typeof cwd !== "string" || cwd.length === 0) return;
+    const drafts = isRecord3(target.__codexhostDraftWorkspacesV1) ? target.__codexhostDraftWorkspacesV1 : {};
+    drafts[hostId] = cwd;
+    Object.defineProperty(target, "__codexhostDraftWorkspacesV1", {
+      configurable: true,
+      value: drafts
+    });
+    if (typeof target.dispatchEvent === "function" && typeof CustomEvent === "function") {
+      target.dispatchEvent(
+        new CustomEvent("codexhost:draft-workspace", { detail: { hostId, cwd } })
+      );
+    }
+  };
   const routedPrewarm = (parameters, options) => {
     const routedParameters = routeThreadStart(parameters);
-    if (shouldUseBridge("thread/start", routedParameters)) {
-      return routedSend("thread/start", routedParameters, options);
+    const generation = prewarmGeneration;
+    publishDraftWorkspace(routedParameters);
+    const pending = shouldUseBridge("thread/start", routedParameters) ? routedSend("thread/start", routedParameters, options) : options === void 0 ? originalPrewarm.call(bridge, routedParameters) : originalPrewarm.call(bridge, routedParameters, options);
+    if (isRecord3(parameters) && parameters.ephemeral === true || typeof pending !== "object" && typeof pending !== "function" || pending === null || typeof Reflect.get(pending, "then") !== "function") {
+      return pending;
     }
-    return options === void 0 ? originalPrewarm.call(bridge, routedParameters) : originalPrewarm.call(bridge, routedParameters, options);
+    return Promise.resolve(pending).then((result) => {
+      if (disposed || generation !== prewarmGeneration) {
+        throw new Error("Renderer draft prewarm was invalidated by a configuration change");
+      }
+      publishDraftWorkspace(routedParameters);
+      return result;
+    });
   };
   bridge.sendRequest = routedSend;
   bridge.prewarmThreadStart = routedPrewarm;
   const routedWindowMessage = (event) => {
     const message = event.data;
-    if (!isRecord4(message) || message.type !== "mcp-notification" || message.hostId !== hostId || typeof message.method !== "string") {
+    if (!isRecord3(message) || message.type !== "mcp-notification" || message.hostId !== hostId || typeof message.method !== "string") {
       return;
     }
     handleOuterNotification(message.method, message.params);
@@ -834,26 +867,35 @@ function installDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewar
     state: "ready",
     hostId,
     owns(candidateManager, candidate, candidateHostId, candidatePrewarmedThreadManager, requiresCurrentManager) {
-      return candidateManager === manager && candidate === bridge && candidateHostId === hostId && candidatePrewarmedThreadManager === prewarmedThreadManager && requiresCurrentManager === !!isCurrentManager;
+      return !disposed && candidateManager === manager && candidate === bridge && candidateHostId === hostId && candidatePrewarmedThreadManager === prewarmedThreadManager && requiresCurrentManager === !!isCurrentManager;
     },
     requestTarget() {
-      if (isCurrentManager && !isCurrentManager())
+      if (disposed || isCurrentManager && !isCurrentManager())
         throw new Error("Renderer request manager is retired");
       return manager;
     },
     select(model) {
+      if (disposed || isCurrentManager && !isCurrentManager())
+        throw new Error("Renderer request manager is retired");
       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;
+      prewarmGeneration += 1;
       return true;
     },
     clear() {
+      if (disposed || isCurrentManager && !isCurrentManager())
+        return Promise.reject(new Error("Renderer request manager is retired"));
+      prewarmGeneration += 1;
       prewarmedThreadManager.discardAllPrewarmedThreads();
       return Promise.resolve();
     },
     dispose() {
+      if (disposed) return;
+      disposed = true;
+      prewarmGeneration += 1;
       retireResponses();
       if (bridge.sendRequest === routedSend) bridge.sendRequest = originalSend;
       if (bridge.prewarmThreadStart === routedPrewarm) {
@@ -886,167 +928,231 @@ function installDraftPrewarmPolicyBridge(manager, bridge, hostId, target, prewar
       selectedModel = null;
     }
   });
-  Object.defineProperty(target, "__codexhostDraftPrewarmPolicyV1", {
-    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" };
+  return policy;
 }
 
-// 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 requestManagerFromHookState(value, activeHostId) {
-  const matchesRequestManager = (candidate) => {
-    if (candidate == null || typeof candidate !== "object" || !("requestClient" in candidate) || !("prewarmedThreadManager" in candidate) || !("sendRequest" in candidate)) {
-      return false;
-    }
-    const requestClient = candidate.requestClient;
-    const prewarmedThreadManager = candidate.prewarmedThreadManager;
-    return requestClient != null && typeof requestClient === "object" && "prewarmThreadStart" in requestClient && typeof requestClient.prewarmThreadStart === "function" && "sendRequest" in requestClient && typeof requestClient.sendRequest === "function" && "enqueueRequest" in requestClient && typeof requestClient.enqueueRequest === "function" && prewarmedThreadManager != null && typeof prewarmedThreadManager === "object" && "discardAllPrewarmedThreads" in prewarmedThreadManager && typeof prewarmedThreadManager.discardAllPrewarmedThreads === "function" && typeof candidate.sendRequest === "function";
+// packages/desktop-control/src/renderer-host-discovery.ts
+function requestManagerFromHookState(value, hostId) {
+  const record = (candidate) => typeof candidate === "object" && candidate !== null;
+  const manager = (candidate) => {
+    if (!record(candidate) || !record(candidate.requestClient) || !record(candidate.prewarmedThreadManager))
+      return null;
+    const bridge = candidate.requestClient;
+    return typeof candidate.sendRequest === "function" && typeof bridge.sendRequest === "function" && typeof bridge.prewarmThreadStart === "function" && typeof bridge.enqueueRequest === "function" && typeof candidate.prewarmedThreadManager.discardAllPrewarmedThreads === "function" ? candidate : null;
   };
-  if (matchesRequestManager(value)) return value;
-  if (value != null && typeof value === "object" && "manager" in value && matchesRequestManager(value.manager)) {
-    return value.manager;
-  }
-  if (typeof activeHostId !== "string" || activeHostId.length === 0) return null;
-  if (value == null || typeof value !== "object" || !("addManager" in value) || typeof value.addManager !== "function" || !("getForHostId" in value) || typeof value.getForHostId !== "function" || !("waitForManagerForHostId" in value) || typeof value.waitForManagerForHostId !== "function") {
+  if (!record(value)) return null;
+  const direct = manager(value) ?? manager(value.manager);
+  if (direct) return direct;
+  if (!hostId || typeof value.addManager !== "function" || typeof value.getForHostId !== "function" || typeof value.waitForManagerForHostId !== "function")
     return null;
-  }
-  const manager = value.getForHostId.call(value, activeHostId);
-  return matchesRequestManager(manager) ? manager : null;
+  return manager(value.getForHostId(hostId));
 }
-function isRecord2(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-var FIND_REQUEST_MANAGER_EXPRESSION = `(() => {
-  const requestManagerFromHookState = ${requestManagerFromHookState.toString()};
-  const committedReactAncestors = ${committedReactAncestors.toString()};
-  const editors = [...document.querySelectorAll(
-    '[data-codex-composer], [contenteditable="true"][role="textbox"]',
-  )];
-  if (editors.length === 0) {
-    return { candidateCount: 0, editorCount: editors.length, hostId: null, sendRequest: null };
-  }
-  // Main and side chat can expose multiple editors backed by the same manager.
-  // Resolve their combined Host ownership before consulting any Host registry.
-  const composerAncestors = new Set();
-  const activeHostIds = new Set();
+function discoverRendererHosts(root, ancestors = committedReactAncestors, managerFrom = requestManagerFromHookState) {
+  const editors = [
+    ...root.querySelectorAll('[data-codex-composer], [contenteditable="true"][role="textbox"]')
+  ];
+  const hostIds = /* @__PURE__ */ new Set();
+  const managers = /* @__PURE__ */ new Set();
+  const registries = /* @__PURE__ */ new Set();
+  const fibers = /* @__PURE__ */ new Set();
   for (const editor of editors) {
     let element = editor;
-    let fiber = null;
-    while (element != null && fiber == null) {
-      const key = Object.getOwnPropertyNames(element).find((name) =>
-        name.startsWith('__reactFiber$'),
+    let fiber;
+    while (element && !fiber) {
+      const key = Object.getOwnPropertyNames(element).find(
+        (name) => name.startsWith("__reactFiber$")
       );
-      if (key != null) fiber = element[key];
-      element = element.parentElement;
+      if (key) fiber = Object.getOwnPropertyDescriptor(element, key)?.value;
+      element = element.parentElement ?? null;
     }
-    for (const current of committedReactAncestors(fiber)) {
-      composerAncestors.add(current);
+    for (const current of ancestors(fiber)) {
+      fibers.add(current);
       const props = current.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);
-        }
+      for (const key of ["executionTargetHostId", "permissionsHostId"]) {
+        const hostId = props?.[key];
+        if (typeof hostId === "string" && hostId) hostIds.add(hostId);
       }
     }
   }
-  const activeHostId =
-    activeHostIds.size === 1 ? activeHostIds.values().next().value : undefined;
-  const managers = new Set();
-  for (const fiber of composerAncestors) {
+  for (const fiber of fibers) {
     let hook = fiber.memoizedState;
-    for (let index = 0; hook != null && index < 120; index += 1, hook = hook.next) {
-      const manager = requestManagerFromHookState(hook.memoizedState, activeHostId);
-      if (manager != null) managers.add(manager);
+    for (let index = 0; hook && index < 120; index += 1) {
+      const value = hook.memoizedState;
+      const manager = managerFrom(value);
+      if (manager) managers.add(manager);
+      if (value && typeof value === "object" && "addManager" in value && typeof value.addManager === "function" && "getForHostId" in value && typeof value.getForHostId === "function" && "waitForManagerForHostId" in value && typeof value.waitForManagerForHostId === "function") {
+        registries.add(value);
+      }
+      hook = hook.next && typeof hook.next === "object" ? hook.next : null;
     }
   }
-  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: selected == null ? candidates.length : 1,
     editorCount: editors.length,
-    hostId: selected?.hostId ?? null,
-    manager: selected?.manager ?? null,
-    requestClient: selected?.requestClient ?? null,
-    prewarmedThreadManager: selected?.prewarmedThreadManager ?? null,
+    hostIds: [...hostIds],
+    managers: [...managers],
+    registries: [...registries]
   };
-})()`;
-var IS_CURRENT_REQUEST_MANAGER = `function(manager, requestClient, hostId, prewarmedThreadManager) {
-  const current = ${FIND_REQUEST_MANAGER_EXPRESSION};
-  return current.editorCount === 0 || (
-    current.manager === manager && current.requestClient === requestClient &&
-    current.hostId === hostId && current.prewarmedThreadManager === prewarmedThreadManager
-  );
-}`;
-var INSTALL_RENDERER_POLICY_FUNCTION = `function(requestClient, hostId, prewarmedThreadManager) {
-  return (${installDraftPrewarmPolicyBridge.toString()})(
-    this,
-    requestClient,
-    hostId,
-    window,
-    prewarmedThreadManager,
-    () => (${IS_CURRENT_REQUEST_MANAGER})(this, requestClient, hostId, prewarmedThreadManager),
-    (${retainRendererHostResponses.toString()}),
+}
+function resolveRendererHostManager(discovery, hostId, managerFrom = requestManagerFromHookState) {
+  if (!hostId) return null;
+  const candidates = discovery.registries.length ? discovery.registries.map((registry) => managerFrom(registry.getForHostId(hostId))) : discovery.managers;
+  const matching = new Set(
+    candidates.filter(
+      (manager) => manager && (manager.getHostId?.() ?? manager.requestClient.hostId) === hostId && (manager.requestClient.hostId === void 0 || manager.requestClient.hostId === hostId)
+    )
   );
-}`;
+  return matching.size === 1 ? matching.values().next().value ?? null : null;
+}
+
+// packages/desktop-control/src/renderer-host-routing.ts
+function installRendererHostRouting(root, target, discover, resolve, createPolicy) {
+  const existing = target.__codexhostHostRoutingV1;
+  if (existing) return existing;
+  target.__codexhostDraftPrewarmPolicyV1?.dispose?.();
+  let disposed = false;
+  let lastDiscovery = null;
+  const routes = /* @__PURE__ */ new Map();
+  const read = (composer) => {
+    const source = composer?.matches?.(
+      '[data-codex-composer], [contenteditable="true"][role="textbox"]'
+    ) ? { querySelectorAll: () => [composer] } : composer ?? root;
+    const discovery = discover(source);
+    if (composer) return discovery;
+    if (discovery.editorCount === 0 && lastDiscovery) return lastDiscovery;
+    lastDiscovery = discovery;
+    return discovery;
+  };
+  const lookup = (hostId, discovery) => {
+    if (disposed) return null;
+    try {
+      return resolve(discovery ?? read(), hostId);
+    } catch {
+      return null;
+    }
+  };
+  const retire = (hostId) => {
+    const entry = routes.get(hostId);
+    routes.delete(hostId);
+    entry?.route.policy.dispose();
+  };
+  const routeFor = (hostId, discovery) => {
+    const manager = lookup(hostId, discovery);
+    const previous = routes.get(hostId);
+    if (manager && previous?.route.manager === manager && previous.bridge === manager.requestClient && previous.prewarmed === manager.prewarmedThreadManager && previous.route.policy.owns(
+      manager,
+      manager.requestClient,
+      hostId,
+      manager.prewarmedThreadManager,
+      true
+    )) {
+      return previous.route;
+    }
+    retire(hostId);
+    if (!manager) return null;
+    const bridge = manager.requestClient;
+    const prewarmed = manager.prewarmedThreadManager;
+    const policy = createPolicy(
+      manager,
+      bridge,
+      hostId,
+      target,
+      prewarmed,
+      () => lookup(hostId) === manager && manager.requestClient === bridge && manager.prewarmedThreadManager === prewarmed
+    );
+    const route = { hostId, manager, policy };
+    routes.set(hostId, { route, bridge, prewarmed });
+    return route;
+  };
+  const publish = (route) => {
+    const policy = route?.policy;
+    if (target.__codexhostDraftPrewarmPolicyV1 === policy) return;
+    Object.defineProperty(target, "__codexhostDraftPrewarmPolicyV1", {
+      configurable: true,
+      value: policy
+    });
+    if (typeof target.dispatchEvent === "function" && typeof CustomEvent === "function") {
+      target.dispatchEvent(new CustomEvent("codexhost:draft-prewarm-policy-changed"));
+    }
+  };
+  const composerHostId = (discovery) => {
+    if (discovery.hostIds.length === 0 && discovery.registries.length > 0) return null;
+    const hostIds = new Set(
+      discovery.hostIds.length ? discovery.hostIds : discovery.managers.map(
+        (manager) => manager.getHostId?.() ?? manager.requestClient.hostId
+      )
+    );
+    const hostId = hostIds.size === 1 ? hostIds.values().next().value : null;
+    return typeof hostId === "string" && hostId ? hostId : null;
+  };
+  const routing = {
+    forHost(hostId) {
+      return hostId ? routeFor(hostId) : null;
+    },
+    hostIdForComposer(composer) {
+      if (disposed) return null;
+      try {
+        return composerHostId(read(composer));
+      } catch {
+        return null;
+      }
+    },
+    forComposer(composer) {
+      if (disposed) return null;
+      let discovery;
+      try {
+        discovery = read(composer);
+      } catch {
+        publish(null);
+        return null;
+      }
+      if (!composer) {
+        for (const [hostId2, entry] of routes) {
+          const manager = lookup(hostId2, discovery);
+          if (manager !== entry.route.manager || manager.requestClient !== entry.bridge || manager.prewarmedThreadManager !== entry.prewarmed)
+            retire(hostId2);
+        }
+      }
+      const hostId = composerHostId(discovery);
+      const route = hostId ? routeFor(hostId, discovery) : null;
+      if (!composer) publish(route);
+      return route;
+    },
+    dispose() {
+      if (disposed) return;
+      disposed = true;
+      for (const hostId of routes.keys()) retire(hostId);
+      lastDiscovery = null;
+      if (target.__codexhostHostRoutingV1 === routing) {
+        delete target.__codexhostHostRoutingV1;
+        publish(null);
+      }
+    }
+  };
+  Object.defineProperty(target, "__codexhostHostRoutingV1", { configurable: true, value: routing });
+  return routing;
+}
+
+// packages/desktop-control/src/renderer-draft-prewarm-policy.ts
 var REQUEST_MANAGER_WAIT_TIMEOUT_MS = 6e4;
 var REQUEST_MANAGER_POLL_INTERVAL_MS = 25;
 function directRendererInstaller() {
-  return `(async () => {
-    const selected = ${FIND_REQUEST_MANAGER_EXPRESSION};
-    if (
-      selected.candidateCount !== 1 ||
-      typeof selected.hostId !== 'string' ||
-      selected.hostId.length === 0 ||
-      selected.manager == null ||
-      selected.requestClient == null
-    ) {
-      throw new Error('Renderer request manager is ambiguous');
-    }
-    if (selected.prewarmedThreadManager == null) {
-      throw new Error('Renderer prewarmed Thread manager is unavailable');
-    }
-    return (${installDraftPrewarmPolicyBridge.toString()})(
-      selected.manager,
-      selected.requestClient,
-      selected.hostId,
-      window,
-      selected.prewarmedThreadManager,
-      () => (${IS_CURRENT_REQUEST_MANAGER})(
-        selected.manager, selected.requestClient, selected.hostId, selected.prewarmedThreadManager,
+  return `(() => {
+    const committedReactAncestors = ${committedReactAncestors.toString()};
+    const requestManagerFromHookState = ${requestManagerFromHookState.toString()};
+    const discoverRendererHosts = ${discoverRendererHosts.toString()};
+    const resolveRendererHostManager = ${resolveRendererHostManager.toString()};
+    const retainRendererHostResponses = ${retainRendererHostResponses.toString()};
+    const createDraftPrewarmPolicyBridge = ${createDraftPrewarmPolicyBridge.toString()};
+    const routing = (${installRendererHostRouting.toString()})(
+      document, window,
+      (root) => discoverRendererHosts(root, committedReactAncestors, requestManagerFromHookState),
+      (discovery, hostId) => resolveRendererHostManager(discovery, hostId, requestManagerFromHookState),
+      (manager, bridge, hostId, target, prewarmed, isCurrent) => createDraftPrewarmPolicyBridge(
+        manager, bridge, hostId, target, prewarmed, isCurrent, retainRendererHostResponses,
       ),
-      (${retainRendererHostResponses.toString()}),
     );
+    if (!routing.forComposer()) throw new Error('Renderer request manager is ambiguous');
+    return { state: 'ready', reason: 'owned-request-bridge' };
   })()`;
 }
 async function waitForDraftPrewarmPolicy(evaluate, expression) {
@@ -1054,17 +1160,17 @@ async function waitForDraftPrewarmPolicy(evaluate, expression) {
   while (true) {
     try {
       const value = await evaluate(expression);
-      if (!isRecord2(value) || value.state !== "ready" || value.reason !== "owned-request-bridge") {
+      if (typeof value !== "object" || value === null || !("state" in value) || value.state !== "ready" || !("reason" in value) || value.reason !== "owned-request-bridge") {
         throw new Error("Renderer draft prewarm policy returned an invalid status");
       }
-      return value;
+      return { state: "ready", reason: "owned-request-bridge" };
     } 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));
-      });
+      await new Promise(
+        (resolve) => setTimeout(resolve, Math.min(REQUEST_MANAGER_POLL_INTERVAL_MS, remaining))
+      );
     }
   }
 }
@@ -1076,14 +1182,15 @@ function installRendererDraftPrewarmPolicyDirect(renderer) {
 }
 
 // packages/desktop-control/src/renderer-cdp-control-session.ts
-function isRecord3(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function sleep(milliseconds) {
   return new Promise((resolve) => setTimeout(resolve, milliseconds));
 }
 function sameAgents(actual, expected) {
-  return actual.length === expected.length && actual.every((agent, index) => agent === expected[index]);
+  const expectedSet = new Set(expected);
+  return actual.length === expected.length && new Set(actual).size === actual.length && actual.every((agent) => expectedSet.has(agent));
 }
 function isPrimaryRendererUrl(value) {
   try {
@@ -1110,7 +1217,7 @@ var RendererAdapterReadinessError = class extends Error {
   reason;
 };
 function validateBindingStatus(value, expectedAgents) {
-  if (!isRecord3(value) || value.version !== 2 || !Array.isArray(value.enabledAgents) || value.enabledAgents.some((agent) => typeof agent !== "string") || !sameAgents(value.enabledAgents, expectedAgents) || !isRecord3(value.adapter)) {
+  if (!isRecord2(value) || value.version !== 2 || !Array.isArray(value.enabledAgents) || value.enabledAgents.some((agent) => typeof agent !== "string") || !sameAgents(value.enabledAgents, expectedAgents) || !isRecord2(value.adapter)) {
     throw new Error("Production Renderer binding returned an invalid status");
   }
   if (value.adapter.state !== "ready" || typeof value.adapter.reason !== "string") {
@@ -1144,8 +1251,8 @@ async function evaluateSource(renderer, source) {
     expression: source,
     awaitPromise: true
   });
-  if (!isRecord3(response)) throw new Error("Renderer source evaluation returned an invalid result");
-  if (isRecord3(response.exceptionDetails)) {
+  if (!isRecord2(response)) throw new Error("Renderer source evaluation returned an invalid result");
+  if (isRecord2(response.exceptionDetails)) {
     const text = typeof response.exceptionDetails.text === "string" ? response.exceptionDetails.text : "Renderer source evaluation failed";
     throw new Error(text);
   }
@@ -1235,7 +1342,6 @@ var InstalledRendererCdpControlSession = class {
     try {
       const existing = await readBinding(this.renderer);
       if (existing === null) await evaluateSource(this.renderer, this.rendererSource);
-      else validateBindingStatus(existing, this.enabledAgents);
       const draftPrewarmPolicy = await this.operations.installDraftPrewarmPolicy(this.renderer);
       const binding = await waitForBinding(
         this.renderer,
@@ -1494,9 +1600,10 @@ ${rendererSource}`,
           "codebuddy",
           "workbuddy",
           "cursor-cli",
+          "hermes",
           "qoder",
           "qoder-cn",
-          "hermes"
+          "kimi-code"
         ],
         timeoutMs: PRODUCTION_INSTALL_TIMEOUT_MS
       },