svamp-cli 0.2.24 → 0.2.25

package/dist/{agentCommands-XQqXEOXO.mjs → agentCommands-MiAH1S9e.mjs}

@@ -148,7 +148,7 @@ async function sessionBroadcast(action, args) {
   console.log(`Broadcast sent: ${action}`);
 }
 async function connectToMachineService() {
-  const { connectAndGetMachine } = await import('./commands-CEiWVChH.mjs');
+  const { connectAndGetMachine } = await import('./commands-DRpGTxYD.mjs');
   return connectAndGetMachine();
 }
 async function inboxSend(targetSessionId, opts) {
@@ -165,7 +165,7 @@ async function inboxSend(targetSessionId, opts) {
   }
   const { server, machine } = await connectToMachineService();
   try {
-    const { resolveSessionId } = await import('./commands-CEiWVChH.mjs');
+    const { resolveSessionId } = await import('./commands-DRpGTxYD.mjs');
     const sessions = await machine.listSessions();
     const match = resolveSessionId(sessions, targetSessionId);
     const fullTargetId = match.sessionId;

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-Cq-vqhYX.mjs';
+import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-BTlUAfV3.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -36,7 +36,7 @@ async function main() {
     await logoutFromHypha();
   } else if (subcommand === "daemon") {
     if (daemonSubcommand === "restart") {
-      const { restartDaemon } = await import('./run-Cq-vqhYX.mjs').then(function (n) { return n.k; });
+      const { restartDaemon } = await import('./run-BTlUAfV3.mjs').then(function (n) { return n.k; });
       await restartDaemon();
       process.exit(0);
     }
@@ -238,7 +238,7 @@ async function main() {
       console.error("svamp service: Service commands are not available in sandboxed sessions.");
       process.exit(1);
     }
-    const { handleServiceCommand } = await import('./commands-ybRzIOIu.mjs');
+    const { handleServiceCommand } = await import('./commands-DV2tFSXm.mjs');
     await handleServiceCommand();
   } else if (subcommand === "serve") {
     const { isSandboxed: isSandboxedServe } = await import('./sandboxDetect-DNTcbgWD.mjs');
@@ -246,7 +246,7 @@ async function main() {
       console.error("svamp serve: Serve commands are not available in sandboxed sessions.");
       process.exit(1);
     }
-    const { handleServeCommand } = await import('./serveCommands-Q6dCUe4U.mjs');
+    const { handleServeCommand } = await import('./serveCommands-Ci4DE-iQ.mjs');
     await handleServeCommand();
     process.exit(0);
   } else if (subcommand === "process" || subcommand === "proc") {
@@ -255,7 +255,7 @@ async function main() {
       console.error("svamp process: Process commands are not available in sandboxed sessions.");
       process.exit(1);
     }
-    const { processCommand } = await import('./commands-BjHspJLZ.mjs');
+    const { processCommand } = await import('./commands-ibBP43SF.mjs');
     let machineId;
     const processArgs = args.slice(1);
     const mIdx = processArgs.findIndex((a) => a === "--machine" || a === "-m");
@@ -273,7 +273,7 @@ async function main() {
   } else if (!subcommand || subcommand === "start") {
     await handleInteractiveCommand();
   } else if (subcommand === "--version" || subcommand === "-v") {
-    const pkg = await import('./package-BPrzOhTb.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-BKGqkCGK.mjs').catch(() => ({ default: { version: "unknown" } }));
     console.log(`svamp version: ${pkg.default.version}`);
   } else {
     console.error(`Unknown command: ${subcommand}`);
@@ -282,7 +282,7 @@ async function main() {
   }
 }
 async function handleInteractiveCommand() {
-  const { runInteractive } = await import('./run-BZDgOpT5.mjs');
+  const { runInteractive } = await import('./run-DlcgeE63.mjs');
   const interactiveArgs = subcommand === "start" ? args.slice(1) : args;
   let directory = process.cwd();
   let resumeSessionId;
@@ -327,7 +327,7 @@ async function handleAgentCommand() {
     return;
   }
   if (agentArgs[0] === "list") {
-    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-Cq-vqhYX.mjs').then(function (n) { return n.i; });
+    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-BTlUAfV3.mjs').then(function (n) { return n.i; });
     console.log("Known agents:");
     for (const [name, config2] of Object.entries(KNOWN_ACP_AGENTS)) {
       console.log(`  ${name.padEnd(12)} ${config2.command} ${config2.args.join(" ")}  (ACP)`);
@@ -339,7 +339,7 @@ async function handleAgentCommand() {
     console.log('Use "svamp agent -- <command> [args]" for a custom ACP agent.');
     return;
   }
-  const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-Cq-vqhYX.mjs').then(function (n) { return n.i; });
+  const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-BTlUAfV3.mjs').then(function (n) { return n.i; });
   let cwd = process.cwd();
   const filteredArgs = [];
   for (let i = 0; i < agentArgs.length; i++) {
@@ -363,12 +363,12 @@ async function handleAgentCommand() {
   console.log(`Starting ${config.agentName} agent in ${cwd}...`);
   let backend;
   if (KNOWN_MCP_AGENTS[config.agentName]) {
-    const { CodexMcpBackend } = await import('./run-Cq-vqhYX.mjs').then(function (n) { return n.j; });
+    const { CodexMcpBackend } = await import('./run-BTlUAfV3.mjs').then(function (n) { return n.j; });
     backend = new CodexMcpBackend({ cwd, log: logFn });
   } else {
-    const { AcpBackend } = await import('./run-Cq-vqhYX.mjs').then(function (n) { return n.h; });
-    const { GeminiTransport } = await import('./run-Cq-vqhYX.mjs').then(function (n) { return n.G; });
-    const { DefaultTransport } = await import('./run-Cq-vqhYX.mjs').then(function (n) { return n.D; });
+    const { AcpBackend } = await import('./run-BTlUAfV3.mjs').then(function (n) { return n.h; });
+    const { GeminiTransport } = await import('./run-BTlUAfV3.mjs').then(function (n) { return n.G; });
+    const { DefaultTransport } = await import('./run-BTlUAfV3.mjs').then(function (n) { return n.D; });
     const transportHandler = config.agentName === "gemini" ? new GeminiTransport() : new DefaultTransport(config.agentName);
     backend = new AcpBackend({
       agentName: config.agentName,
@@ -495,7 +495,7 @@ async function handleSessionCommand() {
       process.exit(1);
     }
   }
-  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionInboxSend, sessionInboxList, sessionInboxRead, sessionInboxReply, sessionInboxClear } = await import('./commands-CEiWVChH.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionInboxSend, sessionInboxList, sessionInboxRead, sessionInboxReply, sessionInboxClear } = await import('./commands-DRpGTxYD.mjs');
   const parseFlagStr = (flag, shortFlag) => {
     for (let i = 1; i < sessionArgs.length; i++) {
       if ((sessionArgs[i] === flag || shortFlag) && i + 1 < sessionArgs.length) {
@@ -555,7 +555,7 @@ async function handleSessionCommand() {
         allowDomain.push(sessionArgs[++i]);
       }
     }
-    const { parseShareArg } = await import('./commands-CEiWVChH.mjs');
+    const { parseShareArg } = await import('./commands-DRpGTxYD.mjs');
     const shareEntries = share.map((s) => parseShareArg(s));
     await sessionSpawn(agent, dir, targetMachineId, {
       message,
@@ -641,7 +641,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session approve <session-id> [request-id] [--json]");
       process.exit(1);
     }
-    const { sessionApprove } = await import('./commands-CEiWVChH.mjs');
+    const { sessionApprove } = await import('./commands-DRpGTxYD.mjs');
     const approveReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
     await sessionApprove(sessionArgs[1], approveReqId, targetMachineId, {
       json: hasFlag("--json")
@@ -651,7 +651,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session deny <session-id> [request-id] [--json]");
       process.exit(1);
     }
-    const { sessionDeny } = await import('./commands-CEiWVChH.mjs');
+    const { sessionDeny } = await import('./commands-DRpGTxYD.mjs');
     const denyReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
     await sessionDeny(sessionArgs[1], denyReqId, targetMachineId, {
       json: hasFlag("--json")
@@ -687,7 +687,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session set-title <title>");
       process.exit(1);
     }
-    const { sessionSetTitle } = await import('./agentCommands-XQqXEOXO.mjs');
+    const { sessionSetTitle } = await import('./agentCommands-MiAH1S9e.mjs');
     await sessionSetTitle(title);
   } else if (sessionSubcommand === "set-link") {
     const url = sessionArgs[1];
@@ -696,7 +696,7 @@ async function handleSessionCommand() {
       process.exit(1);
     }
     const label = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
-    const { sessionSetLink } = await import('./agentCommands-XQqXEOXO.mjs');
+    const { sessionSetLink } = await import('./agentCommands-MiAH1S9e.mjs');
     await sessionSetLink(url, label);
   } else if (sessionSubcommand === "notify") {
     const message = sessionArgs[1];
@@ -705,7 +705,7 @@ async function handleSessionCommand() {
       process.exit(1);
     }
     const level = parseFlagStr("--level") || "info";
-    const { sessionNotify } = await import('./agentCommands-XQqXEOXO.mjs');
+    const { sessionNotify } = await import('./agentCommands-MiAH1S9e.mjs');
     await sessionNotify(message, level);
   } else if (sessionSubcommand === "broadcast") {
     const action = sessionArgs[1];
@@ -713,7 +713,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session broadcast <action> [args...]\nActions: open-canvas <url> [label], close-canvas, toast <message>");
       process.exit(1);
     }
-    const { sessionBroadcast } = await import('./agentCommands-XQqXEOXO.mjs');
+    const { sessionBroadcast } = await import('./agentCommands-MiAH1S9e.mjs');
     await sessionBroadcast(action, sessionArgs.slice(2).filter((a) => !a.startsWith("--")));
   } else if (sessionSubcommand === "inbox") {
     const inboxSubcmd = sessionArgs[1];
@@ -724,7 +724,7 @@ async function handleSessionCommand() {
         process.exit(1);
       }
       if (agentSessionId) {
-        const { inboxSend } = await import('./agentCommands-XQqXEOXO.mjs');
+        const { inboxSend } = await import('./agentCommands-MiAH1S9e.mjs');
         await inboxSend(sessionArgs[2], {
           body: sessionArgs[3],
           subject: parseFlagStr("--subject"),
@@ -739,7 +739,7 @@ async function handleSessionCommand() {
       }
     } else if (inboxSubcmd === "list" || inboxSubcmd === "ls") {
       if (agentSessionId && !sessionArgs[2]) {
-        const { inboxList } = await import('./agentCommands-XQqXEOXO.mjs');
+        const { inboxList } = await import('./agentCommands-MiAH1S9e.mjs');
         await inboxList({
           unread: hasFlag("--unread"),
           limit: parseFlagInt("--limit"),
@@ -761,7 +761,7 @@ async function handleSessionCommand() {
         process.exit(1);
       }
       if (agentSessionId && !sessionArgs[3]) {
-        const { inboxList } = await import('./agentCommands-XQqXEOXO.mjs');
+        const { inboxList } = await import('./agentCommands-MiAH1S9e.mjs');
         await sessionInboxRead(agentSessionId, sessionArgs[2], targetMachineId);
       } else if (sessionArgs[3]) {
         await sessionInboxRead(sessionArgs[2], sessionArgs[3], targetMachineId);
@@ -771,7 +771,7 @@ async function handleSessionCommand() {
       }
     } else if (inboxSubcmd === "reply") {
       if (agentSessionId && sessionArgs[2] && sessionArgs[3] && !sessionArgs[4]) {
-        const { inboxReply } = await import('./agentCommands-XQqXEOXO.mjs');
+        const { inboxReply } = await import('./agentCommands-MiAH1S9e.mjs');
         await inboxReply(sessionArgs[2], sessionArgs[3]);
       } else if (sessionArgs[2] && sessionArgs[3] && sessionArgs[4]) {
         await sessionInboxReply(sessionArgs[2], sessionArgs[3], sessionArgs[4], targetMachineId);
@@ -807,7 +807,7 @@ async function handleMachineCommand() {
     return;
   }
   if (machineSubcommand === "share") {
-    const { machineShare } = await import('./commands-CEiWVChH.mjs');
+    const { machineShare } = await import('./commands-DRpGTxYD.mjs');
     let machineId;
     const shareArgs = [];
     for (let i = 1; i < machineArgs.length; i++) {
@@ -837,7 +837,7 @@ async function handleMachineCommand() {
     }
     await machineShare(machineId, { add, remove, list, configPath, showConfig });
   } else if (machineSubcommand === "exec") {
-    const { machineExec } = await import('./commands-CEiWVChH.mjs');
+    const { machineExec } = await import('./commands-DRpGTxYD.mjs');
     let machineId;
     let cwd;
     const cmdParts = [];
@@ -857,7 +857,7 @@ async function handleMachineCommand() {
     }
     await machineExec(machineId, command, cwd);
   } else if (machineSubcommand === "info") {
-    const { machineInfo } = await import('./commands-CEiWVChH.mjs');
+    const { machineInfo } = await import('./commands-DRpGTxYD.mjs');
     let machineId;
     for (let i = 1; i < machineArgs.length; i++) {
       if ((machineArgs[i] === "--machine" || machineArgs[i] === "-m") && i + 1 < machineArgs.length) {
@@ -877,10 +877,10 @@ async function handleMachineCommand() {
         level = machineArgs[++i];
       }
     }
-    const { machineNotify } = await import('./agentCommands-XQqXEOXO.mjs');
+    const { machineNotify } = await import('./agentCommands-MiAH1S9e.mjs');
     await machineNotify(message, level);
   } else if (machineSubcommand === "ls") {
-    const { machineLs } = await import('./commands-CEiWVChH.mjs');
+    const { machineLs } = await import('./commands-DRpGTxYD.mjs');
     let machineId;
     let showHidden = false;
     let path;

package/dist/{commands-CEiWVChH.mjs → commands-DRpGTxYD.mjs}

@@ -2,7 +2,7 @@ import { existsSync, readFileSync } from 'node:fs';
 import { execSync } from 'node:child_process';
 import { resolve, join } from 'node:path';
 import os from 'node:os';
-import { l as loadSecurityContextConfig, e as resolveSecurityContext, f as buildSecurityContextFromFlags, m as mergeSecurityContexts, c as connectToHypha } from './run-Cq-vqhYX.mjs';
+import { l as loadSecurityContextConfig, e as resolveSecurityContext, f as buildSecurityContextFromFlags, m as mergeSecurityContexts, c as connectToHypha } from './run-BTlUAfV3.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{commands-ybRzIOIu.mjs → commands-DV2tFSXm.mjs}

@@ -21,9 +21,7 @@ function positionalArgs(args) {
   const result = [];
   for (let i = 0; i < args.length; i++) {
     if (args[i].startsWith("--")) {
-      if (i + 1 < args.length && !args[i + 1].startsWith("--")) {
-        i++;
-      }
+      if (i + 1 < args.length && !args[i + 1].startsWith("--")) i++;
       continue;
     }
     result.push(args[i]);
@@ -57,7 +55,7 @@ async function serviceExpose(args) {
     console.error("Usage: svamp service expose <name> --port <port> [--port <port2>] [options]");
     process.exit(1);
   }
-  const { runFrpcTunnel } = await import('./frpc-C9Qs-5jQ.mjs');
+  const { runFrpcTunnel } = await import('./frpc-BhS2e6r-.mjs');
   await runFrpcTunnel(name, ports, void 0, {
     group,
     groupKey,
@@ -90,17 +88,14 @@ async function serviceServe(args) {
     };
     process.on("SIGINT", cleanup);
     process.on("SIGTERM", cleanup);
-    const { runFrpcTunnel } = await import('./frpc-C9Qs-5jQ.mjs');
+    const { runFrpcTunnel } = await import('./frpc-BhS2e6r-.mjs');
     await runFrpcTunnel(name, [caddyPort]);
   } catch (err) {
     console.error(`Error serving directory: ${err.message}`);
     process.exit(1);
   }
 }
-async function serviceTunnel(args) {
-  await serviceExpose(args);
-}
-async function serviceList(args) {
+async function serviceList(_args) {
   console.log("Active tunnels are managed by the svamp daemon.");
   console.log('Use "svamp service expose" to start a tunnel in the foreground.');
 }
@@ -122,12 +117,10 @@ async function handleServiceCommand() {
     return;
   }
   const commandArgs = serviceArgs.slice(1);
-  if (sub === "expose") {
+  if (sub === "expose" || sub === "tunnel") {
     await serviceExpose(commandArgs);
   } else if (sub === "serve") {
     await serviceServe(commandArgs);
-  } else if (sub === "tunnel") {
-    await serviceTunnel(commandArgs);
   } else if (sub === "list" || sub === "ls") {
     await serviceList();
   } else if (sub === "delete" || sub === "rm") {
@@ -145,7 +138,6 @@ svamp service \u2014 Expose local services via frpc tunnels
 Usage:
   svamp service expose <name> --port <port> [options]    Expose local ports via tunnel
   svamp service serve <name> [directory] [--no-listing]   Serve static files via tunnel
-  svamp service tunnel <name> --port <port> [options]     Alias for expose
   svamp service list                                      List active tunnels (daemon)
   svamp service delete <name>                             Stop a tunnel (daemon)
 
@@ -160,10 +152,9 @@ Options:
 Service Groups:
   Run the same command on different machines with --group to create a
   load-balanced service. frps round-robins traffic across all group members.
-  Unhealthy backends are auto-removed when --health-check is enabled.
 
-  Machine A:  svamp service expose my-api --port 8000 --group my-api --group-key secret123
-  Machine B:  svamp service expose my-api --port 8000 --group my-api --group-key secret123
+  Machine A:  svamp service expose my-api --port 8000 --group my-api --group-key s3cret
+  Machine B:  svamp service expose my-api --port 8000 --group my-api --group-key s3cret
   \u2192 Both serve at the same URL, frps load-balances between them
 
 Examples:
@@ -172,8 +163,7 @@ Examples:
   svamp service expose my-api --port 8000 --port 3000
   svamp service expose my-api --port 8000 --group my-api --group-key s3cret
   svamp service serve my-site ./dist
-  svamp service serve my-site
 `.trim());
 }
 
-export { handleServiceCommand, serviceDelete, serviceExpose, serviceList, serviceServe, serviceTunnel };
+export { handleServiceCommand, serviceDelete, serviceExpose, serviceList, serviceServe };

package/dist/{commands-BjHspJLZ.mjs → commands-ibBP43SF.mjs}

@@ -1,11 +1,11 @@
 import { writeFileSync, readFileSync } from 'fs';
 import { resolve } from 'path';
-import { connectAndGetMachine } from './commands-CEiWVChH.mjs';
+import { connectAndGetMachine } from './commands-DRpGTxYD.mjs';
 import 'node:fs';
 import 'node:child_process';
 import 'node:path';
 import 'node:os';
-import './run-Cq-vqhYX.mjs';
+import './run-BTlUAfV3.mjs';
 import 'os';
 import 'fs/promises';
 import 'url';

package/dist/{frpc-C9Qs-5jQ.mjs → frpc-BhS2e6r-.mjs}

@@ -4,7 +4,7 @@ import { join } from 'path';
 import { homedir, platform, arch } from 'os';
 import { createHash } from 'crypto';
 
-const FRP_VERSION = "0.61.1";
+const FRP_VERSION = "0.68.0";
 const BIN_DIR = join(homedir(), ".svamp", "bin");
 const FRPC_BIN = join(BIN_DIR, platform() === "win32" ? "frpc.exe" : "frpc");
 function isInCluster() {
@@ -62,7 +62,19 @@ function getFrpcPath() {
   return "frpc";
 }
 async function ensureFrpc(log) {
-  if (existsSync(FRPC_BIN)) return FRPC_BIN;
+  if (existsSync(FRPC_BIN)) {
+    try {
+      const out = execSync(`"${FRPC_BIN}" --version`, { stdio: "pipe", timeout: 5e3 }).toString().trim();
+      if (out === FRP_VERSION) return FRPC_BIN;
+      (log || console.log)(`frpc version mismatch: ${out} \u2260 ${FRP_VERSION}, re-downloading...`);
+    } catch {
+      (log || console.log)("frpc binary broken or invalid signature, re-downloading...");
+    }
+    try {
+      unlinkSync(FRPC_BIN);
+    } catch {
+    }
+  }
   const logger = log || console.log;
   mkdirSync(BIN_DIR, { recursive: true });
   const url = getFrpcDownloadUrl();
@@ -165,6 +177,12 @@ class FrpcTunnel {
   logBuffer = [];
   maxLogLines = 200;
   proxies = [];
+  // Health tracking
+  _consecutiveErrors = 0;
+  _lastConnectedAt = 0;
+  _lastErrorAt = 0;
+  _firstErrorAt = 0;
+  _restartAttempts = 0;
   constructor(options) {
     this.options = options;
     this.log = options.log || ((msg) => console.log(`[FRPC] ${msg}`));
@@ -230,6 +248,10 @@ class FrpcTunnel {
         if (text.includes("start proxy success") || text.includes("login to server success")) {
           if (!this._connected) {
             this._connected = true;
+            this._lastConnectedAt = Date.now();
+            this._restartAttempts = 0;
+            this._consecutiveErrors = 0;
+            this._firstErrorAt = 0;
             this.options.onConnect?.();
             if (!resolved) {
               resolved = true;
@@ -238,6 +260,9 @@ class FrpcTunnel {
           }
         }
         if (text.includes("[E]") || text.includes("error")) {
+          this._consecutiveErrors++;
+          this._lastErrorAt = Date.now();
+          if (this._firstErrorAt === 0) this._firstErrorAt = Date.now();
           this.options.onError?.(new Error(text));
         }
       };
@@ -259,14 +284,16 @@ class FrpcTunnel {
           reject(new Error(`frpc exited with code ${code}`));
         }
         if (!this._destroyed && code !== 0) {
-          this.log(`frpc exited with code ${code}, restarting in 3s...`);
+          this._restartAttempts++;
+          const delay = Math.min(3e3 * Math.pow(2, this._restartAttempts - 1), 6e4);
+          this.log(`frpc exited with code ${code}, restarting in ${Math.round(delay / 1e3)}s (attempt ${this._restartAttempts})...`);
           setTimeout(() => {
             if (!this._destroyed) {
               this.connect().catch((err) => {
                 this.options.onError?.(err);
               });
             }
-          }, 3e3);
+          }, delay);
         }
       });
       setTimeout(() => {
@@ -310,9 +337,22 @@ class FrpcTunnel {
       name: this.options.name,
       ports: this.options.ports,
       serverAddr: this.serverConfig.serverAddr,
-      recentLogs: this.logBuffer.slice(-10)
+      recentLogs: this.logBuffer.slice(-10),
+      consecutiveErrors: this._consecutiveErrors,
+      lastConnectedAt: this._lastConnectedAt,
+      lastErrorAt: this._lastErrorAt,
+      firstErrorAt: this._firstErrorAt,
+      restartAttempts: this._restartAttempts,
+      failingDurationMs: this._firstErrorAt > 0 ? Date.now() - this._firstErrorAt : 0
     };
   }
+  /** Update the Hypha token. Rewrites config; takes effect on next frpc restart. */
+  updateToken(newToken) {
+    this.serverConfig.hyphaToken = newToken;
+    const configContent = generateFrpcConfig(this.serverConfig, this.proxies);
+    writeFileSync(this.configPath, configContent);
+    this.log("Config updated with fresh token");
+  }
   /** Get the public URLs for each port. */
   getUrls() {
     const urls = /* @__PURE__ */ new Map();

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-Cq-vqhYX.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-BTlUAfV3.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{package-BPrzOhTb.mjs → package-BKGqkCGK.mjs}

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

package/dist/{run-Cq-vqhYX.mjs → run-BTlUAfV3.mjs}

@@ -8,9 +8,9 @@ import { randomUUID as randomUUID$1 } from 'crypto';
 import { existsSync, readFileSync, writeFileSync as writeFileSync$1, mkdirSync as mkdirSync$1, appendFileSync } from 'node:fs';
 import { randomUUID, createHash } from 'node:crypto';
 import { join as join$1 } from 'node:path';
-import { spawn, execSync, execFile } from 'node:child_process';
+import { spawn, execSync, execFile, execFileSync } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
-import { homedir } from 'node:os';
+import { homedir, platform } from 'node:os';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { ElicitRequestSchema } from '@modelcontextprotocol/sdk/types.js';
@@ -350,6 +350,10 @@ async function registerMachineService(server, machineId, metadata, daemonState,
   let currentDaemonState = { ...daemonState };
   let metadataVersion = 1;
   let daemonStateVersion = 1;
+  let lastInboundRpcAt = Date.now();
+  const trackInbound = () => {
+    lastInboundRpcAt = Date.now();
+  };
   const listeners = [];
   const removeListener = (listener, reason) => {
     const idx = listeners.indexOf(listener);
@@ -394,6 +398,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
       config: { visibility: "unlisted", require_context: true },
       // Machine info
       getMachineInfo: async (context) => {
+        trackInbound();
         let hasMachineAccess = false;
         try {
           authorizeRequest(context, currentMetadata.sharing, "view");
@@ -435,6 +440,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
       },
       // Heartbeat
       heartbeat: async (context) => {
+        trackInbound();
         authorizeRequest(context, currentMetadata.sharing, "view");
         return {
           time: Date.now(),
@@ -446,6 +452,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
       // If machine sharing grants access, return all. Otherwise return only
       // sessions whose own sharing config grants access to this user.
       listSessions: async (context) => {
+        trackInbound();
         let hasMachineAccess = false;
         try {
           authorizeRequest(context, currentMetadata.sharing, "view");
@@ -473,6 +480,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
        * sessions whose sharing config grants them access.
        */
       getSessions: async (context) => {
+        trackInbound();
         let hasMachineAccess = false;
         try {
           authorizeRequest(context, currentMetadata.sharing, "view");
@@ -513,8 +521,12 @@ async function registerMachineService(server, machineId, metadata, daemonState,
        * Dispatch an RPC call to a specific session's handler.
        * This consolidates all session RPCs through the machine service,
        * eliminating the need for per-session Hypha service registration.
+       *
+       * `kwargs` is an object whose keys map to handler parameter names.
+       * Context is injected automatically — callers must NOT include it.
        */
       sessionRPC: async (sessionId, method, kwargs, context) => {
+        trackInbound();
         const rpc = handlers.getSessionRPCHandlers?.(sessionId);
         if (!rpc) {
           throw new Error(`Session ${sessionId} not found on this machine`);
@@ -545,6 +557,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
        * Delegates to the session store's registerListener.
        */
       registerSessionListener: async (sessionId, callback, context) => {
+        trackInbound();
         const rpc = handlers.getSessionRPCHandlers?.(sessionId);
         if (!rpc) {
           throw new Error(`Session ${sessionId} not found on this machine`);
@@ -564,6 +577,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
       },
       // Spawn a new session
       spawnSession: async (options, context) => {
+        trackInbound();
         authorizeRequest(context, currentMetadata.sharing, "interact");
         const callerEmail = context?.user?.email;
         const machineOwner = currentMetadata.sharing?.owner;
@@ -776,6 +790,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
       },
       // Register a listener for real-time updates (app calls this with _rintf callback)
       registerListener: async (callback, context) => {
+        trackInbound();
         authorizeRequest(context, currentMetadata.sharing, "view");
         listeners.push(callback);
         return { success: true, listenerId: listeners.length - 1 };
@@ -1092,7 +1107,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
         const tunnels = handlers.tunnels;
         if (!tunnels) throw new Error("Tunnel management not available");
         if (tunnels.has(params.name)) throw new Error(`Tunnel '${params.name}' already running`);
-        const { FrpcTunnel } = await import('./frpc-C9Qs-5jQ.mjs');
+        const { FrpcTunnel } = await import('./frpc-BhS2e6r-.mjs');
         const tunnel = new FrpcTunnel({
           name: params.name,
           ports: params.ports,
@@ -1222,6 +1237,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
         daemonState: { value: currentDaemonState, version: daemonStateVersion }
       });
     },
+    getLastInboundRpcAt: () => lastInboundRpcAt,
     disconnect: async () => {
       const toRemove = [...listeners];
       for (const listener of toRemove) {
@@ -4780,12 +4796,32 @@ async function stageCredentialsForSharing(sessionId) {
   const stagedClaudeDir = join$1(tmpHome, ".claude");
   await mkdir(stagedClaudeDir, { recursive: true });
   const credentialFiles = ["credentials.json", ".credentials.json"];
+  let credentialsCopied = false;
   for (const file of credentialFiles) {
     try {
       await copyFile(join$1(realClaudeDir, file), join$1(stagedClaudeDir, file));
+      credentialsCopied = true;
     } catch {
     }
   }
+  if (!credentialsCopied && platform() === "darwin") {
+    const stagedCredFile = join$1(stagedClaudeDir, ".credentials.json");
+    const hasExistingCredentials = existsSync(stagedCredFile);
+    if (!hasExistingCredentials) {
+      try {
+        const keychainData = execFileSync("security", [
+          "find-generic-password",
+          "-s",
+          "Claude Code-credentials",
+          "-w"
+        ], { encoding: "utf-8", timeout: 5e3 }).trim();
+        if (keychainData.startsWith("{") || keychainData.startsWith("[")) {
+          await writeFile(stagedCredFile, keychainData);
+        }
+      } catch {
+      }
+    }
+  }
   try {
     await copyFile(join$1(realHome, ".gitconfig"), join$1(tmpHome, ".gitconfig"));
   } catch {
@@ -6174,6 +6210,11 @@ async function startDaemon(options) {
     const msg = String(reason);
     logger.error("Unhandled rejection:", reason);
     const isTransient = TRANSIENT_REJECTION_PATTERNS.some((p) => msg.toLowerCase().includes(p.toLowerCase()));
+    const isSessionLoss = msg.toLowerCase().includes("session does not exist");
+    if (isSessionLoss && consecutiveHeartbeatFailures === 0) {
+      logger.log(`Session loss detected with healthy heartbeat \u2014 triggering immediate service probe`);
+      consecutiveHeartbeatFailures = 1;
+    }
     if (isTransient || consecutiveHeartbeatFailures > 0) {
       logger.log(`Ignoring transient rejection (heartbeatFailures=${consecutiveHeartbeatFailures}): ${msg.slice(0, 200)}`);
       return;
@@ -6256,7 +6297,7 @@ async function startDaemon(options) {
   const supervisor = new ProcessSupervisor(join(SVAMP_HOME, "processes"));
   await supervisor.init();
   const tunnels = /* @__PURE__ */ new Map();
-  const { ServeManager } = await import('./serveManager-BiyUnYbW.mjs');
+  const { ServeManager } = await import('./serveManager-BTbXyL0i.mjs');
   const serveManager = new ServeManager(SVAMP_HOME, (msg) => logger.log(`[SERVE] ${msg}`), hyphaServerUrl);
   ensureAutoInstalledSkills(logger).catch(() => {
   });
@@ -8695,13 +8736,15 @@ The automated loop has finished. Review the progress above and let me know if yo
     console.log(`  Service: svamp-machine-${machineId}`);
     console.log(`  Log file: ${logger.logFilePath}`);
     const HEARTBEAT_INTERVAL_MS = 1e4;
-    const PING_TIMEOUT_MS = 6e4;
+    const PING_TIMEOUT_MS = 15e3;
     const POST_RECONNECT_GRACE_MS = 2e4;
     let heartbeatRunning = false;
     let lastReconnectAt = 0;
+    let heartbeatCycle = 0;
     const heartbeatInterval = setInterval(async () => {
       if (heartbeatRunning) return;
       heartbeatRunning = true;
+      heartbeatCycle++;
       try {
         try {
           const state = readDaemonStateFile();
@@ -8731,6 +8774,22 @@ The automated loop has finished. Review the progress above and let me know if yo
             }
           }
         }
+        const INBOUND_SILENCE_THRESHOLD_MS = 12e4;
+        const inboundSilenceMs = Date.now() - machineService.getLastInboundRpcAt();
+        const hasActiveSessions = pidToTrackedSession.size > 0;
+        if (hasActiveSessions && inboundSilenceMs > INBOUND_SILENCE_THRESHOLD_MS && consecutiveHeartbeatFailures === 0) {
+          logger.log(`No inbound RPC for ${Math.round(inboundSilenceMs / 1e3)}s with ${pidToTrackedSession.size} active session(s) \u2014 zombie probe`);
+          try {
+            const machineServiceId = `${server.config.client_id}:default`;
+            await Promise.race([
+              server.getService(machineServiceId),
+              new Promise((_, reject) => setTimeout(() => reject(new Error("Zombie probe timed out")), PING_TIMEOUT_MS))
+            ]);
+          } catch (err) {
+            logger.log(`Zombie detection probe failed: ${err.message} \u2014 forcing reconnection`);
+            consecutiveHeartbeatFailures = 2;
+          }
+        }
         const inGrace = lastReconnectAt > 0 && Date.now() - lastReconnectAt < POST_RECONNECT_GRACE_MS;
         if (!inGrace) {
           try {
@@ -8756,7 +8815,7 @@ The automated loop has finished. Review the progress above and let me know if yo
             } else if (consecutiveHeartbeatFailures % 6 === 0) {
               logger.log(`Connection down for ${consecutiveHeartbeatFailures * HEARTBEAT_INTERVAL_MS / 1e3}s (${consecutiveHeartbeatFailures} failures, retrying indefinitely)`);
             }
-            if (consecutiveHeartbeatFailures === 1 || consecutiveHeartbeatFailures % 3 === 0) {
+            if (consecutiveHeartbeatFailures === 2 || consecutiveHeartbeatFailures % 3 === 0) {
               const conn = server.rpc?._connection;
               const ws = conn?._websocket;
               if (ws?.readyState === 1) {
@@ -8782,6 +8841,22 @@ The automated loop has finished. Review the progress above and let me know if yo
             }
           }
         }
+        const FRPC_FAILING_THRESHOLD_MS = 5 * 6e4;
+        const serveHealth = serveManager.getTunnelHealth();
+        if (serveHealth && serveHealth.failingDurationMs > FRPC_FAILING_THRESHOLD_MS) {
+          logger.log(`Serve manager tunnel failing for ${Math.round(serveHealth.failingDurationMs / 1e3)}s (${serveHealth.consecutiveErrors} errors, ${serveHealth.restartAttempts} restarts) \u2014 recreating`);
+          serveManager.recreateTunnel().catch((err) => {
+            logger.log(`Failed to recreate serve tunnel: ${err.message}`);
+          });
+        }
+        for (const [name, tunnel] of tunnels) {
+          const health = tunnel.status;
+          if (health.failingDurationMs > FRPC_FAILING_THRESHOLD_MS) {
+            logger.log(`frpc tunnel '${name}' failing for ${Math.round(health.failingDurationMs / 1e3)}s \u2014 destroying stale tunnel`);
+            tunnel.destroy();
+            tunnels.delete(name);
+          }
+        }
       } finally {
         heartbeatRunning = false;
       }
@@ -8817,6 +8892,7 @@ The automated loop has finished. Review the progress above and let me know if yo
         shutdownSource: source
       });
       await new Promise((r) => setTimeout(r, 200));
+      const shouldMarkStopped = source === "os-signal-cleanup";
       for (const [, session] of pidToTrackedSession) {
         session.hyphaService?.disconnect().catch(() => {
         });
@@ -8826,11 +8902,12 @@ The automated loop has finished. Review the progress above and let me know if yo
           } catch {
           }
         }
-        session.cleanupCredentials?.().catch(() => {
-        });
+        if (shouldMarkStopped) {
+          session.cleanupCredentials?.().catch(() => {
+          });
+        }
         session.cleanupSvampConfig?.();
       }
-      const shouldMarkStopped = source === "os-signal-cleanup";
       if (shouldMarkStopped) {
         try {
           const index = loadSessionIndex();

package/dist/{run-BZDgOpT5.mjs → run-DlcgeE63.mjs}

@@ -2,7 +2,7 @@ import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(im
 import os from 'node:os';
 import { join, resolve } from 'node:path';
 import { mkdirSync, writeFileSync, existsSync, unlinkSync, readFileSync, watch } from 'node:fs';
-import { c as connectToHypha, a as registerSessionService } from './run-Cq-vqhYX.mjs';
+import { c as connectToHypha, a as registerSessionService } from './run-BTlUAfV3.mjs';
 import { createServer } from 'node:http';
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';

package/dist/{serveCommands-Q6dCUe4U.mjs → serveCommands-Ci4DE-iQ.mjs}

@@ -52,7 +52,7 @@ async function handleServeCommand() {
   }
 }
 async function serveAdd(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-CEiWVChH.mjs');
+  const { connectAndGetMachine } = await import('./commands-DRpGTxYD.mjs');
   const pos = positionalArgs(args);
   const name = pos[0];
   if (!name) {
@@ -84,7 +84,7 @@ async function serveAdd(args, machineId) {
   }
 }
 async function serveRemove(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-CEiWVChH.mjs');
+  const { connectAndGetMachine } = await import('./commands-DRpGTxYD.mjs');
   const pos = positionalArgs(args);
   const name = pos[0];
   if (!name) {
@@ -104,7 +104,7 @@ async function serveRemove(args, machineId) {
   }
 }
 async function serveList(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-CEiWVChH.mjs');
+  const { connectAndGetMachine } = await import('./commands-DRpGTxYD.mjs');
   const all = hasFlag(args, "--all", "-a");
   const json = hasFlag(args, "--json");
   const sessionId = getFlag(args, "--session");
@@ -137,7 +137,7 @@ async function serveList(args, machineId) {
   }
 }
 async function serveInfo(machineId) {
-  const { connectAndGetMachine } = await import('./commands-CEiWVChH.mjs');
+  const { connectAndGetMachine } = await import('./commands-DRpGTxYD.mjs');
   const { machine, server } = await connectAndGetMachine(machineId);
   try {
     const info = await machine.serveInfo();

package/dist/{serveManager-BiyUnYbW.mjs → serveManager-BTbXyL0i.mjs}

@@ -530,10 +530,23 @@ button{padding:10px 24px;background:#0969da;color:#fff;border:none;border-radius
       server.on("error", reject);
     });
   }
+  /** Get frpc tunnel health status, or null if no tunnel. */
+  getTunnelHealth() {
+    return this.frpcTunnel?.status ?? null;
+  }
+  /** Destroy and recreate the frpc tunnel with fresh config. */
+  async recreateTunnel() {
+    if (this.frpcTunnel) {
+      this.log("Recreating frpc tunnel (persistent failure detected)...");
+      this.frpcTunnel.destroy();
+      this.frpcTunnel = null;
+    }
+    await this.ensureTunnel();
+  }
   /** Start frpc tunnel for the Caddy port. */
   async ensureTunnel() {
     try {
-      const { FrpcTunnel } = await import('./frpc-C9Qs-5jQ.mjs');
+      const { FrpcTunnel } = await import('./frpc-BhS2e6r-.mjs');
       this.frpcTunnel = new FrpcTunnel({
         name: this.serviceName,
         ports: [this.port],

package/package.json

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