@fulldivevr/workcord-cli 3.0.4 → 3.0.5

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, codexCandidates, detectAdapters } from "../machine/agents.js";
+import { ADAPTER_NAMES, childEnv, 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,7 @@ export function registerMachine(program) {
         const detected = await detectAdapters();
         pickAdapters(detected, opts.adapter, home);
         // checkAdapters already narrowed the set to the chosen adapter.
-        const usable = await checkAdapters(detected, opts.adapter, home, undefined, process.env, await codexCandidates());
+        const usable = await checkAdapters(detected, opts.adapter, home);
         const adapters = pickAdapters(usable, "auto", home);
         const baseUrl = credential.baseUrl || (await getBaseUrl());
         const installationId = await readOrCreateInstallationId();
@@ -184,36 +184,23 @@ function collect(value, previous) {
 }
 const RUNNERS = { claude: runClaude, codex: runCodex };
 /**
- * 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.
+ * Prints the binary each adapter uses. A Codex that cannot answer `app-server`
+ * 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, codexCandidates = installed.codex ? [installed.codex] : []) {
+export async function checkAdapters(installed, choice, home, log = (line) => process.stderr.write(line + "\n"), env = process.env) {
     const usable = {};
     for (const [name, binary] of Object.entries(installed)) {
         if (!binary || (choice !== "auto" && choice !== name))
             continue;
         if (name === "codex") {
-            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"`);
+            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)}`);
+                throw new Error("codex cannot run tasks, see the ERROR line above.");
             }
+            usable.codex = binary;
             log(`machine: codex at ${usable.codex}`);
             continue;
         }

package/dist/machine/agents.js

@@ -1,4 +1,4 @@
-import { access, constants, realpath } from "node:fs/promises";
+import { access, constants } from "node:fs/promises";
 import { homedir } from "node:os";
 import { delimiter, join } from "node:path";
 export const ADAPTER_NAMES = ["claude", "codex"];
@@ -13,7 +13,7 @@ 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. */
+/** Codex desktop bundles a current codex that is not on PATH; when one exists it is the codex, ahead of PATH. */
 export function codexDesktopPaths(platform = process.platform, home = homedir()) {
     if (platform !== "darwin")
         return [];
@@ -26,21 +26,6 @@ const isExecutable = (path) => access(path, constants.X_OK).then(() => true, ()
 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, codexDesktop = codexDesktopPaths()) {
     const found = {};
@@ -50,9 +35,12 @@ export async function detectAdapters(env = process.env, codexDesktop = codexDesk
             break;
         }
     }
-    const [codex] = await codexCandidates(env, codexDesktop);
-    if (codex)
-        found.codex = codex;
+    for (const candidate of [...codexDesktop, ...onPath("codex", env)]) {
+        if (await isExecutable(candidate)) {
+            found.codex = candidate;
+            break;
+        }
+    }
     return found;
 }
 //# sourceMappingURL=agents.js.map

package/package.json

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