@join-pantheon/cli 0.25.2 → 0.26.0

package/dist/install.js

@@ -1,6 +1,6 @@
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from "node:fs";
 import { execFileSync } from "node:child_process";
-import { homedir } from "node:os";
+import { homedir, platform } from "node:os";
 import { join, dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { grantToolPermissions, claudeSettingsFile, cursorCliConfigFile } from "./grants.js";
@@ -23,26 +23,52 @@ export function launcher(force) {
         ? { command: "pantheon", args: ["mcp"], portable: true }
         : { command: process.execPath, args: [resolve(HERE, "cli.js"), "mcp"], portable: false };
 }
-function mergeMcpJson(file, entry) {
-    let doc = {};
-    if (existsSync(file)) {
-        try {
-            doc = JSON.parse(readFileSync(file, "utf8"));
-        }
-        catch {
-            throw new Error(`${file} is not valid JSON — fix or move it, then re-run`);
-        }
+function readConfigJson(file) {
+    if (!existsSync(file))
+        return {};
+    const text = readFileSync(file, "utf8");
+    if (!text.trim())
+        return {};
+    try {
+        const doc = JSON.parse(text);
+        if (doc && typeof doc === "object" && !Array.isArray(doc))
+            return doc;
     }
+    catch { }
+    throw new Error(`${file} is not valid JSON — fix or move it, then re-run`);
+}
+function mergeMcpJson(file, entry, shape = {}) {
+    const doc = readConfigJson(file);
     const existed = existsSync(file);
     doc.mcpServers ??= {};
     const before = JSON.stringify(doc.mcpServers["pantheon"] ?? null);
-    doc.mcpServers["pantheon"] = { ...entry, env: {} };
+    doc.mcpServers["pantheon"] = { ...shape, ...entry, env: {} };
     if (before === JSON.stringify(doc.mcpServers["pantheon"]))
         return "unchanged";
     mkdirSync(dirname(file), { recursive: true });
     writeFileSync(file, JSON.stringify(doc, null, 2) + "\n");
     return existed ? "updated" : "created";
 }
+export const COPILOT_ENTRY_SHAPE = { type: "local", tools: ["*"] };
+export function mergeVsCodeMcpJson(file, entry) {
+    const doc = readConfigJson(file);
+    const existed = existsSync(file);
+    doc.servers ??= {};
+    const before = JSON.stringify(doc.servers["pantheon"] ?? null);
+    doc.servers["pantheon"] = { type: "stdio", command: entry.command, args: entry.args };
+    if (before === JSON.stringify(doc.servers["pantheon"]))
+        return "unchanged";
+    mkdirSync(dirname(file), { recursive: true });
+    writeFileSync(file, JSON.stringify(doc, null, 2) + "\n");
+    return existed ? "updated" : "created";
+}
+export const copilotMcpConfigFile = (home = homedir(), env = process.env) => join(env.COPILOT_HOME || join(home, ".copilot"), "mcp-config.json");
+export function vsCodeUserDir(home = homedir(), os = platform(), env = process.env) {
+    const dir = os === "darwin" ? join(home, "Library", "Application Support", "Code", "User")
+        : os === "win32" ? join(env.APPDATA || join(home, "AppData", "Roaming"), "Code", "User")
+            : join(env.XDG_CONFIG_HOME || join(home, ".config"), "Code", "User");
+    return existsSync(dir) ? dir : null;
+}
 const BRIEF_MARK = "<!-- pantheon:begin -->";
 function brief(cfg) {
     return `${BRIEF_MARK}
@@ -95,14 +121,19 @@ export function install(projectDir, cfg, force) {
     const out = [];
     const l = launcher(force);
     const entry = { command: l.command, args: l.args };
-    out.push(`  .mcp.json                 ${mergeMcpJson(join(projectDir, ".mcp.json"), entry)}   (claude code, conductor)`);
+    out.push(`  .mcp.json                 ${mergeMcpJson(join(projectDir, ".mcp.json"), entry)}   (claude code, conductor, copilot cli)`);
     out.push(`  .cursor/mcp.json          ${mergeMcpJson(join(projectDir, ".cursor", "mcp.json"), entry)}   (cursor)`);
+    const vscodeDir = join(projectDir, ".vscode");
+    out.push(existsSync(vscodeDir) || vsCodeUserDir()
+        ? `  .vscode/mcp.json          ${mergeVsCodeMcpJson(join(vscodeDir, "mcp.json"), entry)}   (copilot in vs code)`
+        : `  .vscode/mcp.json          ${"skipped".padEnd(9)} no .vscode/ here and no VS Code on this machine   (a VS Code user runs pantheon install --user)`);
     for (const f of ["CLAUDE.md", "AGENTS.md"]) {
         const p = join(projectDir, f);
         if (existsSync(p) || f === "AGENTS.md")
             out.push(`  ${f.padEnd(25)} ${upsertBrief(p, cfg)}   (the collaboration brief)`);
     }
     out.push("");
+    out.push("  Copilot asks once to trust this folder before it reads the repo's MCP servers and hooks.");
     out.push("  Codex reads ~/.codex/config.toml, which `pantheon join` already wrote at user scope.");
     out.push("  If you need it by hand, this is the block (absolute path so a GUI launch finds it):");
     out.push("");
@@ -172,11 +203,44 @@ function cursorUserScope(entry) {
         return { tool: "cursor", where: file, status: `failed: ${e.message}` };
     }
 }
+function copilotUserScope(entry) {
+    const tool = "copilot";
+    const file = copilotMcpConfigFile();
+    let present = existsSync(dirname(file));
+    if (!present) {
+        try {
+            execFileSync("sh", ["-lc", "command -v copilot"], { stdio: "ignore" });
+            present = true;
+        }
+        catch { }
+    }
+    if (!present)
+        return { tool, where: "-", status: "skipped (copilot not on PATH)" };
+    try {
+        return { tool, where: file, status: mergeMcpJson(file, entry, COPILOT_ENTRY_SHAPE) };
+    }
+    catch (e) {
+        return { tool, where: file, status: `failed: ${e.message}` };
+    }
+}
+function vsCodeUserScope(entry) {
+    const tool = "vs code";
+    const dir = vsCodeUserDir();
+    if (!dir)
+        return { tool, where: "-", status: "skipped (VS Code not found)" };
+    const file = join(dir, "mcp.json");
+    try {
+        return { tool, where: file, status: mergeVsCodeMcpJson(file, entry) };
+    }
+    catch (e) {
+        return { tool, where: file, status: `failed: ${e.message}` };
+    }
+}
 export const CODEX_APPROVAL_LINE = `default_tools_approval_mode = "approve"`;
 export function approvalSummary(approval) {
     return approval === "ask-before-sending"
         ? `your agent asks you before each send, goal or claim in your name; reading and waiting run without a prompt. Unattended runs keep their own per-run approvals — this governs the agent you sit in front of`
-        : `pantheon's ${PANTHEON_TOOL_NAMES.length} tools run without a per-call prompt in Claude Code, Cursor and Codex — your agent coordinates for you without stopping to ask`;
+        : `pantheon's ${PANTHEON_TOOL_NAMES.length} tools run without a per-call prompt in Claude Code, Cursor and Codex — your agent coordinates for you without stopping to ask. Copilot has no allow-list file: it asks once per tool per folder and remembers your answer`;
 }
 export function codexTomlBlock(entry, env = { PANTHEON_AGENT: "codex" }, approval = "approve") {
     const envToml = Object.entries(env)
@@ -374,6 +438,7 @@ export function installForUser(approval = chosenApproval()) {
     const entry = userEntry();
     return [
         claudeUserScope(entry), cursorUserScope(entry), codexUserScope(entry, approval),
+        copilotUserScope(entry), vsCodeUserScope(entry),
         ...grantToolPermissions(approval).map((g) => ({
             tool: g.tool,
             where: g.tool.startsWith("claude") ? claudeSettingsFile() : cursorCliConfigFile(),

package/dist/machine.js

@@ -4,6 +4,7 @@ import { homedir, platform } from "node:os";
 import { join } from "node:path";
 import { CONFIG_DIR } from "./config.js";
 import { plistPath } from "./service.js";
+import { copilotMcpConfigFile, vsCodeUserDir } from "./install.js";
 const sh = (cmd) => {
     try {
         return execFileSync("sh", ["-lc", cmd], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim() || null;
@@ -109,6 +110,16 @@ export function wiring() {
         tool: "codex",
         state: existsSync(codex) && /\[mcp_servers\.pantheon\]/.test(readFileSync(codex, "utf8")) ? "wired" : "not wired",
     });
+    const copilot = copilotMcpConfigFile();
+    out.push({
+        tool: "copilot",
+        state: existsSync(copilot) && /"pantheon"/.test(readFileSync(copilot, "utf8")) ? "wired" : "not wired",
+    });
+    const vscodeDir = vsCodeUserDir();
+    if (vscodeDir) {
+        const f = join(vscodeDir, "mcp.json");
+        out.push({ tool: "vs code", state: existsSync(f) && /"pantheon"/.test(readFileSync(f, "utf8")) ? "wired" : "not wired" });
+    }
     return out;
 }
 export function logFileFor(kind, proc) {

package/dist/measure.js

@@ -3,7 +3,9 @@ import { existsSync } from "node:fs";
 import { resolve, dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { claudeGrantedEffective, cursorGrantedEffective, claudeAllow, cursorAllow, isServerWide } from "./grants.js";
-import { codexApprovalState } from "./install.js";
+import { codexApprovalState, copilotMcpConfigFile } from "./install.js";
+import { existsSync as fileExists, readFileSync } from "node:fs";
+import { dirname as dirOf } from "node:path";
 import { PANTHEON_TOOL_NAMES, WRITE_TOOL_NAMES } from "./tools.js";
 const ROOT = process.env.PANTHEON_MCP_ROOT ?? resolve(dirname(fileURLToPath(import.meta.url)), "..");
 export const HOST_STARTUP_ALLOWANCE_MS = 10_000;
@@ -157,12 +159,24 @@ export function toolsReport(registered, seen, approval, opts = {}) {
             problems.push("Codex's per-tool overrides do not match your choice");
         }
     }
-    const detail = `${head}; ${claude.text}, ${cursor.text}, ${codex}`;
+    const copilot = seen.copilot === undefined || seen.copilot === null ? null
+        : seen.copilot ? "Copilot wired (it asks once per tool per folder and remembers)" : "Copilot has no pantheon entry";
+    const detail = `${head}; ${claude.text}, ${cursor.text}, ${codex}${copilot ? `, ${copilot}` : ""}`;
     if (!problems.length)
         return { level: "pass", detail };
     return { level: "warn", detail, fix: `${problems.join("; ")} — pantheon install --user rewrites every grant in your own settings to match this build and your approval choice; a rule in this repo's .claude/settings*.json or .cursor/cli.json is yours to edit by hand` };
 }
 export function grantsSeen(projectDir = null) {
-    return { claude: claudeGrantedEffective(projectDir), cursor: cursorGrantedEffective(projectDir), codex: codexApprovalState() };
+    return { claude: claudeGrantedEffective(projectDir), cursor: cursorGrantedEffective(projectDir), codex: codexApprovalState(), copilot: copilotWired() };
+}
+export function copilotWired(file = copilotMcpConfigFile()) {
+    if (!fileExists(dirOf(file)))
+        return null;
+    try {
+        return fileExists(file) && /"pantheon"/.test(readFileSync(file, "utf8"));
+    }
+    catch {
+        return false;
+    }
 }
 //# sourceMappingURL=measure.js.map

package/dist/notice.js

@@ -1,10 +1,11 @@
 import { decisionPrompt, decisionTitle } from "./decision-ui.js";
-export const TOOL_LABELS = { "claude-code": "Claude Code", codex: "Codex", cursor: "Cursor", grok: "Grok" };
+export const TOOL_LABELS = { "claude-code": "Claude Code", codex: "Codex", cursor: "Cursor", copilot: "Copilot", grok: "Grok" };
 export const APP_TOOLS = [
     { id: "cursor-app", label: "Cursor app", kind: "app", bundle: "com.todesktop.230313mzl4w4u92", deeplink: "cursor://anysphere.cursor-deeplink/prompt?text={prompt}" },
     { id: "claude-app", label: "Claude app · question copied", kind: "app", bundle: "com.anthropic.claudefordesktop" },
     { id: "chatgpt-app", label: "ChatGPT app · question copied", kind: "app", bundle: "com.openai.chat" },
     { id: "codex-app", label: "Codex app · question copied", kind: "app", bundle: "com.openai.codex" },
+    { id: "vscode-app", label: "VS Code · question copied", kind: "app", bundle: "com.microsoft.VSCode" },
 ];
 export const BUDGET = { who: 60, heading: 40, context: 70, body: 190 };
 const oneLine = (s) => s.replace(/\s+/g, " ").trim();
@@ -64,6 +65,8 @@ const agentLabel = (agent) => {
         return "Codex";
     if (a.includes("cursor"))
         return "Cursor";
+    if (a.includes("copilot"))
+        return "Copilot";
     return null;
 };
 function whoLine(from, agent, ts, now) {
@@ -95,7 +98,7 @@ export function composeDecision(o, act, goal, peer, ctx) {
         body: fit(body, BUDGET.body),
         ttl: 0,
         sound: true,
-        primary: primaryFor(ctx.tools, ctx.preferred, decisionPrompt(o.id)),
+        primary: primaryFor(ctx.tools, ctx.preferred, decisionPrompt(o.id, decisionTitle(o.body))),
         details: { decision: o.id, ...(act ? { act: act.id } : {}) },
     };
 }

package/dist/notifier.js

@@ -99,6 +99,7 @@ export function installedTools() {
             "claude-app": ["/Applications/Claude.app", join(homedir(), "Applications", "Claude.app")],
             "chatgpt-app": ["/Applications/ChatGPT.app", join(homedir(), "Applications", "ChatGPT.app")],
             "codex-app": ["/Applications/Codex.app", join(homedir(), "Applications", "Codex.app")],
+            "vscode-app": ["/Applications/Visual Studio Code.app", join(homedir(), "Applications", "Visual Studio Code.app")],
         };
         for (const t of APP_TOOLS)
             if ((APP_PATHS[t.id] ?? []).some((p) => existsSync(p)))

package/dist/notify.js

@@ -3,7 +3,7 @@ import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { whichPantheon } from "./service.js";
 import { detectForHooks, agentById } from "./agents.js";
-import { codexHookState, cursorHookState, installCodexHooks, installCursorHooks, removeCodexHooks, removeCursorHooks, } from "./hooks-install.js";
+import { codexHookState, cursorHookState, copilotHookState, installCodexHooks, installCursorHooks, installCopilotHooks, removeCodexHooks, removeCursorHooks, removeCopilotHooks, } from "./hooks-install.js";
 export const HOOK_MARKER = "pantheon hook";
 export function settingsPath(scope, projectDir = process.cwd()) {
     return scope === "user"
@@ -93,6 +93,9 @@ export function agentHookStates(projectDir = process.cwd(), only) {
         const cursor = cursorHookState(scope, projectDir);
         if (cursor.installed)
             out.push(cursor);
+        const copilot = copilotHookState(scope, projectDir);
+        if (copilot.installed)
+            out.push(copilot);
     }
     const byAgent = new Map();
     for (const s of out) {
@@ -116,6 +119,8 @@ export function repairHook(home) {
             missing.push(id);
         if (id === "cursor" && !cursorHookState(intent.scope, projectDir).installed)
             missing.push(id);
+        if (id === "copilot" && !copilotHookState(intent.scope, projectDir).installed)
+            missing.push(id);
     }
     if (!missing.length)
         return null;
@@ -165,7 +170,7 @@ export function installHooks(scope, projectDir = process.cwd(), only) {
         ? only.map((id) => agentById(id)).filter((b) => !!b)
         : available;
     if (!pick.length) {
-        throw new Error("no agent found — install claude, codex, or cursor-agent, or open a project that already uses one");
+        throw new Error("no agent found — install claude, codex, cursor-agent, or copilot, or open a project that already uses one");
     }
     const lines = [];
     const agents = [];
@@ -183,6 +188,10 @@ export function installHooks(scope, projectDir = process.cwd(), only) {
             lines.push(...installCursorHooks(bin, scope, projectDir));
             agents.push("cursor");
         }
+        else if (backend.id === "copilot") {
+            lines.push(...installCopilotHooks(bin, scope, projectDir));
+            agents.push("copilot");
+        }
     }
     lines.push(`  effect     when your agent tries to finish, it checks whether a peer is waiting`, `             on you — and keeps going instead of leaving them hanging.`, `             it also reports when a turn starts and ends, so a worker can tell`, `             an idle editor from one you are actually using.`);
     return { lines, agents };
@@ -195,6 +204,7 @@ export function removeHook(projectDir = process.cwd()) {
     out.push(...removeClaudeHook(projectDir));
     out.push(...removeCodexHooks(projectDir));
     out.push(...removeCursorHooks(projectDir));
+    out.push(...removeCopilotHooks(projectDir));
     return out.length ? out : ["  nothing installed"];
 }
 function removeClaudeHook(projectDir = process.cwd()) {

package/dist/persona.js

@@ -170,7 +170,7 @@ export const PERSONA_TEMPLATE = `---
 # wake_by: alice, bob          # only these peers' requests are handled by this persona
 # kinds: ANSWER, ACCEPT        # ANSWER (asks), ACCEPT (verdicts), REVISE (objections), CONTINUE (replies/deliveries)
 # goals: launch-*              # only goals whose id or title matches
-# agent: auto                  # claude-code | codex | cursor | auto
+# agent: auto                  # claude-code | codex | cursor | copilot | auto
 ---
 Say how this worker should behave when it is woken while you are away — what it
 should take on, what it should refuse, and where its judgment ends and yours

package/dist/profile.js

@@ -1,11 +1,12 @@
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { CONFIG_DIR } from "./config.js";
-export const AGENT_SURFACES = ["codex", "claude-code", "cursor"];
+export const AGENT_SURFACES = ["codex", "claude-code", "cursor", "copilot"];
 export const SURFACE_BUNDLE_IDS = {
     codex: "com.openai.codex",
     "claude-code": "com.anthropic.claudefordesktop",
     cursor: "com.todesktop.230313mzl4w4u92",
+    copilot: "com.microsoft.VSCode",
 };
 export const profilePath = (home = CONFIG_DIR) => join(home, "profile.json");
 export function isAgentSurface(value) {
@@ -14,6 +15,8 @@ export function isAgentSurface(value) {
 export function surfaceFromAgent(agent) {
     if (agent && /cursor/i.test(agent))
         return "cursor";
+    if (agent && /copilot/i.test(agent))
+        return "copilot";
     if (agent && /claude/i.test(agent))
         return "claude-code";
     return "codex";

package/dist/run-failure.js

@@ -1,4 +1,11 @@
 import { execFileSync } from "node:child_process";
+export const AUTH_RE = /not (?:logged|signed) in|not authenticated|no (?:github )?(?:authentication|credentials?|token) (?:found|available)|login required|please (?:log|sign) in|run .*login|invalid api key|unauthori[sz]ed|authentication (?:failed|required)|\b401\b|expired (?:token|session)/i;
+export const SIGN_IN_FIX = {
+    "claude-code": "run `claude`, then /login",
+    codex: "run `codex login`",
+    cursor: "run `cursor-agent login`",
+    copilot: "run `copilot login` (or `gh auth login` — copilot uses gh's sign-in too)",
+};
 const sh = (dir, ...args) => execFileSync("git", ["-C", dir, ...args], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 5_000 }).trim();
 export const gitProbe = {
     isRepo: (dir) => { try {
@@ -42,6 +49,14 @@ catch {
     return fallback;
 } };
 export function diagnoseRun(f, probe = gitProbe) {
+    if (!f.exited && AUTH_RE.test(f.detail)) {
+        const fix = SIGN_IN_FIX[f.agent ?? ""] ?? "sign in to the agent CLI on this machine";
+        return {
+            cause: "not_signed_in",
+            says: `The agent could not start because nobody is signed in to it${f.agent ? ` (${f.agent})` : ""} — ${exitLine(f.detail)}.`,
+            fix: `Sign in once and the next run works: ${fix}. Until then every woken run on this machine fails the same way.`,
+        };
+    }
     if (!f.exited) {
         return {
             cause: "crashed",

package/dist/setup-guide.js

@@ -195,7 +195,7 @@ export async function runGuide(io, ctx, deps = {}, preset = {}) {
                     : "only people you approve by hand (pantheon admit <name> --may-wake)"}`);
         io.say(`  • Alerts: ${shortAlert(a.notifications).toLowerCase()}`);
         io.say(`  • Approval: ${a.approval === "approve"
-            ? "your agent sends to teammates in your name without asking each time (Claude Code, Cursor and Codex)"
+            ? "your agent sends to teammates in your name without asking each time (Claude Code, Cursor and Codex; Copilot asks once per tool per folder)"
             : "your agent asks you before each send, goal and claim; reading and waiting never prompt"}`);
         io.say(`  • Decisions: ${a.decides.length ? `you personally decide ${a.decides.join(", ")}` : "none reserved for you — your agent may decide; add an area when one comes up"}`);
         if (a.wake !== "no" && ctx.project)

package/dist/tray.js

@@ -86,6 +86,7 @@ export async function trayStatus(cfg = load(), f = loadAll()) {
         return {
             ...first,
             space: ok.map((p) => p.space).join(" · "),
+            spaces: ok.map((p) => p.space),
             relay_ok: ok.every((p) => p.relay_ok),
             decisions_ok: ok.every((p) => p.decisions_ok),
             unavailable_spaces: ok.flatMap((p) => p.unavailable_spaces ?? []),
@@ -117,11 +118,11 @@ async function trayStatusOne(cfg) {
     const mineHuman = all.filter((o) => o.owner === `human:${cfg.member}`);
     const decisionsOk = ok;
     const decisions = mineHuman
-        .map((o) => ({ id: o.id, body: decisionTitle(o.body), detail: o.body, prompt: decisionPrompt(o.id) }));
+        .map((o) => ({ id: o.id, body: decisionTitle(o.body), detail: o.body, prompt: decisionPrompt(o.id, decisionTitle(o.body)) }));
     const senderOf = (o) => stripCeremony(o.body).from;
     const row = (o, kind, who, prompt) => ({
         id: o.id, kind, title: decisionTitle(o.body), headline: decisionTitle(o.body, 200), detail: o.body, prompt, who,
-        when: o.created_at ?? 0,
+        when: o.created_at ?? 0, space: cfg.space,
         ...(o.goal ? { goal: o.goal } : {}),
         ...(o.ref ? { ref: o.ref } : {}),
     });
@@ -130,7 +131,7 @@ async function trayStatusOne(cfg) {
     const items = [
         ...mineHuman.map((o) => {
             const from = senderOf(o);
-            return row(o, "decision", !from || from === cfg.member ? "your agent" : from, decisionPrompt(o.id));
+            return row(o, "decision", !from || from === cfg.member ? "your agent" : from, decisionPrompt(o.id, decisionTitle(o.body)));
         }),
         ...owed.map((o) => row(o, "owed", "you", owedPrompt(decisionTitle(o.body), o.goal))),
         ...waiting.map((o) => {
@@ -143,12 +144,13 @@ async function trayStatusOne(cfg) {
     ];
     const profile = loadProfile(cfg);
     const surface = profile.agent.primary_surface;
-    const surfaceName = surface === "claude-code" ? "Claude" : surface === "cursor" ? "Cursor" : "Codex";
+    const surfaceName = surface === "claude-code" ? "Claude" : surface === "cursor" ? "Cursor" : surface === "copilot" ? "Copilot" : "Codex";
     const rawWorkerState = workerState();
     return {
         configured: true,
         version: VERSION,
         space: cfg.space,
+        spaces: [cfg.space],
         member: cfg.member,
         relay: cfg.relay,
         relay_ok: !!space,

package/dist/worker.js

@@ -4,7 +4,7 @@ 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 { VERSION } from "./version.js";
 import { applyAnswer, loadPolicy, mayAsk, needsSelfUpgrade, recordAsk, savePolicy, useGrant, } from "./worker-policy.js";
 import { agentHookStates, repairHook } from "./notify.js";
@@ -191,6 +191,7 @@ export function answerWindow(askSeq, hint, fullScanDue) {
 export class Worker {
     cfg;
     opts;
+    lastAgentSaid = "";
     running = false;
     done = [];
     stopped = false;
@@ -329,8 +330,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 +580,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 +596,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(" ")}…`);
@@ -629,7 +637,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;