agentradar-cli 0.2.3 → 0.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent-guard/.claude-plugin/marketplace.json +14 -0
- package/dist/agent-guard/.claude-plugin/plugin.json +7 -0
- package/dist/agent-guard/hooks/hooks.json +7 -0
- package/dist/agent-guard/scripts/guard.mjs +121 -0
- package/dist/agent-guard/skills/agentradar-discipline/SKILL.md +30 -0
- package/dist/runner.js +94 -1
- package/dist/setup.js +85 -15
- package/dist/update.js +94 -0
- package/dist/vendor-runner/feeder.mjs +22 -3
- package/dist/vendor-runner/supervisor/agentradar-agent@.service.template +2 -0
- package/dist/vendor-runner/supervisor/com.agentradar.agent.plist.template +4 -1
- package/dist/vendor-runner/supervisor/supervise-agent.sh +8 -2
- package/package.json +7 -2
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "agentradar",
|
|
3
|
+
"description": "AgentRadar plugins for agents working on the rail.",
|
|
4
|
+
"owner": {
|
|
5
|
+
"name": "AgentRadar"
|
|
6
|
+
},
|
|
7
|
+
"plugins": [
|
|
8
|
+
{
|
|
9
|
+
"name": "agent-guard",
|
|
10
|
+
"source": "./",
|
|
11
|
+
"description": "AgentRadar work discipline for agents on the rail."
|
|
12
|
+
}
|
|
13
|
+
]
|
|
14
|
+
}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"description": "Blocks going idle while AgentRadar work is owed; reminds of the house rules every AR_DISCIPLINE_EVERY turns.",
|
|
3
|
+
"hooks": {
|
|
4
|
+
"Stop": [{ "hooks": [{ "type": "command", "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/guard.mjs\" stop", "timeout": 30 }] }],
|
|
5
|
+
"UserPromptSubmit": [{ "hooks": [{ "type": "command", "command": "node \"${CLAUDE_PLUGIN_ROOT}/scripts/guard.mjs\" prompt", "timeout": 10 }] }]
|
|
6
|
+
}
|
|
7
|
+
}
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
// AgentRadar agent-guard: `guard.mjs stop` (Stop hook) and `guard.mjs prompt` (UserPromptSubmit hook).
|
|
3
|
+
// Claude Code and Codex share the hook I/O used here: JSON on stdin, JSON decision on stdout.
|
|
4
|
+
//
|
|
5
|
+
// stop: asks the server (`agentradar call <runner> agent_obligations`) what the agent still owes and
|
|
6
|
+
// blocks the stop while a message or task is unacknowledged, at most MAX_BLOCKS times in a row.
|
|
7
|
+
// Tasks still in progress get one reminder. Anything unexpected (no runner, server down, bad
|
|
8
|
+
// output) lets the agent stop: a guard that wedges the session is worse than no guard.
|
|
9
|
+
// prompt: every AR_DISCIPLINE_EVERY turns (default 20, 0 = off) re-adds the house rules, the must-nots
|
|
10
|
+
// and the installed skills to the context.
|
|
11
|
+
import { spawnSync } from "node:child_process";
|
|
12
|
+
import { mkdirSync, readdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
|
|
13
|
+
import { homedir, tmpdir } from "node:os";
|
|
14
|
+
import { join } from "node:path";
|
|
15
|
+
import { fileURLToPath } from "node:url";
|
|
16
|
+
|
|
17
|
+
const MAX_BLOCKS = 3;
|
|
18
|
+
const runner = process.env.AR_CLI_RUNNER_ID ?? "";
|
|
19
|
+
const cli = process.env.AR_AGENTRADAR_BIN || "agentradar";
|
|
20
|
+
|
|
21
|
+
let input = {};
|
|
22
|
+
try { input = JSON.parse(readFileSync(0, "utf8") || "{}"); } catch {}
|
|
23
|
+
// ponytail: no lock; one session's hooks run one at a time.
|
|
24
|
+
const stateDir = process.env.CLAUDE_PLUGIN_DATA || tmpdir();
|
|
25
|
+
const stateFile = join(stateDir, `agent-guard-${String(input.session_id ?? "none").replace(/[^A-Za-z0-9_-]/g, "_")}.json`);
|
|
26
|
+
let state = { turns: 0, blocks: 0 };
|
|
27
|
+
try { state = { ...state, ...JSON.parse(readFileSync(stateFile, "utf8")) }; } catch {}
|
|
28
|
+
const save = () => { try { mkdirSync(stateDir, { recursive: true }); writeFileSync(stateFile, JSON.stringify(state)); return true; } catch { return false; } };
|
|
29
|
+
const call = (tool) => `agentradar call ${runner} ${tool}`;
|
|
30
|
+
|
|
31
|
+
const RULES = [
|
|
32
|
+
"Answer every message in the channel it came from, and a human first: someone is waiting.",
|
|
33
|
+
`Acknowledge what you handled: ${call("acknowledge_messages")} --args '{"eventIds":[...]}' for messages, ${call("acknowledge_task")} --issueId <id> for a task you take on.`,
|
|
34
|
+
"Talk is not a task: reply conversationally, and create a task only for trackable, billable work.",
|
|
35
|
+
`Before you go idle, run ${call("agent_obligations")}: "owed" must be 0, and every in-progress task must be moving or waiting on someone who knows it.`,
|
|
36
|
+
];
|
|
37
|
+
const MUST_NOTS = [
|
|
38
|
+
"Never ask for, print or pass on a credential. AgentRadar holds the keys.",
|
|
39
|
+
`Never call decide_outcome or declare_outcome on your own task: only a human accepts your work. Record the final state with ${call("append_task_log")} and reply that it is ready for them.`,
|
|
40
|
+
"Never contact the platform team (submit_feedback) unless the human asks you to.",
|
|
41
|
+
];
|
|
42
|
+
|
|
43
|
+
// Skill folders the agent can load: this plugin's, the project's, and the user's (Claude Code and Codex).
|
|
44
|
+
function skills() {
|
|
45
|
+
const dirs = [
|
|
46
|
+
fileURLToPath(new URL("../skills", import.meta.url)),
|
|
47
|
+
input.cwd && join(input.cwd, ".claude", "skills"),
|
|
48
|
+
join(process.env.CLAUDE_CONFIG_DIR || join(homedir(), ".claude"), "skills"),
|
|
49
|
+
process.env.CODEX_HOME && join(process.env.CODEX_HOME, "skills"),
|
|
50
|
+
];
|
|
51
|
+
const names = new Set();
|
|
52
|
+
for (const dir of dirs) {
|
|
53
|
+
if (!dir) continue;
|
|
54
|
+
// statSync follows a symlinked skill folder; a broken link or a plain file is not a skill.
|
|
55
|
+
try { for (const name of readdirSync(dir)) if (!name.startsWith(".") && statSync(join(dir, name), { throwIfNoEntry: false })?.isDirectory()) names.add(name); } catch {}
|
|
56
|
+
}
|
|
57
|
+
return [...names].sort();
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
if (process.argv[2] === "prompt") {
|
|
61
|
+
const every = Number.parseInt(process.env.AR_DISCIPLINE_EVERY ?? "20", 10);
|
|
62
|
+
// No reset of `blocks` here: Codex may run this hook for a Stop continuation, which would lift the cap.
|
|
63
|
+
state.turns += 1;
|
|
64
|
+
save();
|
|
65
|
+
if (runner && every > 0 && state.turns % every === 0) {
|
|
66
|
+
process.stdout.write(JSON.stringify({
|
|
67
|
+
hookSpecificOutput: {
|
|
68
|
+
hookEventName: "UserPromptSubmit",
|
|
69
|
+
additionalContext: [
|
|
70
|
+
`AgentRadar house rules (reminder every ${every} turns):`,
|
|
71
|
+
...RULES.map((rule, i) => `${i + 1}. ${rule}`),
|
|
72
|
+
"You must not:",
|
|
73
|
+
...MUST_NOTS.map((rule) => `- ${rule}`),
|
|
74
|
+
`Your skills (load the one that fits before acting): ${skills().join(", ") || "none installed"}.`,
|
|
75
|
+
].join("\n"),
|
|
76
|
+
},
|
|
77
|
+
}));
|
|
78
|
+
}
|
|
79
|
+
} else if (process.argv[2] === "stop" && runner) {
|
|
80
|
+
const reason = stopReason();
|
|
81
|
+
state.blocks += 1;
|
|
82
|
+
// A block that cannot be counted is never sent: an unwritable state dir must not lift the cap.
|
|
83
|
+
if (reason && state.blocks <= MAX_BLOCKS && save()) {
|
|
84
|
+
process.stdout.write(JSON.stringify({ decision: "block", reason }));
|
|
85
|
+
} else {
|
|
86
|
+
if (reason) process.stderr.write(`agent-guard: ${state.blocks > MAX_BLOCKS ? `still owed after ${MAX_BLOCKS} reminders` : "cannot record reminders"}; letting the agent stop\n`);
|
|
87
|
+
state.blocks = 0;
|
|
88
|
+
save();
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
function stopReason() {
|
|
93
|
+
const run = spawnSync(cli, ["call", runner, "agent_obligations"], { encoding: "utf8", timeout: 20_000 });
|
|
94
|
+
if (run.status !== 0) return "";
|
|
95
|
+
let o;
|
|
96
|
+
try { o = JSON.parse(run.stdout); } catch { return ""; }
|
|
97
|
+
const messages = Array.isArray(o.unacknowledgedMessages) ? o.unacknowledgedMessages : [];
|
|
98
|
+
const tasks = Array.isArray(o.unacknowledgedTasks) ? o.unacknowledgedTasks : [];
|
|
99
|
+
const working = Array.isArray(o.inProgressTasks) ? o.inProgressTasks : [];
|
|
100
|
+
const asks = Array.isArray(o.overdueAsks) ? o.overdueAsks : [];
|
|
101
|
+
const name = (t) => `${t.identifier ?? t.issueId} "${t.title ?? ""}" (issueId ${t.issueId})`;
|
|
102
|
+
if (messages.length || tasks.length || asks.length) {
|
|
103
|
+
return [
|
|
104
|
+
`AgentRadar: you still owe ${messages.length + tasks.length + asks.length} item(s). Do not go idle yet.`,
|
|
105
|
+
...(messages.length ? [
|
|
106
|
+
`Messages received but not acknowledged: ${messages.join(", ")}. Each reached you earlier in this session as an event carrying that eventId (${call("read_history")} --conversationId <its conversationId> shows the thread). Reply to each in the channel it came from (a human first), then ${call("acknowledge_messages")} --args '${JSON.stringify({ eventIds: messages })}'.`,
|
|
107
|
+
] : []),
|
|
108
|
+
...tasks.map((t) => `Task assigned to you, not acknowledged: ${name(t)}. Take it on or say why not, then ${call("acknowledge_task")} --issueId ${t.issueId}.`),
|
|
109
|
+
...asks.map((a) => `Nobody answered your ask in thread ${a.threadId} (due ${a.dueAt}${a.note ? `; ${a.note}` : ""}). Chase them in that thread, or if it no longer matters ${call("expect_reply")} --args '${JSON.stringify({ conversationId: a.threadId, by: null })}'.`),
|
|
110
|
+
`Check again with ${call("agent_obligations")}, then stop.`,
|
|
111
|
+
].join("\n");
|
|
112
|
+
}
|
|
113
|
+
// Only once per stop: when this stop is itself the result of a block, the agent has seen it.
|
|
114
|
+
if (working.length && !input.stop_hook_active) {
|
|
115
|
+
return [
|
|
116
|
+
`AgentRadar: ${working.length} task(s) still in progress: ${working.map(name).join("; ")}.`,
|
|
117
|
+
"Keep working on them, or, if one is waiting on someone, make sure its thread says so, then stop.",
|
|
118
|
+
].join("\n");
|
|
119
|
+
}
|
|
120
|
+
return "";
|
|
121
|
+
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
---
|
|
2
|
+
name: agentradar-discipline
|
|
3
|
+
description: >
|
|
4
|
+
House rules for an agent working through AgentRadar. Use before going idle, after receiving a
|
|
5
|
+
channel message or an assigned task, and whenever unsure whether something is still owed.
|
|
6
|
+
---
|
|
7
|
+
|
|
8
|
+
# AgentRadar discipline
|
|
9
|
+
|
|
10
|
+
You act through `agentradar call <runner-id> <tool>`. Your runner id is in `$AR_CLI_RUNNER_ID`.
|
|
11
|
+
|
|
12
|
+
## Before you go idle
|
|
13
|
+
|
|
14
|
+
1. Run `agentradar call $AR_CLI_RUNNER_ID agent_obligations`.
|
|
15
|
+
2. `owed` must be 0:
|
|
16
|
+
- each id in `unacknowledgedMessages` is a message you received and have not handled. Reply in the channel it came from, then `agentradar call $AR_CLI_RUNNER_ID acknowledge_messages --args '{"eventIds":["<id>"]}'`;
|
|
17
|
+
- each entry in `unacknowledgedTasks` is a task assigned to you. Read it, take it on or say why not, then `agentradar call $AR_CLI_RUNNER_ID acknowledge_task --issueId <issueId>`.
|
|
18
|
+
3. Each entry in `inProgressTasks` is either still moving, or its thread says who it is waiting on.
|
|
19
|
+
4. Each entry in `overdueAsks` is a question nobody answered in time. Chase them in that thread with `reply`.
|
|
20
|
+
|
|
21
|
+
The Stop hook runs the same check and will not let you stop while something is owed.
|
|
22
|
+
|
|
23
|
+
## Always
|
|
24
|
+
|
|
25
|
+
- Answer every message in the channel it came from. A human who wrote is waiting for you; answer them first.
|
|
26
|
+
- Talk is not a task. Reply conversationally by default; create a task only for trackable, billable work.
|
|
27
|
+
- Never ask for, print or pass on a credential. AgentRadar holds the keys.
|
|
28
|
+
- When you ask another agent or a human something, call `expect_reply` on that thread with the time you need the answer by. If nobody answers, `next_event` wakes you with kind `followup`: chase them in the thread. If they stay silent, you may escalate to the next human up the chain from the person you wait on; that is your call, never required.
|
|
29
|
+
- Only a human accepts your work. Asked to "mark it done": record the final state with `append_task_log`, then reply that it is finished and ready for them to accept. Never call `decide_outcome` or `declare_outcome` on your own task.
|
|
30
|
+
- Never contact the platform team (`submit_feedback`) unless the human asks you to. "Just handle it" means do the work in your own tools, not report it to AgentRadar.
|
package/dist/runner.js
CHANGED
|
@@ -6,6 +6,7 @@ import { fileURLToPath } from "node:url";
|
|
|
6
6
|
import { promisify } from "node:util";
|
|
7
7
|
import { shellValue, trustedMcpEndpoint, writePrivateFile } from "./setup.js";
|
|
8
8
|
import { callAwpTool, envValue } from "./tool-run.js";
|
|
9
|
+
import { installedVersion, runningVersion, selfUpdate } from "./update.js";
|
|
9
10
|
const RUNNER_ID = /^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/;
|
|
10
11
|
const ENGAGEMENT_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
|
|
11
12
|
// Per-hire bearers are ordinary agent keys (`pcp_…`); the runner's own is an AWP key (`ar_…`).
|
|
@@ -14,6 +15,8 @@ const HIRE_BEARER = /^(ar|pcp)_[A-Za-z0-9_-]+$/;
|
|
|
14
15
|
// A hire always runs Claude, whose MCP config it owns; a Codex home would be the catalog agent's.
|
|
15
16
|
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)=/;
|
|
16
17
|
const CODEX_HARNESS = /^(export\s+)?AR_AGENT_HARNESS=\s*["']?codex\b/m;
|
|
18
|
+
// While a pane shows this, its agent is mid-turn (the feeder's in-progress hint, same for Claude and Codex).
|
|
19
|
+
const MID_TURN = /esc to interrupt|\besc to cancel\b/i;
|
|
17
20
|
const run = promisify(execFile);
|
|
18
21
|
/** Run from outside the target harness: the command deliberately replaces that harness process. */
|
|
19
22
|
export async function runRestartSelftest(runnerId, deps = {}) {
|
|
@@ -227,7 +230,22 @@ export async function startVendorRunner(runnerId, home = homedir(), deps = {}) {
|
|
|
227
230
|
const spawnChild = deps.spawn ?? ((command, args) => spawn(command, args, { stdio: "inherit", env: process.env }));
|
|
228
231
|
const hires = new Map();
|
|
229
232
|
let timer;
|
|
233
|
+
let updateTimer;
|
|
230
234
|
let stopped = false;
|
|
235
|
+
let updating = false;
|
|
236
|
+
const tmux = deps.tmux ?? (async (args) => (await run("bash", [
|
|
237
|
+
"-c", 'PATH="/opt/homebrew/bin:/usr/local/bin:$PATH"; exec "${TMUX_BIN:-tmux}" "$@"', "tmux", ...args,
|
|
238
|
+
])).stdout);
|
|
239
|
+
const installed = deps.installed ?? (() => installedVersion());
|
|
240
|
+
// Unknown (package.json unreadable): auto-update stays off rather than restart on every check.
|
|
241
|
+
const running = await (deps.installed ? installed() : runningVersion()).catch(() => null);
|
|
242
|
+
// Only our own LaunchAgent / systemd unit sets AGENTRADAR_SERVICE=1, and only they restart the runner.
|
|
243
|
+
// Not the parent pid: a nohup/setsid start is reparented to launchd or a subreaper too, and would be
|
|
244
|
+
// killed for an update with nothing to start it again. Every other runner installs updates, never exits.
|
|
245
|
+
const serviced = deps.serviced ?? process.env.AGENTRADAR_SERVICE === "1";
|
|
246
|
+
// Read once, then dropped: the supervisor's tmux server would otherwise pass it to every runner a vendor
|
|
247
|
+
// later starts by hand in that tmux, and those would exit for an update with nothing to restart them.
|
|
248
|
+
delete process.env.AGENTRADAR_SERVICE;
|
|
231
249
|
const runHire = (hireEnv) => {
|
|
232
250
|
if (stopped || hires.has(hireEnv))
|
|
233
251
|
return;
|
|
@@ -399,12 +417,87 @@ export async function startVendorRunner(runnerId, home = homedir(), deps = {}) {
|
|
|
399
417
|
const stop = () => {
|
|
400
418
|
stopped = true;
|
|
401
419
|
clearTimeout(timer);
|
|
420
|
+
clearTimeout(updateTimer);
|
|
402
421
|
for (const child of hires.values())
|
|
403
422
|
child.kill("SIGTERM");
|
|
404
423
|
};
|
|
424
|
+
// Every tmux session this runner owns: the shared agent's and each hire's.
|
|
425
|
+
let sessions = [];
|
|
426
|
+
const sessionNames = async () => (await Promise.all([envPath, ...hires.keys()].map(async (file) => {
|
|
427
|
+
const contents = await readFile(file, "utf8").catch(() => "");
|
|
428
|
+
return envValue(contents, "TMUX_SESSION") ?? envValue(contents, "AGENT_NAME");
|
|
429
|
+
}))).filter((name) => Boolean(name));
|
|
430
|
+
const midTurn = async () => {
|
|
431
|
+
for (const name of await sessionNames()) {
|
|
432
|
+
if (MID_TURN.test(await tmux(["capture-pane", "-p", "-t", `=${name}:`]).catch(() => "")))
|
|
433
|
+
return true;
|
|
434
|
+
}
|
|
435
|
+
return false;
|
|
436
|
+
};
|
|
405
437
|
const shared = spawnChild("bash", [supervisor, envPath]);
|
|
406
438
|
shared.once("error", (error) => { stop(); reject(error); });
|
|
407
|
-
shared.once("exit", (code, signal) => {
|
|
439
|
+
shared.once("exit", (code, signal) => {
|
|
440
|
+
stop();
|
|
441
|
+
if (!updating)
|
|
442
|
+
return resolvePromise(code ?? (signal ? 1 : 0));
|
|
443
|
+
// The supervisors are gone, so nothing relaunches the old panes: end them, and exit for launchd or
|
|
444
|
+
// systemd to start this runner on the new code, whose supervisors resume each session (AR_RESUME_FLAGS)
|
|
445
|
+
// with the new agent-guard plugin, which loads in place from this package.
|
|
446
|
+
void Promise.all(sessions.map((name) => tmux(["kill-session", "-t", `=${name}`]).catch(() => "")))
|
|
447
|
+
.then(() => resolvePromise(0));
|
|
448
|
+
});
|
|
449
|
+
// The package is shared by every agent on this machine, so AGENTRADAR_NO_AUTO_UPDATE=1 in the service's
|
|
450
|
+
// environment or in any agent's env file turns updates off for all of them.
|
|
451
|
+
const optedOut = async () => {
|
|
452
|
+
const values = [process.env.AGENTRADAR_NO_AUTO_UPDATE];
|
|
453
|
+
for (const file of await readdir(agentDir).catch(() => [])) {
|
|
454
|
+
if (file.endsWith(".env"))
|
|
455
|
+
values.push(envValue(await readFile(join(agentDir, file), "utf8").catch(() => ""), "AGENTRADAR_NO_AUTO_UPDATE") ?? undefined);
|
|
456
|
+
}
|
|
457
|
+
return values.some((value) => value && value !== "0");
|
|
458
|
+
};
|
|
459
|
+
// At start and then daily: install npm's latest release. Every tick: restart onto whatever is on disk if
|
|
460
|
+
// it is not what this process runs (another runner on this machine may have installed it). A restart
|
|
461
|
+
// waits for every pane to finish its turn, for at most an hour.
|
|
462
|
+
let nextCheck = 0;
|
|
463
|
+
let told = "";
|
|
464
|
+
const autoUpdate = async () => {
|
|
465
|
+
try {
|
|
466
|
+
if (running && !(await optedOut())) {
|
|
467
|
+
if (Date.now() >= nextCheck) {
|
|
468
|
+
nextCheck = Date.now() + (deps.updateEveryMs ?? 86_400_000);
|
|
469
|
+
const fresh = await (deps.update ?? selfUpdate)();
|
|
470
|
+
if (fresh)
|
|
471
|
+
log(`AgentRadar CLI ${fresh} installed (was ${running})`);
|
|
472
|
+
}
|
|
473
|
+
const onDisk = await installed();
|
|
474
|
+
if (onDisk !== running && !serviced) {
|
|
475
|
+
if (told !== onDisk)
|
|
476
|
+
log(`AgentRadar CLI ${onDisk} is installed; restart this runner to use it`);
|
|
477
|
+
told = onDisk;
|
|
478
|
+
}
|
|
479
|
+
else if (onDisk !== running) {
|
|
480
|
+
for (let i = 0; i < 240 && !stopped && await midTurn(); i += 1) {
|
|
481
|
+
await new Promise((resolveWait) => setTimeout(resolveWait, deps.idlePollMs ?? 15_000));
|
|
482
|
+
}
|
|
483
|
+
if (stopped)
|
|
484
|
+
return;
|
|
485
|
+
log(`Restarting on AgentRadar CLI ${onDisk}; each session resumes where it was`);
|
|
486
|
+
sessions = await sessionNames();
|
|
487
|
+
updating = true;
|
|
488
|
+
stop();
|
|
489
|
+
shared.kill("SIGTERM");
|
|
490
|
+
return;
|
|
491
|
+
}
|
|
492
|
+
}
|
|
493
|
+
}
|
|
494
|
+
catch (error) {
|
|
495
|
+
log(`Auto-update failed, staying on ${running}: ${error.message}`);
|
|
496
|
+
}
|
|
497
|
+
if (!stopped)
|
|
498
|
+
updateTimer = setTimeout(autoUpdate, deps.tickMs ?? 60_000);
|
|
499
|
+
};
|
|
500
|
+
void autoUpdate();
|
|
408
501
|
hireTick()
|
|
409
502
|
.then((tick) => {
|
|
410
503
|
// The next tick is scheduled only after this one finishes, so a slow clone never overlaps another.
|
package/dist/setup.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
|
-
import { execFile } from "node:child_process";
|
|
2
|
+
import { execFile, spawn } from "node:child_process";
|
|
3
|
+
import { createInterface } from "node:readline";
|
|
3
4
|
import { chmod, cp, lstat, mkdir, readFile, readlink, realpath, rename, rm, symlink, writeFile } from "node:fs/promises";
|
|
4
5
|
import { basename, dirname, join, resolve } from "node:path";
|
|
5
6
|
import { fileURLToPath } from "node:url";
|
|
@@ -7,6 +8,8 @@ import { homedir } from "node:os";
|
|
|
7
8
|
import * as tls from "node:tls";
|
|
8
9
|
import { promisify } from "node:util";
|
|
9
10
|
const DEFAULT_API_URL = "https://vendor.agentradar.com/api";
|
|
11
|
+
/** The service's CLI build (the CLI itself and the agent-guard plugin): `installCli` keeps it current, never the npx cache. */
|
|
12
|
+
const cliDist = (home) => join(home, ".agentradar", "cli", "current", "dist");
|
|
10
13
|
/** `ar_` is a vendor runner bearer; `pcp_` is the key an organisation's own agent claims through `join`. */
|
|
11
14
|
const BEARER_SHAPE = /^(?:ar|pcp)_[A-Za-z0-9_-]+$/;
|
|
12
15
|
/**
|
|
@@ -241,12 +244,13 @@ async function codexServiceHome(home, runnerId, env) {
|
|
|
241
244
|
const codexHome = join(home, ".agentradar", "codex", runnerId);
|
|
242
245
|
await mkdir(codexHome, { recursive: true, mode: 0o700 });
|
|
243
246
|
await chmod(codexHome, 0o700);
|
|
244
|
-
let
|
|
247
|
+
let dropTable = false;
|
|
245
248
|
let inTable = false;
|
|
246
249
|
let depth = 0;
|
|
247
250
|
let dropping = false;
|
|
248
251
|
const text = { open: null };
|
|
249
252
|
// A restart would otherwise stop on Codex's "Update available" screen, with nobody there to press a key.
|
|
253
|
+
// The vendor's own hooks stay out too: the service runs AgentRadar's guard and nothing it did not review.
|
|
250
254
|
const config = ["check_for_update_on_startup = false", ...(await readFile(join(source, "config.toml"), "utf8").catch(() => "")).split("\n").filter((line) => {
|
|
251
255
|
// Brackets inside strings and comments don't count; a line inside a multi-line array or string goes with its key.
|
|
252
256
|
const continued = depth > 0 || text.open !== null;
|
|
@@ -254,18 +258,31 @@ async function codexServiceHome(home, runnerId, env) {
|
|
|
254
258
|
depth = Math.max(0, depth + (bare.match(/\[/g)?.length ?? 0) - (bare.match(/\]/g)?.length ?? 0));
|
|
255
259
|
if (continued)
|
|
256
260
|
return !dropping;
|
|
261
|
+
// An escape in a quoted key ("\u0068ooks") could name mcp_servers or hooks past both checks.
|
|
262
|
+
if (/^\s*(?:\[\[?\s*)?(?:[\w-]+\s*\.\s*)*"[^"\n]*\\/.test(line))
|
|
263
|
+
throw new Error(`${join(source, "config.toml")} has a quoted key with an escape; spell it plainly and run join again`);
|
|
257
264
|
const header = /^\s*\[\[?\s*([^\]]+)\]/.exec(line);
|
|
258
265
|
if (header) {
|
|
259
|
-
|
|
266
|
+
dropTable = /^["']?(?:mcp_servers|hooks)\b/.test(header[1]);
|
|
260
267
|
inTable = true;
|
|
261
268
|
}
|
|
262
|
-
dropping =
|
|
269
|
+
dropping = dropTable || /^\s*["']?(?:mcp_servers|hooks)["']?\s*[.=]/.test(line) || (!inTable && /^\s*["']?check_for_update_on_startup["']?\s*=/.test(line));
|
|
263
270
|
return !dropping;
|
|
264
271
|
})].join("\n");
|
|
265
|
-
// Fail closed: another client's MCP server must never reach this client's session.
|
|
266
|
-
if (/^\s*(?:\[\[?\s*)?["']?mcp_servers\b/m.test(config))
|
|
267
|
-
throw new Error(`Could not strip the MCP servers from ${join(source, "config.toml")}; simplify it and run join again`);
|
|
272
|
+
// Fail closed: another client's MCP server, or a hook we did not review, must never reach this client's session.
|
|
273
|
+
if (/^\s*(?:\[\[?\s*)?["']?(?:mcp_servers|hooks)\b/m.test(config))
|
|
274
|
+
throw new Error(`Could not strip the MCP servers and hooks from ${join(source, "config.toml")}; simplify it and run join again`);
|
|
268
275
|
await writePrivateFile(join(codexHome, "config.toml"), config);
|
|
276
|
+
const guard = `node ${JSON.stringify(join(cliDist(home), "agent-guard", "scripts", "guard.mjs"))}`;
|
|
277
|
+
await writePrivateFile(join(codexHome, "hooks.json"), `${JSON.stringify({ hooks: {
|
|
278
|
+
Stop: [{ hooks: [{ type: "command", command: `${guard} stop`, timeout: 30 }] }],
|
|
279
|
+
UserPromptSubmit: [{ hooks: [{ type: "command", command: `${guard} prompt`, timeout: 10 }] }],
|
|
280
|
+
} }, null, 2)}\n`);
|
|
281
|
+
const trusted = await codexHookHashes(codexHome, env).catch(() => []);
|
|
282
|
+
if (trusted.length) {
|
|
283
|
+
await writePrivateFile(join(codexHome, "config.toml"), `${config.replace(/\n*$/, "\n")}${trusted
|
|
284
|
+
.map(({ key, hash }) => `\n[hooks.state.${JSON.stringify(key)}]\ntrusted_hash = ${JSON.stringify(hash)}\n`).join("")}`);
|
|
285
|
+
}
|
|
269
286
|
await cp(join(source, "rules"), join(codexHome, "rules"), { recursive: true, force: true }).catch((error) => {
|
|
270
287
|
if (error.code !== "ENOENT")
|
|
271
288
|
throw error;
|
|
@@ -278,6 +295,46 @@ async function codexServiceHome(home, runnerId, env) {
|
|
|
278
295
|
}
|
|
279
296
|
return { codexHome, keys: [...config.matchAll(/^\s*env_key\s*=\s*"([A-Za-z_][A-Za-z0-9_]*)"/gm)].map((match) => match[1]) };
|
|
280
297
|
}
|
|
298
|
+
/**
|
|
299
|
+
* Codex runs a user hook only once its hash is recorded as trusted (`[hooks.state."<key>"] trusted_hash`),
|
|
300
|
+
* which is what its /hooks review writes. Asks Codex itself for the keys and hashes of the hooks in
|
|
301
|
+
* `<codexHome>/hooks.json` (app-server `hooks/list`), so the hash is never recomputed here. Any failure
|
|
302
|
+
* leaves them untrusted: Codex then skips them, and the agent runs without the guard rather than not at all.
|
|
303
|
+
*/
|
|
304
|
+
async function codexHookHashes(codexHome, env) {
|
|
305
|
+
const child = spawn(env.CODEX_BIN || "codex", ["app-server"], { cwd: codexHome, env: { ...env, CODEX_HOME: codexHome }, stdio: ["pipe", "pipe", "ignore"] });
|
|
306
|
+
const lines = createInterface({ input: child.stdout });
|
|
307
|
+
// A child that never spawned (no codex on PATH) emits no end on stdout; closing the reader ends the loop.
|
|
308
|
+
const stop = () => { child.kill(); lines.close(); };
|
|
309
|
+
const timer = setTimeout(stop, 20_000);
|
|
310
|
+
try {
|
|
311
|
+
child.on("error", stop);
|
|
312
|
+
child.stdin.on("error", () => undefined);
|
|
313
|
+
const send = (message) => child.stdin.write(`${JSON.stringify({ jsonrpc: "2.0", ...message })}\n`);
|
|
314
|
+
send({ id: 1, method: "initialize", params: { clientInfo: { name: "agentradar", version: "0" } } });
|
|
315
|
+
send({ method: "initialized" });
|
|
316
|
+
send({ id: 2, method: "hooks/list", params: { cwds: [codexHome] } });
|
|
317
|
+
for await (const line of lines) {
|
|
318
|
+
let message;
|
|
319
|
+
try {
|
|
320
|
+
message = JSON.parse(line);
|
|
321
|
+
}
|
|
322
|
+
catch {
|
|
323
|
+
continue;
|
|
324
|
+
}
|
|
325
|
+
if (message.id !== 2)
|
|
326
|
+
continue;
|
|
327
|
+
return (message.result?.data ?? []).flatMap((entry) => entry.hooks ?? [])
|
|
328
|
+
.filter((hook) => hook.source === "user" && basename(hook.sourcePath) === "hooks.json")
|
|
329
|
+
.map((hook) => ({ key: hook.key, hash: hook.currentHash }));
|
|
330
|
+
}
|
|
331
|
+
return [];
|
|
332
|
+
}
|
|
333
|
+
finally {
|
|
334
|
+
clearTimeout(timer);
|
|
335
|
+
child.kill();
|
|
336
|
+
}
|
|
337
|
+
}
|
|
281
338
|
async function installRunner(home, projectPath, approved, service) {
|
|
282
339
|
if (!/^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/.test(approved.runnerId)) {
|
|
283
340
|
throw new Error("AgentRadar returned an invalid runner ID");
|
|
@@ -300,7 +357,7 @@ async function installRunner(home, projectPath, approved, service) {
|
|
|
300
357
|
const envPath = join(agentDir, `${approved.runnerId}.env`);
|
|
301
358
|
const joined = [];
|
|
302
359
|
if (service) {
|
|
303
|
-
joined.push(`AR_CLI_RUNNER_ID=${shellValue(approved.runnerId)}`);
|
|
360
|
+
joined.push(`AR_CLI_RUNNER_ID=${shellValue(approved.runnerId)}`, `AR_AGENTRADAR_BIN=${shellValue(join(cliDist(home), "index.js"))}`);
|
|
304
361
|
let toolKeys = [];
|
|
305
362
|
if (harness === "codex") {
|
|
306
363
|
const { codexHome, keys } = await codexServiceHome(home, approved.runnerId, service.env);
|
|
@@ -322,6 +379,14 @@ async function installRunner(home, projectPath, approved, service) {
|
|
|
322
379
|
const configDirEnv = service.env.CLAUDE_CONFIG_DIR?.trim();
|
|
323
380
|
if (configDirEnv)
|
|
324
381
|
joined.push(`CLAUDE_CONFIG_DIR=${shellValue(resolve(configDirEnv))}`);
|
|
382
|
+
// agent-guard, enabled for this session only (`--settings`), loaded from the copy inside this package, with
|
|
383
|
+
// its plugin state under the runner's config so the vendor's own Claude plugins are never touched.
|
|
384
|
+
const settings = join(configDir, "agentradar-settings.json");
|
|
385
|
+
await writePrivateFile(settings, `${JSON.stringify({
|
|
386
|
+
extraKnownMarketplaces: { agentradar: { source: { source: "directory", path: join(cliDist(home), "agent-guard") } } },
|
|
387
|
+
enabledPlugins: { "agent-guard@agentradar": true },
|
|
388
|
+
}, null, 2)}\n`);
|
|
389
|
+
joined.push(`CLAUDE_SETTINGS=${shellValue(settings)}`, `CLAUDE_CODE_PLUGIN_CACHE_DIR=${shellValue(join(configDir, "plugins"))}`);
|
|
325
390
|
}
|
|
326
391
|
const toolEnv = Object.entries(service.env)
|
|
327
392
|
.filter(([key, value]) => (TOOL_ENV.test(key) || toolKeys.includes(key)) && key !== "ANTHROPIC_API_KEY" && value && !value.includes("\n"))
|
|
@@ -459,23 +524,28 @@ export async function installCli(home, pkg = dirname(dirname(fileURLToPath(impor
|
|
|
459
524
|
if (!(await lstat(target).then(() => true, () => false))) {
|
|
460
525
|
// Staged then renamed, so a half-finished copy is never a version directory.
|
|
461
526
|
const staged = `${target}.${process.pid}.tmp`;
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
527
|
+
try {
|
|
528
|
+
await cp(join(pkg, "dist"), join(staged, "dist"), { recursive: true });
|
|
529
|
+
await cp(join(pkg, "package.json"), join(staged, "package.json"));
|
|
530
|
+
await rename(staged, target);
|
|
531
|
+
}
|
|
532
|
+
catch (error) {
|
|
533
|
+
// A copy that fails partway leaves nothing behind; losing the rename to another runner is fine.
|
|
465
534
|
await rm(staged, { recursive: true, force: true });
|
|
466
|
-
|
|
535
|
+
const code = error.code;
|
|
536
|
+
if (code !== "ENOTEMPTY" && code !== "EEXIST")
|
|
467
537
|
throw error;
|
|
468
|
-
}
|
|
538
|
+
}
|
|
469
539
|
}
|
|
470
540
|
// Forward only: an older CLI run later (a stale npx cache) never downgrades the service.
|
|
471
541
|
const current = await readlink(join(cli, "current")).catch(() => "");
|
|
472
542
|
if (current && versionRank(current) > versionRank(version))
|
|
473
|
-
return
|
|
543
|
+
return cliDist(home);
|
|
474
544
|
const link = join(cli, `current.${process.pid}.tmp`);
|
|
475
545
|
await rm(link, { force: true });
|
|
476
546
|
await symlink(version, link);
|
|
477
547
|
await rename(link, join(cli, "current"));
|
|
478
|
-
return
|
|
548
|
+
return cliDist(home);
|
|
479
549
|
}
|
|
480
550
|
/** `install-agent.sh <id> --load` with the CLI at ~/.agentradar/cli/current, so the service does not depend on PATH. */
|
|
481
551
|
async function installAgentService(runnerId, home, env) {
|
package/dist/update.js
ADDED
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
import { execFile } from "node:child_process";
|
|
2
|
+
import { createHash } from "node:crypto";
|
|
3
|
+
import { mkdir, mkdtemp, readFile, rename, rm, writeFile } from "node:fs/promises";
|
|
4
|
+
import { basename, dirname, join } from "node:path";
|
|
5
|
+
import { fileURLToPath } from "node:url";
|
|
6
|
+
import { promisify } from "node:util";
|
|
7
|
+
import { installCli } from "./setup.js";
|
|
8
|
+
const LATEST = "https://registry.npmjs.org/agentradar-cli/latest";
|
|
9
|
+
const TARBALL = /^https:\/\/registry\.npmjs\.org\/agentradar-cli\/-\/agentradar-cli-\d+\.\d+\.\d+\.tgz$/;
|
|
10
|
+
const VERSION = /^(\d+)\.(\d+)\.(\d+)$/;
|
|
11
|
+
/** This package's folder: the CLI, the runner scripts and the agent-guard plugin all live in it. */
|
|
12
|
+
export const PACKAGE_ROOT = dirname(dirname(fileURLToPath(import.meta.url)));
|
|
13
|
+
/** A service's copy, made by `agentradar join` at ~/.agentradar/cli/<version>; the service runs ~/.agentradar/cli/current. */
|
|
14
|
+
const serviceCopy = (root) => basename(dirname(root)) === "cli" && basename(dirname(dirname(root))) === ".agentradar";
|
|
15
|
+
/** The version this process runs, whatever `current` points at now. */
|
|
16
|
+
export const runningVersion = async () => JSON.parse(await readFile(join(PACKAGE_ROOT, "package.json"), "utf8")).version;
|
|
17
|
+
/** The version on disk: for a service's copy, the one `current` points at, which another runner may have moved. */
|
|
18
|
+
export const installedVersion = async (root = PACKAGE_ROOT) => JSON.parse(await readFile(join(serviceCopy(root) ? join(dirname(root), "current") : root, "package.json"), "utf8")).version;
|
|
19
|
+
const newer = (a, b) => {
|
|
20
|
+
const [x, y] = [VERSION.exec(a), VERSION.exec(b)];
|
|
21
|
+
if (!x || !y)
|
|
22
|
+
return false;
|
|
23
|
+
for (let i = 1; i <= 3; i++)
|
|
24
|
+
if (Number(x[i]) !== Number(y[i]))
|
|
25
|
+
return Number(x[i]) > Number(y[i]);
|
|
26
|
+
return false;
|
|
27
|
+
};
|
|
28
|
+
/**
|
|
29
|
+
* Replaces this package in place with npm's latest release, when that is newer. Returns the version it
|
|
30
|
+
* installed, or null when nothing changed. Only a copy npm installed (inside `node_modules`) is touched,
|
|
31
|
+
* never a source checkout. The tarball must match the registry's sha512 before anything is unpacked, and
|
|
32
|
+
* the running folder is swapped by rename, so the service's paths stay valid and a failed update leaves
|
|
33
|
+
* the old copy in place.
|
|
34
|
+
*/
|
|
35
|
+
export async function selfUpdate(deps = {}) {
|
|
36
|
+
const root = deps.root ?? PACKAGE_ROOT;
|
|
37
|
+
if (!serviceCopy(root) && basename(dirname(root)) !== "node_modules")
|
|
38
|
+
return null;
|
|
39
|
+
const current = await installedVersion(root);
|
|
40
|
+
const get = (url) => (deps.fetch ?? fetch)(url, { signal: AbortSignal.timeout(60_000) });
|
|
41
|
+
const response = await get(LATEST);
|
|
42
|
+
if (!response.ok)
|
|
43
|
+
throw new Error(`npm registry answered ${response.status}`);
|
|
44
|
+
const latest = await response.json();
|
|
45
|
+
const version = latest.version ?? "";
|
|
46
|
+
if (!newer(version, current))
|
|
47
|
+
return null;
|
|
48
|
+
const tarballUrl = latest.dist?.tarball ?? "";
|
|
49
|
+
const integrity = latest.dist?.integrity ?? "";
|
|
50
|
+
if (!TARBALL.test(tarballUrl) || !tarballUrl.endsWith(`-${version}.tgz`) || !integrity.startsWith("sha512-")) {
|
|
51
|
+
throw new Error(`npm registry returned an unexpected release for ${version}`);
|
|
52
|
+
}
|
|
53
|
+
const download = await get(tarballUrl);
|
|
54
|
+
if (!download.ok)
|
|
55
|
+
throw new Error(`download of ${version} answered ${download.status}`);
|
|
56
|
+
const bytes = Buffer.from(await download.arrayBuffer());
|
|
57
|
+
if (`sha512-${createHash("sha512").update(bytes).digest("base64")}` !== integrity) {
|
|
58
|
+
throw new Error(`download of ${version} does not match the registry's checksum`);
|
|
59
|
+
}
|
|
60
|
+
// Unpacked beside the package, so the swap is a rename on one filesystem.
|
|
61
|
+
const work = await mkdtemp(join(dirname(root), ".agentradar-cli-update-"));
|
|
62
|
+
try {
|
|
63
|
+
const tarball = join(work, "package.tgz");
|
|
64
|
+
const next = join(work, "package");
|
|
65
|
+
await writeFile(tarball, bytes);
|
|
66
|
+
await mkdir(next);
|
|
67
|
+
await (deps.untar ?? ((file, into) => promisify(execFile)("tar", ["-xzf", file, "-C", into, "--strip-components=1"])))(tarball, next);
|
|
68
|
+
const manifest = JSON.parse(await readFile(join(next, "package.json"), "utf8"));
|
|
69
|
+
if (manifest.name !== "agentradar-cli" || manifest.version !== version)
|
|
70
|
+
throw new Error(`unpacked package is not agentradar-cli ${version}`);
|
|
71
|
+
// Unpacking installs no dependencies; a release that needs some has to go through npm.
|
|
72
|
+
if (Object.keys(manifest.dependencies ?? {}).length)
|
|
73
|
+
throw new Error(`agentradar-cli ${version} has dependencies; update it with npm`);
|
|
74
|
+
// A service's copy gets a new version folder and `current` moves to it; the running one stays untouched.
|
|
75
|
+
if (serviceCopy(root)) {
|
|
76
|
+
await installCli(dirname(dirname(dirname(root))), next);
|
|
77
|
+
return version;
|
|
78
|
+
}
|
|
79
|
+
const old = join(work, "old");
|
|
80
|
+
await rename(root, old);
|
|
81
|
+
try {
|
|
82
|
+
await rename(next, root);
|
|
83
|
+
}
|
|
84
|
+
catch (error) {
|
|
85
|
+
await rename(old, root);
|
|
86
|
+
throw error;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
finally {
|
|
90
|
+
await rm(work, { recursive: true, force: true });
|
|
91
|
+
}
|
|
92
|
+
return version;
|
|
93
|
+
}
|
|
94
|
+
//# sourceMappingURL=update.js.map
|
|
@@ -314,7 +314,23 @@ export function runnerState(auth = agentAuthState, sample = capturePane) {
|
|
|
314
314
|
const authState = auth();
|
|
315
315
|
if (authState === "unauthenticated") return "auth_required";
|
|
316
316
|
if (authState !== "authenticated") return "starting";
|
|
317
|
-
|
|
317
|
+
const pane = sample();
|
|
318
|
+
if (pane?.rateLimited) return "rate_limited";
|
|
319
|
+
return pane?.inputReady ? "ready" : "starting";
|
|
320
|
+
}
|
|
321
|
+
|
|
322
|
+
/**
|
|
323
|
+
* M23 — the CLI's own usage-limit message near the bottom of the pane. Measured in the binaries, not
|
|
324
|
+
* guessed: Claude Code 2.1.281 prints "Usage limit reached · …", "You've hit your monthly spend limit",
|
|
325
|
+
* "you have reached your weekly usage limit"; codex-cli 0.149.1 prints "You've hit your usage limit." and
|
|
326
|
+
* "Usage limit reached. You've reached your usage limit.".
|
|
327
|
+
*
|
|
328
|
+
* ponytail: the transcript tail is scanned too, so an agent quoting the phrase in its last lines reads as
|
|
329
|
+
* limited until it scrolls away. Anchor on the status line only if that is observed on a real runner.
|
|
330
|
+
*/
|
|
331
|
+
export function paneRateLimited(text) {
|
|
332
|
+
const tail = String(text ?? "").split("\n").slice(-12).join("\n");
|
|
333
|
+
return /usage limit reached|you['’]ve hit your (?:\w+ )?(?:usage|spend) limit|you['’]?(?:ve| have) reached your (?:\w+ )?usage limit/i.test(tail);
|
|
318
334
|
}
|
|
319
335
|
|
|
320
336
|
// --------------------------------------------------------------------------
|
|
@@ -359,7 +375,10 @@ async function injectFrame(frame, label) {
|
|
|
359
375
|
return false;
|
|
360
376
|
}
|
|
361
377
|
const [setCmd, pasteCmd, enterCmd] = sendKeysCommands(TMUX_SESSION, frame);
|
|
362
|
-
const
|
|
378
|
+
const okSet = await tmux(setCmd);
|
|
379
|
+
const okText = okSet && (await tmux(pasteCmd));
|
|
380
|
+
// paste-buffer -d frees the buffer only on success; never leave client text sitting in tmux.
|
|
381
|
+
if (okSet && !okText) await tmux(["delete-buffer", "-b", setCmd[2]]);
|
|
363
382
|
await sleep(KEY_SETTLE_MS);
|
|
364
383
|
const okEnter = okText && (await tmux(enterCmd));
|
|
365
384
|
if (okEnter) console.log(`[feeder] injected ${label}`);
|
|
@@ -580,7 +599,7 @@ function capturePane() {
|
|
|
580
599
|
// build after several turns, which falsely demoted a healthy pane to `starting` and stopped next_event
|
|
581
600
|
// from draining until its heartbeat aged stale.
|
|
582
601
|
const inputReady = paneInputReady(text);
|
|
583
|
-
return { hash, inProgress, inputReady, channelGate: classifyChannelBanner(text) };
|
|
602
|
+
return { hash, inProgress, inputReady, rateLimited: paneRateLimited(text), channelGate: classifyChannelBanner(text) };
|
|
584
603
|
}
|
|
585
604
|
/**
|
|
586
605
|
* #173b (disc obs) — format-drift detector. If the STRIPPED fingerprint keeps CHANGING while the pane
|
|
@@ -21,6 +21,8 @@ Type=simple
|
|
|
21
21
|
# The runner reads ~/.agentradar/agents/%i.env.
|
|
22
22
|
# systemd --user starts with a bare PATH; the agent CLI must resolve as it did for the installing user.
|
|
23
23
|
Environment="PATH=__PATH__"
|
|
24
|
+
# Tells the runner systemd restarts it, so it may exit to pick up a CLI update.
|
|
25
|
+
Environment="AGENTRADAR_SERVICE=1"
|
|
24
26
|
ExecStart=__RUNNER__ %i
|
|
25
27
|
Restart=always
|
|
26
28
|
RestartSec=15
|
|
@@ -45,7 +45,10 @@
|
|
|
45
45
|
<key>HOME</key>
|
|
46
46
|
<string>__HOME__</string>
|
|
47
47
|
<key>PATH</key>
|
|
48
|
-
<string>__PATH__</string>
|
|
48
|
+
<string>__PATH__</string>
|
|
49
|
+
<!-- Tells the runner launchd restarts it, so it may exit to pick up a CLI update. -->
|
|
50
|
+
<key>AGENTRADAR_SERVICE</key>
|
|
51
|
+
<string>1</string>__EXTRA_ENV__
|
|
49
52
|
</dict>
|
|
50
53
|
|
|
51
54
|
<key>WorkingDirectory</key>
|
|
@@ -138,6 +138,8 @@ else
|
|
|
138
138
|
# SC2086: CLAUDE_EXTRA_FLAGS is intentionally UNQUOTED so "--chrome" (etc.) word-splits into flags.
|
|
139
139
|
# shellcheck disable=SC2086
|
|
140
140
|
_launch_flags=( ${CLAUDE_EXTRA_FLAGS} --strict-mcp-config --mcp-config="${MCP_CONFIG}" )
|
|
141
|
+
# `agentradar join` enables the agent-guard plugin for this session only, through a settings file.
|
|
142
|
+
[ -n "${CLAUDE_SETTINGS:-}" ] && _launch_flags+=( --settings "${CLAUDE_SETTINGS}" )
|
|
141
143
|
# Pane-alive predicate — MUST be unique per agent. Default to the FULL mcp-config path (each agent's
|
|
142
144
|
# differs by directory), NOT the basename: on a multi-agent box every agent's config is named
|
|
143
145
|
# `awp-only.json`, so a basename match would find ANOTHER agent's live claude and mask THIS agent's
|
|
@@ -169,7 +171,7 @@ if [ -n "${AGENT_TOOL_ENV_FILE}" ]; then
|
|
|
169
171
|
# identity). Reject at parse time (visible warning) AND — belt-and-suspenders — the launch lists
|
|
170
172
|
# the reserved allowlist AFTER TOOL_ENV_ARGS so `env` last-wins keeps reserved vars authoritative.
|
|
171
173
|
case "${_tline%%=*}" in
|
|
172
|
-
HOME|PATH|USER|LOGNAME|SHELL|TERM|COLORTERM|LANG|LC_ALL|LC_CTYPE|TMPDIR|NODE_OPTIONS|CLAUDE_CONFIG_DIR|CLAUDE_CODE_OAUTH_TOKEN|CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC|CLAUDE_CODE_GB_DISK_CACHE_WHEN_TELEMETRY_OFF|CODEX_HOME|AR_RESUME_FLAGS|AR_FRESH_FLAGS|AR_OAUTH_TOKEN_FILE|AR_TOOL_ENV_FILE|ANTHROPIC_API_KEY|AWP_BEARER|AWP_BEARER_FILE|AWP_MCP_URL|TMUX_SESSION|AGENT_PID_PATTERN)
|
|
174
|
+
HOME|PATH|USER|LOGNAME|SHELL|TERM|COLORTERM|LANG|LC_ALL|LC_CTYPE|TMPDIR|NODE_OPTIONS|CLAUDE_CONFIG_DIR|CLAUDE_CODE_OAUTH_TOKEN|CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC|CLAUDE_CODE_GB_DISK_CACHE_WHEN_TELEMETRY_OFF|CODEX_HOME|AR_CLI_RUNNER_ID|AR_AGENTRADAR_BIN|AR_DISCIPLINE_EVERY|CLAUDE_CODE_PLUGIN_CACHE_DIR|AR_RESUME_FLAGS|AR_FRESH_FLAGS|AR_OAUTH_TOKEN_FILE|AR_TOOL_ENV_FILE|ANTHROPIC_API_KEY|AWP_BEARER|AWP_BEARER_FILE|AWP_MCP_URL|TMUX_SESSION|AGENT_PID_PATTERN)
|
|
173
175
|
log "WARN ignoring reserved key '${_tline%%=*}' in ${AGENT_TOOL_ENV_FILE} (cannot override supervisor/agent env)"; continue ;;
|
|
174
176
|
esac
|
|
175
177
|
TOOL_ENV_ARGS+=("${_tline}")
|
|
@@ -186,6 +188,10 @@ fi
|
|
|
186
188
|
unset CLAUDE_CODE_OAUTH_TOKEN
|
|
187
189
|
_claude_cfg=()
|
|
188
190
|
[ -n "${CLAUDE_CONFIG_DIR:-}" ] && _claude_cfg=( CLAUDE_CONFIG_DIR="${CLAUDE_CONFIG_DIR}" )
|
|
191
|
+
# agent-guard (templates/agent-guard): its hooks ask the server what this runner still owes through the CLI.
|
|
192
|
+
for _k in AR_CLI_RUNNER_ID AR_AGENTRADAR_BIN AR_DISCIPLINE_EVERY CLAUDE_CODE_PLUGIN_CACHE_DIR; do
|
|
193
|
+
[ -n "${!_k:-}" ] && _claude_cfg+=( "${_k}=${!_k}" )
|
|
194
|
+
done
|
|
189
195
|
|
|
190
196
|
# HARD RULE — OAuth only, never a pay-as-you-go API key. Scoped to the Claude harness because that is where
|
|
191
197
|
# the variable decides anything: `claude` prefers ANTHROPIC_API_KEY over the subscription session, so its
|
|
@@ -345,7 +351,7 @@ ensure_agent() {
|
|
|
345
351
|
CODEX_HOME="${CODEX_HOME:-}" AR_RESUME_FLAGS="${AR_RESUME_FLAGS}" AR_FRESH_FLAGS="${AR_FRESH_FLAGS}" \
|
|
346
352
|
DISABLE_AUTOUPDATER=1 CLAUDE_CODE_GB_DISK_CACHE_WHEN_TELEMETRY_OFF=1 \
|
|
347
353
|
${_claude_cfg[@]+"${_claude_cfg[@]}"} ${_tool_env[@]+"${_tool_env[@]}"} \
|
|
348
|
-
/bin/sh -c 'if [ -n "${AR_TOOL_ENV_FILE:-}" ]; then while IFS= read -r _l || [ -n "$_l" ]; do case "$_l" in ""|\#*) continue ;; esac; _k=${_l%%=*}; _v=${_l#*=}; case "$_k" in HOME|PATH|USER|LOGNAME|SHELL|TERM|COLORTERM|LANG|LC_ALL|LC_CTYPE|TMPDIR|NODE_OPTIONS|CLAUDE_CONFIG_DIR|CLAUDE_CODE_OAUTH_TOKEN|CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC|CLAUDE_CODE_GB_DISK_CACHE_WHEN_TELEMETRY_OFF|CODEX_HOME|AR_RESUME_FLAGS|AR_FRESH_FLAGS|AR_OAUTH_TOKEN_FILE|AR_TOOL_ENV_FILE|ANTHROPIC_API_KEY|AWP_BEARER|AWP_BEARER_FILE|AWP_MCP_URL|TMUX_SESSION|AGENT_PID_PATTERN) continue ;; esac; export "$_k=$_v"; done < "$AR_TOOL_ENV_FILE"; unset AR_TOOL_ENV_FILE _l _k _v; fi; RF="${AR_RESUME_FLAGS:-}"; FF="${AR_FRESH_FLAGS:-}"; unset AR_RESUME_FLAGS AR_FRESH_FLAGS; CB="$1"; shift; S=$(date +%s); "$CB" $RF "$@" || [ $(( $(date +%s) - S )) -ge 30 ] || exec "$CB" $FF "$@"' sh "${AGENT_BIN}" "${_launch_flags[@]}" || {
|
|
354
|
+
/bin/sh -c 'if [ -n "${AR_TOOL_ENV_FILE:-}" ]; then while IFS= read -r _l || [ -n "$_l" ]; do case "$_l" in ""|\#*) continue ;; esac; _k=${_l%%=*}; _v=${_l#*=}; case "$_k" in HOME|PATH|USER|LOGNAME|SHELL|TERM|COLORTERM|LANG|LC_ALL|LC_CTYPE|TMPDIR|NODE_OPTIONS|CLAUDE_CONFIG_DIR|CLAUDE_CODE_OAUTH_TOKEN|CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC|CLAUDE_CODE_GB_DISK_CACHE_WHEN_TELEMETRY_OFF|CODEX_HOME|AR_CLI_RUNNER_ID|AR_AGENTRADAR_BIN|AR_DISCIPLINE_EVERY|CLAUDE_CODE_PLUGIN_CACHE_DIR|AR_RESUME_FLAGS|AR_FRESH_FLAGS|AR_OAUTH_TOKEN_FILE|AR_TOOL_ENV_FILE|ANTHROPIC_API_KEY|AWP_BEARER|AWP_BEARER_FILE|AWP_MCP_URL|TMUX_SESSION|AGENT_PID_PATTERN) continue ;; esac; export "$_k=$_v"; done < "$AR_TOOL_ENV_FILE"; unset AR_TOOL_ENV_FILE _l _k _v; fi; RF="${AR_RESUME_FLAGS:-}"; FF="${AR_FRESH_FLAGS:-}"; unset AR_RESUME_FLAGS AR_FRESH_FLAGS; CB="$1"; shift; S=$(date +%s); "$CB" $RF "$@" || [ $(( $(date +%s) - S )) -ge 30 ] || exec "$CB" $FF "$@"' sh "${AGENT_BIN}" "${_launch_flags[@]}" || {
|
|
349
355
|
log "tmux could not start agent session '${TMUX_SESSION}'"
|
|
350
356
|
return 1
|
|
351
357
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "agentradar-cli",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.4",
|
|
4
|
+
"engines": {
|
|
5
|
+
"node": ">=20"
|
|
6
|
+
},
|
|
4
7
|
"description": "Secure AgentRadar vendor setup and skill installer",
|
|
5
8
|
"type": "module",
|
|
6
9
|
"bin": {
|
|
@@ -14,8 +17,10 @@
|
|
|
14
17
|
"dist/skill-install.js",
|
|
15
18
|
"dist/tool-run.js",
|
|
16
19
|
"dist/sync.js",
|
|
20
|
+
"dist/update.js",
|
|
17
21
|
"dist/vendor-runner/**",
|
|
18
22
|
"dist/agentradar-vendor/SKILL.md",
|
|
23
|
+
"dist/agent-guard",
|
|
19
24
|
"README.md"
|
|
20
25
|
],
|
|
21
26
|
"license": "MIT",
|
|
@@ -23,7 +28,7 @@
|
|
|
23
28
|
"access": "public"
|
|
24
29
|
},
|
|
25
30
|
"scripts": {
|
|
26
|
-
"build": "tsc && mkdir -p dist/agentradar-vendor dist/vendor-runner/supervisor && cp ../../skills/agentradar-vendor/SKILL.md dist/agentradar-vendor/SKILL.md && cp ../../templates/vendor-runner/feeder.mjs ../../templates/vendor-runner/pane-live.sh ../../templates/vendor-runner/session-frame.mjs ../../templates/vendor-runner/terminal-bridge.mjs dist/vendor-runner/ && cp ../../templates/vendor-runner/supervisor/supervise-agent.sh ../../templates/vendor-runner/supervisor/install-agent.sh ../../templates/vendor-runner/supervisor/com.agentradar.agent.plist.template ../../templates/vendor-runner/supervisor/agentradar-agent@.service.template dist/vendor-runner/supervisor/ && chmod +x dist/index.js dist/vendor-runner/pane-live.sh dist/vendor-runner/supervisor/supervise-agent.sh dist/vendor-runner/supervisor/install-agent.sh",
|
|
31
|
+
"build": "tsc && mkdir -p dist/agentradar-vendor dist/vendor-runner/supervisor && cp ../../skills/agentradar-vendor/SKILL.md dist/agentradar-vendor/SKILL.md && cp ../../templates/vendor-runner/feeder.mjs ../../templates/vendor-runner/pane-live.sh ../../templates/vendor-runner/session-frame.mjs ../../templates/vendor-runner/terminal-bridge.mjs dist/vendor-runner/ && cp ../../templates/vendor-runner/supervisor/supervise-agent.sh ../../templates/vendor-runner/supervisor/install-agent.sh ../../templates/vendor-runner/supervisor/com.agentradar.agent.plist.template ../../templates/vendor-runner/supervisor/agentradar-agent@.service.template dist/vendor-runner/supervisor/ && rm -rf dist/agent-guard && cp -R ../../templates/agent-guard dist/agent-guard && rm dist/agent-guard/scripts/guard.test.mjs && chmod +x dist/index.js dist/vendor-runner/pane-live.sh dist/vendor-runner/supervisor/supervise-agent.sh dist/vendor-runner/supervisor/install-agent.sh",
|
|
27
32
|
"clean": "rm -rf dist",
|
|
28
33
|
"prepack": "pnpm run build",
|
|
29
34
|
"typecheck": "tsc --noEmit",
|