@join-pantheon/cli 0.28.0 → 0.29.1

package/dist/install.js

@@ -3,7 +3,7 @@ import { execFileSync } from "node:child_process";
 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";
+import { grantClaudeToolPermissions, grantCursorToolPermissions, claudeSettingsFile, cursorCliConfigFile } from "./grants.js";
 import { PANTHEON_TOOL_NAMES, WRITE_TOOL_NAMES, toolsAllowed } from "./tools.js";
 import { load } from "./config.js";
 import { loadProfile } from "./profile.js";
@@ -237,8 +237,17 @@ function claudeLocalScope(entry, projectDir) {
         return { tool, where: "local scope", status: `failed: ${e.message.split("\n")[0]}` };
     }
 }
-function cursorUserScope(entry) {
+export function agentPresence(home = homedir(), onPath = onPathNamed) {
+    return {
+        claude: existsSync(join(home, ".claude")) || onPath("claude"),
+        cursor: existsSync(join(home, ".cursor")) || onPath("cursor-agent"),
+        codex: existsSync(join(home, ".codex")) || onPath("codex"),
+    };
+}
+function cursorUserScope(entry, present = true) {
     const file = join(homedir(), ".cursor", "mcp.json");
+    if (!present)
+        return { tool: "cursor", where: "-", status: "skipped (Cursor not found on this machine)" };
     try {
         return { tool: "cursor", where: file, status: mergeMcpJson(file, entry) };
     }
@@ -339,10 +348,94 @@ function isOurToolTable(t) {
     return keys.length === 1 && /^approval_mode\s*=\s*"prompt"\s*$/.test(keys[0]);
 }
 const toolOf = (t) => (t.name && TOOL_TABLE.exec(t.name)?.[1]) ?? null;
+const ENV_TABLE = `${SERVER_TABLE}.env`;
+const isServerSubTable = (t) => !!t.name && t.name.startsWith(`${SERVER_TABLE}.`) && !toolOf(t) && !t.name.startsWith(`${SERVER_TABLE}.tools.`);
+const DOTTED_ENV = /^\s*env\s*\.\s*(.+?)\s*=\s*(.*)$/;
+function tomlValue(raw) {
+    const v = raw.trim();
+    const q = /^("(?:[^"\\]|\\.)*"|'[^']*')\s*(#.*)?$/.exec(v);
+    if (q)
+        return q[1];
+    return v.replace(/\s+#.*$/, "").trim();
+}
+function splitInline(body) {
+    const out = [];
+    let cur = "", quote = null, depth = 0;
+    for (let i = 0; i < body.length; i++) {
+        const ch = body[i];
+        if (quote) {
+            cur += ch;
+            if (ch === "\\" && quote === '"') {
+                cur += body[++i] ?? "";
+                continue;
+            }
+            if (ch === quote)
+                quote = null;
+            continue;
+        }
+        if (ch === '"' || ch === "'") {
+            quote = ch;
+            cur += ch;
+            continue;
+        }
+        if (ch === "[" || ch === "{")
+            depth++;
+        if (ch === "]" || ch === "}")
+            depth--;
+        if (ch === "," && depth === 0) {
+            if (cur.trim())
+                out.push(cur.trim());
+            cur = "";
+            continue;
+        }
+        cur += ch;
+    }
+    if (cur.trim())
+        out.push(cur.trim());
+    return out;
+}
+function hasMultiline(lines) {
+    return lines.some((l) => {
+        const i = l.indexOf("=");
+        if (i <= 0 || l.trim().startsWith("#"))
+            return false;
+        const v = l.slice(i + 1).trim();
+        return ['"""', "'''"].some((d) => v.startsWith(d) && !v.slice(3).includes(d));
+    });
+}
+function theirEnv(tables) {
+    const out = [];
+    for (const t of tables) {
+        if (t.name === ENV_TABLE) {
+            for (const l of keyLines(t)) {
+                const i = l.indexOf("=");
+                if (i > 0)
+                    out.push([l.slice(0, i).trim(), tomlValue(l.slice(i + 1))]);
+            }
+        }
+        if (t.name === SERVER_TABLE) {
+            for (const l of t.lines.slice(1)) {
+                if (l.trim().startsWith("#"))
+                    continue;
+                const m = DOTTED_ENV.exec(l);
+                if (m)
+                    out.push([m[1].trim(), tomlValue(m[2])]);
+                const inline = /^\s*env\s*=\s*\{(.*)\}\s*(#.*)?$/.exec(l);
+                if (inline)
+                    for (const pair of splitInline(inline[1])) {
+                        const i = pair.indexOf("=");
+                        if (i > 0)
+                            out.push([pair.slice(0, i).trim(), pair.slice(i + 1).trim()]);
+                    }
+            }
+        }
+    }
+    return out.filter(([k]) => k.replace(/^["']|["']$/g, "") !== "PANTHEON_AGENT");
+}
 export function codexKept(current, approval = "approve") {
     const tables = parseTables(current);
     const server = tables.find((t) => t.name === SERVER_TABLE);
-    const serverKeys = server ? keyLines(server).filter((l) => !OUR_SERVER_KEYS.test(l)).map((l) => l.split("=")[0].trim()) : [];
+    const serverKeys = server ? keyLines(server).filter((l) => !OUR_SERVER_KEYS.test(l) && !DOTTED_ENV.test(l)).map((l) => l.split("=")[0].trim()) : [];
     const theirs = tables.filter((t) => toolOf(t) && !isOurToolTable(t));
     const ownApproval = approval === "ask-before-sending"
         ? theirs.filter((t) => WRITE_TOOL_NAMES.includes(toolOf(t)) && keyLines(t).some((l) => !marked(l) && /^approval_mode\s*=/.test(l))).map((t) => toolOf(t))
@@ -352,11 +445,21 @@ export function codexKept(current, approval = "approve") {
 export function upsertCodexToml(current, entry, approval = "approve") {
     const tables = parseTables(current);
     const server = tables.find((t) => t.name === SERVER_TABLE);
-    const kept = server ? server.lines.slice(1).filter((l) => l.trim() && !OUR_SERVER_KEYS.test(l)) : [];
+    const envTable = tables.find((t) => t.name === ENV_TABLE);
+    const tableMode = !!envTable && hasMultiline(envTable.lines.slice(1));
+    const dottedMode = !tableMode && !!server && hasMultiline(server.lines.slice(1).filter((l) => DOTTED_ENV.test(l)));
+    const OUR_DOTTED = /^\s*env\s*\.\s*["']?PANTHEON_AGENT["']?\s*=/;
+    const kept = server ? server.lines.slice(1).filter((l) => (dottedMode || l.trim()) && !marked(l) && !OUR_SERVER_KEYS.test(l) && (dottedMode ? !OUR_DOTTED.test(l) : !DOTTED_ENV.test(l))) : [];
+    while (kept.length && !kept[kept.length - 1].trim())
+        kept.pop();
     const theirsFor = new Map(tables.filter((t) => toolOf(t) && !isOurToolTable(t)).map((t) => [toolOf(t), t]));
     const wantPrompt = approval === "ask-before-sending" ? WRITE_TOOL_NAMES : [];
+    const extraEnv = tableMode || dottedMode ? [] : theirEnv(tables);
+    const envLine = `env = { ${[`PANTHEON_AGENT = "codex"`, ...extraEnv.map(([k, v]) => `${k} = ${v}`)].join(", ")} }`;
     const ourBlock = () => {
-        const out = [...codexTomlBlock(entry, undefined, "approve").split("\n"), ...kept];
+        const block = codexTomlBlock(entry, undefined, "approve").split("\n")
+            .flatMap((l) => !/^env = /.test(l) ? [l] : tableMode ? [] : dottedMode ? [`env.PANTHEON_AGENT = "codex"  ${OURS_MARK}`] : [envLine]);
+        const out = [...block, ...kept];
         for (const t of wantPrompt)
             if (!theirsFor.has(t))
                 out.push("", ...ourToolTable(t));
@@ -385,6 +488,13 @@ export function upsertCodexToml(current, entry, approval = "approve") {
             placed = true;
             continue;
         }
+        if (t.name === ENV_TABLE) {
+            if (!tableMode)
+                continue;
+            const OUR_KEY = /^\s*["']?PANTHEON_AGENT["']?\s*=/;
+            out.push(t.lines[0], `PANTHEON_AGENT = "codex"  ${OURS_MARK}`, ...t.lines.slice(1).filter((l) => !marked(l) && !OUR_KEY.test(l)));
+            continue;
+        }
         if (toolOf(t)) {
             if (isOurToolTable(t))
                 continue;
@@ -403,10 +513,16 @@ export function removeCodexToml(current) {
     for (const t of parseTables(current)) {
         if (t.name === SERVER_TABLE)
             continue;
+        if (isServerSubTable(t))
+            continue;
         if (toolOf(t)) {
             if (isOurToolTable(t))
                 continue;
-            out.push(...t.lines.filter((l) => !marked(l)));
+            const lines = t.lines.filter((l) => !marked(l));
+            if (!lines.slice(1).some((l) => l.trim() && !l.trim().startsWith("#")))
+                continue;
+            out.push(`# ${OURS_MARK.slice(2)} leave: kept your setting below, commented out — [mcp_servers.pantheon] is gone, and this table alone would stop Codex starting`);
+            out.push(...lines.map((l) => (l.trim() ? `# ${l}` : l)));
             continue;
         }
         out.push(...t.lines);
@@ -437,8 +553,10 @@ export function codexApprovalState(file = codexConfigFile()) {
         return null;
     }
 }
-function codexUserScope(entry, approval) {
+function codexUserScope(entry, approval, present = true) {
     const file = codexConfigFile();
+    if (!present)
+        return { tool: "codex", where: "-", status: "skipped (Codex not found on this machine)" };
     const said = approval === "ask-before-sending"
         ? `${CODEX_APPROVAL_LINE}, with send/open_goal/claim set to prompt`
         : CODEX_APPROVAL_LINE;
@@ -487,18 +605,100 @@ export function chosenApproval() {
         return "approve";
     }
 }
-export function installForUser(approval = chosenApproval()) {
+export function installForUser(approval = chosenApproval(), present = agentPresence()) {
     const entry = userEntry();
+    const said = (s) => /^(granted|already granted)/.test(s)
+        ? `${s} — ${approval === "ask-before-sending" ? "reads run without asking; send, open_goal and claim prompt" : `the ${PANTHEON_TOOL_NAMES.length} pantheon tools run without asking`}`
+        : s;
     return [
-        claudeUserScope(entry), cursorUserScope(entry), codexUserScope(entry, approval),
+        claudeUserScope(entry), cursorUserScope(entry, present.cursor), codexUserScope(entry, approval, present.codex),
         copilotUserScope(entry), vsCodeUserScope(entry), kiroUserScope(entry, approval),
-        ...grantToolPermissions(approval).map((g) => ({
-            tool: g.tool,
-            where: g.tool.startsWith("claude") ? claudeSettingsFile() : cursorCliConfigFile(),
-            status: /^(granted|already granted)/.test(g.status)
-                ? `${g.status} — ${approval === "ask-before-sending" ? "reads run without asking; send, open_goal and claim prompt" : `the ${PANTHEON_TOOL_NAMES.length} pantheon tools run without asking`}`
-                : g.status,
-        })),
+        present.claude
+            ? { tool: "claude perms", where: claudeSettingsFile(), status: said(grantClaudeToolPermissions(undefined, approval)) }
+            : { tool: "claude perms", where: "-", status: "skipped (Claude Code not found on this machine)" },
+        present.cursor
+            ? { tool: "cursor perms", where: cursorCliConfigFile(), status: said(grantCursorToolPermissions(undefined, approval)) }
+            : { tool: "cursor perms", where: "-", status: "skipped (Cursor not found on this machine)" },
+    ];
+}
+export function isOurMcpEntry(e) {
+    if (!e || typeof e !== "object")
+        return false;
+    const { command, args } = e;
+    if (typeof command !== "string" || !Array.isArray(args) || args.at(-1) !== "mcp")
+        return false;
+    const base = command.split(/[\\/]/).pop() ?? "";
+    if (/^pantheon(\.cmd|\.exe)?$/i.test(base))
+        return true;
+    return args.length >= 2 && typeof args[0] === "string" && /[\\/]cli\.js$/.test(args[0]);
+}
+export function removeMcpJsonEntry(file, key = "mcpServers") {
+    try {
+        if (!existsSync(file))
+            return "absent";
+        const doc = readConfigJson(file);
+        const servers = doc[key];
+        if (!servers || !("pantheon" in servers))
+            return "absent";
+        if (!isOurMcpEntry(servers["pantheon"]))
+            return "not ours";
+        delete servers["pantheon"];
+        writeFileSync(file, JSON.stringify(doc, null, 2) + "\n");
+        return "removed";
+    }
+    catch (e) {
+        return `failed: ${e.message}`;
+    }
+}
+export function removeUserMcpEntries(deps = {}) {
+    const removed = [], left = [];
+    const home = deps.home ?? homedir();
+    const exec = deps.exec ?? ((c, a, o) => execFileSync(c, a, { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"], ...o }) ?? "");
+    const os = deps.os ?? platform();
+    const claudeBin = deps.claudeBin === undefined ? which("claude") : deps.claudeBin;
+    const claudeRemove = (scope, what, cwd) => {
+        const rm = agentSpawn(claudeBin, ["mcp", "remove", "pantheon", "-s", scope], os);
+        try {
+            exec(rm.command, rm.args, { ...rm.options, ...(cwd ? { cwd } : {}) });
+            removed.push(what);
+        }
+        catch (e) {
+            const err = e;
+            const text = `${err.message} ${String(err.stderr ?? "")}`;
+            if (!/not found|no mcp server|does not exist/i.test(text))
+                left.push(`${what} (${text.trim().split("\n")[0]}) — remove it: ${cwd ? `in ${cwd}, ` : ""}claude mcp remove pantheon -s ${scope}`);
+        }
+    };
+    if (claudeBin) {
+        claudeRemove("user", "Claude Code's pantheon MCP server (user scope)");
+        if (os === "win32" && deps.project)
+            claudeRemove("local", `Claude Code's pantheon entry for ${deps.project} (local scope)`, deps.project);
+    }
+    else if (os === "win32" && deps.project) {
+        left.push(`any Claude Code entry for ${deps.project} (local scope) — claude is not on PATH here; once it is: claude mcp remove pantheon -s local, run in that folder`);
+    }
+    const files = [
+        ["Cursor", join(home, ".cursor", "mcp.json"), "mcpServers"],
+        ["Copilot", copilotMcpConfigFile(home), "mcpServers"],
+        ["Kiro", kiroMcpConfigFile(home), "mcpServers"],
     ];
+    const vs = vsCodeUserDir(home);
+    if (vs)
+        files.push(["VS Code", join(vs, "mcp.json"), "servers"]);
+    for (const [who, file, key] of files) {
+        const r = removeMcpJsonEntry(file, key);
+        if (r === "removed")
+            removed.push(`${who}'s pantheon MCP entry (${file})`);
+        else if (r === "not ours")
+            left.push(`an entry named "pantheon" in ${file} that Pantheon did not write — yours to keep or delete`);
+        else if (r !== "absent")
+            left.push(`${who}'s pantheon MCP entry — ${r}; delete the "pantheon" server from ${file} by hand`);
+    }
+    const codex = removeCodexUserScope(deps.codexFile ?? join(home, ".codex", "config.toml"));
+    if (codex && /removed/.test(codex))
+        removed.push(codex.trim().replace(/^removed /, "Codex's "));
+    else if (codex)
+        left.push(codex.trim());
+    return { removed, left };
 }
 //# sourceMappingURL=install.js.map

package/dist/kiro-files.js

@@ -1,15 +1,27 @@
+import { execFileSync } from "node:child_process";
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, join } from "node:path";
+import { basename, dirname, join } from "node:path";
 export const kiroDir = (home = homedir(), env = process.env) => env.KIRO_HOME || join(home, ".kiro");
 export const KIRO_AGENT_NAME = "pantheon";
 export const kiroAgentFile = (kiroBase) => join(kiroBase, "agents", `${KIRO_AGENT_NAME}.json`);
 export const isOurKiroHook = (cmd) => !!cmd && /\bhook\s+kiro-(?:prompt|stop)\b/.test(cmd);
 export const kiroAllowed = (tools) => tools.map((t) => `@pantheon/${t}`);
+export const KIRO_AGENT_MARKER = "[written by pantheon: kiro-agent/1]";
+const KIRO_AGENT_DESCRIPTION = "Kiro's default agent, plus Pantheon: its tools run without asking, and a turn is held open while a teammate is waiting on you";
+export function gitTracks(file) {
+    try {
+        execFileSync("git", ["-C", dirname(file), "ls-files", "--error-unmatch", "--", basename(file)], { stdio: "ignore", timeout: 5_000 });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 export function kiroAgentDoc(bin, allowed) {
     return {
         name: KIRO_AGENT_NAME,
-        description: "Kiro's default agent, plus Pantheon: its tools run without asking, and a turn is held open while a teammate is waiting on you",
+        description: `${KIRO_AGENT_DESCRIPTION} ${KIRO_AGENT_MARKER}`,
         tools: ["*"],
         allowedTools: kiroAllowed(allowed),
         includeMcpJson: true,
@@ -19,16 +31,21 @@ export function kiroAgentDoc(bin, allowed) {
         },
     };
 }
-export function readKiroAgent(file) {
+export function readKiroAgent(file, tracked = gitTracks) {
     if (!existsSync(file))
         return null;
     try {
         const doc = JSON.parse(readFileSync(file, "utf8"));
-        const events = Object.entries(doc.hooks ?? {}).filter(([, es]) => (es ?? []).some((h) => isOurKiroHook(h.command))).map(([e]) => e);
-        return { doc, ours: events.length > 0, events };
+        const hooks = Object.entries(doc.hooks && typeof doc.hooks === "object" ? doc.hooks : {});
+        const events = hooks.filter(([, es]) => Array.isArray(es) && es.some((h) => isOurKiroHook(h?.command))).map(([e]) => e);
+        const onlyOurs = hooks.every(([, es]) => Array.isArray(es) && es.every((h) => isOurKiroHook(h?.command)));
+        const desc = typeof doc.description === "string" ? doc.description : "";
+        const marked = desc.includes(KIRO_AGENT_MARKER) || desc === KIRO_AGENT_DESCRIPTION;
+        const isTracked = tracked(file);
+        return { doc, ours: marked && onlyOurs && events.length > 0 && doc.name === KIRO_AGENT_NAME && !isTracked, tracked: isTracked, events };
     }
     catch {
-        return { doc: {}, ours: false, events: [] };
+        return { doc: {}, ours: false, tracked: tracked(file), events: [] };
     }
 }
 export function writeKiroAgent(file, doc) {

package/dist/ledger.js

@@ -9,7 +9,13 @@ export class Ledger {
         this.file = join(dir, `${space}.jsonl`);
         mkdirSync(dirname(this.file), { recursive: true });
         if (existsSync(this.file)) {
-            for (const line of readFileSync(this.file, "utf8").split("\n")) {
+            let text = readFileSync(this.file, "utf8");
+            if (text.length && !text.endsWith("\n")) {
+                const keep = text.lastIndexOf("\n") + 1;
+                text = text.slice(0, keep);
+                writeFileSync(this.file, text);
+            }
+            for (const line of text.split("\n")) {
                 if (!line.trim())
                     continue;
                 try {
@@ -55,7 +61,7 @@ export class Ledger {
         const cut = Math.max(0, this.records.length - opts.keepRecent);
         if (cut === 0)
             return { dropped: 0, kept: this.records.length };
-        const kept = this.records.filter((r, i) => i >= cut || opts.isLive(r.goal));
+        const kept = this.records.filter((r, i) => i >= cut || opts.isLive(r.goal) || (opts.keep?.(r.id) ?? false));
         const dropped = this.records.length - kept.length;
         if (dropped === 0)
             return { dropped: 0, kept: kept.length };