svamp-cli 0.1.58 → 0.1.60

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-CtrH9ayy.mjs';
+import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-CWOk5gWn.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -109,7 +109,7 @@ async function main() {
     const { handleServiceCommand } = await import('./commands-Dvftls28.mjs');
     await handleServiceCommand();
   } else if (subcommand === "process" || subcommand === "proc") {
-    const { processCommand } = await import('./commands-jfZbr1Qh.mjs');
+    const { processCommand } = await import('./commands-BUvYDka4.mjs');
     let machineId;
     const processArgs = args.slice(1);
     const mIdx = processArgs.findIndex((a) => a === "--machine" || a === "-m");
@@ -127,7 +127,7 @@ async function main() {
   } else if (!subcommand || subcommand === "start") {
     await handleInteractiveCommand();
   } else if (subcommand === "--version" || subcommand === "-v") {
-    const pkg = await import('./package-J1yNZur7.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-ST5rOzw8.mjs').catch(() => ({ default: { version: "unknown" } }));
     console.log(`svamp version: ${pkg.default.version}`);
   } else {
     console.error(`Unknown command: ${subcommand}`);
@@ -136,7 +136,7 @@ async function main() {
   }
 }
 async function handleInteractiveCommand() {
-  const { runInteractive } = await import('./run-BnUNgLTL.mjs');
+  const { runInteractive } = await import('./run-DAoPkBhj.mjs');
   const interactiveArgs = subcommand === "start" ? args.slice(1) : args;
   let directory = process.cwd();
   let resumeSessionId;
@@ -181,7 +181,7 @@ async function handleAgentCommand() {
     return;
   }
   if (agentArgs[0] === "list") {
-    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-CtrH9ayy.mjs').then(function (n) { return n.i; });
+    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-CWOk5gWn.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)`);
@@ -193,7 +193,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-CtrH9ayy.mjs').then(function (n) { return n.i; });
+  const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-CWOk5gWn.mjs').then(function (n) { return n.i; });
   let cwd = process.cwd();
   const filteredArgs = [];
   for (let i = 0; i < agentArgs.length; i++) {
@@ -217,12 +217,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-CtrH9ayy.mjs').then(function (n) { return n.j; });
+    const { CodexMcpBackend } = await import('./run-CWOk5gWn.mjs').then(function (n) { return n.j; });
     backend = new CodexMcpBackend({ cwd, log: logFn });
   } else {
-    const { AcpBackend } = await import('./run-CtrH9ayy.mjs').then(function (n) { return n.h; });
-    const { GeminiTransport } = await import('./run-CtrH9ayy.mjs').then(function (n) { return n.G; });
-    const { DefaultTransport } = await import('./run-CtrH9ayy.mjs').then(function (n) { return n.D; });
+    const { AcpBackend } = await import('./run-CWOk5gWn.mjs').then(function (n) { return n.h; });
+    const { GeminiTransport } = await import('./run-CWOk5gWn.mjs').then(function (n) { return n.G; });
+    const { DefaultTransport } = await import('./run-CWOk5gWn.mjs').then(function (n) { return n.D; });
     const transportHandler = config.agentName === "gemini" ? new GeminiTransport() : new DefaultTransport(config.agentName);
     backend = new AcpBackend({
       agentName: config.agentName,
@@ -340,7 +340,7 @@ async function handleSessionCommand() {
     printSessionHelp();
     return;
   }
-  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionQueueAdd, sessionQueueList, sessionQueueClear } = await import('./commands-DPZbSIdL.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionQueueAdd, sessionQueueList, sessionQueueClear } = await import('./commands-9Kb21VH-.mjs');
   const parseFlagStr = (flag, shortFlag) => {
     for (let i = 1; i < sessionArgs.length; i++) {
       if ((sessionArgs[i] === flag || shortFlag) && i + 1 < sessionArgs.length) {
@@ -400,7 +400,7 @@ async function handleSessionCommand() {
         allowDomain.push(sessionArgs[++i]);
       }
     }
-    const { parseShareArg } = await import('./commands-DPZbSIdL.mjs');
+    const { parseShareArg } = await import('./commands-9Kb21VH-.mjs');
     const shareEntries = share.map((s) => parseShareArg(s));
     await sessionSpawn(agent, dir, targetMachineId, {
       message,
@@ -484,7 +484,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session approve <session-id> [request-id] [--json]");
       process.exit(1);
     }
-    const { sessionApprove } = await import('./commands-DPZbSIdL.mjs');
+    const { sessionApprove } = await import('./commands-9Kb21VH-.mjs');
     const approveReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
     await sessionApprove(sessionArgs[1], approveReqId, targetMachineId, {
       json: hasFlag("--json")
@@ -494,7 +494,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session deny <session-id> [request-id] [--json]");
       process.exit(1);
     }
-    const { sessionDeny } = await import('./commands-DPZbSIdL.mjs');
+    const { sessionDeny } = await import('./commands-9Kb21VH-.mjs');
     const denyReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
     await sessionDeny(sessionArgs[1], denyReqId, targetMachineId, {
       json: hasFlag("--json")
@@ -563,7 +563,7 @@ async function handleMachineCommand() {
     return;
   }
   if (machineSubcommand === "share") {
-    const { machineShare } = await import('./commands-DPZbSIdL.mjs');
+    const { machineShare } = await import('./commands-9Kb21VH-.mjs');
     let machineId;
     const shareArgs = [];
     for (let i = 1; i < machineArgs.length; i++) {
@@ -593,7 +593,7 @@ async function handleMachineCommand() {
     }
     await machineShare(machineId, { add, remove, list, configPath, showConfig });
   } else if (machineSubcommand === "exec") {
-    const { machineExec } = await import('./commands-DPZbSIdL.mjs');
+    const { machineExec } = await import('./commands-9Kb21VH-.mjs');
     let machineId;
     let cwd;
     const cmdParts = [];
@@ -613,7 +613,7 @@ async function handleMachineCommand() {
     }
     await machineExec(machineId, command, cwd);
   } else if (machineSubcommand === "info") {
-    const { machineInfo } = await import('./commands-DPZbSIdL.mjs');
+    const { machineInfo } = await import('./commands-9Kb21VH-.mjs');
     let machineId;
     for (let i = 1; i < machineArgs.length; i++) {
       if ((machineArgs[i] === "--machine" || machineArgs[i] === "-m") && i + 1 < machineArgs.length) {
@@ -622,7 +622,7 @@ async function handleMachineCommand() {
     }
     await machineInfo(machineId);
   } else if (machineSubcommand === "ls") {
-    const { machineLs } = await import('./commands-DPZbSIdL.mjs');
+    const { machineLs } = await import('./commands-9Kb21VH-.mjs');
     let machineId;
     let showHidden = false;
     let path;

package/dist/{commands-DPZbSIdL.mjs → commands-9Kb21VH-.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-CtrH9ayy.mjs';
+import { l as loadSecurityContextConfig, e as resolveSecurityContext, f as buildSecurityContextFromFlags, m as mergeSecurityContexts, c as connectToHypha } from './run-CWOk5gWn.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{commands-jfZbr1Qh.mjs → commands-BUvYDka4.mjs}

@@ -1,11 +1,11 @@
 import { writeFileSync, readFileSync } from 'fs';
 import { resolve } from 'path';
-import { connectAndGetMachine } from './commands-DPZbSIdL.mjs';
+import { connectAndGetMachine } from './commands-9Kb21VH-.mjs';
 import 'node:fs';
 import 'node:child_process';
 import 'node:path';
 import 'node:os';
-import './run-CtrH9ayy.mjs';
+import './run-CWOk5gWn.mjs';
 import 'os';
 import 'fs/promises';
 import 'url';

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-CtrH9ayy.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-CWOk5gWn.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{package-J1yNZur7.mjs → package-ST5rOzw8.mjs}

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

package/dist/{run-CtrH9ayy.mjs → run-CWOk5gWn.mjs}

@@ -4985,7 +4985,20 @@ async function startDaemon(options) {
       logger.log(`Hypha connection permanently lost: ${reason}`);
       requestShutdown("hypha-disconnected", String(reason));
     });
+    let lastHyphaMessageAt = Date.now();
+    const attachMessageTimestampListener = () => {
+      const conn = server.rpc?._connection;
+      const ws = conn?._websocket;
+      if (ws) {
+        ws.addEventListener("message", () => {
+          lastHyphaMessageAt = Date.now();
+        });
+        lastHyphaMessageAt = Date.now();
+      }
+    };
+    attachMessageTimestampListener();
     server.on("services_registered", () => {
+      attachMessageTimestampListener();
       if (consecutiveHeartbeatFailures > 0) {
         logger.log(`Hypha reconnection successful \u2014 services re-registered (resetting ${consecutiveHeartbeatFailures} failures)`);
         consecutiveHeartbeatFailures = 0;
@@ -6734,7 +6747,7 @@ 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 = 5e3;
+    const GHOST_TIMEOUT_MS = 6e4;
     const MAX_FAILURES = 60;
     const POST_RECONNECT_GRACE_MS = 2e4;
     let heartbeatRunning = false;
@@ -6765,79 +6778,32 @@ The automated loop has finished. Review the progress above and let me know if yo
           }
         } catch {
         }
-        for (const [key, session] of pidToTrackedSession) {
-          const child = session.childProcess;
-          if (child && child.pid) {
-            try {
-              process.kill(child.pid, 0);
-            } catch {
-              logger.log(`Removing stale session (child PID ${child.pid} dead): ${session.svampSessionId}`);
-              session.hyphaService?.disconnect().catch(() => {
-              });
-              pidToTrackedSession.delete(key);
-            }
-          }
-        }
         const inGrace = lastReconnectAt > 0 && Date.now() - lastReconnectAt < POST_RECONNECT_GRACE_MS;
-        if (!inGrace) {
-          try {
-            const pingStart = Date.now();
-            await new Promise((resolve2, reject) => {
-              const conn = server.rpc?._connection;
-              const ws = conn?._websocket;
-              if (!ws || ws.readyState !== 1) {
-                reject(new Error("WebSocket not open"));
-                return;
-              }
-              const timer = setTimeout(() => {
-                ws.removeEventListener("message", onMsg);
-                reject(new Error("Ping timed out"));
-              }, PING_TIMEOUT_MS);
-              const onMsg = (event) => {
-                try {
-                  const d = typeof event.data === "string" ? JSON.parse(event.data) : null;
-                  if (d?.type === "pong") {
-                    clearTimeout(timer);
-                    ws.removeEventListener("message", onMsg);
-                    resolve2();
-                  }
-                } catch {
-                }
-              };
-              ws.addEventListener("message", onMsg);
-              ws.send(JSON.stringify({ type: "ping" }));
-            });
-            const pingMs = Date.now() - pingStart;
-            if (pingMs > 1e3) {
-              logger.log(`Slow ping: ${pingMs}ms`);
-            }
-            if (consecutiveHeartbeatFailures > 0) {
-              logger.log(`Heartbeat recovered after ${consecutiveHeartbeatFailures} failures`);
-              consecutiveHeartbeatFailures = 0;
-            }
-          } catch (err) {
+        const timeSinceMsg = Date.now() - lastHyphaMessageAt;
+        if (!inGrace && timeSinceMsg > GHOST_TIMEOUT_MS) {
+          const conn = server.rpc?._connection;
+          const ws = conn?._websocket;
+          if (ws?.readyState === 1) {
             consecutiveHeartbeatFailures++;
             if (consecutiveHeartbeatFailures === 1) {
-              logger.log(`Ping failed: ${err.message}`);
+              logger.log(`No message from server in ${Math.round(timeSinceMsg / 1e3)}s \u2014 ghost connection, force-closing WebSocket`);
             } else if (consecutiveHeartbeatFailures % 6 === 0) {
-              logger.log(`Connection down for ${consecutiveHeartbeatFailures * HEARTBEAT_INTERVAL_MS / 1e3}s (${consecutiveHeartbeatFailures}/${MAX_FAILURES})`);
+              logger.log(`Still reconnecting \u2014 ${consecutiveHeartbeatFailures} failures (${consecutiveHeartbeatFailures * HEARTBEAT_INTERVAL_MS / 1e3}s)`);
             }
-            if (consecutiveHeartbeatFailures === 1 || consecutiveHeartbeatFailures % 3 === 0) {
-              const conn = server.rpc?._connection;
-              const ws = conn?._websocket;
-              if (ws?.readyState === 1) {
-                logger.log("Force-closing stale WebSocket to trigger reconnection");
-                try {
-                  ws.close(4e3, "Stale connection");
-                } catch {
-                }
-              }
+            try {
+              ws.close(4e3, "Ghost connection");
+            } catch {
             }
             if (consecutiveHeartbeatFailures >= MAX_FAILURES) {
               logger.log(`Heartbeat failed ${MAX_FAILURES} times. Shutting down.`);
-              requestShutdown("heartbeat-timeout", err.message);
+              requestShutdown("heartbeat-timeout", `No messages for ${Math.round(timeSinceMsg / 1e3)}s`);
             }
+          } else {
+            lastHyphaMessageAt = Date.now();
           }
+        } else if (consecutiveHeartbeatFailures > 0 && timeSinceMsg < GHOST_TIMEOUT_MS / 2) {
+          logger.log(`Heartbeat recovered after ${consecutiveHeartbeatFailures} failures`);
+          consecutiveHeartbeatFailures = 0;
         }
       } finally {
         heartbeatRunning = false;

package/dist/{run-BnUNgLTL.mjs → run-DAoPkBhj.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-CtrH9ayy.mjs';
+import { c as connectToHypha, a as registerSessionService } from './run-CWOk5gWn.mjs';
 import { createServer } from 'node:http';
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';

package/package.json

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