@fulldivevr/workcord-cli 3.0.3 → 3.0.4

package/dist/commands/machine.js

@@ -8,7 +8,7 @@ import { deleteMachineFile, getMachineLockPath, getMachinePath, getMachineThread
 import { normalizeBaseUrl } from "../http.js";
 import { runClaude } from "../machine/adapters/claude.js";
 import { binaryVersion, probeCodex, runCodex } from "../machine/adapters/codex.js";
-import { ADAPTER_NAMES, childEnv, detectAdapters } from "../machine/agents.js";
+import { ADAPTER_NAMES, childEnv, codexCandidates, detectAdapters } from "../machine/agents.js";
 import { handleTask, TaskContexts } from "../machine/handler.js";
 import { pairComputer } from "../machine/pair.js";
 import { nextRotationDelay, rotateMachineKey, ROTATE_EVERY_MS } from "../machine/rotate.js";
@@ -88,7 +88,8 @@ export function registerMachine(program) {
         const detected = await detectAdapters();
         pickAdapters(detected, opts.adapter, home);
         // checkAdapters already narrowed the set to the chosen adapter.
-        const adapters = pickAdapters(await checkAdapters(detected, opts.adapter, home), "auto", home);
+        const usable = await checkAdapters(detected, opts.adapter, home, undefined, process.env, await codexCandidates());
+        const adapters = pickAdapters(usable, "auto", home);
         const baseUrl = credential.baseUrl || (await getBaseUrl());
         const installationId = await readOrCreateInstallationId();
         const release = await acquireMachineLock(getMachineLockPath());
@@ -183,24 +184,40 @@ function collect(value, previous) {
 }
 const RUNNERS = { claude: runClaude, codex: runCodex };
 /**
- * Prints the binary each adapter uses and drops one that cannot run tasks, so it is
- * never advertised to the server. A Codex older than `app-server` exits at once.
+ * Prints the binary each adapter uses. Codex runs from the first candidate that
+ * answers `app-server`; an installed Codex where none does fails the start, since
+ * a legacy Codex CLI cannot run tasks at all.
  */
-export async function checkAdapters(installed, choice, home, log = (line) => process.stderr.write(line + "\n"), env = process.env) {
+export async function checkAdapters(installed, choice, home, log = (line) => process.stderr.write(line + "\n"), env = process.env, codexCandidates = installed.codex ? [installed.codex] : []) {
     const usable = {};
     for (const [name, binary] of Object.entries(installed)) {
         if (!binary || (choice !== "auto" && choice !== name))
             continue;
         if (name === "codex") {
-            const probe = await probeCodex(binary, env, home);
-            if (!probe.ok) {
-                log(`ERROR: ${probe.message}`);
-                if (probe.stderr)
-                    log(`machine: codex said: ${probe.stderr.replace(/\s+/g, " ").slice(-300)}`);
-                continue;
+            const failed = [];
+            for (const candidate of codexCandidates) {
+                const probe = await probeCodex(candidate, env, home);
+                if (probe.ok) {
+                    usable.codex = candidate;
+                    break;
+                }
+                failed.push({ ...probe, binary: candidate });
             }
+            if (!usable.codex) {
+                for (const probe of failed) {
+                    log(`ERROR: ${probe.message}`);
+                    if (probe.stderr)
+                        log(`machine: codex said: ${probe.stderr.replace(/\s+/g, " ").slice(-300)}`);
+                }
+                throw new Error("codex is installed but none of its copies can run tasks, see the ERROR lines above.");
+            }
+            for (const probe of failed) {
+                log(`machine: warning: skipped codex at ${probe.binary} (version ${probe.version}), it cannot run "codex app-server"`);
+            }
+            log(`machine: codex at ${usable.codex}`);
+            continue;
         }
-        else if (name === "claude" && (await binaryVersion(binary, childEnv(env, home))) === "unknown") {
+        if (name === "claude" && (await binaryVersion(binary, childEnv(env, home))) === "unknown") {
             log(`ERROR: claude at ${binary} does not answer "claude --version". Reinstall it: npm i -g @anthropic-ai/claude-code@latest`);
             continue;
         }

package/dist/machine/adapters/codex.js

@@ -52,7 +52,7 @@ export function binaryVersion(binary, env) {
     });
 }
 export function codexUnusableMessage(binary, version) {
-    return `codex at ${binary} (version ${version}) cannot run "codex app-server". Update it: npm i -g @openai/codex@latest`;
+    return `codex at ${binary} (version ${version}) cannot run "codex app-server". Update it: npm i -g @openai/codex@latest, or install the Codex desktop app (it bundles a current codex)`;
 }
 /** Starts `codex app-server` and accepts it once it answers `initialize`; a legacy Codex CLI never does. */
 export async function probeCodex(binary, env, home, timeoutMs = PROBE_TIMEOUT_MS) {

package/dist/machine/agents.js

@@ -1,4 +1,5 @@
-import { access, constants } from "node:fs/promises";
+import { access, constants, realpath } from "node:fs/promises";
+import { homedir } from "node:os";
 import { delimiter, join } from "node:path";
 export const ADAPTER_NAMES = ["claude", "codex"];
 /**
@@ -12,19 +13,46 @@ export function childEnv(env = process.env, home) {
         return inherited;
     return { ...inherited, HOME: home, CODEX_HOME: join(home, ".codex"), CLAUDE_CONFIG_DIR: join(home, ".claude") };
 }
+/** Codex desktop bundles a current codex that is not on PATH. */
+export function codexDesktopPaths(platform = process.platform, home = homedir()) {
+    if (platform !== "darwin")
+        return [];
+    return ["/Applications", join(home, "Applications")].flatMap((dir) => [
+        join(dir, "ChatGPT.app/Contents/Resources/codex-cli/bin/codex"),
+        join(dir, "Codex.app/Contents/Resources/codex"),
+    ]);
+}
+const isExecutable = (path) => access(path, constants.X_OK).then(() => true, () => false);
+function onPath(name, env) {
+    return String(env.PATH || "").split(delimiter).filter(Boolean).map((dir) => join(dir, name));
+}
+/** Every installed codex, PATH order first, then the desktop bundles, one per real file. */
+export async function codexCandidates(env = process.env, desktop = codexDesktopPaths()) {
+    const seen = new Set();
+    const found = [];
+    for (const candidate of [...onPath("codex", env), ...desktop]) {
+        if (!(await isExecutable(candidate)))
+            continue;
+        const real = await realpath(candidate).catch(() => candidate);
+        if (seen.has(real))
+            continue;
+        seen.add(real);
+        found.push(candidate);
+    }
+    return found;
+}
 /** Absolute path of each installed agent CLI, found the way a shell would find it. */
-export async function detectAdapters(env = process.env) {
+export async function detectAdapters(env = process.env, codexDesktop = codexDesktopPaths()) {
     const found = {};
-    const dirs = String(env.PATH || "").split(delimiter).filter(Boolean);
-    for (const name of ADAPTER_NAMES) {
-        for (const dir of dirs) {
-            const candidate = join(dir, name);
-            if (await access(candidate, constants.X_OK).then(() => true, () => false)) {
-                found[name] = candidate;
-                break;
-            }
+    for (const candidate of onPath("claude", env)) {
+        if (await isExecutable(candidate)) {
+            found.claude = candidate;
+            break;
         }
     }
+    const [codex] = await codexCandidates(env, codexDesktop);
+    if (codex)
+        found.codex = codex;
     return found;
 }
 //# sourceMappingURL=agents.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fulldivevr/workcord-cli",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "Agent-first CLI using persistent Hermes tenant chat, with advanced API diagnostics.",
   "private": false,
   "license": "UNLICENSED",