svamp-cli 0.1.27 → 0.1.29

package/dist/agent-cli.mjs

@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import { connectAndGetMachine, resolveSessionId } from './commands-BOeSil-P.mjs';
+import { connectAndGetMachine, resolveSessionId } from './commands-DDB3y1L1.mjs';
 import 'node:fs';
 import 'node:path';
 import 'node:os';

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-Cmostc0S.mjs';
+import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-BCSNMhiz.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -6,12 +6,18 @@ import 'path';
 import 'url';
 import 'child_process';
 import 'crypto';
-import './hyphaClient-DLkclazm.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'node:path';
 import 'node:child_process';
 import '@agentclientprotocol/sdk';
+import 'node:os';
+import '@modelcontextprotocol/sdk/client/index.js';
+import '@modelcontextprotocol/sdk/client/stdio.js';
+import '@modelcontextprotocol/sdk/types.js';
+import 'zod';
+import 'node:fs/promises';
+import 'node:util';
 
 const args = process.argv.slice(2);
 const subcommand = args[0];
@@ -61,7 +67,8 @@ async function main() {
       await startDaemon();
       process.exit(0);
     } else if (daemonSubcommand === "stop") {
-      await stopDaemon();
+      const cleanup = args.includes("--cleanup");
+      await stopDaemon({ cleanup });
       process.exit(0);
     } else if (daemonSubcommand === "status") {
       daemonStatus();
@@ -82,7 +89,7 @@ async function main() {
   } else if (subcommand === "--help" || subcommand === "-h" || !subcommand) {
     printHelp();
   } else if (subcommand === "--version" || subcommand === "-v") {
-    const pkg = await import('./package-CCJ045H0.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-CKOQ5lA7.mjs').catch(() => ({ default: { version: "unknown" } }));
     console.log(`svamp version: ${pkg.default.version}`);
   } else {
     console.error(`Unknown command: ${subcommand}`);
@@ -97,7 +104,7 @@ async function handleAgentCommand() {
     return;
   }
   if (agentArgs[0] === "list") {
-    const { KNOWN_ACP_AGENTS } = await import('./run-Cmostc0S.mjs').then(function (n) { return n.e; });
+    const { KNOWN_ACP_AGENTS } = await import('./run-BCSNMhiz.mjs').then(function (n) { return n.f; });
     console.log("Known ACP agents:");
     for (const [name, config2] of Object.entries(KNOWN_ACP_AGENTS)) {
       console.log(`  ${name.padEnd(12)} ${config2.command} ${config2.args.join(" ")}`);
@@ -106,10 +113,10 @@ async function handleAgentCommand() {
     console.log('Use "svamp agent -- <command> [args]" for a custom ACP agent.');
     return;
   }
-  const { resolveAcpAgentConfig } = await import('./run-Cmostc0S.mjs').then(function (n) { return n.e; });
-  const { AcpBackend } = await import('./run-Cmostc0S.mjs').then(function (n) { return n.c; });
-  const { GeminiTransport } = await import('./run-Cmostc0S.mjs').then(function (n) { return n.G; });
-  const { DefaultTransport } = await import('./run-Cmostc0S.mjs').then(function (n) { return n.D; });
+  const { resolveAcpAgentConfig } = await import('./run-BCSNMhiz.mjs').then(function (n) { return n.f; });
+  const { AcpBackend } = await import('./run-BCSNMhiz.mjs').then(function (n) { return n.e; });
+  const { GeminiTransport } = await import('./run-BCSNMhiz.mjs').then(function (n) { return n.G; });
+  const { DefaultTransport } = await import('./run-BCSNMhiz.mjs').then(function (n) { return n.D; });
   let cwd = process.cwd();
   const filteredArgs = [];
   for (let i = 0; i < agentArgs.length; i++) {
@@ -232,15 +239,45 @@ Agent stopped: ${msg.detail || ""}`);
   });
 }
 async function handleSessionCommand() {
-  const sessionArgs = args.slice(1);
+  const rawSessionArgs = args.slice(1);
+  let targetMachineId;
+  const sessionArgs = [];
+  for (let i = 0; i < rawSessionArgs.length; i++) {
+    if ((rawSessionArgs[i] === "--machine" || rawSessionArgs[i] === "-m") && i + 1 < rawSessionArgs.length) {
+      targetMachineId = rawSessionArgs[i + 1];
+      i++;
+    } else {
+      sessionArgs.push(rawSessionArgs[i]);
+    }
+  }
   const sessionSubcommand = sessionArgs[0];
   if (!sessionSubcommand || sessionSubcommand === "--help" || sessionSubcommand === "-h") {
     printSessionHelp();
     return;
   }
-  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach } = await import('./commands-BOeSil-P.mjs');
-  if (sessionSubcommand === "list" || sessionSubcommand === "ls") {
-    await sessionList();
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait } = await import('./commands-CtO1WRt4.mjs');
+  const parseFlagStr = (flag, shortFlag) => {
+    for (let i = 1; i < sessionArgs.length; i++) {
+      if ((sessionArgs[i] === flag || shortFlag) && i + 1 < sessionArgs.length) {
+        return sessionArgs[i + 1];
+      }
+    }
+    return void 0;
+  };
+  const parseFlagInt = (flag, shortFlag) => {
+    const v = parseFlagStr(flag, shortFlag);
+    if (v === void 0) return void 0;
+    const n = parseInt(v, 10);
+    return isNaN(n) ? void 0 : n;
+  };
+  const hasFlag = (flag) => sessionArgs.includes(flag);
+  if (sessionSubcommand === "machines" || sessionSubcommand === "machine") {
+    await sessionMachines();
+  } else if (sessionSubcommand === "list" || sessionSubcommand === "ls") {
+    await sessionList(targetMachineId, {
+      active: hasFlag("--active"),
+      json: hasFlag("--json")
+    });
   } else if (sessionSubcommand === "spawn") {
     const agent = sessionArgs[1] || "claude";
     let dir = process.cwd();
@@ -250,36 +287,58 @@ async function handleSessionCommand() {
         i++;
       }
     }
-    await sessionSpawn(agent, dir);
+    const message = parseFlagStr("--message");
+    const wait = hasFlag("--wait");
+    await sessionSpawn(agent, dir, targetMachineId, { message, wait });
   } else if (sessionSubcommand === "stop") {
     if (!sessionArgs[1]) {
       console.error("Usage: svamp session stop <session-id>");
       process.exit(1);
     }
-    await sessionStop(sessionArgs[1]);
+    await sessionStop(sessionArgs[1], targetMachineId);
   } else if (sessionSubcommand === "info") {
     if (!sessionArgs[1]) {
       console.error("Usage: svamp session info <session-id>");
       process.exit(1);
     }
-    await sessionInfo(sessionArgs[1]);
+    await sessionInfo(sessionArgs[1], targetMachineId, {
+      json: hasFlag("--json")
+    });
   } else if (sessionSubcommand === "messages" || sessionSubcommand === "msgs") {
     if (!sessionArgs[1]) {
-      console.error("Usage: svamp session messages <session-id> [--last N]");
+      console.error("Usage: svamp session messages <session-id> [--last N] [--json] [--after N] [--limit N]");
       process.exit(1);
     }
-    let last;
-    const lastIdx = sessionArgs.indexOf("--last");
-    if (lastIdx >= 0 && sessionArgs[lastIdx + 1]) {
-      last = parseInt(sessionArgs[lastIdx + 1], 10);
-    }
-    await sessionMessages(sessionArgs[1], last);
+    await sessionMessages(sessionArgs[1], targetMachineId, {
+      last: parseFlagInt("--last"),
+      json: hasFlag("--json"),
+      after: parseFlagInt("--after"),
+      limit: parseFlagInt("--limit")
+    });
   } else if (sessionSubcommand === "attach") {
     if (!sessionArgs[1]) {
       console.error("Usage: svamp session attach <session-id>");
       process.exit(1);
     }
-    await sessionAttach(sessionArgs[1]);
+    await sessionAttach(sessionArgs[1], targetMachineId);
+  } else if (sessionSubcommand === "send") {
+    if (!sessionArgs[1] || !sessionArgs[2]) {
+      console.error("Usage: svamp session send <session-id> <message> [--wait] [--timeout N] [--json]");
+      process.exit(1);
+    }
+    await sessionSend(sessionArgs[1], sessionArgs[2], targetMachineId, {
+      wait: hasFlag("--wait"),
+      timeout: parseFlagInt("--timeout"),
+      json: hasFlag("--json")
+    });
+  } else if (sessionSubcommand === "wait") {
+    if (!sessionArgs[1]) {
+      console.error("Usage: svamp session wait <session-id> [--timeout N]");
+      process.exit(1);
+    }
+    await sessionWait(sessionArgs[1], targetMachineId, {
+      timeout: parseFlagInt("--timeout")
+    });
   } else {
     console.error(`Unknown session command: ${sessionSubcommand}`);
     printSessionHelp();
@@ -591,11 +650,13 @@ svamp \u2014 Svamp CLI with Hypha transport
 Usage:
   svamp login [url]          Login to Hypha (opens browser, stores token)
   svamp daemon start         Start the daemon (detached)
-  svamp daemon stop          Stop the daemon
+  svamp daemon stop          Stop the daemon (sessions preserved for restart)
+  svamp daemon stop --cleanup  Stop and mark all sessions as stopped
   svamp daemon status        Show daemon status
   svamp daemon install       Install as system service (launchd/systemd/wrapper)
   svamp daemon uninstall     Remove system service
   svamp session list         List active daemon sessions
+  svamp session machines     List discoverable machines
   svamp session spawn        Spawn a new session on the daemon
   svamp session attach <id>  Attach to a session (interactive)
   svamp session --help       Show all session commands
@@ -618,11 +679,12 @@ function printDaemonHelp() {
 svamp daemon \u2014 Daemon management
 
 Usage:
-  svamp daemon start       Start the daemon (detached)
-  svamp daemon stop        Stop the daemon
-  svamp daemon status      Show daemon status
-  svamp daemon install     Install as launchd service (macOS) \u2014 auto-restart on crash
-  svamp daemon uninstall   Remove launchd service
+  svamp daemon start         Start the daemon (detached)
+  svamp daemon stop          Stop the daemon (sessions preserved for restart)
+  svamp daemon stop --cleanup  Stop and mark all sessions as stopped
+  svamp daemon status        Show daemon status
+  svamp daemon install       Install as launchd service (macOS) \u2014 auto-restart on crash
+  svamp daemon uninstall     Remove launchd service
 `);
 }
 function printSessionHelp() {
@@ -630,16 +692,25 @@ function printSessionHelp() {
 svamp session \u2014 Manage daemon sessions (Claude, Gemini, OpenCode)
 
 Usage:
-  svamp session list                       List active sessions
-  svamp session spawn <agent> [-d <path>]  Spawn a new session
-  svamp session stop <id>                  Stop a session
-  svamp session info <id>                  Show session metadata
-  svamp session messages <id> [--last N]   Dump recent messages
-  svamp session attach <id>                Attach to session (interactive)
+  svamp session list [--active] [--json]                     List sessions (alias: ls)
+  svamp session machines                                      List discoverable machines
+  svamp session spawn <agent> [-d <path>] [--message <msg>] [--wait]
+                                                              Spawn a new session
+  svamp session stop <id>                                     Stop a session
+  svamp session info <id> [--json]                           Show session metadata + activity
+  svamp session send <id> <message> [--wait] [--timeout N] [--json]
+                                                              Send a message to a session
+  svamp session wait <id> [--timeout N]                      Wait for agent to become idle
+  svamp session messages <id> [--last N] [--json] [--after N] [--limit N]
+                                                              Show messages (alias: msgs)
+  svamp session attach <id>                                   Attach to session (interactive)
+
+Options:
+  --machine <id>, -m <id>  Target a specific machine (prefix match supported)
 
 Agents: claude (default), gemini, opencode
 
-Session IDs can be abbreviated (prefix match, like Docker).
+Session and machine IDs can be abbreviated (prefix match, like Docker).
 
 Attach commands:
   /quit, /detach    Detach (session keeps running)
@@ -648,11 +719,12 @@ Attach commands:
   /info             Show session status
 
 Examples:
-  svamp session list
-  svamp session spawn claude -d ~/projects/myapp
-  svamp session spawn gemini
-  svamp session info abc12345
-  svamp session messages abc12345 --last 10
+  svamp session list --active --json
+  svamp session spawn claude -d ~/projects/myapp --message "Fix the bug" --wait
+  svamp session send abc12345 "Run the tests" --wait --timeout 600
+  svamp session wait abc12345 --timeout 120
+  svamp session info abc12345 --json
+  svamp session messages abc12345 --last 10 --json
   svamp session attach abc12345
 `);
 }