@codexhost/cli 0.1.0-test.2 → 0.1.1

package/README.md

@@ -5,9 +5,11 @@ Run Pi and Claude Code as first-class external harnesses inside Codex Desktop.
 ## Install
 
 ```bash
-npm install -g @codexhost/cli@0.1.0-test.2
+npm install -g @codexhost/cli@0.1.1
 ```
 
 npm automatically installs the matching macOS or Windows platform package. Node.js 22 or newer and Codex Desktop are required.
 
+The `codexhost` command starts Codex Desktop and returns immediately: the packaged Launcher keeps supervising in the background and exits after you quit the Desktop. Re-running `codexhost` attaches to the same controlled instance.
+
 If installation used `--omit=optional`, reinstall without that option so npm can select the native package for the current architecture.

package/bin/codexhost.js

@@ -3,6 +3,7 @@ import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
 import { createRequire } from "node:module";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 
 const platformPackages = {
   "darwin-arm64": "@codexhost/cli-darwin-arm64",
@@ -19,9 +20,26 @@ let packageRoot;
 try {
   packageRoot = path.dirname(require.resolve(`${platformPackage}/package.json`));
 } catch {
-  fail(
-    `missing optional platform package '${platformPackage}'. Reinstall @codexhost/cli without --omit=optional.`,
-  );
+  // Local folder installs symlink packages into the source tree; Node realpaths
+  // the entry script, so the sibling platform package drops off the resolution
+  // chain. Fall back to the npm global layout derived from the bin symlink.
+  packageRoot = null;
+  if (process.platform !== "win32" && process.argv[1]) {
+    const prefix = path.dirname(path.dirname(path.resolve(process.argv[1])));
+    const globalPackage = path.join(
+      prefix,
+      "lib",
+      "node_modules",
+      platformPackage,
+      "package.json",
+    );
+    if (existsSync(globalPackage)) packageRoot = path.dirname(globalPackage);
+  }
+  if (!packageRoot) {
+    fail(
+      `missing optional platform package '${platformPackage}'. Reinstall @codexhost/cli without --omit=optional.`,
+    );
+  }
 }
 
 const executableSuffix = process.platform === "win32" ? ".exe" : "";
@@ -46,6 +64,29 @@ for (const [label, filePath] of [
   if (!existsSync(filePath)) fail(`missing ${label}: ${filePath}`);
 }
 
+const npmCliCandidates = [
+  process.env.npm_execpath,
+  process.platform === "win32"
+    ? path.join(path.dirname(process.execPath), "node_modules", "npm", "bin", "npm-cli.js")
+    : path.join(
+        path.dirname(path.dirname(process.execPath)),
+        "lib",
+        "node_modules",
+        "npm",
+        "bin",
+        "npm-cli.js",
+      ),
+].filter((candidate) => typeof candidate === "string" && candidate.length > 0);
+const npmCliPath = npmCliCandidates.find((candidate) => existsSync(candidate));
+if (!npmCliPath) fail("could not locate the npm CLI used to update this global installation");
+const updateEnvironment = {
+  ...process.env,
+  CODEXHOST_NPM_NODE_PATH: process.execPath,
+  CODEXHOST_NPM_CLI_PATH: path.resolve(npmCliPath),
+  CODEXHOST_NPM_LAUNCHER_PATH: fileURLToPath(import.meta.url),
+  CODEXHOST_NPM_PACKAGE_ROOT: packageRoot,
+};
+
 const userArguments = process.argv.slice(2);
 let launchArguments;
 if (userArguments.length === 0) {
@@ -99,15 +140,47 @@ if (launchArguments[0] === "launch") {
   launchArguments = ["launch", ...extras, ...launchArguments.slice(1)];
 }
 
-const child = spawn(launcher, launchArguments, {
-  stdio: "inherit",
-  windowsHide: true,
-});
-child.on("error", (error) => fail(error.message));
-child.on("exit", (code, signal) => {
-  if (signal) {
-    process.kill(process.pid, signal);
-    return;
-  }
-  process.exit(code ?? 1);
-});
+if (launchArguments[0] === "launch") {
+  // The Launcher prints "ready" once the Desktop, Controller, and Host chain
+  // are up, then detaches from the terminal to keep supervising. Return
+  // success immediately so the terminal is not held open by this command.
+  const child = spawn(launcher, launchArguments, {
+    env: updateEnvironment,
+    stdio: ["ignore", "pipe", "inherit"],
+    windowsHide: true,
+  });
+  let finished = false;
+  const finish = (code) => {
+    if (finished) return;
+    finished = true;
+    process.exit(code);
+  };
+  child.stdout.setEncoding("utf8");
+  let launcherOutput = "";
+  child.stdout.on("data", (chunk) => {
+    launcherOutput += chunk;
+    if (launcherOutput.includes("ready\n")) finish(0);
+  });
+  child.on("error", (error) => fail(error.message));
+  child.on("exit", (code, signal) => {
+    if (signal) {
+      process.kill(process.pid, signal);
+      return;
+    }
+    finish(code ?? 1);
+  });
+} else {
+  const child = spawn(launcher, launchArguments, {
+    env: updateEnvironment,
+    stdio: "inherit",
+    windowsHide: true,
+  });
+  child.on("error", (error) => fail(error.message));
+  child.on("exit", (code, signal) => {
+    if (signal) {
+      process.kill(process.pid, signal);
+      return;
+    }
+    process.exit(code ?? 1);
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codexhost/cli",
-  "version": "0.1.0-test.2",
+  "version": "0.1.1",
   "description": "Run Pi and Claude Code as first-class external harnesses inside Codex Desktop.",
   "type": "module",
   "bin": {
@@ -14,10 +14,10 @@
     "node": ">=22"
   },
   "optionalDependencies": {
-    "@codexhost/cli-darwin-arm64": "0.1.0-test.2",
-    "@codexhost/cli-darwin-x64": "0.1.0-test.2",
-    "@codexhost/cli-win32-x64": "0.1.0-test.2",
-    "@codexhost/cli-win32-arm64": "0.1.0-test.2"
+    "@codexhost/cli-darwin-arm64": "0.1.1",
+    "@codexhost/cli-darwin-x64": "0.1.1",
+    "@codexhost/cli-win32-x64": "0.1.1",
+    "@codexhost/cli-win32-arm64": "0.1.1"
   },
   "keywords": [
     "codex",