svamp-cli 0.1.29 → 0.1.31

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-BCSNMhiz.mjs';
+import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-dBWhjQRf.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -89,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-CKOQ5lA7.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-BtoCHVOd.mjs').catch(() => ({ default: { version: "unknown" } }));
     console.log(`svamp version: ${pkg.default.version}`);
   } else {
     console.error(`Unknown command: ${subcommand}`);
@@ -104,7 +104,7 @@ async function handleAgentCommand() {
     return;
   }
   if (agentArgs[0] === "list") {
-    const { KNOWN_ACP_AGENTS } = await import('./run-BCSNMhiz.mjs').then(function (n) { return n.f; });
+    const { KNOWN_ACP_AGENTS } = await import('./run-dBWhjQRf.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(" ")}`);
@@ -113,10 +113,10 @@ async function handleAgentCommand() {
     console.log('Use "svamp agent -- <command> [args]" for a custom ACP agent.');
     return;
   }
-  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; });
+  const { resolveAcpAgentConfig } = await import('./run-dBWhjQRf.mjs').then(function (n) { return n.f; });
+  const { AcpBackend } = await import('./run-dBWhjQRf.mjs').then(function (n) { return n.e; });
+  const { GeminiTransport } = await import('./run-dBWhjQRf.mjs').then(function (n) { return n.G; });
+  const { DefaultTransport } = await import('./run-dBWhjQRf.mjs').then(function (n) { return n.D; });
   let cwd = process.cwd();
   const filteredArgs = [];
   for (let i = 0; i < agentArgs.length; i++) {
@@ -255,7 +255,7 @@ async function handleSessionCommand() {
     printSessionHelp();
     return;
   }
-  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait } = await import('./commands-CtO1WRt4.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait } = await import('./commands-78RHC879.mjs');
   const parseFlagStr = (flag, shortFlag) => {
     for (let i = 1; i < sessionArgs.length; i++) {
       if ((sessionArgs[i] === flag || shortFlag) && i + 1 < sessionArgs.length) {

package/dist/{commands-CgT3AgJ0.mjs → commands-78RHC879.mjs}

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import os from 'node:os';
-import { c as connectToHypha } from './run-DZmxHj-e.mjs';
+import { c as connectToHypha } from './run-dBWhjQRf.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -186,7 +186,15 @@ async function connectAndGetMachine(machineId) {
         }
       }
     } else {
-      selectedService = services[0];
+      if (state.machineId) {
+        const localMatch = services.find((s) => {
+          const id = s.id || s.name || "";
+          return id.includes(state.machineId);
+        });
+        selectedService = localMatch || services[0];
+      } else {
+        selectedService = services[0];
+      }
     }
     const svcId = selectedService.id || selectedService.name;
     machine = await server.getService(svcId);
@@ -199,6 +207,81 @@ async function connectAndGetMachine(machineId) {
   restoreConsole();
   return { server, machine };
 }
+async function connectAndGetAllMachines() {
+  loadDotEnv();
+  const state = readDaemonState();
+  if (!state || !isDaemonAlive(state)) {
+    console.error('Daemon is not running. Start it with "svamp daemon start".');
+    process.exit(1);
+  }
+  const serverUrl = process.env.HYPHA_SERVER_URL || state.hyphaServerUrl;
+  const token = process.env.HYPHA_TOKEN;
+  if (!serverUrl) {
+    console.error('No Hypha server URL. Run "svamp login <url>" first.');
+    process.exit(1);
+  }
+  const origLog = console.log;
+  const origWarn = console.warn;
+  const origInfo = console.info;
+  const origError = console.error;
+  const stdoutWrite = process.stdout.write.bind(process.stdout);
+  const stderrWrite = process.stderr.write.bind(process.stderr);
+  const isHyphaLog = (chunk) => typeof chunk === "string" && (chunk.includes("WebSocket connection") || chunk.includes("Connection established") || chunk.includes("registering service built-in") || chunk.includes("registered service") || chunk.includes("registered all") || chunk.includes("Subscribing to client_") || chunk.includes("subscribed to client_") || chunk.includes("subscribe to client_") || chunk.includes("Cleaning up all sessions") || chunk.includes("WebSocket connection disconnected") || chunk.includes("local RPC disconnection") || chunk.includes("Timeout registering service") || chunk.includes("Failed to subscribe to client_disconnected") || chunk.includes("Timeout subscribing to client_disconnected"));
+  console.log = () => {
+  };
+  console.warn = () => {
+  };
+  console.info = () => {
+  };
+  console.error = (...args) => {
+    if (!args.some((a) => isHyphaLog(a))) origError(...args);
+  };
+  process.stdout.write = (chunk, ...args) => {
+    if (isHyphaLog(chunk)) return true;
+    return stdoutWrite(chunk, ...args);
+  };
+  process.stderr.write = (chunk, ...args) => {
+    if (isHyphaLog(chunk)) return true;
+    return stderrWrite(chunk, ...args);
+  };
+  const restoreConsole = () => {
+    console.log = origLog;
+    console.warn = origWarn;
+    console.info = origInfo;
+    console.error = origError;
+  };
+  let server;
+  try {
+    server = await connectToHypha({ serverUrl, token, name: "svamp-session-cli" });
+  } catch (err) {
+    restoreConsole();
+    console.error(`Failed to connect to Hypha: ${err.message}`);
+    process.exit(1);
+  }
+  const machines = [];
+  try {
+    const services = await server.listServices({ type: "svamp-machine" });
+    for (const svc of services) {
+      try {
+        const svcId = svc.id || svc.name;
+        machines.push(await server.getService(svcId));
+      } catch {
+      }
+    }
+  } catch (err) {
+    restoreConsole();
+    console.error(`Failed to discover machine services: ${err.message}`);
+    await server.disconnect();
+    process.exit(1);
+  }
+  restoreConsole();
+  if (machines.length === 0) {
+    console.error("No machine service found. Is the daemon registered on Hypha?");
+    await server.disconnect();
+    process.exit(1);
+  }
+  return { server, machines };
+}
 async function sessionMachines() {
   loadDotEnv();
   const state = readDaemonState();
@@ -497,66 +580,90 @@ async function waitForBusyThenIdle(server, sessionId, timeoutMs = 3e5, busyTimeo
   throw new Error("Timeout waiting for agent to become idle");
 }
 async function sessionList(machineId, opts) {
-  const { server, machine } = await connectAndGetMachine(machineId);
-  try {
-    const sessions = await machine.listSessions();
-    const filtered = opts?.active ? sessions.filter((s) => s.active) : sessions;
-    if (filtered.length === 0) {
-      if (opts?.json) {
-        console.log(formatJson([]));
-      } else {
-        console.log("No active sessions.");
-      }
-      return;
+  if (machineId) {
+    const { server, machine } = await connectAndGetMachine(machineId);
+    try {
+      await listSessionsFromMachines(server, [machine], opts);
+    } finally {
+      await server.disconnect();
     }
-    const enriched = [];
-    for (const s of filtered) {
-      let flavor = "claude";
-      let name = "";
-      let path = s.directory || "";
-      let host = "";
-      if (s.metadata) {
-        flavor = s.metadata.flavor || "claude";
-        name = s.metadata.name || "";
-      }
-      if (s.active) {
-        try {
-          const svc = await server.getService(`svamp-session-${s.sessionId}`);
-          const { metadata } = await svc.getMetadata();
-          flavor = metadata?.flavor || flavor;
-          name = metadata?.name || name;
-          path = metadata?.path || path;
-          host = metadata?.host || "";
-        } catch {
-        }
+  } else {
+    const { server, machines } = await connectAndGetAllMachines();
+    try {
+      await listSessionsFromMachines(server, machines, opts);
+    } finally {
+      await server.disconnect();
+    }
+  }
+}
+async function listSessionsFromMachines(server, machines, opts) {
+  const allSessions = [];
+  for (const machine of machines) {
+    try {
+      const info = await machine.getMachineInfo();
+      const sessions = await machine.listSessions();
+      for (const s of sessions) {
+        s.machineHost = info.metadata?.displayName || info.metadata?.host || info.machineId;
       }
-      enriched.push({ ...s, flavor, name, path, host });
+      allSessions.push(...sessions);
+    } catch {
     }
+  }
+  const filtered = opts?.active ? allSessions.filter((s) => s.active) : allSessions;
+  if (filtered.length === 0) {
     if (opts?.json) {
-      console.log(formatJson(enriched.map((s) => ({
-        sessionId: s.sessionId,
-        agent: s.flavor,
-        name: s.name,
-        path: s.path,
-        host: s.host,
-        active: s.active,
-        directory: s.directory
-      }))));
+      console.log(formatJson([]));
     } else {
-      const header = `${"ID".padEnd(10)} ${"AGENT".padEnd(10)} ${"STATUS".padEnd(9)} ${"NAME".padEnd(25)} ${"DIRECTORY".padEnd(35)}`;
-      console.log(header);
-      console.log("-".repeat(header.length));
-      for (const s of enriched) {
-        const id = s.sessionId.slice(0, 8);
-        const agent = (s.flavor || "claude").padEnd(10);
-        const status = s.active ? "\x1B[32mactive\x1B[0m  " : "\x1B[90minactive\x1B[0m";
-        const name = truncate(s.name || "-", 25).padEnd(25);
-        const dir = truncate(s.directory || "-", 33).padEnd(35);
-        console.log(`${id.padEnd(10)} ${agent} ${status} ${name} ${dir}`);
+      console.log("No active sessions.");
+    }
+    return;
+  }
+  const enriched = [];
+  for (const s of filtered) {
+    let flavor = "claude";
+    let name = "";
+    let path = s.directory || "";
+    let host = s.machineHost || "";
+    if (s.metadata) {
+      flavor = s.metadata.flavor || "claude";
+      name = s.metadata.name || "";
+    }
+    if (s.active) {
+      try {
+        const svc = await server.getService(`svamp-session-${s.sessionId}`);
+        const { metadata } = await svc.getMetadata();
+        flavor = metadata?.flavor || flavor;
+        name = metadata?.name || name;
+        path = metadata?.path || path;
+        host = metadata?.host || host;
+      } catch {
       }
     }
-  } finally {
-    await server.disconnect();
+    enriched.push({ ...s, flavor, name, path, host });
+  }
+  if (opts?.json) {
+    console.log(formatJson(enriched.map((s) => ({
+      sessionId: s.sessionId,
+      agent: s.flavor,
+      name: s.name,
+      path: s.path,
+      host: s.host,
+      active: s.active,
+      directory: s.directory
+    }))));
+  } else {
+    const header = `${"ID".padEnd(10)} ${"AGENT".padEnd(10)} ${"STATUS".padEnd(9)} ${"NAME".padEnd(25)} ${"MACHINE".padEnd(18)} ${"DIRECTORY".padEnd(35)}`;
+    console.log(header);
+    console.log("-".repeat(header.length));
+    for (const s of enriched) {
+      const id = s.sessionId.slice(0, 8);
+      const agent = (s.flavor || "claude").padEnd(10);
+      const status = s.active ? "\x1B[32mactive\x1B[0m  " : "\x1B[90minactive\x1B[0m";
+      const name = truncate(s.name || "-", 25).padEnd(25);
+      const machine = truncate(s.host || "-", 16).padEnd(18);
+      const dir = truncate(s.directory || "-", 33).padEnd(35);
+      console.log(`${id.padEnd(10)} ${agent} ${status} ${name} ${machine} ${dir}`);
+    }
   }
 }
 async function sessionSpawn(agent, directory, machineId, opts) {

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { c as connectToHypha, d as daemonStatus, g as getHyphaServerUrl, r as registerMachineService, a as registerSessionService, s as startDaemon, b as stopDaemon } from './run-BCSNMhiz.mjs';
+export { c as connectToHypha, d as daemonStatus, g as getHyphaServerUrl, r as registerMachineService, a as registerSessionService, s as startDaemon, b as stopDaemon } from './run-dBWhjQRf.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{package-DPXkSwHu.mjs → package-BtoCHVOd.mjs}

@@ -1,5 +1,5 @@
 var name = "svamp-cli";
-var version = "0.1.28";
+var version = "0.1.31";
 var description = "Svamp CLI — AI workspace daemon on Hypha Cloud";
 var author = "Amun AI AB";
 var license = "SEE LICENSE IN LICENSE";

package/dist/{run-BCSNMhiz.mjs → run-dBWhjQRf.mjs}

@@ -183,6 +183,11 @@ async function registerMachineService(server, machineId, metadata, daemonState,
         });
         return result;
       },
+      // Restart agent process in a session (machine-level fallback)
+      restartSession: async (sessionId, context) => {
+        authorizeRequest(context, currentMetadata.sharing, "interact");
+        return await handlers.restartSession(sessionId);
+      },
       // Stop the daemon
       stopDaemon: async (context) => {
         authorizeRequest(context, currentMetadata.sharing, "admin");
@@ -425,6 +430,8 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
         data.uuid = randomUUID();
       }
       wrappedContent = { role: "agent", content: { type: "output", data } };
+    } else if (role === "event") {
+      wrappedContent = { role: "agent", content: { type: "event", data: content } };
     } else if (role === "session") {
       wrappedContent = { role: "session", content: { type: "session", data: content } };
     } else {
@@ -2262,15 +2269,15 @@ function bridgeAcpToSession(backend, sessionService, getMetadata, setMetadata, l
           setMetadata((m) => ({ ...m, lifecycleState: "running" }));
         } else if (msg.status === "error") {
           flushText();
-          sessionService.pushMessage({
-            type: "assistant",
-            content: [{ type: "text", text: `Error: ${msg.detail || "Unknown error"}` }]
-          }, "agent");
-          sessionService.sendKeepAlive(false);
+          sessionService.pushMessage(
+            { type: "message", message: `Agent process exited unexpectedly: ${msg.detail || "Unknown error"}` },
+            "event"
+          );
+          sessionService.sendSessionEnd();
           setMetadata((m) => ({ ...m, lifecycleState: "error" }));
         } else if (msg.status === "stopped") {
           flushText();
-          sessionService.sendKeepAlive(false);
+          sessionService.sendSessionEnd();
           setMetadata((m) => ({ ...m, lifecycleState: "stopped" }));
         }
         break;
@@ -3800,17 +3807,11 @@ async function startDaemon() {
           logger.log(`[Session ${sessionId}] Claude PID: ${child.pid}, stdin: ${!!child.stdin}, stdout: ${!!child.stdout}, stderr: ${!!child.stderr}`);
           child.on("error", (err) => {
             logger.log(`[Session ${sessionId}] Claude process error: ${err.message}`);
-            sessionService.pushMessage({
-              type: "assistant",
-              content: [{
-                type: "text",
-                text: `Error: Failed to start Claude Code CLI: ${err.message}
-
-Please ensure Claude Code CLI is installed on this machine. You can install it with:
-\`npm install -g @anthropic-ai/claude-code\``
-              }]
-            }, "agent");
-            sessionService.sendKeepAlive(false);
+            sessionService.pushMessage(
+              { type: "message", message: `Agent process exited unexpectedly: ${err.message}. Please ensure Claude Code CLI is installed.` },
+              "event"
+            );
+            sessionService.sendSessionEnd();
           });
           let stdoutBuffer = "";
           let lastErrorMessagePushed = false;
@@ -4014,20 +4015,15 @@ Please ensure Claude Code CLI is installed on this machine. You can install it w
             }
             pendingPermissions.clear();
             if (code !== 0 && code !== null && !lastErrorMessagePushed) {
-              sessionService.pushMessage({
-                type: "assistant",
-                content: [{
-                  type: "text",
-                  text: `Error: Claude process exited with code ${code}${signal ? ` (signal: ${signal})` : ""}.
-
-This may indicate that Claude Code CLI is not properly installed or configured.`
-                }]
-              }, "agent");
+              sessionService.pushMessage(
+                { type: "message", message: `Agent process exited unexpectedly (code ${code}${signal ? `, signal: ${signal}` : ""})` },
+                "event"
+              );
             }
             lastErrorMessagePushed = false;
             sessionMetadata = { ...sessionMetadata, lifecycleState: claudeResumeId ? "idle" : "stopped" };
             sessionService.updateMetadata(sessionMetadata);
-            sessionService.sendKeepAlive(false);
+            sessionService.sendSessionEnd();
             if (claudeResumeId && !trackedSession.stopped) {
               saveSession({
                 sessionId,
@@ -4051,6 +4047,30 @@ This may indicate that Claude Code CLI is not properly installed or configured.`
           }
           return child;
         };
+        const restartClaudeHandler = async () => {
+          logger.log(`[Session ${sessionId}] Restart Claude requested`);
+          try {
+            if (claudeProcess && claudeProcess.exitCode === null) {
+              isKillingClaude = true;
+              sessionMetadata = { ...sessionMetadata, lifecycleState: "restarting" };
+              sessionService.updateMetadata(sessionMetadata);
+              await killAndWaitForExit2(claudeProcess);
+              isKillingClaude = false;
+            }
+            if (claudeResumeId) {
+              spawnClaude(void 0, { permissionMode: currentPermissionMode });
+              logger.log(`[Session ${sessionId}] Claude respawned with --resume ${claudeResumeId}`);
+              return { success: true, message: "Claude process restarted successfully." };
+            } else {
+              logger.log(`[Session ${sessionId}] No resume ID \u2014 cannot restart`);
+              return { success: false, message: "No session to resume. Send a message to start a new session." };
+            }
+          } catch (err) {
+            isKillingClaude = false;
+            logger.log(`[Session ${sessionId}] Restart failed: ${err.message}`);
+            return { success: false, message: `Restart failed: ${err.message}` };
+          }
+        };
         const sessionService = await registerSessionService(
           server,
           sessionId,
@@ -4148,30 +4168,7 @@ This may indicate that Claude Code CLI is not properly installed or configured.`
                 spawnClaude(void 0, { permissionMode: mode });
               }
             },
-            onRestartClaude: async () => {
-              logger.log(`[Session ${sessionId}] Restart Claude requested`);
-              try {
-                if (claudeProcess && claudeProcess.exitCode === null) {
-                  isKillingClaude = true;
-                  sessionMetadata = { ...sessionMetadata, lifecycleState: "restarting" };
-                  sessionService.updateMetadata(sessionMetadata);
-                  await killAndWaitForExit2(claudeProcess);
-                  isKillingClaude = false;
-                }
-                if (claudeResumeId) {
-                  spawnClaude(void 0, { permissionMode: currentPermissionMode });
-                  logger.log(`[Session ${sessionId}] Claude respawned with --resume ${claudeResumeId}`);
-                  return { success: true, message: "Claude process restarted successfully." };
-                } else {
-                  logger.log(`[Session ${sessionId}] No resume ID \u2014 cannot restart`);
-                  return { success: false, message: "No session to resume. Send a message to start a new session." };
-                }
-              } catch (err) {
-                isKillingClaude = false;
-                logger.log(`[Session ${sessionId}] Restart failed: ${err.message}`);
-                return { success: false, message: `Restart failed: ${err.message}` };
-              }
-            },
+            onRestartClaude: restartClaudeHandler,
             onKillSession: () => {
               logger.log(`[Session ${sessionId}] Kill session requested`);
               stopSession(sessionId);
@@ -4284,6 +4281,7 @@ This may indicate that Claude Code CLI is not properly installed or configured.`
           checkSvampConfig,
           directory,
           resumeSessionId: claudeResumeId,
+          restartAgent: restartClaudeHandler,
           get childProcess() {
             return claudeProcess || void 0;
           }
@@ -4585,16 +4583,11 @@ This may indicate that Claude Code CLI is not properly installed or configured.`
           logger.log(`[Agent Session ${sessionId}] ${agentName} backend started, waiting for first message`);
         }).catch((err) => {
           logger.error(`[Agent Session ${sessionId}] Failed to start ${agentName}:`, err);
-          sessionService.pushMessage({
-            type: "assistant",
-            content: [{
-              type: "text",
-              text: `Error: Failed to start ${agentName} agent: ${err.message}
-
-Please ensure the ${agentName} CLI is installed.`
-            }]
-          }, "agent");
-          sessionService.sendKeepAlive(false);
+          sessionService.pushMessage(
+            { type: "message", message: `Agent process exited unexpectedly: ${err.message}. Please ensure the ${agentName} CLI is installed.` },
+            "event"
+          );
+          sessionService.sendSessionEnd();
         });
         return {
           type: "success",
@@ -4631,6 +4624,17 @@ Please ensure the ${agentName} CLI is installed.`
       logger.log(`Session ${sessionId} not found`);
       return false;
     };
+    const restartSession = async (sessionId) => {
+      for (const session of pidToTrackedSession.values()) {
+        if (session.svampSessionId === sessionId && !session.stopped) {
+          if (session.restartAgent) {
+            return await session.restartAgent();
+          }
+          return { success: false, message: "This session does not support restart." };
+        }
+      }
+      return { success: false, message: `Session ${sessionId} not found or already stopped.` };
+    };
     let isolationCapabilities;
     try {
       isolationCapabilities = await detectIsolationCapabilities();
@@ -4663,6 +4667,7 @@ Please ensure the ${agentName} CLI is installed.`
       {
         spawnSession,
         stopSession,
+        restartSession,
         requestShutdown: () => requestShutdown("hypha-app"),
         getTrackedSessions: getCurrentChildren
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svamp-cli",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "Svamp CLI — AI workspace daemon on Hypha Cloud",
   "author": "Amun AI AB",
   "license": "SEE LICENSE IN LICENSE",