@join-pantheon/cli 0.23.1 → 0.24.0

package/README.md

@@ -521,6 +521,8 @@ pantheon upgrade          # installs the latest release and finishes the job
 Every command prints its version and nudges you when a newer release exists. `pantheon upgrade`
 installs the new release, re-wires your agents, restarts pantheon's own background services (the
 worker, alerts, menu bar) so they load the new code, and asks any setup question the new version
-has that you have never answered. The one thing it cannot do is restart your agent windows: quit
-and reopen them so they load the new server. A self-hosted relay is shared with your teammates, so
-it prints the restart for that and leaves the timing to you.
+has that you have never answered. Open agent windows come along too: the server each window runs
+notices the new version and switches to it within a minute, with no disconnect and nothing to
+reopen (windows opened on a pantheon older than 0.24 need one `/mcp` reconnect; `pantheon doctor`
+names them). A self-hosted relay is shared with your teammates, so it prints the restart for that
+and leaves the timing to you.

package/dist/agents.js

@@ -17,6 +17,11 @@ const sh = (cmd) => {
         return null;
     }
 };
+export function cliOnPath(name) {
+    if (!binaryCache.has(`path:${name}`))
+        binaryCache.set(`path:${name}`, sh(`command -v ${name}`));
+    return binaryCache.get(`path:${name}`) ?? null;
+}
 export function agentById(id) {
     return AGENTS.find((a) => a.id === id || a.binaries.includes(id));
 }
@@ -57,8 +62,15 @@ export function detectOnPath() {
 const binaryCache = new Map();
 export function resolveBinary(backend) {
     for (const b of backend.binaries) {
-        if (!binaryCache.has(b))
-            binaryCache.set(b, sh(`command -v ${b}`) ? b : null);
+        if (!binaryCache.has(b)) {
+            let found = sh(`command -v ${b}`) ? b : null;
+            if (found && b === "agent") {
+                const v = `${sh("agent --version 2>/dev/null | head -1") ?? ""} ${sh("agent --help 2>/dev/null | head -3") ?? ""}`;
+                if (!/cursor/i.test(v))
+                    found = null;
+            }
+            binaryCache.set(b, found);
+        }
         if (binaryCache.get(b))
             return b;
     }

package/dist/cli.js

@@ -7,7 +7,7 @@ process.emitWarning = ((warning, ...rest) => {
     return _emitWarning(warning, ...rest);
 });
 import { randomBytes } from "node:crypto";
-import { readFileSync } from "node:fs";
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
 import { PantheonClient } from "./client.js";
 import { fromInvite, load, save, toInvite, toJoinLink, resolveFor, loadAll, repoInfo, bindRepo, findMembership, setDefaultSpace, removeMembership, configFor, CONFIG_DIR, CONFIG_PATH, DEFAULT_RELAY, resolveForHook } from "./config.js";
@@ -38,6 +38,7 @@ import { LIMITS } from "./protocol.js";
 import { loadPersonas, personaByName, describePersona, initPersona, personaDir } from "./persona.js";
 import { fingerprint, newKeypair, signAccount } from "./identity.js";
 import { VERSION } from "./version.js";
+import * as mcpWindows from "./mcp-windows.js";
 import { updateBanner } from "./update-check.js";
 const argv = process.argv.slice(2);
 const cmd = argv[0] ?? "help";
@@ -339,6 +340,39 @@ function workerMidRun() {
         return false;
     }
 }
+function staleWindowMessage(cwd) {
+    const { scanMcpWindows, RECONNECT_HINT } = mcpWindows;
+    const legacy = scanMcpWindows().filter((w) => w.kind === "legacy" && w.cwd === cwd);
+    if (!legacy.length)
+        return null;
+    const marker = join(CONFIG_DIR, "mcp", "nudged.json");
+    let seen = {};
+    try {
+        seen = JSON.parse(readFileSync(marker, "utf8"));
+    }
+    catch { }
+    const last = seen[cwd] ?? 0;
+    if (Date.now() - last < 60 * 60_000)
+        return null;
+    seen[cwd] = Date.now();
+    try {
+        mkdirSync(dirname(marker), { recursive: true });
+        writeFileSync(marker, JSON.stringify(seen));
+    }
+    catch { }
+    return `pantheon: this window's pantheon server is from before the installed version (${VERSION}) and cannot reach your team any more — ${RECONNECT_HINT}. Windows opened from now on update themselves.`;
+}
+function reportWindows(installed) {
+    const { scanMcpWindows, describeWindows, killOrphanWindows } = mcpWindows;
+    const windows = scanMcpWindows();
+    const ended = killOrphanWindows(windows);
+    const w = describeWindows(windows, installed);
+    console.error(`\n${B("agent windows:")} ${w.detail}`);
+    if (w.fix)
+        console.error(`  ${D("->")} ${w.fix}`);
+    if (ended.length)
+        console.error(D(`  ended ${ended.length} pantheon server${ended.length > 1 ? "s" : ""} left behind by windows that no longer exist`));
+}
 function printReady(tools) {
     const workerOn = tools.some((t) => t.tool === "worker" && t.status.startsWith("on"));
     console.error(`\n${B("You're set.")} Restart your agent once (quit and reopen) and it is connected.`);
@@ -781,6 +815,7 @@ async function main() {
                 const cur = load();
                 if (cur && loadProfile(cur).agent.wake_default === undefined)
                     await guidedSetup(cur, repoInfo(process.cwd())?.root ?? null);
+                reportWindows(r.from);
                 return;
             }
             console.error(`\n${B(`upgraded ${r.from} → ${r.to}`)}`);
@@ -820,7 +855,7 @@ async function main() {
                 else
                     console.error(D(`\n  Your setup answers still apply — pantheon setup to change them.`));
             }
-            console.error(`\n${B("One thing only you can do:")} quit and reopen your agent windows so they load the new pantheon.`);
+            reportWindows(r.to);
             return;
         }
         case "setup": {
@@ -1260,6 +1295,17 @@ async function main() {
                     }
                 }
                 catch { }
+                try {
+                    let cwd = process.cwd();
+                    try {
+                        cwd = JSON.parse(raw).cwd ?? cwd;
+                    }
+                    catch { }
+                    const msg = staleWindowMessage(cwd);
+                    if (msg)
+                        process.stdout.write(JSON.stringify({ systemMessage: msg }) + "\n");
+                }
+                catch { }
                 process.exit(0);
             }
             if (sub === "end") {
@@ -2122,6 +2168,13 @@ async function main() {
             if (hud?.action === "details") {
                 const acts = await fetchHistory(cfg).catch(() => []);
                 const a = hud.act ? acts.find((x) => x.id === hud.act) : undefined;
+                let o;
+                if (hud.decision) {
+                    const c2 = new PantheonClient(cfg, undefined, { role: "cli" });
+                    await c2.connect().catch((e) => die(e.message));
+                    o = c2.obligations.find((x) => x.id === hud.decision);
+                    c2.close();
+                }
                 if (a) {
                     console.log(formatAct(a));
                     if (a.ref) {
@@ -2130,17 +2183,80 @@ async function main() {
                             console.log(D("\nin reply to:\n") + formatAct(r, { short: true }));
                     }
                 }
-                else if (!hud.decision)
+                else if (!o)
                     console.log(D("that act is no longer in what the relay holds"));
-                if (hud.decision) {
-                    const c2 = new PantheonClient(cfg, undefined, { role: "cli" });
-                    await c2.connect().catch((e) => die(e.message));
-                    const o = c2.obligations.find((x) => x.id === hud.decision);
-                    c2.close();
-                    if (o)
-                        console.log(`\n${B("Decision required")}  ${o.id}\n  ${o.body}\n\nAnswer: ${C(`pantheon approvals answer ${o.id} 'your decision and rationale'`)}\n${D(`or have your agent explain it: pantheon explain ${o.id}`)}`);
-                    else
-                        console.log(D("\nthat decision is no longer waiting on you"));
+                if (o)
+                    console.log(`\n${B("Decision required")}  ${o.id}\n  ${o.body}`);
+                else if (hud.decision)
+                    console.log(D("\nthat decision is no longer waiting on you"));
+                if (!process.stdin.isTTY || (!a && !o))
+                    return;
+                const p0 = loadProfile(cfg);
+                const agent = pickExplainAgent(hud.tool ?? p0.agent.primary_surface, detectAvailable());
+                const goalId = a?.goal ?? o?.goal ?? null;
+                const rl = createInterface({ input: process.stdin, output: process.stderr });
+                const ask = (q) => new Promise((res) => rl.question(q, (v) => res(v.trim())));
+                try {
+                    for (;;) {
+                        console.error(`\n${B("Next")}${agent ? `  ${C("1")} open in ${agent.id} with this loaded` : ""}  ${C("2")} reply from here${goalId ? `  ${C("3")} show the whole thread` : ""}  ${D("Enter) close")}`);
+                        const choice = await ask("  choose: ");
+                        if (!choice)
+                            break;
+                        if (choice === "1" && agent) {
+                            rl.close();
+                            const prompt = o ? dp(o.id) : `Read Pantheon act ${a.id}${goalId ? ` and the thread of goal ${goalId}` : ""}. Explain in plain words what happened and whether anything is owed by me, then give me numbered next steps. Do not act until I choose.`;
+                            console.error(D(`opening ${agent.id}…`));
+                            const { spawnSync } = await import("node:child_process");
+                            spawnSync(agent.binary, [prompt], { stdio: "inherit" });
+                            return;
+                        }
+                        if (choice === "2") {
+                            let kind = "NOTE";
+                            let ref = null;
+                            let to = null;
+                            if (o) {
+                                kind = "ANSWER";
+                                ref = o.ref;
+                            }
+                            else if (a) {
+                                ref = a.id;
+                                to = a.from === cfg.member ? null : [a.from];
+                                if (["ASK", "ESCALATE", "HUMAN_REQUIRED"].includes(a.act))
+                                    kind = "ANSWER";
+                                else if (["DELIVERED", "PROPOSE", "CONTRACT"].includes(a.act)) {
+                                    const v = (await ask("  accept or object? (a/o): ")).toLowerCase();
+                                    kind = v.startsWith("o") ? "OBJECT" : "ACCEPT";
+                                }
+                            }
+                            const text = await ask(`  your ${kind} (one line): `);
+                            if (!text) {
+                                console.error(D("  nothing sent"));
+                                continue;
+                            }
+                            const c3 = new PantheonClient(cfg, undefined, { role: "cli" });
+                            try {
+                                await c3.connect();
+                                const sent = await c3.send({ act: kind, body: text, goal: o ? null : goalId, ref, to });
+                                console.error(`  ${C("sent")} ${kind} id=${sent.id}`);
+                            }
+                            catch (e) {
+                                console.error(`  ${e.message}`);
+                            }
+                            finally {
+                                c3.close();
+                            }
+                            continue;
+                        }
+                        if (choice === "3" && goalId) {
+                            for (const t of selectActs(acts, { goal: goalId, last: 40 }))
+                                console.log(formatAct(t, { short: true }));
+                            continue;
+                        }
+                        console.error(D("  1, 2, 3 or Enter"));
+                    }
+                }
+                finally {
+                    rl.close();
                 }
                 return;
             }
@@ -2150,6 +2266,14 @@ async function main() {
                     saveProfile({ ...p, agent: { ...p.agent, primary_surface: hud.tool }, updated_at: Date.now() });
                     console.error(D(`${hud.tool} is now where your decisions open`));
                 }
+                if (hud.prompt && hud.tool === "grok") {
+                    const { cliOnPath } = await import("./agents.js");
+                    const bin = cliOnPath("grok") ?? die("grok is not on PATH here");
+                    console.error(D("opening grok…"));
+                    const { spawnSync } = await import("node:child_process");
+                    spawnSync(bin, [hud.prompt], { stdio: "inherit" });
+                    return;
+                }
                 if (hud.prompt) {
                     const agent = pickExplainAgent(hud.tool ?? p.agent.primary_surface, detectAvailable());
                     if (!agent)
@@ -2537,7 +2661,12 @@ async function main() {
             return;
         }
         case "mcp":
-            await runMcp();
+            if (argv.includes("--child") || process.env.PANTHEON_MCP_SUPERVISED)
+                await runMcp();
+            else {
+                const { superviseMcp } = await import("./mcp-supervisor.js");
+                await superviseMcp();
+            }
             return;
         case "limits":
             console.log(JSON.stringify(LIMITS, null, 2));

package/dist/doctor.js

@@ -1,4 +1,5 @@
 import { execFileSync } from "node:child_process";
+import { describeWindows, scanMcpWindows } from "./mcp-windows.js";
 import { loadProfile, profileInitialized } from "./profile.js";
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
@@ -221,6 +222,13 @@ export async function doctor(projectDir) {
     if (hookStates.some((s) => s.agent === "codex")) {
         add("warn", "codex hooks", "installed — but codex skips new or changed hooks until they are approved", "run /hooks inside codex once to approve them (needs codex ≥ 0.115; sessions still report presence over MCP either way)");
     }
+    const windows = scanMcpWindows();
+    const w = describeWindows(windows, VERSION);
+    add(w.level, "agent windows", w.detail, w.fix);
+    const orphans = windows.filter((x) => x.kind === "orphan");
+    if (orphans.length) {
+        add("warn", "orphans", `${orphans.length} pantheon server${orphans.length > 1 ? "s" : ""} left behind by windows that no longer exist (pid ${orphans.map((x) => x.pid).join(", ")})`, `harmless but pointless — pantheon upgrade ends them, or: kill ${orphans.map((x) => x.pid).join(" ")}`);
+    }
     const personas = loadPersonas(projectDir);
     if (personas.length) {
         const broken = personas.filter((p) => p.warnings.length);