@join-pantheon/cli 0.25.3 → 0.26.1

package/dist/which.js

@@ -0,0 +1,73 @@
+import { execFileSync } from "node:child_process";
+import { accessSync, constants, existsSync, statSync } from "node:fs";
+import { win32 } from "node:path";
+import { platform } from "node:os";
+export const DEFAULT_PATHEXT = ".COM;.EXE;.BAT;.CMD;.VBS;.JS;.PS1";
+const isWindows = (os = platform()) => os === "win32";
+function runnable(file) {
+    try {
+        if (!existsSync(file) || !statSync(file).isFile())
+            return false;
+        if (isWindows())
+            return true;
+        accessSync(file, constants.X_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export function whichWindows(name, env = process.env, exists = runnable) {
+    if (!name)
+        return null;
+    const exts = (env.PATHEXT || DEFAULT_PATHEXT).split(";").map((e) => e.trim()).filter(Boolean);
+    const ext = win32.extname(name);
+    const hasExt = !!ext && exts.some((e) => e.toLowerCase() === ext.toLowerCase());
+    const candidates = (base) => hasExt ? [base] : exts.flatMap((e) => (e === e.toLowerCase() ? [base + e] : [base + e.toLowerCase(), base + e]));
+    if (win32.isAbsolute(name)) {
+        for (const c of candidates(name))
+            if (exists(c))
+                return c;
+        return null;
+    }
+    for (const dir of (env.PATH || env.Path || "").split(";")) {
+        const d = dir.replace(/^"|"$/g, "").trim();
+        if (!d)
+            continue;
+        for (const c of candidates(win32.join(d, name)))
+            if (exists(c))
+                return c;
+    }
+    return null;
+}
+export function which(name, os = platform(), env = process.env) {
+    if (isWindows(os))
+        return whichWindows(name, env);
+    try {
+        const out = execFileSync("sh", ["-lc", `command -v ${name}`], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim();
+        if (!out)
+            return null;
+        return out.startsWith("/") && !runnable(out) ? null : out;
+    }
+    catch {
+        return null;
+    }
+}
+export const onPathNamed = (name, os = platform(), env = process.env) => which(name, os, env) !== null;
+export function spawnShape(binary, os = platform()) {
+    if (!isWindows(os))
+        return { command: binary, shell: false };
+    return { command: binary, shell: /\.(cmd|bat)$/i.test(binary) };
+}
+const cmdQuote = (a) => (/[\s"&|<>^()]/.test(a) || a === "" ? `"${a.replace(/"/g, '\\"')}"` : a);
+export function agentSpawn(binary, args, os = platform()) {
+    if (!isWindows(os) || !/\.(cmd|bat)$/i.test(binary))
+        return { command: binary, args: [...args], options: {} };
+    const line = [binary, ...args].map(cmdQuote).join(" ");
+    return {
+        command: process.env.ComSpec || "cmd.exe",
+        args: ["/d", "/s", "/c", `"${line}"`],
+        options: { windowsVerbatimArguments: true },
+    };
+}
+//# sourceMappingURL=which.js.map

package/dist/worker.js

@@ -4,7 +4,8 @@ import { mkdirSync, writeFileSync, existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
 import { PantheonClient } from "./client.js";
-import { headlessSpawn, materializeSpawnFiles, resolveAgent } from "./agents.js";
+import { headlessSpawn, materializeSpawnFiles, chooseAgent, describeChoice } from "./agents.js";
+import { agentSpawn } from "./which.js";
 import { VERSION } from "./version.js";
 import { applyAnswer, loadPolicy, mayAsk, needsSelfUpgrade, recordAsk, savePolicy, useGrant, } from "./worker-policy.js";
 import { agentHookStates, repairHook } from "./notify.js";
@@ -191,6 +192,7 @@ export function answerWindow(askSeq, hint, fullScanDue) {
 export class Worker {
     cfg;
     opts;
+    lastAgentSaid = "";
     running = false;
     done = [];
     stopped = false;
@@ -329,8 +331,7 @@ export class Worker {
         const agentLabel = this.opts.agentCmd
             ? this.opts.agentCmd
             : (() => { try {
-                const r = resolveAgent(this.opts.agent);
-                return `${r.backend.label} (${r.binary})`;
+                return describeChoice(chooseAgent(this.opts.agent, { prefer: loadProfile(this.cfg).agent.primary_surface }));
             }
             catch {
                 return "auto";
@@ -580,10 +581,12 @@ export class Worker {
         const startedAt = Date.now();
         writeFileSync(join(worktree, ".pantheon-task.md"), brief);
         let command;
+        let agentId;
         let args;
         let env = { ...process.env };
         try {
             const runHome = this.runHome();
+            agentId = this.opts.agentCmd ? "claude-code" : undefined;
             if (this.opts.agentCmd) {
                 const plan = headlessSpawn({
                     backend: { id: "claude-code", label: "Claude Code", binaries: ["claude"] },
@@ -594,8 +597,14 @@ export class Worker {
                 ({ command, args, env } = { command: plan.command, args: plan.args, env: { ...env, ...plan.env } });
             }
             else {
-                const { backend, binary } = resolveAgent(policy.agent ?? this.opts.agent);
-                const plan = headlessSpawn({ backend, binary, prompt: brief, worktree, cfg: this.cfg, branch, allowBash, runHome });
+                const choice = chooseAgent(policy.agent ?? this.opts.agent, { prefer: loadProfile(this.cfg).agent.primary_surface });
+                agentId = choice.backend.id;
+                const said = describeChoice(choice);
+                if (said !== this.lastAgentSaid) {
+                    this.opts.log(`  agent   ${said}`);
+                    this.lastAgentSaid = said;
+                }
+                const plan = headlessSpawn({ backend: choice.backend, binary: choice.binary, prompt: brief, worktree, cfg: this.cfg, branch, allowBash, runHome });
                 materializeSpawnFiles(worktree, plan);
                 ({ command, args, env } = { command: plan.command, args: plan.args, env: { ...env, ...plan.env } });
                 this.opts.log(`  spawn   ${command} ${args.slice(0, 3).join(" ")}…`);
@@ -608,7 +617,8 @@ export class Worker {
             return { obligation: o, branch, worktree, ok: false, detail };
         }
         const detail = await new Promise((res) => {
-            const child = procSpawn(command, args, { cwd: worktree, stdio: ["ignore", "pipe", "pipe"], env });
+            const sp = agentSpawn(command, args);
+            const child = procSpawn(sp.command, sp.args, { cwd: worktree, stdio: ["ignore", "pipe", "pipe"], env, ...sp.options });
             let out = "";
             child.stdout.on("data", (b) => { out += b.toString(); });
             child.stderr.on("data", (b) => { out += b.toString(); });
@@ -629,7 +639,7 @@ export class Worker {
         }, this.opts.home);
         const sent = client.mineSince(startedAt, o.goal);
         const quiet = ok && !requireReply && sent.length === 0;
-        const diagnosis = ok ? undefined : diagnoseRun({ exited, replied, allowBash, branch, project: this.opts.project, worktree, detail, runLog }, this.opts.probe ?? gitProbe);
+        const diagnosis = ok ? undefined : diagnoseRun({ exited, replied, allowBash, branch, project: this.opts.project, worktree, detail, runLog, ...(agentId ? { agent: agentId } : {}) }, this.opts.probe ?? gitProbe);
         if (this.opts.notify && !quiet && (!ok || loadProfile(this.cfg).notifications?.worker_done)) {
             try {
                 const reply = sent[sent.length - 1] ?? null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@join-pantheon/cli",
-  "version": "0.25.3",
-  "description": "Let your coding agent collaborate directly with your teammates' agents — ask, agree an interface, and deliver, without a human relaying messages.",
+  "version": "0.26.1",
+  "description": "Let your coding agent collaborate directly with your teammates' agents \u2014 ask, agree an interface, and deliver, without a human relaying messages.",
   "type": "module",
   "bin": {
     "pantheon": "bin/pantheon.js"
@@ -10,13 +10,15 @@
     "node": ">=22"
   },
   "scripts": {
-    "build": "rm -rf dist && tsc -p .",
+    "build": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\" && tsc -p .",
     "dev": "tsc -p . --watch",
     "relay": "node dist/cli.js relay",
     "test": "PANTHEON_HOME=\"$(mktemp -d)\" HOME=\"$(mktemp -d)\" node --test --test-force-exit dist/test/*.test.js",
     "prepare": "npm run build",
     "prepublishOnly": "npm run build && npm test",
-    "start": "node dist/cli.js relay"
+    "start": "node dist/cli.js relay",
+    "test:ci": "node scripts/test.mjs",
+    "smoke": "node scripts/smoke.mjs"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.0.0",