svamp-cli 0.2.346 → 0.2.356

package/dist/{commands-C2aODeVc.mjs → commands-BkdbelFo.mjs}

@@ -1,16 +1,16 @@
 import { existsSync } from 'node:fs';
 import { join, resolve } from 'node:path';
-import { connectAndGetMachine, resolveSessionId, createWorktree, connectAndResolveSession } from './commands-D1pZq3d4.mjs';
+import { connectAndGetMachine, resolveSessionId, createWorktree, connectAndResolveSession } from './commands-B-yczgz_.mjs';
 import { execFileSync } from 'node:child_process';
 import { w as withFileLock } from './fileLock-BMPwCrB6.mjs';
-import { u as updateIssue, f as addComment, h as addIssue, n as resolveCrewIssueOnMerge } from './store-Bn0ByYev.mjs';
+import { u as updateIssue, h as addComment, i as addIssue, o as resolveCrewIssueOnMerge } from './store-B4E6NzG6.mjs';
 import { s as shortId } from './friendlyName-1UZcyDhu.mjs';
 import { w as wantsHelp } from './wantsHelp-6bMOeNUz.mjs';
 import 'node:os';
 import './hyphaClient-ybivOjZo.mjs';
 import './types-57J3Re0n.mjs';
 import './securityContext-Cm5UTCuD.mjs';
-import './loopVerify-B47sSjxe.mjs';
+import './loopVerify-DALtTk2V.mjs';
 import './instance-CeHz5C8v.mjs';
 import 'fs';
 import 'path';
@@ -306,6 +306,7 @@ async function featureStart(brief, opts = {}) {
     const standalone = !!opts.noWorktree;
     let childDir;
     let base = "";
+    const leadDir = opts.directory || lead.directory;
     if (standalone) {
       const dir = opts.directory;
       if (!dir) {
@@ -319,15 +320,14 @@ async function featureStart(brief, opts = {}) {
       }
       console.log(`Standalone child folder: ${childDir} (no worktree)`);
     } else {
-      const leadDir = opts.directory || lead.directory;
       if (!leadDir) {
         console.error("Could not determine the lead project directory.");
         process.exit(1);
       }
-      const projectRoot2 = canonicalProjectRoot(leadDir);
-      base = opts.baseBranch || currentBranch(projectRoot2) || "main";
+      const worktreeRoot = canonicalProjectRoot(leadDir);
+      base = opts.baseBranch || currentBranch(worktreeRoot) || "main";
       try {
-        wt = createWorktree(projectRoot2);
+        wt = createWorktree(worktreeRoot);
       } catch (e) {
         console.error(`Failed to create worktree: ${e.message}`);
         process.exit(1);
@@ -335,7 +335,7 @@ async function featureStart(brief, opts = {}) {
       childDir = wt.path;
       console.log(`Worktree: ${wt.branch} \u2192 ${wt.path}`);
     }
-    const projectRoot = canonicalProjectRoot(lead.directory || opts.directory || childDir);
+    const projectRoot = canonicalProjectRoot(leadDir || childDir);
     const result = await machine.spawnSession({
       directory: childDir,
       agent: "claude",
@@ -629,7 +629,14 @@ async function featureMerge(childPartial, opts = {}) {
         notifyLead,
         childId,
         `<crew-freeze>Your lead is merging branch ${branch} into ${base}. Stop editing files now; do not commit until told.</crew-freeze>`,
-        "crew: freeze for merge"
+        "crew: freeze for merge",
+        // #1619: URGENT. This is a pre-emption notice, and the state it must interrupt —
+        // a child mid-work — is by definition NOT idle, so at 'normal' urgency
+        // classifyInbound QUEUES it until the child stops on its own. waitForChildIdle
+        // below is supposed to observe the child halting BECAUSE of this message; a queued
+        // message causes no halt, so the wait could only ever time out, and mergeBack can
+        // then reach `git worktree remove --force` on a tree the child is still writing.
+        "urgent"
       );
     } catch {
     }
@@ -649,7 +656,10 @@ async function featureMerge(childPartial, opts = {}) {
 Merge was not applied: ${r.detail}
 Resolve and run \`svamp feature done\` again.
 </crew-rework>`,
-            "crew: rework needed"
+            "crew: rework needed",
+            // #1619: URGENT — the comment above says 're-wake the child', which at
+            // 'normal' urgency is exactly what did not happen.
+            "urgent"
           );
         } catch {
         }
@@ -665,7 +675,12 @@ Resolve and run \`svamp feature done\` again.
 Merge could not be applied (${r.stage}): ${r.detail}
 Stop editing and hold \u2014 do not keep working. Once the blocker is resolved, the lead can retry \`svamp feature merge\`.
 </crew-blocked>`,
-            "crew: merge blocked"
+            "crew: merge blocked",
+            // #1619: URGENT. #0353's whole point is to STOP a child that is 'silently
+            // LOOPING against an un-merged branch, burning tokens toward the cost
+            // ceiling'. A looping child is never idle, so a queued STOP notice arrived
+            // only once it was no longer needed.
+            "urgent"
           );
         } catch {
         }

package/dist/{commands-BB1Kcyt-.mjs → commands-C13-yE2R.mjs}

@@ -1,4 +1,4 @@
-import { connectAndResolveSession } from './commands-D1pZq3d4.mjs';
+import { connectAndResolveSession } from './commands-B-yczgz_.mjs';
 import { w as wantsHelp } from './wantsHelp-6bMOeNUz.mjs';
 import 'node:fs';
 import 'node:child_process';
@@ -9,12 +9,12 @@ import './friendlyName-1UZcyDhu.mjs';
 import 'node:crypto';
 import './types-57J3Re0n.mjs';
 import './securityContext-Cm5UTCuD.mjs';
-import './loopVerify-B47sSjxe.mjs';
+import './loopVerify-DALtTk2V.mjs';
 import './instance-CeHz5C8v.mjs';
 import 'fs';
 import 'path';
 import 'os';
-import './store-Bn0ByYev.mjs';
+import './store-B4E6NzG6.mjs';
 import './fileLock-BMPwCrB6.mjs';
 import './flushExit-C-i6SGjj.mjs';
 
@@ -111,6 +111,27 @@ async function outpostInstall(args) {
     if (info.downloadBase) console.log("Direct download: " + info.downloadBase);
   }
 }
+async function outpostRotate(args) {
+  const dl = argVal(args, "--download-base");
+  if (!args.includes("--yes") && !args.includes("-y")) {
+    console.log("This REVOKES this session's outpost token and mints a new one.");
+    console.log("Every currently-connected outpost will stop working until it re-runs the new");
+    console.log("install command. Re-run with --yes to proceed.");
+    process.exit(1);
+  }
+  const info = await withSession((m, id) => m.sessionRPC(id, "outpostRotateToken", dl ? { params: { downloadBase: dl } } : {}));
+  if (!info || info.error) {
+    console.error(`Could not rotate the outpost token: ${info?.error || "unknown error"}`);
+    process.exit(1);
+  }
+  console.log("\u2713 outpost token rotated \u2014 the previous token no longer works.\n");
+  console.log("Any machine that was connected must re-run the install command below:\n");
+  const gen = info.install || {};
+  if (gen.unix) console.log("  macOS / Linux:\n    " + gen.unix + "\n");
+  if (gen.windows) console.log("  Windows (PowerShell):\n    " + gen.windows + "\n");
+  if (info.pairingCode) console.log(`  \u2026or the short pairing code:  ${info.pairingCode}
+`);
+}
 function usage() {
   console.log(`svamp outpost \u2014 drive a connected remote machine (FDE outpost)
 
@@ -121,6 +142,10 @@ function usage() {
                                         stdout/stderr/exit code synchronously (like a local command).
                                         With one outpost connected, --machine is optional.
   svamp outpost install [--os <os>]     Reprint the install one-liner(s) for this session's outpost
+  svamp outpost rotate [--yes]          REVOKE this session's outpost token and mint a new one.
+                                        Use after the install one-liner has been shared somewhere it
+                                        should not have been. Every currently-connected outpost stops
+                                        working and must re-run the new install command.
 
   With several machines connected, target each by id, e.g.:
     svamp outpost exec --machine build-mac "uname -a"
@@ -149,6 +174,10 @@ async function outpostCommand(args) {
     await outpostInstall(args.slice(1));
     return;
   }
+  if (sub === "rotate" || sub === "revoke") {
+    await outpostRotate(args.slice(1));
+    return;
+  }
   console.error(`unknown outpost command: ${sub}`);
   usage();
   process.exit(1);

package/dist/{commands-D69mnkYu.mjs → commands-CoOc4qiw.mjs}

@@ -1,4 +1,4 @@
-import { r as resolveProjectRoot } from './store-Bn0ByYev.mjs';
+import { r as resolveProjectRoot } from './store-B4E6NzG6.mjs';
 import { w as wantsHelp } from './wantsHelp-6bMOeNUz.mjs';
 import { s as setWorkflowEnabled, i as isWorkflowEnabled, r as removeWorkflow, g as getWorkflow, l as listWorkflows, c as workflowSteps, a as saveWorkflow, b as rawWorkflow } from './store-fi0f-ff1.mjs';
 import { v as validateCronExpr, d as describeNextFire } from './cron-hHGdb5kU.mjs';
@@ -147,7 +147,7 @@ async function workflowCommand(args) {
         console.error(`Workflow not found: ${name}`);
         process.exit(1);
       }
-      const { runWorkflow } = await import('./run-DkjwF-zA.mjs').then(function (n) { return n.e; });
+      const { runWorkflow } = await import('./run-DDmeV9K3.mjs').then(function (n) { return n.e; });
       const run = await runWorkflow(root, wf, { trigger: "manual", actor: process.env.SVAMP_SESSION_ID || null });
       console.log(`\u25B6 ran workflow "${wf.name}" (${run.steps.length} step${run.steps.length === 1 ? "" : "s"}) \u2192 ${run.status}`);
       for (const st of run.steps) {

package/dist/{commands-CiRCwjkJ.mjs → commands-sPvRcG3J.mjs}

@@ -61,7 +61,7 @@ async function serviceExpose(args) {
     process.exit(1);
   }
   if (foreground) {
-    const { runFrpcTunnel } = await import('./hookSettings-DYMTUgVA.mjs').then(function (n) { return n.w; });
+    const { runFrpcTunnel } = await import('./hookSettings-FFc1pi8j.mjs').then(function (n) { return n.w; });
     await runFrpcTunnel(name, ports, void 0, {
       group,
       groupKey,
@@ -71,7 +71,7 @@ async function serviceExpose(args) {
     });
     return;
   }
-  const { connectAndGetMachine } = await import('./commands-D1pZq3d4.mjs');
+  const { connectAndGetMachine } = await import('./commands-B-yczgz_.mjs');
   const { server, machine } = await connectAndGetMachine();
   try {
     const status = await machine.tunnelStart({
@@ -93,7 +93,7 @@ async function serviceExpose(args) {
         console.log(`  port ${port}: ${url}`);
       }
       if (process.env.SVAMP_SESSION_ID) {
-        const { autoAddSessionLink } = await import('./agentCommands-B2Nl7Fof.mjs');
+        const { autoAddSessionLink } = await import('./agentCommands-D91RcjqQ.mjs');
         let added = 0;
         for (const [port, url] of urlEntries) {
           const label = urlEntries.length > 1 ? `${name}:${port}` : name;
@@ -129,8 +129,8 @@ async function serviceServe(args) {
     const resolvedDir = path.resolve(directory);
     console.log(`Serving ${resolvedDir}`);
     const http = await import('http');
-    const { serveStaticMount } = await import('./hookSettings-DYMTUgVA.mjs').then(function (n) { return n.x; });
-    const { getFreePort } = await import('./hookSettings-DYMTUgVA.mjs').then(function (n) { return n.w; });
+    const { serveStaticMount } = await import('./hookSettings-FFc1pi8j.mjs').then(function (n) { return n.x; });
+    const { getFreePort } = await import('./hookSettings-FFc1pi8j.mjs').then(function (n) { return n.w; });
     const server = http.createServer((req, res) => {
       const u = new URL(req.url || "/", "http://127.0.0.1");
       let rel = u.pathname;
@@ -153,7 +153,7 @@ async function serviceServe(args) {
         resolve(18080);
       });
     });
-    const { runFrpcTunnel } = await import('./hookSettings-DYMTUgVA.mjs').then(function (n) { return n.w; });
+    const { runFrpcTunnel } = await import('./hookSettings-FFc1pi8j.mjs').then(function (n) { return n.w; });
     void server;
     await runFrpcTunnel(name, [servePort]);
   } catch (err) {
@@ -163,7 +163,7 @@ async function serviceServe(args) {
 }
 async function serviceList(_args) {
   try {
-    const { connectAndGetMachine } = await import('./commands-D1pZq3d4.mjs');
+    const { connectAndGetMachine } = await import('./commands-B-yczgz_.mjs');
     const { server, machine } = await connectAndGetMachine();
     try {
       const tunnels = await machine.tunnelList({});
@@ -203,11 +203,11 @@ async function serviceDelete(args) {
     process.exit(1);
   }
   try {
-    const { connectAndGetMachine } = await import('./commands-D1pZq3d4.mjs');
+    const { connectAndGetMachine } = await import('./commands-B-yczgz_.mjs');
     const { server, machine } = await connectAndGetMachine();
     try {
       await machine.tunnelStop({ name });
-      const { removeSessionLinkByService } = await import('./agentCommands-B2Nl7Fof.mjs');
+      const { removeSessionLinkByService } = await import('./agentCommands-D91RcjqQ.mjs');
       removeSessionLinkByService("tunnel", name);
       console.log(`Stopped tunnel '${name}'.`);
     } catch (err) {

package/dist/{detectIsolation-CzoDCEnh.mjs → detectIsolation-CrV8IFDv.mjs}

@@ -1,5 +1,5 @@
 import { execFile } from 'node:child_process';
-import { mkdir, rm, readFile, chmod, access, mkdtemp } from 'node:fs/promises';
+import { mkdir, rm, readFile, mkdtemp, access, chmod, rename } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { promisify } from 'node:util';
@@ -65,6 +65,16 @@ function getNonoAssetName(version) {
   }
   return null;
 }
+async function probeNonoRuns(binaryPath) {
+  try {
+    const { stdout } = await execFileAsync(binaryPath, ["--version"], { timeout: 5e3 });
+    return { ok: true, version: stdout.trim().split("\n")[0] };
+  } catch (e) {
+    const stderr = typeof e?.stderr === "string" ? e.stderr.trim() : "";
+    const first = stderr.split("\n").find((l) => l.trim()) || e?.message || "unknown error";
+    return { ok: false, reason: first.trim() };
+  }
+}
 async function installNono() {
   const platform = process.platform;
   if (platform !== "darwin" && platform !== "linux") {
@@ -116,23 +126,33 @@ async function installNono() {
       return false;
     }
     console.log(`[isolation] nono ${version} checksum verified (${actual.slice(0, 12)}\u2026)`);
-    await execFileAsync("tar", [
-      "xzf",
-      tarball,
-      "-C",
-      SVAMP_BIN_DIR
-    ], { timeout: 15e3 });
-    await rm(tarball, { force: true }).catch(() => {
-    });
     const nonoPath = join(SVAMP_BIN_DIR, "nono");
-    await chmod(nonoPath, 493);
+    const stageDir = await mkdtemp(join(SVAMP_BIN_DIR, ".nono-stage-"));
     try {
-      await access(nonoPath);
-      console.log(`[isolation] nono ${version} installed at ${nonoPath}`);
+      await execFileAsync("tar", ["xzf", tarball, "-C", stageDir], { timeout: 15e3 });
+      await rm(tarball, { force: true }).catch(() => {
+      });
+      const staged = join(stageDir, "nono");
+      try {
+        await access(staged);
+      } catch {
+        console.warn("[isolation] Download completed but nono binary not found in the archive");
+        return false;
+      }
+      await chmod(staged, 493);
+      const probe = await probeNonoRuns(staged);
+      if (!probe.ok) {
+        console.error(
+          `[isolation] nono ${version} downloaded and checksum-verified, but it CANNOT RUN on this host: ${probe.reason}. Refusing to install \u2014 the previous binary (if any) is untouched. This host needs a nono build compatible with its libc; sessions will fall back to docker/podman, where --allow-write and --allow-domain are NOT enforced (#0878).`
+        );
+        return false;
+      }
+      await rename(staged, nonoPath);
+      console.log(`[isolation] nono ${version} installed at ${nonoPath} (verified runnable: ${probe.version || "ok"})`);
       return true;
-    } catch {
-      console.warn("[isolation] Download completed but nono binary not found");
-      return false;
+    } finally {
+      await rm(stageDir, { recursive: true, force: true }).catch(() => {
+      });
     }
   } catch (e) {
     console.warn(`[isolation] Failed to install nono: ${e.message}`);
@@ -316,4 +336,4 @@ async function detectIsolationCapabilities() {
   return { available, preferred, details };
 }
 
-export { detectIsolationCapabilities, installNono, isolationDisabledByEnv, verifyWithHardTimeout };
+export { detectIsolationCapabilities, installNono, isolationDisabledByEnv, probeNonoRuns, verifyWithHardTimeout };

package/dist/{fleet-DM_Q7w69.mjs → fleet-Ca-UjJNL.mjs}

@@ -37,6 +37,26 @@ function readDaemonState() {
 function getSelfMachineId() {
   return readDaemonState()?.machineId || null;
 }
+function rowDetail(result) {
+  const one = (t) => (t || "").trim().replace(/\s+/g, " ");
+  const err = one(result.stderr).slice(-200);
+  if (result.exitCode === 124 || /timed out and was killed/i.test(err)) {
+    return `TIMED OUT (may have partially completed) \u2014 ${err || "no stderr"}`;
+  }
+  const last = one((result.stdout || "").trim().split("\n").slice(-1)[0]);
+  return last || err || "";
+}
+const INSTALL_TIMEOUT_MS = 10 * 60 * 1e3;
+const SAFE_SKILL_NAME = /^[a-z0-9][a-z0-9._-]*$/i;
+const SAFE_VERSION = /^[0-9][0-9a-zA-Z.+-]*$/;
+function assertSafeFleetArg(value, kind, pattern) {
+  if (typeof value !== "string" || !pattern.test(value)) {
+    throw new Error(
+      `refusing to fan out: ${kind} ${JSON.stringify(value)} is not a plain ${kind} (expected ${pattern.source}). This string would be interpolated into a shell command run on every machine.`
+    );
+  }
+  return value;
+}
 function partitionSelf(machines, selfId) {
   if (!selfId) return { targets: machines, skipped: [] };
   return {
@@ -234,8 +254,9 @@ async function fleetUpgradeClaude(opts) {
 `);
   try {
     printHeader(["MACHINE ID", "LABEL", "STATE", "DETAIL"], [20, 24, 6, 60]);
+    assertSafeFleetArg(version, "version", SAFE_VERSION);
     const cmd = `claude install ${version} 2>&1 || claude update 2>&1`;
-    const rows = await fanOut(machines, async (m) => await m.rpc.bash(cmd, void 0));
+    const rows = await fanOut(machines, async (m) => await m.rpc.bash(cmd, void 0, INSTALL_TIMEOUT_MS));
     let failures = 0;
     for (const r of rows) {
       if (!r.ok) {
@@ -244,7 +265,7 @@ async function fleetUpgradeClaude(opts) {
         continue;
       }
       const ok = r.result.exitCode === 0;
-      const detail = (r.result.stdout?.trim().split("\n").slice(-1)[0] || r.result.stderr?.trim().slice(-200) || "").replace(/\s+/g, " ");
+      const detail = rowDetail(r.result);
       printResultRow(r.machine, ok ? "OK" : "FAIL", detail);
       if (!ok) failures += 1;
     }
@@ -271,8 +292,9 @@ async function fleetUpgradeCodex(opts) {
 `);
   try {
     printHeader(["MACHINE ID", "LABEL", "STATE", "DETAIL"], [20, 24, 6, 60]);
+    assertSafeFleetArg(version, "version", SAFE_VERSION);
     const cmd = `bash -lc '${NPM_PREFIX_RESOLVER}; npm install -g $PREFIX_ARG @openai/codex@${version} 2>&1 | tail -5'`;
-    const rows = await fanOut(machines, async (m) => await m.rpc.bash(cmd, void 0));
+    const rows = await fanOut(machines, async (m) => await m.rpc.bash(cmd, void 0, INSTALL_TIMEOUT_MS));
     let failures = 0;
     for (const r of rows) {
       if (!r.ok) {
@@ -281,7 +303,7 @@ async function fleetUpgradeCodex(opts) {
         continue;
       }
       const ok = r.result.exitCode === 0;
-      const detail = (r.result.stdout?.trim().split("\n").slice(-1)[0] || r.result.stderr?.trim().slice(-200) || "").replace(/\s+/g, " ");
+      const detail = rowDetail(r.result);
       printResultRow(r.machine, ok ? "OK" : "FAIL", detail);
       if (!ok) failures += 1;
     }
@@ -318,7 +340,7 @@ async function fleetUpgradeNono(opts) {
   try {
     printHeader(["MACHINE ID", "LABEL", "STATE", "DETAIL"], [20, 24, 6, 60]);
     const cmd = `svamp daemon install-nono 2>&1 | tail -5`;
-    const rows = await fanOut(machines, async (m) => await m.rpc.bash(cmd, void 0));
+    const rows = await fanOut(machines, async (m) => await m.rpc.bash(cmd, void 0, INSTALL_TIMEOUT_MS));
     let failures = 0;
     for (const r of rows) {
       if (!r.ok) {
@@ -327,7 +349,7 @@ async function fleetUpgradeNono(opts) {
         continue;
       }
       const ok = r.result.exitCode === 0;
-      const detail = (r.result.stdout?.trim().split("\n").slice(-1)[0] || r.result.stderr?.trim().slice(-200) || "").replace(/\s+/g, " ");
+      const detail = rowDetail(r.result);
       printResultRow(r.machine, ok ? "OK" : "FAIL", detail);
       if (!ok) failures += 1;
     }
@@ -347,6 +369,7 @@ async function fleetUpgradeKimi(opts) {
     await server.disconnect();
     return;
   }
+  assertSafeFleetArg(version, "version", SAFE_VERSION);
   console.log(`Reconciling Kimi to ${version} on ${machines.length} machine(s)...
 `);
   console.log(`Note: Kimi is a global npm package (${KIMI_NPM_PACKAGE}); machines that never use it can ignore this.`);
@@ -355,7 +378,7 @@ async function fleetUpgradeKimi(opts) {
   try {
     printHeader(["MACHINE ID", "LABEL", "STATE", "DETAIL"], [20, 24, 6, 60]);
     const cmd = `bash -lc '${NPM_PREFIX_RESOLVER}; npm install -g $PREFIX_ARG ${KIMI_NPM_PACKAGE}@${version} 2>&1 | tail -5'`;
-    const rows = await fanOut(machines, async (m) => await m.rpc.bash(cmd, void 0));
+    const rows = await fanOut(machines, async (m) => await m.rpc.bash(cmd, void 0, INSTALL_TIMEOUT_MS));
     let failures = 0;
     for (const r of rows) {
       if (!r.ok) {
@@ -364,7 +387,7 @@ async function fleetUpgradeKimi(opts) {
         continue;
       }
       const ok = r.result.exitCode === 0;
-      const detail = (r.result.stdout?.trim().split("\n").slice(-1)[0] || r.result.stderr?.trim().slice(-200) || "").replace(/\s+/g, " ");
+      const detail = rowDetail(r.result);
       printResultRow(r.machine, ok ? "OK" : "FAIL", detail);
       if (!ok) failures += 1;
     }
@@ -395,8 +418,9 @@ async function fleetUpgradeSvamp(opts) {
   try {
     printHeader(["MACHINE ID", "LABEL", "STATE", "DETAIL"], [20, 24, 6, 60]);
     for (const m of skipped) printResultRow(m, "SKIP", 'self \u2014 restart separately with "svamp daemon restart"');
+    assertSafeFleetArg(version, "version", SAFE_VERSION);
     const cmd = `bash -lc '${NPM_PREFIX_RESOLVER}; npm install -g $PREFIX_ARG svamp-cli@${version} 2>&1 | tail -5 && ${restartCmd} 2>&1 | tail -5'`;
-    const rows = await fanOut(targets, async (m) => await m.rpc.bash(cmd, void 0));
+    const rows = await fanOut(targets, async (m) => await m.rpc.bash(cmd, void 0, INSTALL_TIMEOUT_MS));
     let failures = 0;
     for (const r of rows) {
       if (!r.ok) {
@@ -405,7 +429,7 @@ async function fleetUpgradeSvamp(opts) {
         continue;
       }
       const ok = r.result.exitCode === 0;
-      const detail = (r.result.stdout?.trim().split("\n").slice(-1)[0] || r.result.stderr?.trim().slice(-200) || "").replace(/\s+/g, " ");
+      const detail = rowDetail(r.result);
       printResultRow(r.machine, ok ? "OK" : "FAIL", detail);
       if (!ok) failures += 1;
     }
@@ -445,7 +469,7 @@ async function fleetDaemonRestart(opts) {
     console.log(`Restarting daemons on ${machines.length} machine(s) \u2014 ${mode}...
 `);
     printHeader(["MACHINE ID", "LABEL", "STATE", "DETAIL"], [20, 24, 6, 60]);
-    const rows = await fanOut(machines, async (m) => await m.rpc.bash(cmd, void 0));
+    const rows = await fanOut(machines, async (m) => await m.rpc.bash(cmd, void 0, INSTALL_TIMEOUT_MS));
     let failures = 0;
     for (const r of rows) {
       if (!r.ok) {
@@ -454,7 +478,7 @@ async function fleetDaemonRestart(opts) {
         continue;
       }
       const ok = r.result.exitCode === 0;
-      const detail = (r.result.stdout?.trim().split("\n").slice(-1)[0] || r.result.stderr?.trim().slice(-200) || "").replace(/\s+/g, " ");
+      const detail = rowDetail(r.result);
       printResultRow(r.machine, ok ? "OK" : "FAIL", detail);
       if (!ok) failures += 1;
     }
@@ -480,8 +504,9 @@ async function fleetPushSkill(name) {
 `);
   try {
     printHeader(["MACHINE ID", "LABEL", "STATE", "DETAIL"], [20, 24, 6, 60]);
+    assertSafeFleetArg(name, "skill name", SAFE_SKILL_NAME);
     const cmd = `svamp skills install ${name} --force 2>&1`;
-    const rows = await fanOut(machines, async (m) => await m.rpc.bash(cmd, void 0));
+    const rows = await fanOut(machines, async (m) => await m.rpc.bash(cmd, void 0, INSTALL_TIMEOUT_MS));
     let failures = 0;
     for (const r of rows) {
       if (!r.ok) {
@@ -490,7 +515,7 @@ async function fleetPushSkill(name) {
         continue;
       }
       const ok = r.result.exitCode === 0;
-      const detail = (r.result.stdout?.trim().split("\n").slice(-1)[0] || r.result.stderr?.trim().slice(-200) || "").replace(/\s+/g, " ");
+      const detail = rowDetail(r.result);
       printResultRow(r.machine, ok ? "OK" : "FAIL", detail);
       if (!ok) failures += 1;
     }
@@ -502,4 +527,4 @@ ${rows.length - failures}/${rows.length} updated.`);
   }
 }
 
-export { fleetDaemonRestart, fleetDaemonRestartCommand, fleetExec, fleetPushSkill, fleetStatus, fleetUpgradeClaude, fleetUpgradeCodex, fleetUpgradeKimi, fleetUpgradeNono, fleetUpgradeSvamp, parseVersionOutput, partitionSelf };
+export { assertSafeFleetArg, fleetDaemonRestart, fleetDaemonRestartCommand, fleetExec, fleetPushSkill, fleetStatus, fleetUpgradeClaude, fleetUpgradeCodex, fleetUpgradeKimi, fleetUpgradeNono, fleetUpgradeSvamp, parseVersionOutput, partitionSelf, rowDetail };