agentradar-cli 0.3.5 → 0.3.7

package/dist/index.js

@@ -1,44 +1,63 @@
 #!/usr/bin/env node
 import { createRequire } from "node:module";
+import { homedir } from "node:os";
 import { installVendorSkill } from "./skill-install.js";
 import { startChannel } from "./channel.js";
 import { runRestartSelftest, startVendorRunner } from "./runner.js";
-import { cancelJoin, CODEX_GUARD_REFUSAL, ensureCodexGuard, joinOrganisation, leaveOrganisation, setupVendorAgent } from "./setup.js";
-import { callAwpTool, callToolOverCli, createTaskOverCli, INBOX_SEARCH_USAGE, METRIC_REPORT_USAGE, PROPOSE_HUMAN_USAGE, inboxSearchOverCli, LISTING_DESCRIBE_USAGE, listServiceToolsOverCli, parseCallArgs, PERMISSION_VERB_TOOLS, runServiceToolOverCli, TASK_VERB_TOOLS } from "./tool-run.js";
+import { cancelJoin, CODEX_GUARD_REFUSAL, dropStaleMcp, ensureCodexGuard, joinOrganisation, leaveOrganisation, setupVendorAgent } from "./setup.js";
+import { callAwpTool, callToolOverCli, EXIT, parseCallArgs } from "./tool-run.js";
 import { installSyncTimer, syncAgentDir } from "./sync.js";
 import { importVaultOverCli } from "./vault-import.js";
 import { cloneVaultOverCli } from "./vault-clone.js";
 import { secretsOverCli } from "./secrets.js";
+import { adminOverCli } from "./admin.js";
 // `run` is the one prefix every agent-facing command shares, so one harness "always allow agentradar run"
 // covers a whole session: `run <link>` (or `run join <link>`) joins, `run <runner-id> <tool>` calls a tool.
 export const runArgs = (raw) => raw[0] !== "run" ? raw
     : raw[1] === "join" ? raw.slice(1)
         : /^https?:\/\//.test(raw[1] ?? "") ? ["join", ...raw.slice(1)]
             : ["call", ...raw.slice(1)];
+const USAGE = [
+    "Usage: agentradar <noun> [<sub-noun>] <verb> [--<flag> <value> | --<flag>-file <path> ...] [--dry-run] [--json] [--runner <id>]",
+    "  Every agent command comes from the server. agentradar --help lists the groups (as $AR_CLI_RUNNER_ID),",
+    "  agentradar <group> --help a group's commands, agentradar <command> --help its flags.",
+    "  Examples:",
+    "    agentradar inbox next",
+    "    agentradar channels reply --thread-id <id> --text \"On it\"",
+    "    agentradar tasks create --title \"Draft the brief\" --dry-run",
+    "  The runner is $AR_CLI_RUNNER_ID, or --runner <id>. --dry-run prints the exact call and sends nothing.",
+    "  Exit codes: 0 done; 1 refused or unreachable (the reason is on stderr); 2 the command was wrong.",
+    "Local commands:",
+    "  agentradar join <join-link> [--name <n>] [--model <m>] [--trust] [--attach-tmux <pane> | --attach-current] [--session <id>] [--no-service | --service]",
+    "  agentradar join cancel <join-link|request-id>",
+    "  agentradar setup [--trust] [--harness claude|codex]",
+    "  agentradar leave <runner-id>",
+    "  agentradar channel <runner-id>",
+    "  agentradar selftest <runner-id> [--status|--restart]",
+    "  agentradar runner start <runner-id>",
+    "  agentradar call <runner-id> <tool | command> [--<flag> <value> ...] [--args '<json>']",
+    "  agentradar vault import <runner-id> <dir> [--vault <vault-id>] [--source <name>] [--write]",
+    "  agentradar vault clone <runner-id> <vault-id> [dir]",
+    "  agentradar secrets pull|renew|env <runner-id> | agentradar secrets exec <runner-id> -- <command>",
+    "  agentradar secrets upload|rotate <runner-id> --env-file <path> | --from-env <NAME,...> | --prompt <NAME> [--replace]",
+    "  agentradar skill install | agentradar sync [dir] | agentradar sync install [dir] [--interval <s>]",
+    "  agentradar admin broadcast --dry-run|--send --target all --text <text> --cta <next step>",
+    "  agentradar upgrade | agentradar --version",
+].join("\n");
 async function main() {
     const args = runArgs(process.argv.slice(2));
     if (args.length === 1 && (args[0] === "--help" || args[0] === "-h")) {
-        console.log("Usage: agentradar run <join-link> [--name <n>] [--model <m>] | agentradar run <runner-id> <tool> [--<argument> <value> | --<argument>-file <path> ...] | agentradar setup [--trust] [--harness claude|codex] | agentradar join <join-link> [--name <n>] [--model <m>] [--trust] [--attach-tmux <pane> | --attach-current] [--session <id>] [--feeder] | agentradar join cancel <join-link|request-id> | agentradar leave <runner-id> | agentradar channel <runner-id> | agentradar selftest <runner-id> [--status|--restart] | agentradar runner start <runner-id> | agentradar tool list <runner-id> | agentradar tool run <runner-id> <tool-key> [--args '<json>'] | agentradar call <runner-id> <tool> [--<argument> <value> ...] [--args '<json>'] | agentradar task create|repeat|make-recurring <runner-id> --args '<json>' | agentradar inbox search <runner-id> [--query <text>] [--<filter> <value> ...] [--json] | agentradar listing describe <runner-id> --capabilities <text> | agentradar permissions mine|roles|set|request|grant-tool <runner-id> [--<argument> <value> ...] | agentradar vault import <runner-id> <dir> [--vault <vault-id>] [--source <name>] [--write] | agentradar vault clone <runner-id> <vault-id> [dir] | agentradar metric report <runner-id> --metric-id <id> --value <n> --period-start <iso> --period-end <iso> [--evidence <text>] | agentradar secrets pull|renew <runner-id> | agentradar secrets exec <runner-id> -- <command> | agentradar propose-human <runner-id> --name <name> --email <email> --role-id <id> | agentradar secrets upload <runner-id> --env-file <path> | --from-env <NAME,...> | --prompt <NAME> [--replace] | agentradar skill install | agentradar sync [dir] | agentradar sync install [dir] [--interval <s>]");
-        console.log([
-            "agentradar run <runner-id> <noun> <verb> [--<argument> <value> ...] [--dry-run] [--json]",
-            "  Every agent tool, grouped in AgentRadar terms: inbox, thread, message, task, metric, vault, ...",
-            "  agentradar run <runner-id> --help           the command groups",
-            "  agentradar run <runner-id> thread --help    a group's verbs",
-            "  agentradar run <runner-id> thread reply --help   one command's arguments",
-            "  Examples:",
-            "    agentradar run r1 inbox next",
-            "    agentradar run r1 thread reply --thread-id <id> --text \"On it\"",
-            "    agentradar run r1 inbox ack --message-ids <id> --message-ids <id>",
-            "    agentradar run r1 task create --title \"Draft the brief\" --dry-run",
-            "  --dry-run prints the exact call and sends nothing. Output is JSON. Exit codes: 0 done; 1 refused or",
-            "  unreachable (reason on stderr); 2 the command was wrong.",
-            "agentradar upgrade   install the latest agentradar-cli",
-        ].join("\n"));
+        console.log(USAGE);
+        // The agent's own groups, from its server, when this shell is a runner's.
+        const runner = process.env.AR_CLI_RUNNER_ID;
+        if (runner)
+            process.exitCode = await callToolOverCli(runner, "", undefined, {}, [["help", ""]]);
         return;
     }
     if (args.length === 1 && args[0] === "upgrade") {
         const { selfUpdate, runningVersion } = await import("./update.js");
         const installed = await selfUpdate();
+        await dropStaleMcp(process.cwd(), homedir());
         console.log(installed ? `agentradar upgraded to ${installed}` : `agentradar ${await runningVersion()} is the latest`);
         return;
     }
@@ -67,7 +86,7 @@ async function main() {
         await startChannel(args[1]);
         return;
     }
-    if (args[0] === "selftest" && args.length === 3 && args[2] === "--restart") {
+    if (args[0] === "selftest" && args[1] !== "run" && args.length === 3 && args[2] === "--restart") {
         // A native-channel session resumes in this terminal; print the result after it closes, not over its screen.
         const report = [];
         process.once("exit", () => { if (report.length)
@@ -75,7 +94,7 @@ async function main() {
         await runRestartSelftest(args[1], { log: (text) => report.push(text) });
         return;
     }
-    if (args[0] === "selftest" && (args.length === 2 || (args.length === 3 && args[2] === "--status"))) {
+    if (args[0] === "selftest" && args[1] !== "run" && (args.length === 2 || (args.length === 3 && args[2] === "--status"))) {
         process.exitCode = await callAwpTool(args[1], "run_selftest", { statusOnly: args[2] === "--status" }, {});
         return;
     }
@@ -107,18 +126,18 @@ async function main() {
         for (let i = 1; i < args.length; i++) {
             if (["--name", "--model", "--attach-tmux", "--session"].includes(args[i]))
                 named[args[i].slice(2)] = args[++i] ?? "-";
-            else if (!["--trust", "--attach-current", "--allow-bypass", "--revoke-bypass", "--feeder"].includes(args[i]))
+            else if (!["--trust", "--attach-current", "--allow-bypass", "--revoke-bypass", "--feeder", "--service", "--no-service"].includes(args[i]))
                 urls.push(args[i]);
         }
-        if (urls.length !== 1 || [urls[0], ...Object.values(named)].some((value) => value.startsWith("-")) || (named["attach-tmux"] && args.includes("--attach-current"))) {
-            console.error("Usage: agentradar join <join-link> [--name <your name>] [--model <your model id>] [--trust] [--attach-tmux <session[:window.pane]> | --attach-current] [--session <claude session id>] [--revoke-bypass] [--feeder]");
+        if (urls.length !== 1 || [urls[0], ...Object.values(named)].some((value) => value.startsWith("-")) || (named["attach-tmux"] && args.includes("--attach-current")) || (args.includes("--service") && args.includes("--no-service"))) {
+            console.error("Usage: agentradar join <join-link> [--name <your name>] [--model <your model id>] [--trust] [--attach-tmux <session[:window.pane]> | --attach-current (Codex and other CLIs)] [--session <claude session id>] [--revoke-bypass] [--no-service | --service]");
             process.exitCode = 1;
             return;
         }
         process.exitCode = await joinOrganisation(urls[0], {
             trust: args.includes("--trust"), agentName: named.name, model: named.model, session: named.session,
             attach: args.includes("--attach-current") ? "current" : named["attach-tmux"],
-            revokeBypass: args.includes("--revoke-bypass"), feeder: args.includes("--feeder"),
+            revokeBypass: args.includes("--revoke-bypass"), feeder: args.includes("--feeder"), service: args.includes("--service"),
         });
         return;
     }
@@ -131,21 +150,16 @@ async function main() {
         process.exitCode = await startVendorRunner(args[2]);
         return;
     }
-    if (args.length === 3 && args[0] === "tool" && args[1] === "list") {
-        process.exitCode = await listServiceToolsOverCli(args[2]);
-        return;
-    }
-    if ((args[0] === "tool" && args[1] === "run") || args[0] === "call") {
-        const call = args[0] === "call";
-        const parsed = parseCallArgs(args.slice(call ? 1 : 2));
-        if (!parsed || (!call && parsed.flags.length)) {
-            console.error(call ? "Usage: agentradar run <runner-id> <tool> [--<argument> <value> ...] [--args '<json>'] | agentradar run <runner-id> [<tool>] --help" : "Usage: agentradar tool run <runner-id> <tool-key> [--args '<json>']");
-            process.exitCode = 1;
+    if (args[0] === "call") {
+        // `call <runner-id> <tool | command>`: the runner named in place, for a shell that has no AR_CLI_RUNNER_ID.
+        const parsed = parseCallArgs(args.slice(1));
+        const [runnerId, ...words] = parsed?.words ?? [];
+        if (!parsed || !runnerId || words.length > 3 || (!words.length && !parsed.flags.some(([flag]) => flag === "help"))) {
+            console.error("Usage: agentradar call <runner-id> <tool | command> [--<flag> <value> ...] [--args '<json>'] | agentradar call <runner-id> [<command>] --help");
+            process.exitCode = EXIT.usage;
             return;
         }
-        process.exitCode = call
-            ? await callToolOverCli(parsed.runnerId, parsed.tool, parsed.json, {}, parsed.flags)
-            : await runServiceToolOverCli(parsed.runnerId, parsed.tool, parsed.json);
+        process.exitCode = await callToolOverCli(runnerId, words.join(" "), parsed.json, {}, parsed.flags);
         return;
     }
     if (args[0] === "vault" && args[1] === "import") {
@@ -168,71 +182,13 @@ async function main() {
         process.exitCode = await cloneVaultOverCli(args[2], args[3], args[4]);
         return;
     }
-    if (args[0] === "inbox" && args[1] === "search") {
-        const parsed = parseCallArgs([...args.slice(2).filter((arg) => arg !== "--json"), "inbox_search"]);
-        if (!parsed || parsed.tool !== "inbox_search") {
-            console.error(INBOX_SEARCH_USAGE);
-            process.exitCode = 1;
-            return;
-        }
-        process.exitCode = await inboxSearchOverCli(parsed.runnerId, parsed.flags, args.includes("--json"));
-        return;
-    }
-    if (args[0] === "metric" && args[1] === "report") {
-        // report_metric over the same endpoint and key: an agent's own metric, a subordinate's, or a person's below it.
-        const parsed = parseCallArgs([...args.slice(2), "report_metric"]);
-        if (!parsed || !parsed.flags.some(([flag]) => flag === "metric-id")) {
-            console.error(METRIC_REPORT_USAGE);
-            process.exitCode = 1;
-            return;
-        }
-        process.exitCode = await callToolOverCli(parsed.runnerId, parsed.tool, undefined, {}, parsed.flags);
-        return;
-    }
-    if (args[0] === "propose-human") {
-        // R013: the Chief invites a human it found into a vacant role, the MCP `propose_human` over the same endpoint and key.
-        const parsed = parseCallArgs([...args.slice(1), "propose_human"]);
-        if (!parsed || !["name", "email", "role-id"].every((k) => parsed.flags.some(([flag]) => flag === k))) {
-            console.error(PROPOSE_HUMAN_USAGE);
-            process.exitCode = 1;
-            return;
-        }
-        process.exitCode = await callToolOverCli(parsed.runnerId, parsed.tool, undefined, {}, parsed.flags);
-        return;
-    }
-    if (args[0] === "listing" && args[1] === "describe") {
-        // UAT U1: the agent's public catalog description, the MCP `set_listing_description` over the same endpoint and key.
-        const parsed = parseCallArgs([...args.slice(2), "set_listing_description"]);
-        if (!parsed || !parsed.flags.some(([flag]) => flag === "capabilities")) {
-            console.error(LISTING_DESCRIBE_USAGE);
-            process.exitCode = 1;
-            return;
-        }
-        process.exitCode = await callToolOverCli(parsed.runnerId, parsed.tool, undefined, {}, parsed.flags);
-        return;
-    }
-    if (args[0] === "permissions" && args[1] && Object.hasOwn(PERMISSION_VERB_TOOLS, args[1])) {
-        const tool = PERMISSION_VERB_TOOLS[args[1]];
-        const parsed = parseCallArgs([...args.slice(2), tool]);
-        if (!parsed || parsed.tool !== tool) {
-            console.error("Usage: agentradar permissions mine|roles|set|request|grant-tool <runner-id> [--<argument> <value> ...]");
-            process.exitCode = 1;
-            return;
-        }
-        process.exitCode = await callToolOverCli(parsed.runnerId, tool, parsed.json, {}, parsed.flags);
-        return;
-    }
-    if (args[0] === "secrets") {
+    // The local secrets verbs take the runner in place; `secrets list|upload|grant|revoke|rotate --<flag>` are the server's.
+    if (args[0] === "secrets" && ["pull", "renew", "env", "exec", "upload", "rotate"].includes(args[1] ?? "") && args[2] && !args[2].startsWith("-")) {
         process.exitCode = await secretsOverCli(args.slice(1));
         return;
     }
-    if (args[0] === "task" && args[1] && Object.hasOwn(TASK_VERB_TOOLS, args[1])) {
-        if (args.length !== 5 || args[3] !== "--args") {
-            console.error("Usage: agentradar task create|repeat|make-recurring <runner-id> --args '<json>'");
-            process.exitCode = 1;
-            return;
-        }
-        process.exitCode = await createTaskOverCli(args[2], args[1], args[4]);
+    if (args[0] === "admin") {
+        process.exitCode = await adminOverCli(args.slice(1));
         return;
     }
     if (args.length === 2 && args[0] === "skill" && args[1] === "install") {
@@ -253,13 +209,21 @@ async function main() {
         return;
     }
     if (args[0] === "sync" && args.length <= 2) {
+        await dropStaleMcp(args[1] ?? process.cwd(), homedir());
         process.exitCode = await syncAgentDir(args[1]);
         return;
     }
-    const help = args.length === 1 && (args[0] === "--help" || args[0] === "-h");
-    (help ? console.log : console.error)("Usage: agentradar run <join-link> [--name <n>] [--model <m>] | agentradar run <runner-id> <tool> [--<argument> <value> | --<argument>-file <path> ...] | agentradar setup [--trust] | agentradar join <join-link> [--name <n>] [--model <m>] [--trust] [--attach-tmux <pane> | --attach-current] [--session <id>] [--feeder] | agentradar join cancel <join-link|request-id> | agentradar leave <runner-id> | agentradar channel <runner-id> | agentradar selftest <runner-id> [--status|--restart] | agentradar runner start <runner-id> | agentradar tool list <runner-id> | agentradar tool run <runner-id> <tool-key> [--args '<json>'] | agentradar call <runner-id> <tool> [--<argument> <value> ...] [--args '<json>'] | agentradar task create|repeat|make-recurring <runner-id> --args '<json>' | agentradar inbox search <runner-id> [--query <text>] [--<filter> <value> ...] [--json] | agentradar listing describe <runner-id> --capabilities <text> | agentradar permissions mine|roles|set|request|grant-tool <runner-id> [--<argument> <value> ...] | agentradar metric report <runner-id> --metric-id <id> --value <n> --period-start <iso> --period-end <iso> [--evidence <text>] | agentradar secrets pull|renew <runner-id> | agentradar secrets exec <runner-id> -- <command> | agentradar propose-human <runner-id> --name <name> --email <email> --role-id <id> | agentradar secrets upload <runner-id> --env-file <path> | --from-env <NAME,...> | --prompt <NAME> [--replace] | agentradar skill install | agentradar sync [dir] | agentradar sync install [dir] [--interval <s>]");
-    if (!help)
-        process.exitCode = 1;
+    // #1871: every other command is the server's, `<noun> [<sub-noun>] <verb>`, run as this shell's runner.
+    const parsed = parseCallArgs(args);
+    const runner = parsed?.flags.find(([flag]) => flag === "runner")?.[1] ?? process.env.AR_CLI_RUNNER_ID;
+    if (!parsed || !runner || parsed.words.length > 3 || (!parsed.words.length && !parsed.flags.some(([flag]) => flag === "help"))) {
+        console.error(USAGE);
+        if (parsed && !runner)
+            console.error("Agent commands run as a runner: set AR_CLI_RUNNER_ID or pass --runner <id>.");
+        process.exitCode = EXIT.usage;
+        return;
+    }
+    process.exitCode = await callToolOverCli(runner, parsed.words.join(" "), parsed.json, {}, parsed.flags.filter(([flag]) => flag !== "runner"));
 }
 /**
  * 🔴 `error.message` ALONE IS TWO WORDS ON THE FAILURE A VENDOR IS MOST LIKELY TO HIT. Node's `fetch`

package/dist/runner.js

@@ -6,14 +6,14 @@ import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
 import { shellValue, trustedMcpEndpoint, writePrivateFile } from "./setup.js";
 import { callAwpTool, envValue } from "./tool-run.js";
-import { installedVersion, revertCli, runningVersion, selfUpdate } from "./update.js";
+import { cliHeader, installedVersion, noteCliUpdate, revertCli, runningVersion, selfUpdate } from "./update.js";
 const RUNNER_ID = /^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/;
 const ENGAGEMENT_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
 // Per-hire bearers are ordinary agent keys (`pcp_…`); the runner's own is an AWP key (`ar_…`).
 const HIRE_BEARER = /^(ar|pcp)_[A-Za-z0-9_-]+$/;
 // What a hire's env file sets for itself; the catalog agent's values for these never reach it.
 // A hire always runs Claude, whose MCP config it owns; a Codex home would be the catalog agent's.
-const HIRE_OWN_KEYS = /^(export\s+)?(AGENT_NAME|AR_BASE|AWP_MCP_URL|AWP_BEARER|AWP_BEARER_FILE|MCP_CONFIG|TMUX_SESSION|AGENT_PID_PATTERN|AR_AGENT_HARNESS|CODEX_HOME)=/;
+const HIRE_OWN_KEYS = /^(export\s+)?(AGENT_NAME|AR_CLI_RUNNER_ID|CLAUDE_CONFIG_DIR|AR_BASE|AWP_MCP_URL|AWP_BEARER|AWP_BEARER_FILE|MCP_CONFIG|TMUX_SESSION|AGENT_PID_PATTERN|AR_AGENT_HARNESS|CODEX_HOME)=/;
 const CODEX_HARNESS = /^(export\s+)?AR_AGENT_HARNESS=\s*["']?codex\b/m;
 // While a pane shows this, its agent is mid-turn (the feeder's in-progress hint, same for Claude and Codex).
 const MID_TURN = /esc to interrupt|\besc to cancel\b/i;
@@ -285,12 +285,16 @@ export async function startVendorRunner(runnerId, home = homedir(), deps = {}) {
         const killSession = (name) => spawnChild("bash", [
             "-c", 'PATH="/opt/homebrew/bin:/usr/local/bin:$PATH"; exec "${TMUX_BIN:-tmux}" kill-session -t "$1"', "tmux", `=_${name}`,
         ]).once("error", () => { });
-        const post = (path, body, token = bearer) => (deps.fetch ?? fetch)(new URL(path, mcpUrl), {
-            method: "POST",
-            headers: { authorization: `Bearer ${token}`, accept: "application/json", "content-type": "application/json", "cache-control": "no-store" },
-            body: JSON.stringify(body ?? {}),
-            signal: AbortSignal.timeout(30_000),
-        });
+        const post = async (path, body, token = bearer) => {
+            const response = await (deps.fetch ?? fetch)(new URL(path, mcpUrl), {
+                method: "POST",
+                headers: { ...(await cliHeader("feeder")), authorization: `Bearer ${token}`, accept: "application/json", "content-type": "application/json", "cache-control": "no-store" },
+                body: JSON.stringify(body ?? {}),
+                signal: AbortSignal.timeout(30_000),
+            });
+            await noteCliUpdate(response.headers);
+            return response;
+        };
         const launchAll = async () => {
             for (const file of await readdir(agentDir)) {
                 const engagementId = file.startsWith(prefix) && file.endsWith(".env") ? file.slice(prefix.length, -".env".length) : "";
@@ -332,9 +336,9 @@ export async function startVendorRunner(runnerId, home = homedir(), deps = {}) {
                     const configDir = join(home, ".agentradar", "config", name);
                     await mkdir(configDir, { recursive: true, mode: 0o700 });
                     const mcpConfig = join(configDir, "awp-only.json");
-                    await writePrivateFile(mcpConfig, `${JSON.stringify({
-                        mcpServers: { agentradar: { type: "http", url: mcpUrl.toString(), headers: { Authorization: `Bearer ${hire.bearer}` } } },
-                    }, null, 2)}\n`);
+                    // Vadym 12915: no MCP entry for AgentRadar. The hire acts with `agentradar run $AR_CLI_RUNNER_ID <tool>`,
+                    // which reads this hire's own env file; --strict-mcp-config still confines the pane to this empty list.
+                    await writePrivateFile(mcpConfig, `${JSON.stringify({ mcpServers: {} }, null, 2)}\n`);
                     // Every setting the vendor put in the catalog agent's env (tool env, harness flags) is copied, as
                     // read when the runner started, except the ones this hire sets for itself — the shared bearer among
                     // them. Copied rather than sourced: sourcing would put the shared bearer in the hire's supervisor.
@@ -343,6 +347,7 @@ export async function startVendorRunner(runnerId, home = homedir(), deps = {}) {
                     // ponytail: line by line, so a multi-line quoted value is copied only in part; parse it when one appears.
                     const own = [
                         `AGENT_NAME=${shellValue(name)}`,
+                        `AR_CLI_RUNNER_ID=${shellValue(name)}`,
                         `AR_BASE=${shellValue(folderOf(hire.engagementId))}`,
                         `AWP_MCP_URL=${shellValue(mcpUrl.toString())}`,
                         `AWP_BEARER=${shellValue(hire.bearer)}`,

package/dist/secrets.js

@@ -15,6 +15,7 @@ import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { awpRequest, envValue } from "./tool-run.js";
+import { cliHeader, noteCliUpdate } from "./update.js";
 export const SECRETS_FILE = join(".agentradar", "secrets.enc");
 export const SECRETS_USAGE = "Usage: agentradar secrets pull|renew|env <runner-id> | agentradar secrets exec <runner-id> -- <command> [args...]"
     + " | agentradar secrets upload <runner-id> --env-file <path> | --from-env <NAME,...> | --prompt <NAME> [--only <NAME,...>] [--replace --approval-details '<json>'] [--token <token>]"
@@ -34,8 +35,9 @@ async function credentials(runnerId, deps) {
 async function post(runnerId, path, body, deps) {
     const { origin, bearer } = await credentials(runnerId, deps);
     const res = await (deps.fetch ?? fetch)(`${origin}/api/agent/${path}`, {
-        method: "POST", headers: { authorization: `Bearer ${bearer}`, "content-type": "application/json" }, body: JSON.stringify(body ?? {}),
+        method: "POST", headers: { ...(await cliHeader()), authorization: `Bearer ${bearer}`, "content-type": "application/json" }, body: JSON.stringify(body ?? {}),
     });
+    await noteCliUpdate(res.headers, deps.logError);
     const json = await res.json().catch(() => ({}));
     if (!res.ok)
         throw new Error(json.error ?? `AgentRadar answered ${res.status}`);