agentradar-cli 0.2.2 → 0.2.3

package/dist/index.js

@@ -4,18 +4,18 @@ import { installVendorSkill } from "./skill-install.js";
 import { startChannel } from "./channel.js";
 import { runRestartSelftest, startVendorRunner } from "./runner.js";
 import { joinOrganisation, leaveOrganisation, setupVendorAgent } from "./setup.js";
-import { callAwpTool, callToolOverCli, createTaskOverCli, listenOverCli, listServiceToolsOverCli, parseCallArgs, runServiceToolOverCli } from "./tool-run.js";
+import { callAwpTool, callToolOverCli, createTaskOverCli, listServiceToolsOverCli, parseCallArgs, runServiceToolOverCli } from "./tool-run.js";
 import { installSyncTimer, syncAgentDir } from "./sync.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)]
-            : raw.length === 3 && raw[2] === "listen" ? ["listen", raw[1]] : ["call", ...raw.slice(1)];
+            : ["call", ...raw.slice(1)];
 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 <enrolment-url> [--name <n>] [--model <m>] | agentradar run <runner-id> <tool> [--<argument> <value> | --<argument>-file <path> ...] | agentradar run <runner-id> listen | agentradar setup [--trust] [--harness claude|codex] | agentradar join <enrolment-url> [--name <n>] [--model <m>] [--trust] | 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 <runner-id> --args '<json>' | agentradar skill install | agentradar sync [dir] | agentradar sync install [dir] [--interval <s>]");
+        console.log("Usage: agentradar run <enrolment-url> [--name <n>] [--model <m>] | agentradar run <runner-id> <tool> [--<argument> <value> | --<argument>-file <path> ...] | agentradar setup [--trust] [--harness claude|codex] | agentradar join <enrolment-url> [--name <n>] [--model <m>] [--trust] | 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 <runner-id> --args '<json>' | agentradar skill install | agentradar sync [dir] | agentradar sync install [dir] [--interval <s>]");
         return;
     }
     if (args[0] === "leave" && args.length === 2) {
@@ -98,10 +98,6 @@ async function main() {
             : await runServiceToolOverCli(parsed.runnerId, parsed.tool, parsed.json);
         return;
     }
-    if (args[0] === "listen" && args.length === 2) {
-        process.exitCode = await listenOverCli(args[1]);
-        return;
-    }
     if (args[0] === "task" && (args[1] === "create" || args[1] === "repeat")) {
         if (args.length !== 5 || args[3] !== "--args") {
             console.error("Usage: agentradar task create|repeat <runner-id> --args '<json>'");
@@ -133,7 +129,7 @@ async function main() {
         return;
     }
     const help = args.length === 1 && (args[0] === "--help" || args[0] === "-h");
-    (help ? console.log : console.error)("Usage: agentradar run <enrolment-url> [--name <n>] [--model <m>] | agentradar run <runner-id> <tool> [--<argument> <value> | --<argument>-file <path> ...] | agentradar run <runner-id> listen | agentradar setup [--trust] | agentradar join <enrolment-url> [--name <n>] [--model <m>] [--trust] | 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 <runner-id> --args '<json>' | agentradar skill install | agentradar sync [dir] | agentradar sync install [dir] [--interval <s>]");
+    (help ? console.log : console.error)("Usage: agentradar run <enrolment-url> [--name <n>] [--model <m>] | agentradar run <runner-id> <tool> [--<argument> <value> | --<argument>-file <path> ...] | agentradar setup [--trust] | agentradar join <enrolment-url> [--name <n>] [--model <m>] [--trust] | 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 <runner-id> --args '<json>' | agentradar skill install | agentradar sync [dir] | agentradar sync install [dir] [--interval <s>]");
     if (!help)
         process.exitCode = 1;
 }

package/dist/setup.js

@@ -1,6 +1,6 @@
 import { createHash } from "node:crypto";
 import { execFile } from "node:child_process";
-import { chmod, cp, lstat, mkdir, readFile, realpath, rename, rm, symlink, writeFile } from "node:fs/promises";
+import { chmod, cp, lstat, mkdir, readFile, readlink, realpath, rename, rm, symlink, writeFile } from "node:fs/promises";
 import { basename, dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { homedir } from "node:os";
@@ -188,6 +188,48 @@ export async function writePrivateFile(path, contents) {
 }
 /** The gateway env a session needs to reach its model. Never ANTHROPIC_API_KEY (OAuth or gateway only). */
 const TOOL_ENV = /^(?:ANTHROPIC_(?!API_KEY$)[A-Z0-9_]+|CLAUDE_SECURESTORAGE_CONFIG_DIR)$/;
+/**
+ * One TOML line with its strings emptied and its comment cut, so only real brackets are left to count.
+ * `text.open` carries a multi-line string (`"""` or `'''`) from one line to the next.
+ */
+function tomlCode(line, text) {
+    let out = "";
+    let i = 0;
+    while (i < line.length) {
+        if (text.open) {
+            let end = line.indexOf(text.open, i);
+            // An odd run of backslashes escapes the quote; an even run is escaped backslashes.
+            while (end > 0 && text.open === '"""' && (line.slice(0, end).match(/\\*$/)[0].length % 2))
+                end = line.indexOf(text.open, end + 1);
+            if (end < 0)
+                return out;
+            i = end + 3;
+            text.open = null;
+            out += '""';
+            continue;
+        }
+        const three = line.slice(i, i + 3);
+        if (three === '"""' || three === "'''") {
+            text.open = three;
+            i += 3;
+            continue;
+        }
+        const c = line[i];
+        if (c === "#")
+            break;
+        if (c === '"' || c === "'") {
+            let j = i + 1;
+            while (j < line.length && line[j] !== c)
+                j += c === '"' && line[j] === "\\" ? 2 : 1;
+            i = j + 1;
+            out += '""';
+            continue;
+        }
+        out += c;
+        i++;
+    }
+    return out;
+}
 /**
  * The service's Codex home: the vendor's config.toml without its MCP servers (the agent acts through the CLI,
  * and Codex has no `--strict-mcp-config`), its approval rules copied, its login linked. auth.json is linked,
@@ -203,11 +245,12 @@ async function codexServiceHome(home, runnerId, env) {
     let inTable = false;
     let depth = 0;
     let dropping = false;
+    const text = { open: null };
     // A restart would otherwise stop on Codex's "Update available" screen, with nobody there to press a key.
     const config = ["check_for_update_on_startup = false", ...(await readFile(join(source, "config.toml"), "utf8").catch(() => "")).split("\n").filter((line) => {
-            // Brackets inside strings and comments don't count; a line inside a multi-line array goes with its key.
-            const bare = line.replace(/"(?:[^"\\]|\\.)*"|'[^']*'/g, '""').replace(/#.*/, "");
-            const continued = depth > 0;
+            // Brackets inside strings and comments don't count; a line inside a multi-line array or string goes with its key.
+            const continued = depth > 0 || text.open !== null;
+            const bare = tomlCode(line, text);
             depth = Math.max(0, depth + (bare.match(/\[/g)?.length ?? 0) - (bare.match(/\]/g)?.length ?? 0));
             if (continued)
                 return !dropping;
@@ -219,6 +262,9 @@ async function codexServiceHome(home, runnerId, env) {
             dropping = inMcp || /^\s*["']?mcp_servers["']?\s*[.=]/.test(line) || (!inTable && /^\s*["']?check_for_update_on_startup["']?\s*=/.test(line));
             return !dropping;
         })].join("\n");
+    // Fail closed: another client's MCP server must never reach this client's session.
+    if (/^\s*(?:\[\[?\s*)?["']?mcp_servers\b/m.test(config))
+        throw new Error(`Could not strip the MCP servers from ${join(source, "config.toml")}; simplify it and run join again`);
     await writePrivateFile(join(codexHome, "config.toml"), config);
     await cp(join(source, "rules"), join(codexHome, "rules"), { recursive: true, force: true }).catch((error) => {
         if (error.code !== "ENOENT")
@@ -267,7 +313,9 @@ async function installRunner(home, projectPath, approved, service) {
             const bin = (service.env.AGENTRADAR_AGENT_BIN ?? "").trim();
             if (!bin)
                 throw new Error("Set AGENTRADAR_AGENT_BIN to the command that starts your agent's CLI");
-            joined.push(`AR_AGENT_BIN=${shellValue(bin)}`, `AR_AGENT_ARGS=${shellValue(service.env.AGENTRADAR_AGENT_ARGS ?? "")}`, `AR_RESUME_FLAGS=${shellValue(service.env.AGENTRADAR_RESUME_ARGS ?? "")}`, `AGENT_PID_PATTERN=${shellValue(basename(bin).replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))}`);
+            joined.push(`AR_AGENT_BIN=${shellValue(bin)}`, `AR_AGENT_ARGS=${shellValue(service.env.AGENTRADAR_AGENT_ARGS ?? "")}`, `AR_RESUME_FLAGS=${shellValue(service.env.AGENTRADAR_RESUME_ARGS ?? "")}`, 
+            // The feeder types only when this matches the pane's last lines; without it a live pane counts as idle.
+            ...(service.env.AGENTRADAR_INPUT_READY_PATTERN ? [`AR_INPUT_READY_PATTERN=${shellValue(service.env.AGENTRADAR_INPUT_READY_PATTERN)}`] : []), `AGENT_PID_PATTERN=${shellValue(basename(bin).replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))}`);
         }
         else {
             joined.push(`AR_RESUME_FLAGS=${shellValue(`--resume ${service.sessionId}`)}`, `AR_FRESH_FLAGS=${shellValue(`--session-id ${service.sessionId}`)}`);
@@ -392,6 +440,11 @@ export async function setupVendorAgent(deps = {}) {
     }
     throw new Error("AgentRadar setup code expired; run setup again");
 }
+/** A sortable key for `x.y.z[-pre]`; a release sorts above its prereleases. ponytail: prereleases of one version tie. */
+const versionRank = (version) => {
+    const [core = "", pre] = version.split(/-(.*)/);
+    return [...core.split("."), pre === undefined ? "1" : "0"].map((part) => part.padStart(9, "0")).join(".");
+};
 /**
  * Copies the running CLI to ~/.agentradar/cli/<version> and points ~/.agentradar/cli/current at it. The service
  * runs `current`, never the npx cache the CLI may be running from (npm can clean that) or a pinned version.
@@ -414,6 +467,10 @@ export async function installCli(home, pkg = dirname(dirname(fileURLToPath(impor
                 throw error;
         });
     }
+    // Forward only: an older CLI run later (a stale npx cache) never downgrades the service.
+    const current = await readlink(join(cli, "current")).catch(() => "");
+    if (current && versionRank(current) > versionRank(version))
+        return join(cli, "current", "dist");
     const link = join(cli, `current.${process.pid}.tmp`);
     await rm(link, { force: true });
     await symlink(version, link);
@@ -446,7 +503,24 @@ export async function joinOrganisation(enrolmentUrl, deps = {}) {
     // AGENTRADAR_AGENT_BIN names any other CLI. Claude Code sets CLAUDECODE in its shell; a machine with both
     // tools installed may export CODEX_HOME too.
     const harness = deps.harness ?? (env.AGENTRADAR_AGENT_BIN?.trim() ? "generic" : env.CLAUDECODE || !env.CODEX_HOME ? "claude" : "codex");
-    const label = harness === "generic" ? basename(env.AGENTRADAR_AGENT_BIN.trim()) : harness === "claude" ? "Claude Code" : "Codex";
+    // Checked before any request: the supervisor sources these as one-line shell values, the binary as one word.
+    if (harness === "generic") {
+        const bin = (env.AGENTRADAR_AGENT_BIN ?? "").trim();
+        if (!bin)
+            throw new Error("Set AGENTRADAR_AGENT_BIN to the command that starts your agent's CLI");
+        if (/\s/.test(bin))
+            throw new Error("AGENTRADAR_AGENT_BIN is one command with no spaces; put its flags in AGENTRADAR_AGENT_ARGS");
+        if (/[\r\n]/.test(`${env.AGENTRADAR_AGENT_ARGS ?? ""}${env.AGENTRADAR_RESUME_ARGS ?? ""}${env.AGENTRADAR_INPUT_READY_PATTERN ?? ""}`)) {
+            throw new Error("AGENTRADAR_AGENT_ARGS, AGENTRADAR_RESUME_ARGS and AGENTRADAR_INPUT_READY_PATTERN must be one line each");
+        }
+        try {
+            new RegExp(env.AGENTRADAR_INPUT_READY_PATTERN ?? "");
+        }
+        catch {
+            throw new Error("AGENTRADAR_INPUT_READY_PATTERN is not a valid regular expression");
+        }
+    }
+    const label = harness === "generic" ? basename((env.AGENTRADAR_AGENT_BIN ?? "").trim()) : harness === "claude" ? "Claude Code" : "Codex";
     // The agent is a persistent session the service owns, not this one: no MCP entry in this folder (it acts
     // through `agentradar run`), a runner env pinned to its own session, and a LaunchAgent / systemd unit.
     const startJoined = async (requestId, agentId, installation, saved) => {

package/dist/tool-run.js

@@ -54,43 +54,6 @@ export async function callToolOverCli(runnerId, tool, argumentsJson, deps = {},
     await writeFile(delivered, JSON.stringify(ids), { mode: 0o600 }).catch(() => undefined);
     return 0;
 }
-/**
- * `agentradar run <runner-id> listen`: bare `next_event` polls (each held by the server, each acking the
- * batch before it) until work, a liveness probe or the welcome arrives, or until the next hold could run
- * past `budgetMs`. The agent runs it as the last step of every turn, so the harness keeps waiting. Nine
- * minutes stays under Claude Code's 10-minute Bash cap; Codex waits on it in 5-minute chunks.
- */
-export async function listenOverCli(runnerId, deps = {}, budgetMs = 540_000) {
-    const now = deps.now ?? Date.now;
-    const sleep = deps.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
-    const start = now();
-    let longest = 0;
-    for (;;) {
-        const began = now();
-        let said = "";
-        const code = await callToolOverCli(runnerId, "next_event", undefined, { ...deps, log: (text) => { said = text; } });
-        if (code !== 0)
-            return code;
-        let batch = null;
-        try {
-            batch = JSON.parse(said);
-        }
-        catch { /* not a batch: keep waiting */ }
-        // Wake on work, a liveness probe or the welcome; anything else (events: null, an unknown key) waits.
-        if ((Array.isArray(batch?.events) && batch.events.length) || batch?.livenessProbe || batch?.welcome) {
-            (deps.log ?? console.log)(said);
-            return 0;
-        }
-        // A caller the server does not hold (not yet hired, a run JWT) answers at once; do not spin on it.
-        if (now() - began < 10_000)
-            await sleep(10_000 - (now() - began));
-        longest = Math.max(longest, now() - began);
-        if (now() - start + longest > budgetMs) {
-            (deps.log ?? console.log)(`No client message in ${Math.round((now() - start) / 60_000)} minutes. Run agentradar run ${runnerId} listen again.`);
-            return 0;
-        }
-    }
-}
 /** Split `<runner-id> <tool> [--args '<json>'] [--<argument> <value> ...]`; null when it is not that shape. */
 export function parseCallArgs(rest) {
     const positional = [];

package/dist/vendor-runner/feeder.mjs

@@ -358,8 +358,8 @@ async function injectFrame(frame, label) {
     console.warn(`[feeder] pane ${TMUX_SESSION} not live — NOT injecting ${label} (will re-deliver / probe times out)`);
     return false;
   }
-  const [literalCmd, enterCmd] = sendKeysCommands(TMUX_SESSION, frame);
-  const okText = await tmux(literalCmd);
+  const [setCmd, pasteCmd, enterCmd] = sendKeysCommands(TMUX_SESSION, frame);
+  const okText = (await tmux(setCmd)) && (await tmux(pasteCmd));
   await sleep(KEY_SETTLE_MS);
   const okEnter = okText && (await tmux(enterCmd));
   if (okEnter) console.log(`[feeder] injected ${label}`);

package/dist/vendor-runner/session-frame.mjs

@@ -141,13 +141,18 @@ export function formatWelcomeFrame(welcome, probe) {
 }
 
 /**
- * The two tmux invocations that inject `text` as one submitted turn into `session`'s
- * pane: send the literal text (‑l so it is NOT parsed as key names), then a separate
- * Enter to submit. Returns argv arrays (no shell) — caller spawns `tmux` with each.
+ * The tmux invocations that inject `text` as one submitted turn into `session`'s pane: load it
+ * into a buffer, paste it as a bracketed paste, then a separate Enter to submit. Returns argv
+ * arrays (no shell) — caller spawns `tmux` with each, the last one after a short settle.
+ * Typed with `send-keys -l`, a frame over ~1 KB reached Claude Code 2.1.281 as an unbracketed
+ * burst and it kept only the last chunk (measured 2026-09-28: the welcome lost its first 1,022
+ * bytes, liveness command included). `-p` brackets only when the CLI asked for it.
  */
 export function sendKeysCommands(session, text) {
+  const buffer = `agentradar-${session}`;
   return [
-    ["send-keys", "-t", session, "-l", text],
+    ["set-buffer", "-b", buffer, "--", text],
+    ["paste-buffer", "-p", "-d", "-b", buffer, "-t", session],
     ["send-keys", "-t", session, "Enter"],
   ];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentradar-cli",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Secure AgentRadar vendor setup and skill installer",
   "type": "module",
   "bin": {