agentradar-cli 0.3.5 → 0.3.6

package/dist/admin.js

@@ -0,0 +1,39 @@
+/**
+ * ADMIN-BROADCAST (Vadym 12310/12828): `agentradar admin broadcast` for an instance admin. Authenticates with a board
+ * API key in AGENTRADAR_ADMIN_TOKEN, never a runner key; the server refuses anyone who is not an instance admin.
+ */
+export const ADMIN_BROADCAST_USAGE = "Usage: agentradar admin broadcast --dry-run|--send --target all --text <text> --cta <next step>"
+    + "  (env AGENTRADAR_ADMIN_TOKEN = an instance admin's board API key; AGENTRADAR_API_URL = the API base)";
+export async function adminOverCli(args, deps = {}) {
+    const env = deps.env ?? process.env, log = deps.log ?? console.log, logError = deps.logError ?? console.error;
+    const named = {};
+    const modes = args.slice(1).filter((arg) => arg === "--dry-run" || arg === "--send");
+    for (let i = 1; i < args.length; i++) {
+        if (["--target", "--text", "--cta"].includes(args[i]))
+            named[args[i].slice(2)] = args[++i] ?? "";
+        else if (!modes.includes(args[i]))
+            modes.push("?");
+    }
+    if (args[0] !== "broadcast" || modes.length !== 1 || modes[0] === "?" || named.target !== "all" || !named.text || !named.cta) {
+        logError(ADMIN_BROADCAST_USAGE);
+        return 2;
+    }
+    const token = env.AGENTRADAR_ADMIN_TOKEN?.trim();
+    if (!token) {
+        logError("Set AGENTRADAR_ADMIN_TOKEN to an instance admin's board API key");
+        return 2;
+    }
+    const base = (env.AGENTRADAR_API_URL ?? "https://vendor.agentradar.com/api").replace(/\/+$/, "");
+    const res = await (deps.fetch ?? fetch)(`${base}/admin/agent-broadcast`, {
+        method: "POST", headers: { authorization: `Bearer ${token}`, "content-type": "application/json" },
+        body: JSON.stringify({ target: "all", text: named.text, cta: named.cta, dryRun: modes[0] === "--dry-run" }),
+    });
+    const text = await res.text();
+    if (!res.ok) {
+        logError(`Refused (${res.status}): ${text}`);
+        return 1;
+    }
+    log(text);
+    return 0;
+}
+//# sourceMappingURL=admin.js.map

package/dist/agent-guard/hooks/hooks.json

@@ -1,11 +1,11 @@
 {
-  "description": "Marks the session as guarded (the runner reports ready only then); blocks going idle while AgentRadar work is owed; reminds of the house rules every AR_DISCIPLINE_EVERY turns; guards AgentRadar compact-then-switch model changes (a crashed PreModelSwitch hook exits 2 and refuses).",
+  "description": "Marks the session as guarded (the runner reports ready only then); blocks going idle while AgentRadar work is owed; reminds of the house rules every AR_DISCIPLINE_EVERY turns; reports compactions to AgentRadar; guards AgentRadar compact-then-switch model changes (a crashed PreModelSwitch hook exits 2 and refuses).",
   "hooks": {
     "SessionStart": [{ "hooks": [{ "type": "command", "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/guard.mjs\" start", "timeout": 10 }] }],
     "Stop": [{ "hooks": [{ "type": "command", "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/guard.mjs\" stop", "timeout": 30 }] }],
     "UserPromptSubmit": [{ "hooks": [{ "type": "command", "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/guard.mjs\" prompt", "timeout": 10 }] }],
-    "PreCompact": [{ "hooks": [{ "type": "command", "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/model-switch.mjs\" PreCompact", "timeout": 30 }] }],
-    "PostCompact": [{ "hooks": [{ "type": "command", "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/model-switch.mjs\" PostCompact", "timeout": 30 }] }],
+    "PreCompact": [{ "hooks": [{ "type": "command", "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/model-switch.mjs\" PreCompact", "timeout": 30 }, { "type": "command", "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/compaction-report.mjs\" PreCompact", "timeout": 30 }] }],
+    "PostCompact": [{ "hooks": [{ "type": "command", "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/model-switch.mjs\" PostCompact", "timeout": 30 }, { "type": "command", "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/compaction-report.mjs\" PostCompact", "timeout": 30 }] }],
     "PreModelSwitch": [{ "hooks": [{ "type": "command", "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/model-switch.mjs\" PreModelSwitch || exit 2", "timeout": 30 }] }],
     "PostModelSwitch": [{ "hooks": [{ "type": "command", "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/model-switch.mjs\" PostModelSwitch", "timeout": 30 }] }]
   }

package/dist/agent-guard/scripts/compaction-report.mjs

@@ -0,0 +1,76 @@
+#!/usr/bin/env node
+// Reports this session's compactions to AgentRadar (Vadym 11657). Registered for PreCompact and PostCompact as
+// `compaction-report.mjs <event>`; JSON on stdin. Observation only: it never blocks (exit 0 whatever happens).
+// PostCompact stdin carries no token counts, so they come from the transcript's compact_boundary line.
+import { spawn, spawnSync } from "node:child_process";
+import { closeSync, existsSync, fstatSync, openSync, readFileSync, readSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+
+const ID = /^[a-zA-Z0-9_-]{1,100}$/;
+const TAIL_BYTES = 1024 * 1024;
+/** The last lines of a transcript, read from its last 1 MB only (a long session's file is far larger). */
+const tail = (path) => {
+  let fd;
+  try {
+    fd = openSync(path, "r");
+    const { size } = fstatSync(fd);
+    const buf = Buffer.alloc(Math.min(size, TAIL_BYTES));
+    readSync(fd, buf, 0, buf.length, size - buf.length);
+    return buf.toString("utf8").split("\n").slice(-200);
+  } catch { return []; } finally { if (fd !== undefined) closeSync(fd); }
+};
+
+/** The newest compact_boundary written at or after `sinceMs`, as { preTokens, postTokens, durationMs }. */
+export function lastBoundary(transcriptPath, sinceMs) {
+  for (const line of tail(transcriptPath).reverse()) {
+    if (!line.includes('"compact_boundary"')) continue;
+    try {
+      const entry = JSON.parse(line);
+      if (Date.parse(entry.timestamp) < sinceMs) return null;
+      const { preTokens = null, postTokens = null, durationMs = null } = entry.compactMetadata ?? {};
+      return { preTokens, postTokens, durationMs };
+    } catch { /* partial line: keep looking */ }
+  }
+  return null;
+}
+
+/** One hook call. `send` posts a report; `stateDir` holds the start time between the two hooks. */
+export async function reportCompaction(event, input, { send, followUp, stateDir = tmpdir(), now = Date.now }) {
+  if (input?.hook_event_name !== event || !ID.test(input.session_id ?? "")) return;
+  const marker = join(stateDir, `agentradar-compaction-${input.session_id}.json`);
+  const trigger = typeof input.trigger === "string" ? input.trigger.slice(0, 40) : null;
+  if (event === "PreCompact") {
+    writeFileSync(marker, JSON.stringify({ at: now() }), { mode: 0o600 });
+    return send({ phase: "start", trigger });
+  }
+  if (event !== "PostCompact") return;
+  let startedAt = now();
+  if (existsSync(marker)) { try { startedAt = JSON.parse(readFileSync(marker, "utf8")).at; } catch { /* keep now */ } }
+  rmSync(marker, { force: true });
+  // The compact_boundary line (the only source of token counts) is written after this hook returns, so it is
+  // reported separately, by a detached follow-up; this report must not wait for it.
+  send({ phase: "end", outcome: "ok", trigger, durationMs: now() - startedAt });
+  return followUp?.({ transcriptPath: input.transcript_path, startedAt, trigger });
+}
+
+/** Detached follow-up: waits up to `waitMs` for the boundary this compaction wrote, then reports its token counts. */
+export async function reportTokens({ transcriptPath, startedAt, trigger }, { send, sleep = (ms) => new Promise((r) => setTimeout(r, ms)), waitMs = 60_000, pollMs = 500 }) {
+  for (let waited = 0; waited <= waitMs; waited += pollMs) {
+    const boundary = lastBoundary(transcriptPath, startedAt - 1_000);
+    if (boundary) return send({ phase: "tokens", trigger, ...boundary });
+    await sleep(pollMs);
+  }
+}
+
+const sendToServer = (report) => spawnSync(process.env.AR_AGENTRADAR_BIN || "agentradar",
+  ["call", process.env.AR_CLI_RUNNER_ID || "hosted", "report_compaction", "--args", JSON.stringify(report)], { encoding: "utf8", timeout: 20_000 });
+const spawnFollowUp = (job) => spawn(process.execPath, [fileURLToPath(import.meta.url), "tokens", JSON.stringify(job)], { detached: true, stdio: "ignore" }).unref();
+
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  try {
+    if (process.argv[2] === "tokens") await reportTokens(JSON.parse(process.argv[3]), { send: sendToServer });
+    else await reportCompaction(process.argv[2], JSON.parse(readFileSync(0, "utf8")), { send: sendToServer, followUp: spawnFollowUp });
+  } catch { /* observation only */ }
+}

package/dist/agentradar-vendor/SKILL.md

@@ -1,24 +1,26 @@
 ---
 name: agentradar-vendor
 description: >
-  Run an AgentRadar vendor agent on vendor-owned compute through the single
-  AgentRadar MCP. Use when receiving client work, replying, reporting usage,
+  Run an AgentRadar vendor agent on vendor-owned compute through the
+  AgentRadar CLI. Use when receiving client work, replying, reporting usage,
   or checking context for an AgentRadar engagement.
 ---
 
 # AgentRadar vendor agent
 
-You work on the vendor's computer and connect to AgentRadar through the `agentradar` MCP only. AgentRadar holds every client channel credential; never ask for or store a client's Slack, email, Telegram, or AgentRadar token.
+Every tool named in this skill runs as `agentradar run $AR_CLI_RUNNER_ID <tool>`; add `--help` for its arguments. AgentRadar is CLI-only: there is no AgentRadar MCP to connect to.
+
+You work on the vendor's computer and act on AgentRadar through the `agentradar` CLI only (`agentradar run $AR_CLI_RUNNER_ID <tool>`). AgentRadar holds every client channel credential; never ask for or store a client's Slack, email, Telegram, or AgentRadar token.
 
 ## Authentication
 
 - Authenticate Claude Code interactively with `/login` and the vendor's claude.ai subscription.
 - Never use `ANTHROPIC_API_KEY` or `CLAUDE_CODE_OAUTH_TOKEN`.
-- Never print, inspect, copy, or move the AgentRadar MCP authorization header. The setup CLI stores it in the project-local entry of `~/.claude.json`, outside the project repository.
+- Never print, inspect, copy, or move the AgentRadar key. The setup CLI stores it in your runner config under `~/.agentradar/agents/`, outside the project repository.
 
 ## Start of every session
 
-Call `get_my_context` on the AgentRadar MCP FIRST, before any other tool. It returns your client organisation, your role and function, your goals, your metrics with their current quotas, your superior, your direct reports and your colleagues. It also carries your memory snapshot, the Markdown files in your personal vault: `recall` fetches newer files and `remember` saves a durable fact, preference or correction.
+Run `get_my_context` FIRST, before any other tool. It returns your client organisation, your role and function, your goals, your metrics with their current quotas, your superior, your direct reports and your colleagues. It also carries your memory snapshot, the Markdown files in your personal vault: `recall` fetches newer files and `remember` saves a durable fact, preference or correction.
 
 Keep each human's page in company memory current, every fact cited, as the Humans section of the `agentradar-memory-and-skills` skill says. A page is knowledge, never permission.
 
@@ -32,10 +34,10 @@ Write to humans so a 13-year-old would understand: a few short plain lines, then
 
 ## Work loop
 
-1. Use the AgentRadar MCP to receive the next event or assigned work.
+1. Run `agentradar run $AR_CLI_RUNNER_ID inbox next` to receive the next event or assigned work.
 2. Read the supplied engagement context before acting.
 3. Do the work in this project folder on the vendor's compute.
-4. Reply through the MCP so AgentRadar can enforce the client boundary and audit the action.
-5. Report actual usage through the MCP when the work incurs billable time or metered extras.
+4. Reply with `agentradar run $AR_CLI_RUNNER_ID reply` so AgentRadar can enforce the client boundary and audit the action.
+5. Report actual usage with `report_usage` when the work incurs billable time or metered extras.
 
-Do not connect directly to a client's workspace or bypass the MCP with direct channel/API calls.
+Do not connect directly to a client's workspace or bypass AgentRadar with direct channel/API calls.

package/dist/channel.js

@@ -1,16 +1,17 @@
 import { randomUUID } from "node:crypto";
-import { existsSync } from "node:fs";
+import { existsSync, statSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { createRequire } from "node:module";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { createInterface } from "node:readline";
 import { envValue } from "./tool-run.js";
+import { noteCliUpdate } from "./update.js";
 import { trustedMcpEndpoint } from "./setup.js";
 import { syncJoinedSkills } from "./skill-install.js";
-export const CHANNEL_GUIDANCE = "AgentRadar channel messages are wake signals only. Call next_event to receive the events, then pass their eventIds as ackEventIds on your next call. Answer livenessProbe with liveness_ack. Never acknowledge an event you have not read. Never poll next_event on your own or keep a loop running: when a channel message arrives, drain it, then end your turn.";
-export const CHANNEL_BLOCKED = "AgentRadar has not observed a next_event call from this session. Channel delivery is unconfirmed. On Claude Team/Enterprise an Owner must enable Channels (channelsEnabled); the development flag cannot override that policy. Until then, deliver with the feeder: run your join again with --feeder (agentradar join <your join link> --feeder). Your company sees this agent as not receiving messages until one or the other works.";
-/** One local MCP, forwarding tools to AWP. Wake signals never consume the durable queue. */
+export const CHANNEL_GUIDANCE = "AgentRadar channel messages are wake signals only. Receive the events with `agentradar run $AR_CLI_RUNNER_ID inbox next`; the next call acknowledges the batch you read. Answer a liveness check with `agentradar run $AR_CLI_RUNNER_ID liveness_ack --nonce <nonce>`. Never acknowledge an event you have not read. Never poll on your own or keep a loop running: when a channel message arrives, drain it, then end your turn.";
+export const CHANNEL_BLOCKED = "AgentRadar has not seen this session run `agentradar run $AR_CLI_RUNNER_ID inbox next`. Channel delivery is unconfirmed. On Claude Team/Enterprise an Owner must enable Channels (channelsEnabled); the development flag cannot override that policy. Until then, deliver with the feeder: run your join again with --feeder (agentradar join <your join link> --feeder). Your company sees this agent as not receiving messages until one or the other works.";
+/** The channel: a local stdio MCP with no tools, only wake signals. The agent acts through the CLI; wake signals never consume the durable queue. */
 export async function startChannel(runnerId, deps = {}) {
     if (!/^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/.test(runnerId))
         throw new Error("Invalid runner ID");
@@ -27,8 +28,17 @@ export async function startChannel(runnerId, deps = {}) {
     let sequence = 0;
     let polling = false;
     let agentPolled = false;
+    const startedAt = Date.now();
+    // The CLI rewrites <runner>.delivered.json after every `inbox next`, so a newer mtime is the session having polled.
+    const delivered = join(home, ".agentradar", "agents", `${runnerId}.delivered.json`);
+    const polled = () => agentPolled ||= (() => { try {
+        return statSync(delivered).mtimeMs >= startedAt;
+    }
+    catch {
+        return false;
+    } })();
     // Vadym 10342: an unconfirmed channel is reported to AgentRadar (runnerState channel_unconfirmed), so the owner sees
-    // the agent is not receiving messages; "ready" again once the session does call next_event.
+    // the agent is not receiving messages; "ready" again once the session does run `inbox next`.
     let unconfirmed = null;
     let warning;
     let skillSync;
@@ -39,10 +49,11 @@ export async function startChannel(runnerId, deps = {}) {
         const response = await (deps.fetch ?? fetch)(endpoint, {
             method: "POST",
             redirect: "error",
-            headers: { "x-agentradar-cli": createRequire(import.meta.url)("../package.json").version, authorization: `Bearer ${bearer}`, "content-type": "application/json", accept: "application/json, text/event-stream" },
+            headers: { "x-agentradar-cli": createRequire(import.meta.url)("../package.json").version, "x-agentradar-surface": "channel", authorization: `Bearer ${bearer}`, "content-type": "application/json", accept: "application/json, text/event-stream" },
             body: JSON.stringify({ jsonrpc: "2.0", id: ++sequence, method, params }),
             signal: AbortSignal.any([stop.signal, AbortSignal.timeout(230_000)]),
         });
+        await noteCliUpdate(response.headers, logError);
         if (!response.ok) {
             const said = response.status === 426 ? await response.json().then((body) => body.error?.message).catch(() => null) : null;
             throw new Error(said ?? `AgentRadar refused the channel call (${response.status})`);
@@ -81,7 +92,7 @@ export async function startChannel(runnerId, deps = {}) {
                     await next({ runnerState: "channel_unconfirmed" });
                     unconfirmed = "reported";
                 }
-                if (unconfirmed === "reported" && agentPolled)
+                if (unconfirmed === "reported" && polled())
                     unconfirmed = null;
                 // While reported, no runnerState: the stored state stands, and the poll still drains for wake signals.
                 // AGENT-GUARD-ACTIVE: the supervisor's marker, written by agent-guard's SessionStart hook in this session.
@@ -95,7 +106,7 @@ export async function startChannel(runnerId, deps = {}) {
                 const wake = JSON.stringify([events.map((event) => event.eventId), payload.livenessProbe?.nonce, Boolean(payload.onboarding)]);
                 if ((events.length || payload.livenessProbe || payload.onboarding) && (wake !== lastWake || Date.now() - lastSent >= 30_000)) {
                     await send({ jsonrpc: "2.0", method: "notifications/claude/channel", params: {
-                            content: `${payload.firstStep ? `${payload.firstStep} ` : ""}${events.length} new AgentRadar events; call next_event${payload.livenessProbe ? " to receive your liveness check" : ""}.`,
+                            content: `${payload.firstStep ? `${payload.firstStep} ` : ""}${events.length} new AgentRadar events; run \`agentradar run ${runnerId} inbox next\`${payload.livenessProbe ? " to receive your liveness check" : ""}.`,
                             meta: { count: String(events.length) },
                         } });
                     lastWake = wake;
@@ -116,7 +127,7 @@ export async function startChannel(runnerId, deps = {}) {
         if (message.method === "initialize") {
             await send({ jsonrpc: "2.0", id: message.id, result: {
                     protocolVersion: "2024-11-05",
-                    capabilities: { tools: {}, experimental: { "claude/channel": {} } },
+                    capabilities: { experimental: { "claude/channel": {} } },
                     serverInfo: { name: "agentradar", version: createRequire(import.meta.url)("../package.json").version },
                     instructions: CHANNEL_GUIDANCE,
                 } });
@@ -124,7 +135,7 @@ export async function startChannel(runnerId, deps = {}) {
         else if (message.method === "notifications/initialized") {
             if (!polling) {
                 polling = true;
-                warning = setTimeout(() => { if (!agentPolled) {
+                warning = setTimeout(() => { if (!polled()) {
                     logError(CHANNEL_BLOCKED);
                     unconfirmed = "pending";
                 } }, deps.confirmMs ?? 30_000);
@@ -142,16 +153,6 @@ export async function startChannel(runnerId, deps = {}) {
             if (message.method === "ping") {
                 await send({ jsonrpc: "2.0", id: message.id, result: {} });
             }
-            else if (message.method === "tools/list" || message.method === "tools/call") {
-                const params = message.params ?? {};
-                const isNext = message.method === "tools/call" && params.name === "next_event";
-                const response = isNext ? await next(params.arguments ?? {}) : await remote(message.method, params);
-                if (isNext && !response.error && !response.result?.isError) {
-                    agentPolled = true;
-                    clearTimeout(warning);
-                }
-                await send({ jsonrpc: "2.0", id: message.id, ...(response.error ? { error: response.error } : { result: response.result }) });
-            }
             else {
                 await send({ jsonrpc: "2.0", id: message.id, error: { code: -32601, message: "Method not found" } });
             }

package/dist/index.js

@@ -1,14 +1,16 @@
 #!/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 { cancelJoin, CODEX_GUARD_REFUSAL, dropStaleMcp, 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 { 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
@@ -18,7 +20,7 @@ export const runArgs = (raw) => raw[0] !== "run" ? raw
 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("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>] | agentradar admin broadcast --dry-run|--send --target all --text <text> --cta <next step>");
         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, ...",
@@ -39,6 +41,7 @@ async function main() {
     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;
     }
@@ -226,6 +229,10 @@ async function main() {
         process.exitCode = await secretsOverCli(args.slice(1));
         return;
     }
+    if (args[0] === "admin") {
+        process.exitCode = await adminOverCli(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>'");
@@ -253,11 +260,12 @@ 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>]");
+    (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>] | agentradar admin broadcast --dry-run|--send --target all --text <text> --cta <next step>");
     if (!help)
         process.exitCode = 1;
 }

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}`);