@codexhost/cli 0.1.4 → 0.1.6

package/README.md

@@ -5,7 +5,7 @@ Run Pi and Claude Code as first-class external harnesses inside Codex Desktop.
 ## Install
 
 ```bash
-npm install -g @codexhost/cli@0.1.4
+npm install -g @codexhost/cli@0.1.6
 ```
 
 npm automatically installs the matching macOS or Windows platform package. Node.js 22 or newer and Codex Desktop are required.

package/bin/codexhost.js

@@ -1,12 +1,19 @@
 #!/usr/bin/env node
 import { spawn } from "node:child_process";
-import { existsSync } from "node:fs";
+import { existsSync, realpathSync } from "node:fs";
 import { createRequire } from "node:module";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 
-const version = "0.1.4";
+const version = "0.1.6";
 const userArguments = process.argv.slice(2);
+const startupTraceStartedAt = Date.now();
+function startupTrace(stage) {
+  if (process.env.CODEXHOST_STARTUP_TRACE !== "1") return;
+  console.error(
+    "[codexhost startup +" + (Date.now() - startupTraceStartedAt) + "ms] npm: " + stage,
+  );
+}
 if (
   userArguments.length === 1 &&
   (userArguments[0] === "--version" || userArguments[0] === "-v")
@@ -14,6 +21,7 @@ if (
   console.log(version);
   process.exit(0);
 }
+startupTrace("entry");
 
 const platformPackages = {
   "darwin-arm64": "@codexhost/cli-darwin-arm64",
@@ -52,6 +60,7 @@ try {
   }
 }
 
+startupTrace("platform package resolved");
 const executableSuffix = process.platform === "win32" ? ".exe" : "";
 const launcher = path.join(packageRoot, "bin", `codexhost${executableSuffix}`);
 const shim = path.join(packageRoot, "libexec", `codexhost-shim${executableSuffix}`);
@@ -74,20 +83,81 @@ 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")
+function existingFile(filePath) {
+  return typeof filePath === "string" && filePath.length > 0 && existsSync(filePath)
+    ? filePath
+    : undefined;
+}
+function officialNpmCliPath(nodePath) {
+  return process.platform === "win32"
+    ? path.join(path.dirname(nodePath), "node_modules", "npm", "bin", "npm-cli.js")
     : path.join(
-        path.dirname(path.dirname(process.execPath)),
+        path.dirname(path.dirname(nodePath)),
         "lib",
         "node_modules",
         "npm",
         "bin",
         "npm-cli.js",
-      ),
-].filter((candidate) => typeof candidate === "string" && candidate.length > 0);
-const npmCliPath = npmCliCandidates.find((candidate) => existsSync(candidate));
+      );
+}
+function homebrewNpmCliPath(nodePath) {
+  if (process.platform === "win32") return undefined;
+  const segments = nodePath.split(path.sep);
+  const cellarIndex = segments.lastIndexOf("Cellar");
+  if (
+    cellarIndex >= 1 &&
+    segments[cellarIndex + 1] === "node" &&
+    segments.at(-2) === "bin" &&
+    segments.at(-1) === "node"
+  ) {
+    const brewPrefix = segments.slice(0, cellarIndex).join(path.sep);
+    return (
+      existingFile(
+        path.join(brewPrefix, "lib", "node_modules", "npm", "bin", "npm-cli.js"),
+      ) ??
+      existingFile(
+        path.join(
+          path.dirname(path.dirname(nodePath)),
+          "libexec",
+          "lib",
+          "node_modules",
+          "npm",
+          "bin",
+          "npm-cli.js",
+        ),
+      )
+    );
+  }
+  const brewPrefix = process.env.HOMEBREW_PREFIX;
+  if (typeof brewPrefix === "string" && brewPrefix.length > 0) {
+    return existingFile(
+      path.join(brewPrefix, "lib", "node_modules", "npm", "bin", "npm-cli.js"),
+    );
+  }
+  return undefined;
+}
+function pathNpmCliPath() {
+  const pathValue = process.env.PATH;
+  if (typeof pathValue !== "string" || pathValue.length === 0) return undefined;
+  const npmName = process.platform === "win32" ? "npm.cmd" : "npm";
+  for (const directory of pathValue.split(path.delimiter)) {
+    if (!directory) continue;
+    const candidate = path.join(directory, npmName);
+    if (!existsSync(candidate)) continue;
+    try {
+      const resolved = realpathSync(candidate);
+      if (path.basename(resolved) === "npm-cli.js") return resolved;
+    } catch {
+      continue;
+    }
+  }
+  return undefined;
+}
+const npmCliPath =
+  existingFile(process.env.npm_execpath) ??
+  existingFile(officialNpmCliPath(process.execPath)) ??
+  homebrewNpmCliPath(process.execPath) ??
+  pathNpmCliPath();
 if (!npmCliPath) fail("could not locate the npm CLI used to update this global installation");
 const updateEnvironment = {
   ...process.env,
@@ -154,6 +224,7 @@ 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.
+  startupTrace("spawning Launcher");
   const child = spawn(launcher, launchArguments, {
     env: updateEnvironment,
     stdio: ["ignore", "pipe", "inherit"],
@@ -163,16 +234,24 @@ if (launchArguments[0] === "launch") {
   const finish = (code) => {
     if (finished) return;
     finished = true;
+    startupTrace("Launcher finished startup with code " + code);
     process.exit(code);
   };
   child.stdout.setEncoding("utf8");
   let launcherOutput = "";
   child.stdout.on("data", (chunk) => {
     launcherOutput += chunk;
-    if (launcherOutput.includes("ready\n")) finish(0);
+    if (launcherOutput.includes("ready\n")) {
+      startupTrace("received Launcher ready");
+      finish(0);
+    }
+  });
+  child.on("error", (error) => {
+    startupTrace("Launcher spawn failed: " + error.message);
+    fail(error.message);
   });
-  child.on("error", (error) => fail(error.message));
   child.on("exit", (code, signal) => {
+    startupTrace("Launcher exited before ready");
     if (signal) {
       process.kill(process.pid, signal);
       return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codexhost/cli",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "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.4",
-    "@codexhost/cli-darwin-x64": "0.1.4",
-    "@codexhost/cli-win32-x64": "0.1.4",
-    "@codexhost/cli-win32-arm64": "0.1.4"
+    "@codexhost/cli-darwin-arm64": "0.1.6",
+    "@codexhost/cli-darwin-x64": "0.1.6",
+    "@codexhost/cli-win32-x64": "0.1.6",
+    "@codexhost/cli-win32-arm64": "0.1.6"
   },
   "keywords": [
     "codex",