svamp-cli 0.1.23 → 0.1.28

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-4fyJcaRE.mjs';
+import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-DjfPjgOb.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -6,6 +6,7 @@ import 'path';
 import 'url';
 import 'child_process';
 import 'crypto';
+import './hyphaClient-DLkclazm.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'node:path';
@@ -65,6 +66,12 @@ async function main() {
     } else if (daemonSubcommand === "status") {
       daemonStatus();
       process.exit(0);
+    } else if (daemonSubcommand === "install") {
+      await installDaemonService();
+      process.exit(0);
+    } else if (daemonSubcommand === "uninstall") {
+      await uninstallDaemonService();
+      process.exit(0);
     } else {
       printDaemonHelp();
     }
@@ -75,7 +82,7 @@ async function main() {
   } else if (subcommand === "--help" || subcommand === "-h" || !subcommand) {
     printHelp();
   } else if (subcommand === "--version" || subcommand === "-v") {
-    const pkg = await import('./package-C5B0twb8.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-CvnNnsm7.mjs').catch(() => ({ default: { version: "unknown" } }));
     console.log(`svamp version: ${pkg.default.version}`);
   } else {
     console.error(`Unknown command: ${subcommand}`);
@@ -90,7 +97,7 @@ async function handleAgentCommand() {
     return;
   }
   if (agentArgs[0] === "list") {
-    const { KNOWN_ACP_AGENTS } = await import('./run-4fyJcaRE.mjs').then(function (n) { return n.f; });
+    const { KNOWN_ACP_AGENTS } = await import('./run-DjfPjgOb.mjs').then(function (n) { return n.e; });
     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(" ")}`);
@@ -99,10 +106,10 @@ async function handleAgentCommand() {
     console.log('Use "svamp agent -- <command> [args]" for a custom ACP agent.');
     return;
   }
-  const { resolveAcpAgentConfig } = await import('./run-4fyJcaRE.mjs').then(function (n) { return n.f; });
-  const { AcpBackend } = await import('./run-4fyJcaRE.mjs').then(function (n) { return n.e; });
-  const { GeminiTransport } = await import('./run-4fyJcaRE.mjs').then(function (n) { return n.G; });
-  const { DefaultTransport } = await import('./run-4fyJcaRE.mjs').then(function (n) { return n.D; });
+  const { resolveAcpAgentConfig } = await import('./run-DjfPjgOb.mjs').then(function (n) { return n.e; });
+  const { AcpBackend } = await import('./run-DjfPjgOb.mjs').then(function (n) { return n.c; });
+  const { GeminiTransport } = await import('./run-DjfPjgOb.mjs').then(function (n) { return n.G; });
+  const { DefaultTransport } = await import('./run-DjfPjgOb.mjs').then(function (n) { return n.D; });
   let cwd = process.cwd();
   const filteredArgs = [];
   for (let i = 0; i < agentArgs.length; i++) {
@@ -231,7 +238,7 @@ async function handleSessionCommand() {
     printSessionHelp();
     return;
   }
-  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach } = await import('./commands-_uCC3U1U.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach } = await import('./commands-BOeSil-P.mjs');
   if (sessionSubcommand === "list" || sessionSubcommand === "ls") {
     await sessionList();
   } else if (sessionSubcommand === "spawn") {
@@ -297,16 +304,13 @@ async function loginToHypha() {
     }
     const token = await hyphaWebsocketClient.login({
       server_url: serverUrl,
+      login_timeout: 120,
       login_callback: (context) => {
         console.log(`
 Please open this URL in your browser:
   ${context.login_url}
 `);
-        import('child_process').then(({ exec }) => {
-          const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
-          exec(`${cmd} "${context.login_url}"`);
-        }).catch(() => {
-        });
+        console.log("Waiting for you to complete login in the browser...\n");
       }
     });
     if (!token) {
@@ -314,13 +318,13 @@ Please open this URL in your browser:
       process.exit(1);
     }
     const connectToServer = mod.connectToServer || mod.default && mod.default.connectToServer || hyphaWebsocketClient && hyphaWebsocketClient.connectToServer;
-    const server = await connectToServer({ server_url: serverUrl, token, transport: "http" });
+    const server = await connectToServer({ server_url: serverUrl, token });
     const workspace = server.config.workspace;
     const userId = server.config.user?.id || workspace;
     let longLivedToken = token;
     try {
       const sixMonthsInSeconds = 6 * 30 * 24 * 60 * 60;
-      longLivedToken = await server.generateToken({ expires_in: sixMonthsInSeconds });
+      longLivedToken = await server.generateToken({ expires_in: sixMonthsInSeconds, workspace });
       console.log("Generated long-lived token (expires in ~6 months)");
     } catch (err) {
       console.warn("Could not generate long-lived token, using login token:", err.message || err);
@@ -364,6 +368,222 @@ You can now start the daemon: svamp daemon start`);
     process.exit(1);
   }
 }
+const LAUNCHD_LABEL = "io.hypha.svamp.daemon";
+async function installDaemonService() {
+  const os = await import('os');
+  const { join, dirname } = await import('path');
+  const fs = await import('fs');
+  const { execSync } = await import('child_process');
+  const svampHome = process.env.SVAMP_HOME || join(os.homedir(), ".svamp");
+  const logsDir = join(svampHome, "logs");
+  let svampBinary = process.argv[1];
+  try {
+    const resolved = execSync(`which svamp`, { encoding: "utf-8" }).trim();
+    if (resolved) svampBinary = resolved;
+  } catch {
+  }
+  if (!fs.existsSync(svampBinary)) {
+    console.error(`Cannot find svamp binary at: ${svampBinary}`);
+    console.error("Please install svamp-cli globally first.");
+    process.exit(1);
+  }
+  const nodeBinDir = dirname(process.execPath);
+  const shellPath = process.env.PATH || "";
+  const supervisedPath = shellPath.includes(nodeBinDir) ? shellPath : [nodeBinDir, shellPath].filter(Boolean).join(":");
+  if (!fs.existsSync(logsDir)) fs.mkdirSync(logsDir, { recursive: true });
+  if (process.platform === "darwin") {
+    const launchAgentsDir = join(os.homedir(), "Library", "LaunchAgents");
+    const plistPath = join(launchAgentsDir, `${LAUNCHD_LABEL}.plist`);
+    if (!fs.existsSync(launchAgentsDir)) fs.mkdirSync(launchAgentsDir, { recursive: true });
+    const plist = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>${LAUNCHD_LABEL}</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>${svampBinary}</string>
+        <string>daemon</string>
+        <string>start-sync</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>KeepAlive</key>
+    <dict>
+        <!-- Only restart on crash (non-zero exit). svamp daemon stop exits 0. -->
+        <key>SuccessfulExit</key>
+        <false/>
+    </dict>
+    <key>ThrottleInterval</key>
+    <integer>10</integer>
+    <key>StandardOutPath</key>
+    <string>${logsDir}/daemon-supervised.log</string>
+    <key>StandardErrorPath</key>
+    <string>${logsDir}/daemon-supervised.log</string>
+    <key>EnvironmentVariables</key>
+    <dict>
+        <key>PATH</key>
+        <string>${supervisedPath}</string>
+        <key>SVAMP_HOME</key>
+        <string>${svampHome}</string>
+        <key>SVAMP_SUPERVISED</key>
+        <string>1</string>
+    </dict>
+</dict>
+</plist>
+`;
+    fs.writeFileSync(plistPath, plist, "utf-8");
+    console.log(`Plist written: ${plistPath}`);
+    try {
+      execSync(`launchctl unload "${plistPath}" 2>/dev/null`, { stdio: "ignore" });
+    } catch {
+    }
+    execSync(`launchctl load "${plistPath}"`);
+    console.log(`
+Svamp daemon service installed and started!`);
+    console.log(`  Service: ${LAUNCHD_LABEL}`);
+    console.log(`  Auto-restart on crash: enabled`);
+    console.log(`  Log file: ${logsDir}/daemon-supervised.log`);
+    console.log(`
+To stop the service:   svamp daemon stop`);
+    console.log(`To uninstall:          svamp daemon uninstall`);
+  } else if (process.platform === "linux") {
+    const hasSystemd = (() => {
+      try {
+        execSync("systemctl --user status 2>/dev/null", { stdio: "pipe" });
+        return true;
+      } catch {
+        return false;
+      }
+    })();
+    if (hasSystemd) {
+      const systemdUserDir = join(os.homedir(), ".config", "systemd", "user");
+      const unitPath = join(systemdUserDir, "svamp-daemon.service");
+      if (!fs.existsSync(systemdUserDir)) fs.mkdirSync(systemdUserDir, { recursive: true });
+      const unit = `[Unit]
+Description=Svamp Daemon \u2014 AI workspace on Hypha Cloud
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+ExecStart=${svampBinary} daemon start-sync
+Restart=on-failure
+RestartSec=10
+Environment=PATH=${supervisedPath}
+Environment=SVAMP_HOME=${svampHome}
+Environment=SVAMP_SUPERVISED=1
+StandardOutput=append:${logsDir}/daemon-supervised.log
+StandardError=append:${logsDir}/daemon-supervised.log
+
+[Install]
+WantedBy=default.target
+`;
+      fs.writeFileSync(unitPath, unit, "utf-8");
+      execSync("systemctl --user daemon-reload");
+      execSync("systemctl --user enable --now svamp-daemon.service");
+      console.log(`
+Svamp daemon service installed and started!`);
+      console.log(`  Service: svamp-daemon.service (systemd user)`);
+      console.log(`  Unit file: ${unitPath}`);
+      console.log(`  Auto-restart on crash: enabled`);
+      console.log(`  Log file: ${logsDir}/daemon-supervised.log`);
+      console.log(`
+To stop the service:   svamp daemon stop`);
+      console.log(`To uninstall:          svamp daemon uninstall`);
+    } else {
+      const wrapperPath = join(svampHome, "daemon-supervisor.sh");
+      const wrapper = `#!/bin/sh
+# Svamp daemon supervisor \u2014 restarts on crash. Run this as your container CMD
+# or in a background process. Stop with: svamp daemon stop
+export PATH="${supervisedPath}"
+export SVAMP_HOME="${svampHome}"
+export SVAMP_SUPERVISED=1
+
+mkdir -p "${logsDir}"
+echo "[svamp-supervisor] Starting svamp daemon supervisor" >> "${logsDir}/daemon-supervised.log"
+
+while true; do
+    "${svampBinary}" daemon start-sync >> "${logsDir}/daemon-supervised.log" 2>&1
+    EXIT_CODE=$?
+    # Exit code 0 = clean stop (svamp daemon stop). Do not restart.
+    if [ "$EXIT_CODE" -eq 0 ]; then
+        echo "[svamp-supervisor] Daemon stopped cleanly (exit 0). Not restarting." >> "${logsDir}/daemon-supervised.log"
+        break
+    fi
+    echo "[svamp-supervisor] Daemon exited with code $EXIT_CODE. Restarting in 10s..." >> "${logsDir}/daemon-supervised.log"
+    sleep 10
+done
+`;
+      fs.writeFileSync(wrapperPath, wrapper, { mode: 493 });
+      console.log(`
+Svamp daemon supervisor script written!`);
+      console.log(`  Script: ${wrapperPath}`);
+      console.log(`  Log file: ${logsDir}/daemon-supervised.log`);
+      console.log(`
+To use in Docker, set your container CMD to:`);
+      console.log(`  ${wrapperPath}`);
+      console.log(`
+Or run in the background:`);
+      console.log(`  nohup ${wrapperPath} &`);
+      console.log(`
+To stop the daemon:    svamp daemon stop`);
+    }
+  } else {
+    console.error(`Daemon service install is not supported on ${process.platform}.`);
+    console.error("Supported platforms: macOS (launchd), Linux (systemd or wrapper script).");
+    process.exit(1);
+  }
+}
+async function uninstallDaemonService() {
+  const os = await import('os');
+  const { join } = await import('path');
+  const fs = await import('fs');
+  const { execSync } = await import('child_process');
+  if (process.platform === "darwin") {
+    const plistPath = join(os.homedir(), "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
+    if (!fs.existsSync(plistPath)) {
+      console.log("Svamp daemon service is not installed.");
+      return;
+    }
+    try {
+      execSync(`launchctl unload "${plistPath}"`, { stdio: "pipe" });
+    } catch {
+    }
+    fs.unlinkSync(plistPath);
+    console.log("Svamp daemon service uninstalled (launchd).");
+    console.log("The daemon has been stopped and will no longer auto-start.");
+  } else if (process.platform === "linux") {
+    const unitPath = join(os.homedir(), ".config", "systemd", "user", "svamp-daemon.service");
+    const svampHome = process.env.SVAMP_HOME || join(os.homedir(), ".svamp");
+    const wrapperPath = join(svampHome, "daemon-supervisor.sh");
+    let removed = false;
+    if (fs.existsSync(unitPath)) {
+      try {
+        execSync("systemctl --user disable --now svamp-daemon.service", { stdio: "pipe" });
+      } catch {
+      }
+      fs.unlinkSync(unitPath);
+      try {
+        execSync("systemctl --user daemon-reload", { stdio: "pipe" });
+      } catch {
+      }
+      console.log("Svamp daemon service uninstalled (systemd).");
+      removed = true;
+    }
+    if (fs.existsSync(wrapperPath)) {
+      fs.unlinkSync(wrapperPath);
+      if (!removed) console.log("Svamp daemon supervisor script removed.");
+      removed = true;
+    }
+    if (!removed) {
+      console.log("Svamp daemon service is not installed.");
+    }
+  } else {
+    console.error(`Daemon service uninstall is not supported on ${process.platform}.`);
+    process.exit(1);
+  }
+}
 function printHelp() {
   console.log(`
 svamp \u2014 Svamp CLI with Hypha transport
@@ -373,6 +593,8 @@ 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 system service (launchd/systemd/wrapper)
+  svamp daemon uninstall     Remove system service
   svamp session list         List active daemon sessions
   svamp session spawn        Spawn a new session on the daemon
   svamp session attach <id>  Attach to a session (interactive)
@@ -396,9 +618,11 @@ 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 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
 `);
 }
 function printSessionHelp() {