svamp-cli 0.1.70 → 0.1.72

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-C7CEDmD4.mjs';
+import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-p-RshVII.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-CF32XIau.mjs');
+    const { handleServiceCommand } = await import('./commands-BLjcT1Vl.mjs');
     await handleServiceCommand();
   } else if (subcommand === "process" || subcommand === "proc") {
-    const { processCommand } = await import('./commands-CIgrbviM.mjs');
+    const { processCommand } = await import('./commands-DMhuR7JE.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-B0d2rUXI.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-BppQHKG7.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-CgSj6KtU.mjs');
+  const { runInteractive } = await import('./run-D9fkwRb3.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-C7CEDmD4.mjs').then(function (n) { return n.i; });
+    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-p-RshVII.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-C7CEDmD4.mjs').then(function (n) { return n.i; });
+  const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-p-RshVII.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-C7CEDmD4.mjs').then(function (n) { return n.j; });
+    const { CodexMcpBackend } = await import('./run-p-RshVII.mjs').then(function (n) { return n.j; });
     backend = new CodexMcpBackend({ cwd, log: logFn });
   } else {
-    const { AcpBackend } = await import('./run-C7CEDmD4.mjs').then(function (n) { return n.h; });
-    const { GeminiTransport } = await import('./run-C7CEDmD4.mjs').then(function (n) { return n.G; });
-    const { DefaultTransport } = await import('./run-C7CEDmD4.mjs').then(function (n) { return n.D; });
+    const { AcpBackend } = await import('./run-p-RshVII.mjs').then(function (n) { return n.h; });
+    const { GeminiTransport } = await import('./run-p-RshVII.mjs').then(function (n) { return n.G; });
+    const { DefaultTransport } = await import('./run-p-RshVII.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-BodoXVL9.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionQueueAdd, sessionQueueList, sessionQueueClear } = await import('./commands-COX5-rj3.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-BodoXVL9.mjs');
+    const { parseShareArg } = await import('./commands-COX5-rj3.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-BodoXVL9.mjs');
+    const { sessionApprove } = await import('./commands-COX5-rj3.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-BodoXVL9.mjs');
+    const { sessionDeny } = await import('./commands-COX5-rj3.mjs');
     const denyReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
     await sessionDeny(sessionArgs[1], denyReqId, targetMachineId, {
       json: hasFlag("--json")
@@ -597,7 +597,7 @@ async function handleMachineCommand() {
     return;
   }
   if (machineSubcommand === "share") {
-    const { machineShare } = await import('./commands-BodoXVL9.mjs');
+    const { machineShare } = await import('./commands-COX5-rj3.mjs');
     let machineId;
     const shareArgs = [];
     for (let i = 1; i < machineArgs.length; i++) {
@@ -627,7 +627,7 @@ async function handleMachineCommand() {
     }
     await machineShare(machineId, { add, remove, list, configPath, showConfig });
   } else if (machineSubcommand === "exec") {
-    const { machineExec } = await import('./commands-BodoXVL9.mjs');
+    const { machineExec } = await import('./commands-COX5-rj3.mjs');
     let machineId;
     let cwd;
     const cmdParts = [];
@@ -647,7 +647,7 @@ async function handleMachineCommand() {
     }
     await machineExec(machineId, command, cwd);
   } else if (machineSubcommand === "info") {
-    const { machineInfo } = await import('./commands-BodoXVL9.mjs');
+    const { machineInfo } = await import('./commands-COX5-rj3.mjs');
     let machineId;
     for (let i = 1; i < machineArgs.length; i++) {
       if ((machineArgs[i] === "--machine" || machineArgs[i] === "-m") && i + 1 < machineArgs.length) {
@@ -670,7 +670,7 @@ async function handleMachineCommand() {
     const { machineNotify } = await import('./agentCommands-C6iGblcL.mjs');
     await machineNotify(message, level);
   } else if (machineSubcommand === "ls") {
-    const { machineLs } = await import('./commands-BodoXVL9.mjs');
+    const { machineLs } = await import('./commands-COX5-rj3.mjs');
     let machineId;
     let showHidden = false;
     let path;

package/dist/{commands-CF32XIau.mjs → commands-BLjcT1Vl.mjs}

@@ -296,7 +296,7 @@ Service is live:`);
       }
     } else {
       console.log(`No SANDBOX_ID detected \u2014 starting reverse tunnel.`);
-      const { runTunnel } = await import('./tunnel-C3UsqTxi.mjs');
+      const { runTunnel } = await import('./tunnel-C2kqST5d.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-C3UsqTxi.mjs');
+  const { runTunnel } = await import('./tunnel-C2kqST5d.mjs');
   await runTunnel(name, ports);
 }
 async function handleServiceCommand() {

package/dist/{commands-BodoXVL9.mjs → commands-COX5-rj3.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-C7CEDmD4.mjs';
+import { l as loadSecurityContextConfig, e as resolveSecurityContext, f as buildSecurityContextFromFlags, m as mergeSecurityContexts, c as connectToHypha } from './run-p-RshVII.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -181,28 +181,56 @@ async function connectAndGetMachine(machineId) {
         });
         if (prefixMatches.length === 1) {
           selectedService = prefixMatches[0];
-        } else if (prefixMatches.length === 0) {
-          const substringMatches = services.filter((s) => {
-            const id = s.id || s.name || "";
-            return id.includes(machineId);
-          });
-          if (substringMatches.length === 1) {
-            selectedService = substringMatches[0];
-          } else {
-            restoreConsole();
-            console.error(`No machine found matching: ${machineId}`);
-            console.error("Available machines:");
-            for (const s of services) {
-              console.error(`  ${s.id || s.name}`);
-            }
-            await server.disconnect();
-            process.exit(1);
+        }
+      }
+      if (!selectedService) {
+        const query = machineId.toLowerCase();
+        const resolved = [];
+        await Promise.all(services.map(async (svc) => {
+          const svcId2 = svc.id || svc.name;
+          try {
+            const machineSvc = await server.getService(svcId2);
+            const info = await machineSvc.getMachineInfo();
+            resolved.push({
+              svc,
+              machineId: (info.machineId || svcId2).toLowerCase(),
+              host: (info.metadata?.host || "").toLowerCase(),
+              displayName: (info.metadata?.displayName || "").toLowerCase()
+            });
+          } catch {
+          }
+        }));
+        let matches = resolved.filter(
+          (r) => r.machineId === query || r.host === query || r.displayName === query
+        );
+        if (matches.length === 0) {
+          matches = resolved.filter(
+            (r) => r.machineId.startsWith(query) || r.host.startsWith(query) || r.displayName.startsWith(query)
+          );
+        }
+        if (matches.length === 0) {
+          matches = resolved.filter(
+            (r) => r.machineId.includes(query) || r.host.includes(query) || r.displayName.includes(query)
+          );
+        }
+        if (matches.length === 1) {
+          selectedService = matches[0].svc;
+        } else if (matches.length > 1) {
+          restoreConsole();
+          console.error(`Ambiguous machine "${machineId}". Matches:`);
+          for (const m of matches) {
+            console.error(`  ${m.machineId}  (${m.host})`);
           }
+          await server.disconnect();
+          process.exit(1);
         } else {
           restoreConsole();
-          console.error(`Ambiguous machine ID "${machineId}". Matches:`);
-          for (const s of prefixMatches) {
-            console.error(`  ${s.id || s.name}`);
+          console.error(`No machine found matching: ${machineId}`);
+          if (resolved.length > 0) {
+            console.error("Available machines:");
+            for (const r of resolved) {
+              console.error(`  ${r.machineId}  (${r.host})`);
+            }
           }
           await server.disconnect();
           process.exit(1);

package/dist/{commands-CIgrbviM.mjs → commands-DMhuR7JE.mjs}

@@ -1,11 +1,11 @@
 import { writeFileSync, readFileSync } from 'fs';
 import { resolve } from 'path';
-import { connectAndGetMachine } from './commands-BodoXVL9.mjs';
+import { connectAndGetMachine } from './commands-COX5-rj3.mjs';
 import 'node:fs';
 import 'node:child_process';
 import 'node:path';
 import 'node:os';
-import './run-C7CEDmD4.mjs';
+import './run-p-RshVII.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-C7CEDmD4.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-p-RshVII.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{package-B0d2rUXI.mjs → package-BppQHKG7.mjs}

@@ -1,5 +1,5 @@
 var name = "svamp-cli";
-var version = "0.1.70";
+var version = "0.1.72";
 var description = "Svamp CLI — AI workspace daemon on Hypha Cloud";
 var author = "Amun AI AB";
 var license = "SEE LICENSE IN LICENSE";
@@ -19,7 +19,7 @@ var exports$1 = {
 var scripts = {
 	build: "rm -rf dist && tsc --noEmit && pkgroll",
 	typecheck: "tsc --noEmit",
-	test: "npx tsx test/test-authorize.mjs && npx tsx test/test-session-helpers.mjs && npx tsx test/test-cli-routing.mjs && npx tsx test/test-security-context.mjs && npx tsx test/test-ralph-loop.mjs && npx tsx test/test-message-helpers.mjs && npx tsx test/test-agent-config.mjs && npx tsx test/test-wrap-command.mjs && npx tsx test/test-credential-staging.mjs && npx tsx test/test-output-formatters.mjs && npx tsx test/test-agent-types.mjs && npx tsx test/test-transport.mjs && npx tsx test/test-session-update-handlers.mjs && npx tsx test/test-session-scanner.mjs && npx tsx test/test-hypha-client.mjs && npx tsx test/test-hook-settings.mjs && npx tsx test/test-session-service-logic.mjs && npx tsx test/test-daemon-persistence.mjs && npx tsx test/test-detect-isolation.mjs && npx tsx test/test-machine-service-logic.mjs && npx tsx test/test-interactive-helpers.mjs && npx tsx test/test-codex-backend.mjs && npx tsx test/test-acp-backend.mjs && npx tsx test/test-acp-bridge.mjs && npx tsx test/test-hook-server.mjs && npx tsx test/test-session-commands.mjs && npx tsx test/test-interactive-console.mjs && npx tsx test/test-session-messages.mjs && npx tsx test/test-skills.mjs && npx tsx test/test-agent-grouping.mjs && npx tsx test/test-ralph-loop-integration.mjs && npx tsx test/test-ralph-loop-modes.mjs && npx tsx test/test-machine-list-directory.mjs && npx tsx test/test-service-commands.mjs && npx tsx test/test-supervisor.mjs && npx tsx test/test-clear-detection.mjs",
+	test: "npx tsx test/test-authorize.mjs && npx tsx test/test-session-helpers.mjs && npx tsx test/test-cli-routing.mjs && npx tsx test/test-security-context.mjs && npx tsx test/test-ralph-loop.mjs && npx tsx test/test-message-helpers.mjs && npx tsx test/test-agent-config.mjs && npx tsx test/test-wrap-command.mjs && npx tsx test/test-credential-staging.mjs && npx tsx test/test-output-formatters.mjs && npx tsx test/test-agent-types.mjs && npx tsx test/test-transport.mjs && npx tsx test/test-session-update-handlers.mjs && npx tsx test/test-session-scanner.mjs && npx tsx test/test-hypha-client.mjs && npx tsx test/test-hook-settings.mjs && npx tsx test/test-session-service-logic.mjs && npx tsx test/test-daemon-persistence.mjs && npx tsx test/test-detect-isolation.mjs && npx tsx test/test-machine-service-logic.mjs && npx tsx test/test-interactive-helpers.mjs && npx tsx test/test-codex-backend.mjs && npx tsx test/test-acp-backend.mjs && npx tsx test/test-acp-bridge.mjs && npx tsx test/test-hook-server.mjs && npx tsx test/test-session-commands.mjs && npx tsx test/test-interactive-console.mjs && npx tsx test/test-session-messages.mjs && npx tsx test/test-skills.mjs && npx tsx test/test-agent-grouping.mjs && npx tsx test/test-ralph-loop-integration.mjs && npx tsx test/test-ralph-loop-modes.mjs && npx tsx test/test-machine-list-directory.mjs && npx tsx test/test-service-commands.mjs && npx tsx test/test-supervisor.mjs && npx tsx test/test-clear-detection.mjs && npx tsx test/test-session-consolidation.mjs",
 	"test:hypha": "node --no-warnings test/test-hypha-service.mjs",
 	dev: "tsx src/cli.ts",
 	"dev:daemon": "tsx src/cli.ts daemon start-sync",

package/dist/{run-CgSj6KtU.mjs → run-D9fkwRb3.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-C7CEDmD4.mjs';
+import { c as connectToHypha, a as registerSessionService } from './run-p-RshVII.mjs';
 import { createServer } from 'node:http';
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';
@@ -666,7 +666,7 @@ async function runInteractive(options) {
   if (serverUrl && token) {
     try {
       suppressHyphaLogs();
-      server = await connectToHypha({ serverUrl, token, name: "svamp-interactive" });
+      server = await connectToHypha({ serverUrl, token, name: "svamp-interactive", transport: "http" });
       log("Connected to Hypha");
     } catch (err) {
       restoreConsoleLogs();

package/dist/{run-C7CEDmD4.mjs → run-p-RshVII.mjs}

@@ -45,6 +45,11 @@ async function connectToHypha(config) {
       "Timeout connecting to Hypha server (30s). A previous daemon may still be connected. Retrying..."
     )), 3e4))
   ]);
+  if (!server.on && server.rpc) {
+    server.on = server.rpc.on.bind(server.rpc);
+    server.off = server.rpc.off.bind(server.rpc);
+    server.emit = server.rpc.emit.bind(server.rpc);
+  }
   return server;
 }
 function parseWorkspaceFromToken(token) {
@@ -378,6 +383,72 @@ async function registerMachineService(server, machineId, metadata, daemonState,
         authorizeRequest(context, currentMetadata.sharing, "view");
         return handlers.getTrackedSessions();
       },
+      /**
+       * Get summary info for all sessions (metadata, agent state, activity).
+       * Replaces the need to discover and query N individual session services.
+       */
+      getSessions: async (context) => {
+        authorizeRequest(context, currentMetadata.sharing, "view");
+        const sessionIds = handlers.getSessionIds?.() || [];
+        const sessions = [];
+        for (const sid of sessionIds) {
+          const rpc = handlers.getSessionRPCHandlers?.(sid);
+          if (!rpc) continue;
+          try {
+            const [metaResult, stateResult, activity] = await Promise.all([
+              rpc.getMetadata(context),
+              rpc.getAgentState(context),
+              rpc.getActivityState(context).catch(() => ({
+                active: false,
+                thinking: false,
+                time: Date.now()
+              }))
+            ]);
+            sessions.push({
+              id: sid,
+              metadata: metaResult.metadata,
+              metadataVersion: metaResult.version,
+              agentState: stateResult.agentState,
+              agentStateVersion: stateResult.version,
+              active: activity.active ?? false,
+              thinking: activity.thinking ?? false,
+              activeAt: activity.time || Date.now()
+            });
+          } catch {
+          }
+        }
+        return sessions;
+      },
+      /**
+       * 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.
+       */
+      sessionRPC: async (sessionId, method, args, context) => {
+        authorizeRequest(context, currentMetadata.sharing, "view");
+        const rpc = handlers.getSessionRPCHandlers?.(sessionId);
+        if (!rpc) {
+          throw new Error(`Session ${sessionId} not found on this machine`);
+        }
+        const handler = rpc[method];
+        if (typeof handler !== "function") {
+          throw new Error(`Unknown session method: ${method}`);
+        }
+        const argArray = Array.isArray(args) ? args : args !== void 0 ? [args] : [];
+        return await handler(...argArray, context);
+      },
+      /**
+       * Register a listener for a specific session's real-time updates.
+       * Delegates to the session store's registerListener.
+       */
+      registerSessionListener: async (sessionId, callback, context) => {
+        authorizeRequest(context, currentMetadata.sharing, "view");
+        const rpc = handlers.getSessionRPCHandlers?.(sessionId);
+        if (!rpc) {
+          throw new Error(`Session ${sessionId} not found on this machine`);
+        }
+        return await rpc.registerListener(callback, context);
+      },
       // Spawn a new session
       spawnSession: async (options, context) => {
         authorizeRequest(context, currentMetadata.sharing, "interact");
@@ -771,6 +842,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
   console.log(`[HYPHA MACHINE] Machine service registered: ${serviceInfo.id}`);
   return {
     serviceInfo,
+    notifySessionEvent: notifyListeners,
     updateMetadata: (newMetadata) => {
       currentMetadata = newMetadata;
       metadataVersion++;
@@ -827,7 +899,7 @@ function appendMessage(messagesDir, sessionId, msg) {
     console.error(`[HYPHA SESSION ${sessionId}] Failed to persist message: ${err?.message ?? err}`);
   }
 }
-async function registerSessionService(server, sessionId, initialMetadata, initialAgentState, callbacks, options) {
+function createSessionStore(server, sessionId, initialMetadata, initialAgentState, callbacks, options) {
   const messages = options?.messagesDir ? loadMessages(options.messagesDir) : [];
   let nextSeq = messages.length > 0 ? messages[messages.length - 1].seq + 1 : 1;
   let metadata = { ...initialMetadata };
@@ -835,7 +907,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
   let agentState = initialAgentState ? { ...initialAgentState } : null;
   let agentStateVersion = 1;
   let lastActivity = {
-    active: false,
+    active: true,
     thinking: false,
     mode: "remote",
     time: Date.now()
@@ -854,6 +926,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
     }
   };
   const notifyListeners = (update) => {
+    options?.onSessionEvent?.(update);
     const snapshot = [...listeners];
     for (let i = snapshot.length - 1; i >= 0; i--) {
       const listener = snapshot[i];
@@ -880,7 +953,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
       }
       wrappedContent = { role: "agent", content: { type: "output", data } };
     } else if (role === "event") {
-      wrappedContent = { role: "agent", content: { type: "event", data: content } };
+      wrappedContent = { role: "agent", content: { type: "event", id: randomUUID(), data: content } };
     } else if (role === "session") {
       wrappedContent = { role: "session", content: { type: "session", data: content } };
     } else {
@@ -907,11 +980,7 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
     });
     return msg;
   };
-  const serviceDefinition = {
-    id: `svamp-session-${sessionId}`,
-    name: `Svamp Session ${sessionId.slice(0, 8)}`,
-    type: "svamp-session",
-    config: { visibility: "unlisted", require_context: true },
+  const rpcHandlers = {
     // ── Messages ──
     getMessages: async (afterSeq, limit, context) => {
       authorizeRequest(context, metadata.sharing, "view");
@@ -1251,10 +1320,8 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
       return { success: true, listenerId: listeners.length - 1 };
     }
   };
-  const serviceInfo = await server.registerService(serviceDefinition, { overwrite: true });
-  console.log(`[HYPHA SESSION] Session service registered: ${serviceInfo.id}`);
-  return {
-    serviceInfo,
+  const store = {
+    serviceInfo: { id: `svamp-session-${sessionId}` },
     pushMessage,
     get _agentState() {
       return agentState;
@@ -1313,16 +1380,44 @@ async function registerSessionService(server, sessionId, initialMetadata, initia
       for (const listener of toRemove) {
         removeListener(listener, "disconnect");
       }
-      await server.unregisterService(serviceInfo.id);
     },
     reregister: async () => {
-      try {
-        await server.registerService(serviceDefinition, { overwrite: true });
-      } catch (e) {
-        if (!String(e?.message).includes("already exists")) throw e;
-      }
     }
   };
+  return { store, rpcHandlers };
+}
+async function registerSessionService(server, sessionId, initialMetadata, initialAgentState, callbacks, options) {
+  const { store, rpcHandlers } = createSessionStore(
+    server,
+    sessionId,
+    initialMetadata,
+    initialAgentState,
+    callbacks,
+    options
+  );
+  const serviceDefinition = {
+    id: `svamp-session-${sessionId}`,
+    name: `Svamp Session ${sessionId.slice(0, 8)}`,
+    type: "svamp-session",
+    config: { visibility: "unlisted", require_context: true },
+    ...rpcHandlers
+  };
+  const serviceInfo = await server.registerService(serviceDefinition, { overwrite: true });
+  console.log(`[HYPHA SESSION] Session service registered: ${serviceInfo.id}`);
+  const originalDisconnect = store.disconnect;
+  store.disconnect = async () => {
+    await originalDisconnect();
+    await server.unregisterService(serviceInfo.id);
+  };
+  store.reregister = async () => {
+    try {
+      await server.registerService(serviceDefinition, { overwrite: true });
+    } catch (e) {
+      if (!String(e?.message).includes("already exists")) throw e;
+    }
+  };
+  store.serviceInfo = serviceInfo;
+  return store;
 }
 
 async function registerDebugService(server, machineId, deps) {
@@ -5323,6 +5418,7 @@ async function startDaemon(options) {
       serverUrl: hyphaServerUrl,
       token: hyphaToken,
       name: `svamp-machine-${machineId}`,
+      transport: "http",
       ...hyphaClientId ? { clientId: hyphaClientId } : {}
     });
     logger.log(`Connected to Hypha (workspace: ${server.config.workspace})`);
@@ -5337,14 +5433,6 @@ async function startDaemon(options) {
         consecutiveHeartbeatFailures = 0;
         lastReconnectAt = Date.now();
       }
-      const activeSessions = Array.from(pidToTrackedSession.values()).filter((s) => !s.stopped && s.hyphaService);
-      if (activeSessions.length > 0) {
-        logger.log(`Re-registering ${activeSessions.length} session services after reconnect`);
-        Promise.allSettled(activeSessions.map((s) => s.hyphaService.reregister())).then((results) => {
-          const failed = results.filter((r) => r.status === "rejected").length;
-          if (failed > 0) logger.log(`Warning: ${failed} session service re-registrations failed`);
-        });
-      }
     });
     const getCurrentChildren = () => {
       return Array.from(pidToTrackedSession.values()).map((s) => ({
@@ -5355,6 +5443,7 @@ async function startDaemon(options) {
         active: !s.stopped && s.hyphaService != null
       }));
     };
+    let machineServiceRef = null;
     const spawnSession = async (options2) => {
       logger.log("Spawning session:", JSON.stringify(options2));
       const { directory, approvedNewDirectoryCreation = true, resumeSessionId } = options2;
@@ -5756,8 +5845,11 @@ async function startDaemon(options) {
                         const lower = resultText.toLowerCase();
                         const isLoginIssue = lower.includes("login") || lower.includes("logged in") || lower.includes("auth") || lower.includes("api key") || lower.includes("unauthorized");
                         const isResumeIssue = lower.includes("tool_use.name") || lower.includes("invalid_request") || lower.includes("messages.");
+                        const isBillingIssue = lower.includes("credit") || lower.includes("balance") || lower.includes("billing") || lower.includes("quota") || lower.includes("subscription") || lower.includes("payment");
                         let hint = "";
-                        if (isLoginIssue) {
+                        if (isBillingIssue) {
+                          hint = "\n\nCheck your Claude account credits or subscription at https://console.anthropic.com.";
+                        } else if (isLoginIssue) {
                           hint = "\n\nRun `claude login` in your terminal on the machine running the daemon to re-authenticate.";
                         } else if (isResumeIssue) {
                           hint = "\n\nThe conversation history may be corrupted. Try starting a fresh session.";
@@ -5769,10 +5861,9 @@ async function startDaemon(options) {
                         if (startupNonJsonLines.length > 0) {
                           contextInfo = "\n\n**Startup output:**\n```\n" + startupNonJsonLines.slice(-10).join("\n") + "\n```";
                         }
-                        sessionService.pushMessage({
-                          type: "assistant",
-                          content: [{ type: "text", text: `**Error:** ${displayMsg}${hint}${contextInfo}` }]
-                        }, "agent");
+                        const errorText = `${displayMsg}${hint}${contextInfo}`;
+                        logger.log(`[Session ${sessionId}] Pushing error to UI: "${displayMsg}"`);
+                        sessionService.pushMessage({ type: "message", message: errorText, level: "error" }, "event");
                         lastErrorMessagePushed = true;
                       }
                     }
@@ -6166,7 +6257,7 @@ The automated loop has finished. Review the progress above and let me know if yo
           }
         }
         let processMessageQueueRef;
-        const sessionService = await registerSessionService(
+        const { store: sessionService, rpcHandlers: sessionRPCHandlers } = createSessionStore(
           server,
           sessionId,
           sessionMetadata,
@@ -6467,7 +6558,7 @@ The automated loop has finished. Review the progress above and let me know if yo
               return { success: !!tree, tree };
             }
           },
-          { messagesDir: getSessionDir(directory, sessionId) }
+          { messagesDir: getSessionDir(directory, sessionId), onSessionEvent: (update) => machineServiceRef?.notifySessionEvent(update) }
         );
         const svampConfig = createSvampConfigChecker(
           directory,
@@ -6554,6 +6645,7 @@ The automated loop has finished. Review the progress above and let me know if yo
           pid: process.pid,
           svampSessionId: sessionId,
           hyphaService: sessionService,
+          sessionRPCHandlers,
           checkSvampConfig,
           cleanupSvampConfig,
           directory,
@@ -6639,7 +6731,7 @@ The automated loop has finished. Review the progress above and let me know if yo
         const allowedBashLiterals = /* @__PURE__ */ new Set();
         const allowedBashPrefixes = /* @__PURE__ */ new Set();
         const EDIT_TOOLS = /* @__PURE__ */ new Set(["Edit", "MultiEdit", "Write", "NotebookEdit"]);
-        const sessionService = await registerSessionService(
+        const { store: sessionService, rpcHandlers: sessionRPCHandlersAcp } = createSessionStore(
           server,
           sessionId,
           sessionMetadata,
@@ -6878,7 +6970,7 @@ The automated loop has finished. Review the progress above and let me know if yo
               return { success: !!tree, tree };
             }
           },
-          { messagesDir: getSessionDir(directory, sessionId) }
+          { messagesDir: getSessionDir(directory, sessionId), onSessionEvent: (update) => machineServiceRef?.notifySessionEvent(update) }
         );
         let insideOnTurnEnd = false;
         const svampConfigChecker = createSvampConfigChecker(
@@ -7100,6 +7192,7 @@ The automated loop has finished. Review the progress above and let me know if yo
           pid: process.pid,
           svampSessionId: sessionId,
           hyphaService: sessionService,
+          sessionRPCHandlers: sessionRPCHandlersAcp,
           checkSvampConfig,
           cleanupSvampConfig: svampConfigChecker.cleanup,
           directory,
@@ -7225,10 +7318,28 @@ The automated loop has finished. Review the progress above and let me know if yo
         restartSession,
         requestShutdown: () => requestShutdown("hypha-app"),
         getTrackedSessions: getCurrentChildren,
+        getSessionRPCHandlers: (sessionId) => {
+          for (const [, session] of pidToTrackedSession) {
+            if (session.svampSessionId === sessionId && session.sessionRPCHandlers) {
+              return session.sessionRPCHandlers;
+            }
+          }
+          return void 0;
+        },
+        getSessionIds: () => {
+          const ids = [];
+          for (const [, session] of pidToTrackedSession) {
+            if (session.svampSessionId && !session.stopped && session.sessionRPCHandlers) {
+              ids.push(session.svampSessionId);
+            }
+          }
+          return ids;
+        },
         supervisor
       }
     );
     logger.log(`Machine service registered: svamp-machine-${machineId}`);
+    machineServiceRef = machineService;
     const artifactSync = new SessionArtifactSync(server, logger.log);
     const debugService = await registerDebugService(server, machineId, {
       machineId,
@@ -7270,6 +7381,12 @@ The automated loop has finished. Review the progress above and let me know if yo
           });
           if (result.type === "success") {
             logger.log(`Restored session ${persisted.sessionId} (resume=${persisted.claudeResumeId}, wasProcessing=${persisted.wasProcessing})`);
+            for (const [, tracked] of pidToTrackedSession) {
+              if (tracked.svampSessionId === persisted.sessionId && tracked.hyphaService) {
+                tracked.hyphaService.sendKeepAlive(false);
+                break;
+              }
+            }
             if (isOrphaned) {
               for (const [, tracked] of pidToTrackedSession) {
                 if (tracked.svampSessionId === persisted.sessionId && tracked.hyphaService) {
@@ -7500,6 +7617,13 @@ The automated loop has finished. Review the progress above and let me know if yo
                 } catch {
                 }
               }
+              if (conn?._reader) {
+                logger.log("Aborting stale HTTP stream to trigger reconnection");
+                try {
+                  conn._reader.cancel?.("Stale connection");
+                } catch {
+                }
+              }
             }
             if (consecutiveHeartbeatFailures >= MAX_FAILURES) {
               logger.log(`Heartbeat failed ${MAX_FAILURES} times. Shutting down.`);

package/dist/{tunnel-C3UsqTxi.mjs → tunnel-C2kqST5d.mjs}

@@ -14,10 +14,12 @@ class TunnelClient {
   requestCount = 0;
   localWebSockets = /* @__PURE__ */ new Map();
   // request_id → local WS connection
+  pendingBinaryBody = null;
+  // awaiting binary body frame
   constructor(options) {
     this.options = {
       localHost: "localhost",
-      requestTimeout: 3e4,
+      requestTimeout: 12e4,
       ...options
     };
     this.env = options.env || requireSandboxApiEnv();
@@ -40,7 +42,10 @@ class TunnelClient {
     const url = this.buildWsUrl();
     return new Promise((resolve, reject) => {
       try {
-        this.ws = new WebSocket(url);
+        this.ws = new WebSocket(url, {
+          maxPayload: 100 * 1024 * 1024
+          // 100MB for large binary bodies
+        });
       } catch (err) {
         reject(new Error(`Failed to create WebSocket: ${err.message}`));
         return;
@@ -51,13 +56,18 @@ class TunnelClient {
         this.options.onConnect?.();
         resolve();
       });
-      this.ws.on("message", (data) => {
-        const raw = typeof data === "string" ? data : data.toString("utf8");
-        this.handleMessage(raw);
+      this.ws.on("message", (data, isBinary) => {
+        if (isBinary) {
+          this.handleBinaryBody(data);
+        } else {
+          const raw = typeof data === "string" ? data : data.toString("utf8");
+          this.handleMessage(raw);
+        }
       });
       this.ws.on("close", () => {
         this.stopPingInterval();
         this.cleanupLocalWebSockets();
+        this.pendingBinaryBody = null;
         this.options.onDisconnect?.();
         if (!this.destroyed) {
           this.scheduleReconnect();
@@ -104,9 +114,13 @@ class TunnelClient {
         break;
       case "request":
         this.options.onRequest?.(msg);
-        this.proxyRequest(msg).catch((err) => {
-          this.options.onError?.(err);
-        });
+        if (msg.has_body) {
+          this.pendingBinaryBody = msg;
+        } else {
+          this.proxyRequest(msg, Buffer.alloc(0)).catch((err) => {
+            this.options.onError?.(err);
+          });
+        }
         break;
       case "ws_open":
         this.handleWsOpen(msg).catch((err) => {
@@ -121,7 +135,15 @@ class TunnelClient {
         break;
     }
   }
-  async proxyRequest(req) {
+  handleBinaryBody(data) {
+    const req = this.pendingBinaryBody;
+    this.pendingBinaryBody = null;
+    if (!req) return;
+    this.proxyRequest(req, data).catch((err) => {
+      this.options.onError?.(err);
+    });
+  }
+  async proxyRequest(req, bodyBuffer) {
     this.requestCount++;
     const port = req.port || this.options.ports[0];
     const url = `http://${this.options.localHost}:${port}${req.path}`;
@@ -135,14 +157,12 @@ class TunnelClient {
       headers: forwardHeaders,
       signal: controller.signal
     };
-    if (req.body && !["GET", "HEAD"].includes(req.method.toUpperCase())) {
-      init.body = Buffer.from(req.body, "base64");
+    if (bodyBuffer.byteLength > 0 && !["GET", "HEAD"].includes(req.method.toUpperCase())) {
+      init.body = bodyBuffer;
     }
     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;
@@ -152,27 +172,36 @@ class TunnelClient {
         id: req.id,
         status: res.status,
         headers,
-        body: bodyBase64
+        streaming: true
       });
+      if (res.body) {
+        const reader = res.body.getReader();
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            this.send({ type: "response_chunk", id: req.id });
+            this.sendBinary(Buffer.from(value));
+          }
+        } finally {
+          reader.releaseLock();
+        }
+      }
+      this.send({ type: "response_end", id: req.id });
     } 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")
-        });
-      }
+      const status = err.name === "AbortError" ? 504 : 502;
+      const message = err.name === "AbortError" ? "Tunnel: request timeout" : `Tunnel: local service error: ${err.message}`;
+      this.send({
+        type: "response",
+        id: req.id,
+        status,
+        headers: { "content-type": "text/plain" },
+        streaming: true
+      });
+      this.send({ type: "response_chunk", id: req.id });
+      this.sendBinary(Buffer.from(message));
+      this.send({ type: "response_end", id: req.id });
     }
   }
   // ── WebSocket proxying ───────────────────────────────────────────────
@@ -238,6 +267,11 @@ class TunnelClient {
       this.ws.send(JSON.stringify(msg));
     }
   }
+  sendBinary(data) {
+    if (this.ws?.readyState === WebSocket.OPEN) {
+      this.ws.send(data);
+    }
+  }
   startPingInterval() {
     this.stopPingInterval();
     this.pingInterval = setInterval(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svamp-cli",
-  "version": "0.1.70",
+  "version": "0.1.72",
   "description": "Svamp CLI — AI workspace daemon on Hypha Cloud",
   "author": "Amun AI AB",
   "license": "SEE LICENSE IN LICENSE",
@@ -20,7 +20,7 @@
   "scripts": {
     "build": "rm -rf dist && tsc --noEmit && pkgroll",
     "typecheck": "tsc --noEmit",
-    "test": "npx tsx test/test-authorize.mjs && npx tsx test/test-session-helpers.mjs && npx tsx test/test-cli-routing.mjs && npx tsx test/test-security-context.mjs && npx tsx test/test-ralph-loop.mjs && npx tsx test/test-message-helpers.mjs && npx tsx test/test-agent-config.mjs && npx tsx test/test-wrap-command.mjs && npx tsx test/test-credential-staging.mjs && npx tsx test/test-output-formatters.mjs && npx tsx test/test-agent-types.mjs && npx tsx test/test-transport.mjs && npx tsx test/test-session-update-handlers.mjs && npx tsx test/test-session-scanner.mjs && npx tsx test/test-hypha-client.mjs && npx tsx test/test-hook-settings.mjs && npx tsx test/test-session-service-logic.mjs && npx tsx test/test-daemon-persistence.mjs && npx tsx test/test-detect-isolation.mjs && npx tsx test/test-machine-service-logic.mjs && npx tsx test/test-interactive-helpers.mjs && npx tsx test/test-codex-backend.mjs && npx tsx test/test-acp-backend.mjs && npx tsx test/test-acp-bridge.mjs && npx tsx test/test-hook-server.mjs && npx tsx test/test-session-commands.mjs && npx tsx test/test-interactive-console.mjs && npx tsx test/test-session-messages.mjs && npx tsx test/test-skills.mjs && npx tsx test/test-agent-grouping.mjs && npx tsx test/test-ralph-loop-integration.mjs && npx tsx test/test-ralph-loop-modes.mjs && npx tsx test/test-machine-list-directory.mjs && npx tsx test/test-service-commands.mjs && npx tsx test/test-supervisor.mjs && npx tsx test/test-clear-detection.mjs",
+    "test": "npx tsx test/test-authorize.mjs && npx tsx test/test-session-helpers.mjs && npx tsx test/test-cli-routing.mjs && npx tsx test/test-security-context.mjs && npx tsx test/test-ralph-loop.mjs && npx tsx test/test-message-helpers.mjs && npx tsx test/test-agent-config.mjs && npx tsx test/test-wrap-command.mjs && npx tsx test/test-credential-staging.mjs && npx tsx test/test-output-formatters.mjs && npx tsx test/test-agent-types.mjs && npx tsx test/test-transport.mjs && npx tsx test/test-session-update-handlers.mjs && npx tsx test/test-session-scanner.mjs && npx tsx test/test-hypha-client.mjs && npx tsx test/test-hook-settings.mjs && npx tsx test/test-session-service-logic.mjs && npx tsx test/test-daemon-persistence.mjs && npx tsx test/test-detect-isolation.mjs && npx tsx test/test-machine-service-logic.mjs && npx tsx test/test-interactive-helpers.mjs && npx tsx test/test-codex-backend.mjs && npx tsx test/test-acp-backend.mjs && npx tsx test/test-acp-bridge.mjs && npx tsx test/test-hook-server.mjs && npx tsx test/test-session-commands.mjs && npx tsx test/test-interactive-console.mjs && npx tsx test/test-session-messages.mjs && npx tsx test/test-skills.mjs && npx tsx test/test-agent-grouping.mjs && npx tsx test/test-ralph-loop-integration.mjs && npx tsx test/test-ralph-loop-modes.mjs && npx tsx test/test-machine-list-directory.mjs && npx tsx test/test-service-commands.mjs && npx tsx test/test-supervisor.mjs && npx tsx test/test-clear-detection.mjs && npx tsx test/test-session-consolidation.mjs",
     "test:hypha": "node --no-warnings test/test-hypha-service.mjs",
     "dev": "tsx src/cli.ts",
     "dev:daemon": "tsx src/cli.ts daemon start-sync",