svamp-cli 0.1.60 → 0.1.62

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-CWOk5gWn.mjs';
+import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-Bds_JVXp.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -106,10 +106,10 @@ async function main() {
   } else if (subcommand === "skills") {
     await handleSkillsCommand();
   } else if (subcommand === "service" || subcommand === "svc") {
-    const { handleServiceCommand } = await import('./commands-Dvftls28.mjs');
+    const { handleServiceCommand } = await import('./commands-DXia-6W4.mjs');
     await handleServiceCommand();
   } else if (subcommand === "process" || subcommand === "proc") {
-    const { processCommand } = await import('./commands-BUvYDka4.mjs');
+    const { processCommand } = await import('./commands-DTNg_sCX.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-ST5rOzw8.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-BYxU0Wzp.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-DAoPkBhj.mjs');
+  const { runInteractive } = await import('./run-Dg1i7D_o.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-CWOk5gWn.mjs').then(function (n) { return n.i; });
+    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-Bds_JVXp.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-CWOk5gWn.mjs').then(function (n) { return n.i; });
+  const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-Bds_JVXp.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-CWOk5gWn.mjs').then(function (n) { return n.j; });
+    const { CodexMcpBackend } = await import('./run-Bds_JVXp.mjs').then(function (n) { return n.j; });
     backend = new CodexMcpBackend({ cwd, log: logFn });
   } else {
-    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 { AcpBackend } = await import('./run-Bds_JVXp.mjs').then(function (n) { return n.h; });
+    const { GeminiTransport } = await import('./run-Bds_JVXp.mjs').then(function (n) { return n.G; });
+    const { DefaultTransport } = await import('./run-Bds_JVXp.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-9Kb21VH-.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionQueueAdd, sessionQueueList, sessionQueueClear } = await import('./commands-CBTCiCjK.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-9Kb21VH-.mjs');
+    const { parseShareArg } = await import('./commands-CBTCiCjK.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-9Kb21VH-.mjs');
+    const { sessionApprove } = await import('./commands-CBTCiCjK.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-9Kb21VH-.mjs');
+    const { sessionDeny } = await import('./commands-CBTCiCjK.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-9Kb21VH-.mjs');
+    const { machineShare } = await import('./commands-CBTCiCjK.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-9Kb21VH-.mjs');
+    const { machineExec } = await import('./commands-CBTCiCjK.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-9Kb21VH-.mjs');
+    const { machineInfo } = await import('./commands-CBTCiCjK.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-9Kb21VH-.mjs');
+    const { machineLs } = await import('./commands-CBTCiCjK.mjs');
     let machineId;
     let showHidden = false;
     let path;

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

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

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

package/dist/{commands-Dvftls28.mjs → commands-DXia-6W4.mjs}

@@ -296,7 +296,7 @@ Service is live:`);
       }
     } else {
       console.log(`No SANDBOX_ID detected \u2014 starting reverse tunnel.`);
-      const { runTunnel } = await import('./tunnel-Dh1bJZ6R.mjs');
+      const { runTunnel } = await import('./tunnel-CtPReHFY.mjs');
       await runTunnel(name, ports);
     }
   } catch (err) {
@@ -312,7 +312,7 @@ async function serviceTunnel(args) {
     console.error("Usage: svamp service tunnel <name> --port <port> [--port <port2>]");
     process.exit(1);
   }
-  const { runTunnel } = await import('./tunnel-Dh1bJZ6R.mjs');
+  const { runTunnel } = await import('./tunnel-CtPReHFY.mjs');
   await runTunnel(name, ports);
 }
 async function handleServiceCommand() {

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

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

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

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

@@ -313,35 +313,9 @@ async function registerMachineService(server, machineId, metadata, daemonState,
   let currentDaemonState = { ...daemonState };
   let metadataVersion = 1;
   let daemonStateVersion = 1;
-  const listeners = [];
-  const removeListener = (listener, reason) => {
-    const idx = listeners.indexOf(listener);
-    if (idx >= 0) {
-      listeners.splice(idx, 1);
-      console.log(`[HYPHA MACHINE] Listener removed (${reason}), remaining: ${listeners.length}`);
-      const rintfId = listener._rintf_service_id;
-      if (rintfId) {
-        server.unregisterService(rintfId).catch(() => {
-        });
-      }
-    }
-  };
-  const notifyListeners = (update) => {
-    for (let i = listeners.length - 1; i >= 0; i--) {
-      try {
-        const result = listeners[i].onUpdate(update);
-        if (result && typeof result.catch === "function") {
-          const listener = listeners[i];
-          result.catch((err) => {
-            console.error(`[HYPHA MACHINE] Async listener error:`, err);
-            removeListener(listener, "async error");
-          });
-        }
-      } catch (err) {
-        console.error(`[HYPHA MACHINE] Listener error:`, err);
-        removeListener(listeners[i], "sync error");
-      }
-    }
+  const subscribers = /* @__PURE__ */ new Set();
+  const notifySubscribers = (update) => {
+    for (const push of subscribers) push(update);
   };
   const serviceInfo = await server.registerService(
     {
@@ -427,7 +401,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
           machineId
         });
         if (result.type === "success" && result.sessionId) {
-          notifyListeners({
+          notifySubscribers({
             type: "new-session",
             sessionId: result.sessionId,
             machineId
@@ -440,7 +414,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
       stopSession: async (sessionId, context) => {
         authorizeRequest(context, currentMetadata.sharing, "admin");
         const result = handlers.stopSession(sessionId);
-        notifyListeners({
+        notifySubscribers({
           type: "session-stopped",
           sessionId,
           machineId
@@ -481,7 +455,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
           sharing: currentMetadata.sharing,
           securityContextConfig: currentMetadata.securityContextConfig
         });
-        notifyListeners({
+        notifySubscribers({
           type: "update-machine",
           machineId,
           metadata: { value: currentMetadata, version: metadataVersion }
@@ -511,7 +485,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
         }
         currentDaemonState = newState;
         daemonStateVersion++;
-        notifyListeners({
+        notifySubscribers({
           type: "update-machine",
           machineId,
           daemonState: { value: currentDaemonState, version: daemonStateVersion }
@@ -541,7 +515,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
           sharing: currentMetadata.sharing,
           securityContextConfig: currentMetadata.securityContextConfig
         });
-        notifyListeners({
+        notifySubscribers({
           type: "update-machine",
           machineId,
           metadata: { value: currentMetadata, version: metadataVersion }
@@ -562,19 +536,48 @@ async function registerMachineService(server, machineId, metadata, daemonState,
           sharing: currentMetadata.sharing,
           securityContextConfig: currentMetadata.securityContextConfig
         });
-        notifyListeners({
+        notifySubscribers({
           type: "update-machine",
           machineId,
           metadata: { value: currentMetadata, version: metadataVersion }
         });
         return { success: true };
       },
-      // Register a listener for real-time updates (app calls this with _rintf callback)
-      registerListener: async (callback, context) => {
+      // Live update stream — yields machine state changes as they happen.
+      // Frontend iterates with `for await (const update of machine.subscribe())`.
+      subscribe: async function* (context) {
         authorizeRequest(context, currentMetadata.sharing, "view");
-        listeners.push(callback);
-        console.log(`[HYPHA MACHINE] Listener registered (total: ${listeners.length})`);
-        return { success: true, listenerId: listeners.length - 1 };
+        const pending = [];
+        let wake = null;
+        const push = (update) => {
+          pending.push(update);
+          wake?.();
+        };
+        subscribers.add(push);
+        console.log(`[HYPHA MACHINE] subscribe() started (total: ${subscribers.size})`);
+        try {
+          yield {
+            type: "update-machine",
+            machineId,
+            metadata: { value: currentMetadata, version: metadataVersion },
+            daemonState: { value: currentDaemonState, version: daemonStateVersion }
+          };
+          while (true) {
+            while (pending.length === 0) {
+              await new Promise((r) => {
+                wake = r;
+              });
+              wake = null;
+            }
+            while (pending.length > 0) {
+              yield pending.shift();
+            }
+          }
+        } finally {
+          subscribers.delete(push);
+          wake?.();
+          console.log(`[HYPHA MACHINE] subscribe() ended (remaining: ${subscribers.size})`);
+        }
       },
       // Shell access
       bash: async (command, cwd, context) => {
@@ -761,7 +764,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
     updateMetadata: (newMetadata) => {
       currentMetadata = newMetadata;
       metadataVersion++;
-      notifyListeners({
+      notifySubscribers({
         type: "update-machine",
         machineId,
         metadata: { value: currentMetadata, version: metadataVersion }
@@ -770,7 +773,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
     updateDaemonState: (newState) => {
       currentDaemonState = newState;
       daemonStateVersion++;
-      notifyListeners({
+      notifySubscribers({
         type: "update-machine",
         machineId,
         daemonState: { value: currentDaemonState, version: daemonStateVersion }
@@ -819,35 +822,9 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
     mode: "remote",
     time: Date.now()
   };
-  const listeners = [];
-  const removeListener = (listener, reason) => {
-    const idx = listeners.indexOf(listener);
-    if (idx >= 0) {
-      listeners.splice(idx, 1);
-      console.log(`[HYPHA SESSION ${sessionId}] Listener removed (${reason}), remaining: ${listeners.length}`);
-      const rintfId = listener._rintf_service_id;
-      if (rintfId) {
-        server.unregisterService(rintfId).catch(() => {
-        });
-      }
-    }
-  };
-  const notifyListeners = (update) => {
-    for (let i = listeners.length - 1; i >= 0; i--) {
-      try {
-        const result = listeners[i].onUpdate(update);
-        if (result && typeof result.catch === "function") {
-          const listener = listeners[i];
-          result.catch((err) => {
-            console.error(`[HYPHA SESSION ${sessionId}] Async listener error:`, err);
-            removeListener(listener, "async error");
-          });
-        }
-      } catch (err) {
-        console.error(`[HYPHA SESSION ${sessionId}] Listener error:`, err);
-        removeListener(listeners[i], "sync error");
-      }
-    }
+  const subscribers = /* @__PURE__ */ new Set();
+  const notifySubscribers = (update) => {
+    for (const push of subscribers) push(update);
   };
   const pushMessage = (content, role = "agent") => {
     let wrappedContent;
@@ -878,7 +855,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
     if (options?.messagesDir) {
       appendMessage(options.messagesDir, sessionId, msg);
     }
-    notifyListeners({
+    notifySubscribers({
       type: "new-message",
       sessionId,
       message: msg
@@ -939,7 +916,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
         if (options?.messagesDir) {
           appendMessage(options.messagesDir, sessionId, msg);
         }
-        notifyListeners({
+        notifySubscribers({
           type: "new-message",
           sessionId,
           message: msg
@@ -966,7 +943,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
         }
         metadata = newMetadata;
         metadataVersion++;
-        notifyListeners({
+        notifySubscribers({
           type: "update-session",
           sessionId,
           metadata: { value: metadata, version: metadataVersion }
@@ -1007,7 +984,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
         }
         agentState = newState;
         agentStateVersion++;
-        notifyListeners({
+        notifySubscribers({
           type: "update-session",
           sessionId,
           agentState: { value: agentState, version: agentStateVersion }
@@ -1046,7 +1023,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
       // ── Activity ──
       keepAlive: async (thinking, mode, context) => {
         lastActivity = { active: true, thinking: thinking || false, mode: mode || "remote", time: Date.now() };
-        notifyListeners({
+        notifySubscribers({
           type: "activity",
           sessionId,
           ...lastActivity
@@ -1054,7 +1031,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
       },
       sessionEnd: async (context) => {
         lastActivity = { active: false, thinking: false, mode: "remote", time: Date.now() };
-        notifyListeners({
+        notifySubscribers({
           type: "activity",
           sessionId,
           ...lastActivity
@@ -1128,7 +1105,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
         }
         metadata = { ...metadata, sharing: newSharing };
         metadataVersion++;
-        notifyListeners({
+        notifySubscribers({
           type: "update-session",
           sessionId,
           metadata: { value: metadata, version: metadataVersion }
@@ -1146,7 +1123,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
         }
         metadata = { ...metadata, securityContext: newSecurityContext };
         metadataVersion++;
-        notifyListeners({
+        notifySubscribers({
           type: "update-session",
           sessionId,
           metadata: { value: metadata, version: metadataVersion }
@@ -1161,64 +1138,55 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
         }
         return await callbacks.onApplySystemPrompt(prompt);
       },
-      // ── Listener Registration ──
-      registerListener: async (callback, context) => {
+      // ── Live Update Stream ──
+      //
+      // Returns an async generator that yields real-time updates for this session.
+      // hypha-rpc proxies the generator across the RPC boundary — the frontend
+      // iterates with `for await (const update of service.subscribe())`.
+      //
+      // Initial state is replayed as the first batch of yields so the frontend
+      // can reconstruct full session state without a separate RPC call.
+      // Cleanup is automatic: when the frontend disconnects, hypha-rpc calls the
+      // generator's close method, triggering the finally block which removes the
+      // subscriber. No reverse `_rintf` service is registered.
+      subscribe: async function* (context) {
         authorizeRequest(context, metadata.sharing, "view");
-        listeners.push(callback);
-        const replayMessages = messages.slice(-50);
-        console.log(`[HYPHA SESSION ${sessionId}] Listener registered (total: ${listeners.length}), replaying ${replayMessages.length} of ${messages.length} messages`);
-        for (const msg of replayMessages) {
-          if (listeners.indexOf(callback) < 0) break;
-          try {
-            const result = callback.onUpdate({
-              type: "new-message",
-              sessionId,
-              message: msg
-            });
-            if (result && typeof result.catch === "function") {
-              try {
-                await result;
-              } catch (err) {
-                console.error(`[HYPHA SESSION ${sessionId}] Replay listener error, removing:`, err?.message ?? err);
-                removeListener(callback, "replay error");
-                return { success: false, error: "Listener removed during replay" };
-              }
-            }
-          } catch (err) {
-            console.error(`[HYPHA SESSION ${sessionId}] Replay listener error, removing:`, err?.message ?? err);
-            removeListener(callback, "replay error");
-            return { success: false, error: "Listener removed during replay" };
-          }
-        }
-        if (listeners.indexOf(callback) < 0) {
-          return { success: false, error: "Listener was removed during replay" };
-        }
+        const pending = [];
+        let wake = null;
+        const push = (update) => {
+          pending.push(update);
+          wake?.();
+        };
+        subscribers.add(push);
+        console.log(`[HYPHA SESSION ${sessionId}] subscribe() started (total: ${subscribers.size})`);
         try {
-          const result = callback.onUpdate({
+          yield {
             type: "update-session",
             sessionId,
             metadata: { value: metadata, version: metadataVersion },
             agentState: { value: agentState, version: agentStateVersion }
-          });
-          if (result && typeof result.catch === "function") {
-            result.catch(() => {
-            });
+          };
+          const MAX_REPLAY = 50;
+          for (const msg of messages.slice(-MAX_REPLAY)) {
+            yield { type: "new-message", sessionId, message: msg };
           }
-        } catch {
-        }
-        try {
-          const result = callback.onUpdate({
-            type: "activity",
-            sessionId,
-            ...lastActivity
-          });
-          if (result && typeof result.catch === "function") {
-            result.catch(() => {
-            });
+          yield { type: "activity", sessionId, ...lastActivity };
+          while (true) {
+            while (pending.length === 0) {
+              await new Promise((r) => {
+                wake = r;
+              });
+              wake = null;
+            }
+            while (pending.length > 0) {
+              yield pending.shift();
+            }
           }
-        } catch {
+        } finally {
+          subscribers.delete(push);
+          wake?.();
+          console.log(`[HYPHA SESSION ${sessionId}] subscribe() ended (remaining: ${subscribers.size})`);
         }
-        return { success: true, listenerId: listeners.length - 1 };
       }
     },
     { overwrite: true }
@@ -1233,7 +1201,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
     updateMetadata: (newMetadata) => {
       metadata = newMetadata;
       metadataVersion++;
-      notifyListeners({
+      notifySubscribers({
         type: "update-session",
         sessionId,
         metadata: { value: metadata, version: metadataVersion }
@@ -1242,7 +1210,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
     updateAgentState: (newAgentState) => {
       agentState = newAgentState;
       agentStateVersion++;
-      notifyListeners({
+      notifySubscribers({
         type: "update-session",
         sessionId,
         agentState: { value: agentState, version: agentStateVersion }
@@ -1250,7 +1218,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
     },
     sendKeepAlive: (thinking, mode) => {
       lastActivity = { active: true, thinking: thinking || false, mode: mode || "remote", time: Date.now() };
-      notifyListeners({
+      notifySubscribers({
         type: "activity",
         sessionId,
         ...lastActivity
@@ -1258,7 +1226,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
     },
     sendSessionEnd: () => {
       lastActivity = { active: false, thinking: false, mode: "remote", time: Date.now() };
-      notifyListeners({
+      notifySubscribers({
         type: "activity",
         sessionId,
         ...lastActivity
@@ -1274,7 +1242,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
         } catch {
         }
       }
-      notifyListeners({
+      notifySubscribers({
         type: "clear-messages",
         sessionId
       });
@@ -4985,20 +4953,7 @@ 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;
@@ -6747,7 +6702,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 GHOST_TIMEOUT_MS = 6e4;
+    const PING_TIMEOUT_MS = 15e3;
     const MAX_FAILURES = 60;
     const POST_RECONNECT_GRACE_MS = 2e4;
     let heartbeatRunning = false;
@@ -6778,32 +6733,58 @@ 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;
-        const timeSinceMsg = Date.now() - lastHyphaMessageAt;
-        if (!inGrace && timeSinceMsg > GHOST_TIMEOUT_MS) {
-          const conn = server.rpc?._connection;
-          const ws = conn?._websocket;
-          if (ws?.readyState === 1) {
+        if (!inGrace) {
+          try {
+            const pingStart = Date.now();
+            await Promise.race([
+              server.echo("ping"),
+              new Promise((_, reject) => setTimeout(() => reject(new Error("Ping timed out")), PING_TIMEOUT_MS))
+            ]);
+            const pingMs = Date.now() - pingStart;
+            if (pingMs > 5e3) {
+              logger.log(`Slow ping: ${pingMs}ms (server under load)`);
+            }
+            if (consecutiveHeartbeatFailures > 0) {
+              logger.log(`Heartbeat recovered after ${consecutiveHeartbeatFailures} failures`);
+              consecutiveHeartbeatFailures = 0;
+            }
+          } catch (err) {
             consecutiveHeartbeatFailures++;
             if (consecutiveHeartbeatFailures === 1) {
-              logger.log(`No message from server in ${Math.round(timeSinceMsg / 1e3)}s \u2014 ghost connection, force-closing WebSocket`);
+              logger.log(`Ping failed: ${err.message}`);
             } else if (consecutiveHeartbeatFailures % 6 === 0) {
-              logger.log(`Still reconnecting \u2014 ${consecutiveHeartbeatFailures} failures (${consecutiveHeartbeatFailures * HEARTBEAT_INTERVAL_MS / 1e3}s)`);
+              logger.log(`Connection down for ${consecutiveHeartbeatFailures * HEARTBEAT_INTERVAL_MS / 1e3}s (${consecutiveHeartbeatFailures}/${MAX_FAILURES})`);
             }
-            try {
-              ws.close(4e3, "Ghost connection");
-            } catch {
+            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 {
+                }
+              }
             }
             if (consecutiveHeartbeatFailures >= MAX_FAILURES) {
               logger.log(`Heartbeat failed ${MAX_FAILURES} times. Shutting down.`);
-              requestShutdown("heartbeat-timeout", `No messages for ${Math.round(timeSinceMsg / 1e3)}s`);
+              requestShutdown("heartbeat-timeout", err.message);
             }
-          } 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-DAoPkBhj.mjs → run-Dg1i7D_o.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-CWOk5gWn.mjs';
+import { c as connectToHypha, a as registerSessionService } from './run-Bds_JVXp.mjs';
 import { createServer } from 'node:http';
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';

package/dist/{tunnel-Dh1bJZ6R.mjs → tunnel-CtPReHFY.mjs}

@@ -1,4 +1,5 @@
 import * as os from 'os';
+import * as http from 'http';
 import { requireSandboxApiEnv } from './api-Cegey1dh.mjs';
 import { WebSocket } from 'ws';
 
@@ -123,56 +124,71 @@ class TunnelClient {
   async proxyRequest(req) {
     this.requestCount++;
     const port = req.port || this.options.ports[0];
-    const url = `http://${this.options.localHost}:${port}${req.path}`;
-    const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(), this.options.requestTimeout);
     const forwardHeaders = { ...req.headers };
-    delete forwardHeaders["accept-encoding"];
-    delete forwardHeaders["Accept-Encoding"];
-    const init = {
-      method: req.method,
-      headers: forwardHeaders,
-      signal: controller.signal
-    };
-    if (req.body && !["GET", "HEAD"].includes(req.method.toUpperCase())) {
-      init.body = Buffer.from(req.body, "base64");
-    }
-    try {
-      const res = await fetch(url, init);
-      clearTimeout(timeout);
-      const bodyBuffer = await res.arrayBuffer();
-      const bodyBase64 = bodyBuffer.byteLength > 0 ? Buffer.from(bodyBuffer).toString("base64") : void 0;
-      const headers = {};
-      res.headers.forEach((value, key) => {
-        headers[key] = value;
+    const chunks = [];
+    const status_holder = { status: 502, headers: {} };
+    await new Promise((resolve, reject) => {
+      const timeout = setTimeout(() => reject(new Error("timeout")), this.options.requestTimeout);
+      const options = {
+        hostname: this.options.localHost,
+        port,
+        path: req.path,
+        method: req.method,
+        headers: forwardHeaders
+      };
+      const httpReq = http.request(options, (res) => {
+        status_holder.status = res.statusCode ?? 502;
+        const rawHeaders = res.headers;
+        for (const [key, value] of Object.entries(rawHeaders)) {
+          if (Array.isArray(value)) {
+            status_holder.headers[key] = value.join(", ");
+          } else if (value !== void 0) {
+            status_holder.headers[key] = value;
+          }
+        }
+        res.on("data", (chunk) => chunks.push(chunk));
+        res.on("end", () => {
+          clearTimeout(timeout);
+          resolve();
+        });
+        res.on("error", (e) => {
+          clearTimeout(timeout);
+          reject(e);
+        });
+      });
+      httpReq.on("error", (e) => {
+        clearTimeout(timeout);
+        reject(e);
       });
+      if (req.body && !["GET", "HEAD"].includes(req.method.toUpperCase())) {
+        httpReq.write(Buffer.from(req.body, "base64"));
+      }
+      httpReq.end();
+    }).then(() => {
+      const bodyBuffer = Buffer.concat(chunks);
+      const bodyBase64 = bodyBuffer.length > 0 ? bodyBuffer.toString("base64") : void 0;
+      for (const h of ["connection", "keep-alive", "transfer-encoding"]) {
+        delete status_holder.headers[h];
+      }
       this.send({
         type: "response",
         id: req.id,
-        status: res.status,
-        headers,
+        status: status_holder.status,
+        headers: status_holder.headers,
         body: bodyBase64
       });
-    } catch (err) {
-      clearTimeout(timeout);
-      if (err.name === "AbortError") {
-        this.send({
-          type: "response",
-          id: req.id,
-          status: 504,
-          headers: { "content-type": "text/plain" },
-          body: Buffer.from("Tunnel: request timeout").toString("base64")
-        });
-      } else {
-        this.send({
-          type: "response",
-          id: req.id,
-          status: 502,
-          headers: { "content-type": "text/plain" },
-          body: Buffer.from(`Tunnel: local service error: ${err.message}`).toString("base64")
-        });
-      }
-    }
+    }).catch((err) => {
+      const isTimeout = err.message === "timeout";
+      this.send({
+        type: "response",
+        id: req.id,
+        status: isTimeout ? 504 : 502,
+        headers: { "content-type": "text/plain" },
+        body: Buffer.from(
+          isTimeout ? "Tunnel: request timeout" : `Tunnel: local service error: ${err.message}`
+        ).toString("base64")
+      });
+    });
   }
   // ── WebSocket proxying ───────────────────────────────────────────────
   async handleWsOpen(msg) {

package/package.json

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