agentradar-cli 0.3.15 → 0.3.17

package/dist/index.js

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
+import { readFileSync, statSync } from "node:fs";
 import { createRequire } from "node:module";
 import { homedir } from "node:os";
+import { resolve } from "node:path";
 import { installVendorSkill } from "./skill-install.js";
 import { startChannel } from "./channel.js";
 import { runRestartSelftest, startVendorRunner } from "./runner.js";
@@ -19,6 +21,15 @@ export const runArgs = (raw) => raw[0] !== "run" ? raw
     : raw[1] === "join" ? raw.slice(1)
         : /^https?:\/\//.test(raw[1] ?? "") ? ["join", ...raw.slice(1)]
             : ["call", ...raw.slice(1)];
+// The join link carries the secret that claims the agent's key, and ps shows argv to every user on the machine:
+// `--link-file <path>` or `-` (stdin) keeps it off. `again` is how the CLI's own "run it again" lines name it.
+export const joinLink = (urls, linkFile, stdin = () => readFileSync(0, "utf8"), warn = console.error) => {
+    if (linkFile && statSync(linkFile).mode & 0o077)
+        warn(`Warning: ${linkFile} is readable by other users on this machine; chmod 600 it.`);
+    return linkFile ? { link: readFileSync(linkFile, "utf8").trim(), again: `--link-file ${resolve(linkFile)}` }
+        : urls[0] === "-" ? { link: stdin().trim(), again: "-" }
+            : { link: urls[0], again: undefined };
+};
 const USAGE = [
     "Usage: agentradar <noun> [<sub-noun>] <verb> [--<flag> <value> | --<flag>-file <path> ...] [--dry-run] [--json] [--runner <id>]",
     "  Every agent command comes from the server. agentradar --help lists the groups (as $AR_CLI_RUNNER_ID),",
@@ -30,8 +41,8 @@ const USAGE = [
     "  The runner is $AR_CLI_RUNNER_ID, or --runner <id>. --dry-run prints the exact call and sends nothing.",
     "  Exit codes: 0 done; 1 refused or unreachable (the reason is on stderr); 2 the command was wrong.",
     "Local commands:",
-    "  agentradar join <join-link> [--name <n>] [--model <m>] [--runtime claude|codex|other] [--trust] [--attach-tmux <pane> | --attach-current] [--session <id>] [--no-service | --service]",
-    "  agentradar join cancel <join-link|request-id>",
+    "  agentradar join <join-link> | --link-file <path> | - (link on stdin) [--name <n>] [--model <m>] [--runtime claude|codex|other] [--trust] [--attach-tmux <pane> | --attach-current] [--session <id>] [--no-service | --service]",
+    "  agentradar join cancel <request-id> | --link-file <path> | - (link on stdin) | <join-link>",
     "  agentradar setup [--trust] [--harness claude|codex]",
     "  agentradar leave <runner-id>",
     "  agentradar channel <runner-id>",
@@ -119,25 +130,26 @@ async function main() {
         return;
     }
     if (args[0] === "join" && args[1] === "cancel") {
-        if (args.length !== 3 || args[2].startsWith("-")) {
-            console.error("Usage: agentradar join cancel <join-link|request-id>");
+        const fromFile = args.length === 4 && args[2] === "--link-file";
+        if (!fromFile && (args.length !== 3 || (args[2].startsWith("-") && args[2] !== "-"))) {
+            console.error("Usage: agentradar join cancel <request-id> | --link-file <path> | - (link on stdin) | <join-link>");
             process.exitCode = 1;
             return;
         }
-        process.exitCode = await cancelJoin(args[2]);
+        process.exitCode = await cancelJoin(fromFile || args[2] === "-" ? joinLink([args[2]], fromFile ? args[3] : undefined).link : args[2]);
         return;
     }
     if (args[0] === "join") {
         const named = {};
         const urls = [];
         for (let i = 1; i < args.length; i++) {
-            if (["--name", "--model", "--attach-tmux", "--session", "--runtime"].includes(args[i]))
+            if (["--name", "--model", "--attach-tmux", "--session", "--runtime", "--link-file"].includes(args[i]))
                 named[args[i].slice(2)] = args[++i] ?? "-";
             else if (!["--trust", "--attach-current", "--allow-bypass", "--revoke-bypass", "--feeder", "--service", "--no-service"].includes(args[i]))
                 urls.push(args[i]);
         }
-        if (urls.length !== 1 || [urls[0], ...Object.values(named)].some((value) => value.startsWith("-")) || (named["attach-tmux"] && args.includes("--attach-current")) || (args.includes("--service") && args.includes("--no-service"))) {
-            console.error("Usage: agentradar join <join-link> [--name <your name>] [--model <your model id>] [--runtime <claude|codex|other>] [--trust] [--attach-tmux <session[:window.pane]> | --attach-current (Codex and other CLIs)] [--session <claude session id>] [--revoke-bypass] [--no-service | --service]");
+        if (urls.length !== (named["link-file"] ? 0 : 1) || [...urls.filter((url) => url !== "-"), ...Object.values(named)].some((value) => value.startsWith("-")) || (named["attach-tmux"] && args.includes("--attach-current")) || (args.includes("--service") && args.includes("--no-service"))) {
+            console.error("Usage: agentradar join <join-link> | --link-file <path> | - (the link on stdin) [--name <your name>] [--model <your model id>] [--runtime <claude|codex|other>] [--trust] [--attach-tmux <session[:window.pane]> | --attach-current (Codex and other CLIs)] [--session <claude session id>] [--revoke-bypass] [--no-service | --service]");
             process.exitCode = 1;
             return;
         }
@@ -148,7 +160,9 @@ async function main() {
             process.exitCode = 1;
             return;
         }
-        process.exitCode = await joinOrganisation(urls[0], {
+        const { link, again } = joinLink(urls, named["link-file"]);
+        process.exitCode = await joinOrganisation(link, {
+            again,
             harness: runtime.harness, trust: args.includes("--trust"), agentName: named.name, model: named.model, session: named.session,
             attach: args.includes("--attach-current") ? "current" : named["attach-tmux"],
             revokeBypass: args.includes("--revoke-bypass"), feeder: args.includes("--feeder"), service: args.includes("--service"),

package/dist/setup.js

@@ -904,7 +904,7 @@ export async function joinOrganisation(enrolmentUrl, deps = {}) {
         await saved?.();
         log(`Runner installed → ${runnerEnv}`);
         if (bypass)
-            log(bypassOnNotice(enrolmentUrl));
+            log(bypassOnNotice(deps.again ?? enrolmentUrl));
         // Best effort: a failed first sync never stops the join; the service's feeder syncs them again.
         await syncJoinedSkills(runnerId, { home, fetch: fetchImpl, log }).catch((error) => {
             log(`Your AgentRadar skills are not installed yet (${String(error?.message ?? error).split("\n")[0]}); the runner installs them once it is running.`);
@@ -1069,7 +1069,7 @@ You can restart now or after the approval: until then the channel waits. You do
                     const approvedBypass = now.bypassPermissions === true;
                     const bypass = localBypass(approvedBypass, false);
                     if (bypass)
-                        log(bypassOnNotice(enrolmentUrl));
+                        log(bypassOnNotice(deps.again ?? enrolmentUrl));
                     return connected(runnerId, projectPath, approvedBypass, bypass);
                 }
                 if (poll > 1 && (poll - 1) % 3 === 0)
@@ -1084,7 +1084,7 @@ You can restart now or after the approval: until then the channel waits. You do
     }
     for (let poll = 1;; poll++) {
         if (poll > (deps.polls ?? Infinity)) {
-            log(`Still waiting for approval. Run this same command again: agentradar run ${enrolmentUrl}`);
+            log(`Still waiting for approval. Run this same command again: agentradar run ${deps.again ? `join ${deps.again}` : enrolmentUrl}`);
             return 0;
         }
         let response;
@@ -1138,7 +1138,8 @@ export async function cancelJoin(target, deps = {}) {
         }
     }
     if (!state || !statePath) {
-        log(`No join request from this machine for ${target}.`);
+        // A link carries the claim token; never echo it.
+        log(`No join request from this machine for ${/^https?:\/\//.test(target) ? "that join link" : target}.`);
         return 1;
     }
     if (state.agentId) {
@@ -1148,7 +1149,7 @@ export async function cancelJoin(target, deps = {}) {
     // The secret goes only back to the AgentRadar host that issued it.
     const origin = token ? new URL(target).origin : state.approvalUrl ? new URL(state.approvalUrl).origin : "";
     if (!origin || !trustedMcpEndpoint(origin)) {
-        log("Pass the join link instead of the request id: agentradar join cancel <join-link>");
+        log("Pass the join link instead of the request id: agentradar join cancel --link-file <path>");
         return 1;
     }
     const response = await postJson(fetchImpl, new URL(`/api/join-requests/${encodeURIComponent(state.requestId)}/cancel`, origin), { claimSecret: state.claimSecret });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentradar-cli",
-  "version": "0.3.15",
+  "version": "0.3.17",
   "engines": {
     "node": ">=20"
   },