svamp-cli 0.2.342 → 0.2.356

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

@@ -1,26 +1,12 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import os from 'node:os';
-import { ah as PINNED_CODEX_VERSION, c as connectToHypha } from './run-CF4kAVPW.mjs';
+import { c as connectToHypha } from './hyphaClient-ybivOjZo.mjs';
 import { PINNED_CLAUDE_CODE_VERSION } from './pinnedClaudeCode-LCVY4Otm.mjs';
-import 'os';
-import 'fs/promises';
-import 'fs';
-import 'path';
-import 'url';
-import 'child_process';
-import 'crypto';
-import 'node:crypto';
+import { P as PINNED_CODEX_VERSION } from './pinnedCodex-XW4qvOAe.mjs';
+import { P as PINNED_NONO_VERSION } from './pinnedNono-5ZHb6328.mjs';
 import 'node:child_process';
-import 'util';
-import 'http';
-import 'net';
-import 'node:events';
-import '@agentclientprotocol/sdk';
 import 'node:util';
-import 'node:readline';
-import 'node:fs/promises';
-import 'yaml';
 
 const KIMI_NPM_PACKAGE = "@moonshot-ai/kimi-code";
 const PINNED_KIMI_VERSION = "0.38.0";
@@ -51,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 {
@@ -155,28 +161,44 @@ async function fleetStatus() {
     return;
   }
   try {
-    printHeader(["MACHINE ID", "LABEL", "CLAUDE", "SVAMP", "STATUS"], [20, 24, 12, 10, 12]);
+    printHeader(["MACHINE ID", "LABEL", "CLAUDE", "SVAMP", "NONO", "STATUS"], [20, 24, 12, 10, 14, 12]);
     const rows = await fanOut(machines, async (m) => {
-      const [claudeRes, svampRes] = await Promise.all([
+      const [claudeRes, svampRes, nonoRes] = await Promise.all([
         m.rpc.bash("claude --version 2>/dev/null || echo unknown").catch(() => null),
-        m.rpc.bash("svamp --version 2>/dev/null || echo unknown").catch(() => null)
+        m.rpc.bash("svamp --version 2>/dev/null || echo unknown").catch(() => null),
+        // Check PATH and the svamp-managed location — installNono writes to the latter,
+        // which is not necessarily on the daemon's PATH (see #0-series PATH notes).
+        m.rpc.bash("nono --version 2>/dev/null || ~/.svamp/tools/bin/nono --version 2>/dev/null || echo none").catch(() => null)
       ]);
       const claude = parseVersionOutput(claudeRes?.stdout);
       const svamp = parseVersionOutput(svampRes?.stdout);
+      const nono = parseVersionOutput(nonoRes?.stdout);
       const info = await m.rpc.getMachineInfo();
-      return { claude, svamp, status: info.daemonState?.status || "unknown" };
+      return { claude, svamp, nono, status: info.daemonState?.status || "unknown" };
     });
+    let driftingNono = 0;
     for (const r of rows) {
       const id = truncate(r.machine.machineId, 18).padEnd(20);
       const label = truncate(r.machine.label, 22).padEnd(24);
       const claude = (r.ok ? r.result.claude : "-").padEnd(12);
       const svamp = (r.ok ? r.result.svamp : "-").padEnd(10);
+      const nonoRaw = r.ok ? r.result.nono : "-";
+      const nonoDrift = r.ok && nonoRaw !== PINNED_NONO_VERSION;
+      const nono = (nonoDrift ? `${nonoRaw} !` : nonoRaw).padEnd(14);
       const status = r.ok ? r.result.status : r.error || "fail";
       const color = r.ok && r.result.status === "running" ? "\x1B[32m" : "\x1B[31m";
-      console.log(`${id} ${label} ${claude} ${svamp} ${color}${status}\x1B[0m`);
+      console.log(`${id} ${label} ${claude} ${svamp} ${nono}${color}${status}\x1B[0m`);
+      if (nonoDrift) driftingNono += 1;
     }
     console.log(`
 ${machines.length} machine(s).`);
+    if (driftingNono > 0) {
+      console.log(
+        `
+\x1B[33m! ${driftingNono} machine(s) are not on the pinned nono ${PINNED_NONO_VERSION}\x1B[0m \u2014 nono IS the sandbox boundary, and installNono() only runs when the binary is ABSENT, so an
+  existing machine never picks up the pin. Reconcile deliberately with: svamp fleet upgrade-nono`
+      );
+    }
   } finally {
     await server.disconnect();
   }
@@ -232,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) {
@@ -242,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;
     }
@@ -269,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) {
@@ -279,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;
     }
@@ -290,6 +314,53 @@ ${rows.length - failures}/${rows.length} machines on codex ${version}.`);
     await server.disconnect();
   }
 }
+async function fleetUpgradeNono(opts) {
+  if (opts?.version && opts.version !== PINNED_NONO_VERSION) {
+    console.error(`Refusing to install nono ${opts.version}: this command reconciles the PIN, and the pin is ${PINNED_NONO_VERSION}.`);
+    console.error("");
+    console.error("nono is the sandbox boundary, so the version that reaches the fleet must be the one");
+    console.error("reviewed in a commit \u2014 not one typed at the prompt. To roll a different nono:");
+    console.error(`  1. bump PINNED_NONO_VERSION to ${opts.version} in packages/svamp-cli/src/daemon/pinnedNono.ts`);
+    console.error("     (this also updates the checksum the installer verifies against)");
+    console.error("  2. land + publish it, then re-run `svamp fleet upgrade-nono` with no -v");
+    process.exitCode = 1;
+    return;
+  }
+  const version = PINNED_NONO_VERSION;
+  const { server, machines } = await discoverMachines();
+  if (machines.length === 0) {
+    console.log("No machines found.");
+    await server.disconnect();
+    return;
+  }
+  console.log(`Reconciling nono to ${version} on ${machines.length} machine(s)...
+`);
+  console.log("nono IS the sandbox boundary \u2014 roll it deliberately, and canary one machine first.");
+  console.log("No daemon restart needed: the new binary applies to sessions started after this.\n");
+  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, INSTALL_TIMEOUT_MS));
+    let failures = 0;
+    for (const r of rows) {
+      if (!r.ok) {
+        printResultRow(r.machine, "FAIL", r.error || "");
+        failures += 1;
+        continue;
+      }
+      const ok = r.result.exitCode === 0;
+      const detail = rowDetail(r.result);
+      printResultRow(r.machine, ok ? "OK" : "FAIL", detail);
+      if (!ok) failures += 1;
+    }
+    console.log(`
+${rows.length - failures}/${rows.length} machines reconciled to nono ${version}.`);
+    console.log("Confirm with: svamp fleet status   (the NONO column flags anything off the pin)");
+    if (failures > 0) process.exitCode = 1;
+  } finally {
+    await server.disconnect();
+  }
+}
 async function fleetUpgradeKimi(opts) {
   const version = opts?.version || PINNED_KIMI_VERSION;
   const { server, machines } = await discoverMachines();
@@ -298,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.`);
@@ -306,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) {
@@ -315,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;
     }
@@ -346,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) {
@@ -356,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;
     }
@@ -374,6 +447,15 @@ ${rows.length - failures}/${rows.length} machines updated (new binary installed)
     await server.disconnect();
   }
 }
+function fleetDaemonRestartCommand(opts) {
+  if (opts?.graceful === false) {
+    return `svamp daemon stop --cleanup 2>&1 && svamp daemon start 2>&1`;
+  }
+  if (opts?.force) {
+    return `svamp daemon restart 2>&1`;
+  }
+  return `svamp daemon restart --when-idle 2>&1`;
+}
 async function fleetDaemonRestart(opts) {
   const { server, machines } = await discoverMachines();
   if (machines.length === 0) {
@@ -382,9 +464,12 @@ async function fleetDaemonRestart(opts) {
     return;
   }
   try {
+    const cmd = fleetDaemonRestartCommand(opts);
+    const mode = opts?.graceful === false ? "cleanup (hard stop+start)" : opts?.force ? "force (immediate)" : "graceful (restart when idle)";
+    console.log(`Restarting daemons on ${machines.length} machine(s) \u2014 ${mode}...
+`);
     printHeader(["MACHINE ID", "LABEL", "STATE", "DETAIL"], [20, 24, 6, 60]);
-    const cmd = opts?.graceful === false ? `svamp daemon stop --cleanup 2>&1 && svamp daemon start 2>&1` : `svamp daemon restart 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) {
@@ -393,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;
     }
@@ -419,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) {
@@ -429,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;
     }
@@ -441,4 +527,4 @@ ${rows.length - failures}/${rows.length} updated.`);
   }
 }
 
-export { fleetDaemonRestart, fleetExec, fleetPushSkill, fleetStatus, fleetUpgradeClaude, fleetUpgradeCodex, fleetUpgradeKimi, fleetUpgradeSvamp, parseVersionOutput, partitionSelf };
+export { assertSafeFleetArg, fleetDaemonRestart, fleetDaemonRestartCommand, fleetExec, fleetPushSkill, fleetStatus, fleetUpgradeClaude, fleetUpgradeCodex, fleetUpgradeKimi, fleetUpgradeNono, fleetUpgradeSvamp, parseVersionOutput, partitionSelf, rowDetail };

package/dist/flushExit-C-i6SGjj.mjs

@@ -0,0 +1,37 @@
+function flushAndExit(code) {
+  return new Promise((resolve) => {
+    const streams = [process.stdout, process.stderr];
+    let remaining = streams.length;
+    const tryExit = () => {
+      if (--remaining <= 0) {
+        process.exit(code);
+        resolve(void 0);
+      }
+    };
+    for (const s of streams) {
+      if (s.writableLength) {
+        s.write("", () => tryExit());
+      } else {
+        tryExit();
+      }
+    }
+  });
+}
+function flushStdout() {
+  return new Promise((resolve) => {
+    const streams = [process.stdout, process.stderr];
+    let remaining = streams.length;
+    const done = () => {
+      if (--remaining <= 0) resolve();
+    };
+    for (const s of streams) {
+      if (s.writableLength) {
+        s.write("", () => done());
+      } else {
+        done();
+      }
+    }
+  });
+}
+
+export { flushAndExit as a, flushStdout as f };