@codexhost/cli-darwin-arm64 0.3.0-test.3 → 0.3.1

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

package/app/host-runtime.mjs

@@ -45631,6 +45631,16 @@ function isExecutable(candidate, platform) {
     return false;
   }
 }
+function claudeNpmNativeExecutable(npmDirectory) {
+  return path4.join(npmDirectory, "node_modules", "@anthropic-ai", "claude-code", "bin", "claude.exe");
+}
+function runnableCandidate(candidate, platform) {
+  if (platform === "win32" && path4.basename(candidate).toLowerCase() === "claude.cmd") {
+    const nativeExecutable = claudeNpmNativeExecutable(path4.dirname(candidate));
+    return isExecutable(nativeExecutable, platform) ? nativeExecutable : void 0;
+  }
+  return candidate;
+}
 function nvmCandidates(homeDirectory) {
   const versionsDirectory = path4.join(homeDirectory, ".nvm", "versions", "node");
   try {
@@ -45643,6 +45653,7 @@ function userInstallCandidates(platform, environment, homeDirectory) {
   if (platform === "win32") {
     const appData = environment.APPDATA ?? path4.join(homeDirectory, "AppData", "Roaming");
     return [
+      claudeNpmNativeExecutable(path4.join(appData, "npm")),
       path4.join(appData, "npm", "claude.cmd"),
       path4.join(homeDirectory, ".local", "bin", "claude.exe"),
       path4.join(homeDirectory, ".local", "bin", "claude.cmd")
@@ -45667,7 +45678,7 @@ function resolveClaudeCodeExecutable(input = {}) {
     ...candidates(command, platform, environment),
     ...configuredCommand ? [] : userInstallCandidates(platform, environment, homeDirectory)
   ];
-  const executable2 = resolutionCandidates.find((candidate) => isExecutable(candidate, platform));
+  const executable2 = resolutionCandidates.map((candidate) => runnableCandidate(candidate, platform)).find((candidate) => candidate !== void 0 && isExecutable(candidate, platform));
   if (!executable2)
     throw new ClaudeCodeExecutableError("Claude Code is not installed");
   return path4.resolve(executable2);
@@ -68879,22 +68890,27 @@ function createRemoteAppServerWebSocketListener(input) {
       closing = (async () => {
         for (const socket of webSockets.clients) socket.terminate();
         await new Promise((resolve2) => webSockets.close(() => resolve2()));
-        if (listening) {
+        const closeServer = async () => {
+          if (!listening) return;
           await new Promise(
             (resolve2, reject) => server.close((error54) => error54 ? reject(error54) : resolve2())
           );
-        }
-        await Promise.allSettled(sessions);
-        if (process.platform !== "win32" && ownedSocketIdentity) {
-          const identity = ownedSocketIdentity;
+        };
+        if (process.platform !== "win32" && listening) {
           await withRemoteAppServerSocketInitializationLock(input.socketPath, async () => {
-            const current = await unixSocketIdentity(input.socketPath);
-            if (current && sameUnixFileIdentity2(current, identity)) {
-              await rm6(input.socketPath, { force: true });
+            await closeServer();
+            if (ownedSocketIdentity) {
+              const current = await unixSocketIdentity(input.socketPath);
+              if (current && sameUnixFileIdentity2(current, ownedSocketIdentity)) {
+                await rm6(input.socketPath, { force: true });
+              }
+              ownedSocketIdentity = null;
             }
           });
-          ownedSocketIdentity = null;
+        } else {
+          await closeServer();
         }
+        await Promise.allSettled(sessions);
         closed.resolve(void 0);
       })();
       return closing;

package/app/renderer-extension.js

@@ -21451,6 +21451,10 @@ ${error51.stderrTail}`] : []
     if (!isLateConversationTarget(mountedTarget, currentTarget)) return "none";
     return mountedTarget?.[0] === "default" && (sourcePhase === "locked" || submissionPending) ? "transfer" : "inspect";
   }
+  function scopedComposerTarget(target, hostId) {
+    if (target?.[0] !== "conversation" || !hostId) return target;
+    return ["conversation", target[1], hostId];
+  }
   function isComposerModelWriteAllowed(target) {
     return target?.[0] === "default";
   }
@@ -21504,6 +21508,11 @@ ${error51.stderrTail}`] : []
     let adapterDispose = null;
     let applyAdapterAgent = null;
     let modelControl = null;
+    const activeModelHostId = () => {
+      if (!modelControl) return null;
+      return modelControl.currentHostId ? modelControl.currentHostId() : "local";
+    };
+    const controllerTarget = (target, hostId) => scopedComposerTarget(target, hostId);
     let usageNotificationDispose = null;
     const localAgentForSidebarThread = (input) => {
       const mountedHostId = modelControl?.currentHostId?.() ?? "local";
@@ -21722,14 +21731,18 @@ ${error51.stderrTail}`] : []
         mounted.ownershipStatus = "not-required";
         return;
       }
+      const requestModelControl = modelControl;
+      const requestHostId = activeModelHostId();
+      const client = requestModelControl && requestHostId ? requestModelControl.clientForHost?.(requestHostId) ?? requestModelControl : null;
       const generation = controller.beginOwnershipRequest(mounted.composer);
       const usageGeneration = mounted.usageRequestGeneration;
       mounted.ownershipStatus = "loading";
       renderMounted(mounted);
       try {
-        if (!modelControl) throw new Error("Thread ownership control is unavailable");
-        const inspection = await modelControl.inspectThread({ threadId });
-        if (!isCurrentOwnershipRequest(mounted, generation) || mountedByComposer.get(mounted.composer) !== mounted || threadIdFromComposerModelTarget(mounted.modelTarget) !== threadId) {
+        if (!client || !requestHostId) throw new Error("Thread ownership control is unavailable");
+        mounted.hostId = requestHostId;
+        const inspection = await client.inspectThread({ threadId });
+        if (!isCurrentOwnershipRequest(mounted, generation) || mountedByComposer.get(mounted.composer) !== mounted || threadIdFromComposerModelTarget(mounted.modelTarget) !== threadId || mounted.hostId !== requestHostId || modelControl !== requestModelControl || activeModelHostId() !== requestHostId) {
           return;
         }
         const { agent, model, thinkingOptionId, permissionModeId } = restoredThreadOwnership(inspection);
@@ -21794,8 +21807,11 @@ ${error51.stderrTail}`] : []
       );
       if (resolution === "none") return false;
       const previousTarget = mounted.modelTarget;
+      const nextHostId = activeModelHostId() ?? mounted.hostId;
+      const nextControllerTarget = controllerTarget(currentTarget, nextHostId);
       mounted.modelTarget = currentTarget;
-      const rebound = resolution === "transfer" ? controller.transfer(mounted.composer, mounted.composer, currentTarget) : controller.rebindConversation(mounted.composer, currentTarget) !== null;
+      mounted.hostId = nextHostId;
+      const rebound = resolution === "transfer" ? controller.transfer(mounted.composer, mounted.composer, nextControllerTarget) : controller.rebindConversation(mounted.composer, nextControllerTarget) !== null;
       if (!rebound) {
         mounted.ownershipStatus = "error";
         renderMounted(mounted);
@@ -22510,12 +22526,43 @@ ${error51.stderrTail}`] : []
       );
       return promise2;
     }
+    const reloadMountedOwnershipForHost = (hostId) => {
+      for (const mounted of mountedByComposer.values()) {
+        if (mounted.hostId === hostId || !threadIdFromComposerModelTarget(mounted.modelTarget)) {
+          continue;
+        }
+        const target = controllerTarget(mounted.modelTarget, hostId);
+        if (controller.rebindConversation(mounted.composer, target) === null) {
+          mounted.ownershipStatus = "error";
+          renderMounted(mounted);
+          continue;
+        }
+        mounted.hostId = hostId;
+        mounted.composerId = controller.get(mounted.composer).composerId;
+        mounted.modelView = { status: "idle" };
+        mounted.permissionModeView = { status: "idle" };
+        mounted.threadConfiguration = void 0;
+        mounted.ownershipStatus = "loading";
+        mounted.usage = null;
+        mounted.accountCredits = null;
+        mounted.usageRequestGeneration += 1;
+        usageRefreshAttempts.delete(mounted.composer);
+        const timer = usageRefreshTimers.get(mounted.composer);
+        if (timer !== void 0) {
+          window.clearTimeout(timer);
+          usageRefreshTimers.delete(mounted.composer);
+        }
+        renderMounted(mounted);
+        void loadThreadOwnership(mounted);
+      }
+      sidebarAgentIcons.refresh();
+    };
     function reconcileHarnessAvailabilityHost() {
-      const reportedHostId = modelControl?.currentHostId?.();
-      const hostId = reportedHostId ?? (modelControl?.currentHostId ? activeAvailabilityHostId : "local");
-      if (hostId === activeAvailabilityHostId) return;
+      const hostId = activeModelHostId();
+      if (!hostId || hostId === activeAvailabilityHostId) return;
       activeAvailabilityHostId = hostId;
       hostHarnessAvailabilityState(hostId);
+      reloadMountedOwnershipForHost(hostId);
       publishConnectionStatus();
       for (const mounted of mountedByComposer.values()) renderMounted(mounted);
       void refreshHarnessAvailabilityForHost(hostId);
@@ -22565,11 +22612,12 @@ ${error51.stderrTail}`] : []
       const sendButton = sendButtonWithin(composer) ?? allButtons.at(-1) ?? null;
       if (!sendButton) return;
       const modelTarget = findComposerModelTarget(composer);
+      const hostId = activeModelHostId();
       const editor = composer.querySelector(EDITOR_SELECTOR);
       if (!editor) return;
       const state = controller.mount(
         composer,
-        modelTarget,
+        controllerTarget(modelTarget, hostId),
         modelTarget?.[0] === "default" ? readNewThreadAgentPreference(enabledAgentSet) : void 0
       );
       const inherited = pendingReplacements.get(composer)?.source;
@@ -22615,6 +22663,7 @@ ${error51.stderrTail}`] : []
         threadConfiguration: inherited?.threadConfiguration,
         usage: inherited?.usage ?? null,
         accountCredits: inherited?.accountCredits ?? null,
+        hostId: inherited?.hostId ?? hostId,
         usageRequestGeneration: 0
       };
       mountedByComposer.set(composer, mounted);
@@ -22650,12 +22699,17 @@ ${error51.stderrTail}`] : []
       for (const [target, replacement] of pendingReplacements) {
         const sourceState = controller.get(replacement.source.composer);
         const replacementTarget = findComposerModelTarget(target);
+        const replacementHostId = activeModelHostId() ?? replacement.source.hostId;
         if (!shouldTransferComposerState(
           replacement.sourceModelTarget,
           replacementTarget,
           sourceState.phase,
           controller.isSubmissionPending(replacement.source.composer)
-        ) || !controller.transfer(replacement.source.composer, target, replacementTarget)) {
+        ) || !controller.transfer(
+          replacement.source.composer,
+          target,
+          controllerTarget(replacementTarget, replacementHostId)
+        )) {
           pendingReplacements.delete(target);
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codexhost/cli-darwin-arm64",
-  "version": "0.3.0-test.3",
+  "version": "0.3.1",
   "description": "Run Pi and Claude Code as first-class external harnesses inside Codex Desktop.",
   "type": "module",
   "files": [