svamp-cli 0.1.76 → 0.1.79

package/dist/{agentCommands-NVZzP_Vo.mjs → agentCommands-uNFhhdN1.mjs}

@@ -144,47 +144,9 @@ async function sessionBroadcast(action, args) {
   });
   console.log(`Broadcast sent: ${action}`);
 }
-async function connectToSessionService(sessionId) {
-  const ENV_FILE = join(SVAMP_HOME, ".env");
-  if (existsSync(ENV_FILE)) {
-    const lines = readFileSync(ENV_FILE, "utf-8").split("\n");
-    for (const line of lines) {
-      const m = line.match(/^([A-Z_]+)=(.*)/);
-      if (m && !process.env[m[1]]) process.env[m[1]] = m[2].replace(/^["']|["']$/g, "");
-    }
-  }
-  const serverUrl = process.env.HYPHA_SERVER_URL;
-  const token = process.env.HYPHA_TOKEN;
-  if (!serverUrl || !token) {
-    console.error('No Hypha credentials. Run "svamp login" first.');
-    process.exit(1);
-  }
-  const origLog = console.log;
-  const origWarn = console.warn;
-  const origInfo = console.info;
-  console.log = () => {
-  };
-  console.warn = () => {
-  };
-  console.info = () => {
-  };
-  let server;
-  try {
-    const mod = await import('hypha-rpc');
-    const connectToServer = mod.connectToServer || mod.default?.connectToServer;
-    server = await connectToServer({ server_url: serverUrl, token, name: "svamp-agent-inbox" });
-  } catch (err) {
-    console.log = origLog;
-    console.warn = origWarn;
-    console.info = origInfo;
-    console.error(`Failed to connect to Hypha: ${err.message}`);
-    process.exit(1);
-  }
-  console.log = origLog;
-  console.warn = origWarn;
-  console.info = origInfo;
-  const svc = await server.getService(`svamp-session-${sessionId}`);
-  return { server, svc };
+async function connectToMachineService() {
+  const { connectAndGetMachine } = await import('./commands-B6FEeZeP.mjs');
+  return connectAndGetMachine();
 }
 async function inboxSend(targetSessionId, opts) {
   const sessionId = process.env.SVAMP_SESSION_ID;
@@ -197,8 +159,12 @@ async function inboxSend(targetSessionId, opts) {
     console.error("Message body is required.");
     process.exit(1);
   }
-  const { server, svc } = await connectToSessionService(targetSessionId);
+  const { server, machine } = await connectToMachineService();
   try {
+    const { resolveSessionId } = await import('./commands-B6FEeZeP.mjs');
+    const sessions = await machine.listSessions();
+    const match = resolveSessionId(sessions, targetSessionId);
+    const fullTargetId = match.sessionId;
     const { randomUUID } = await import('node:crypto');
     const message = {
       messageId: randomUUID(),
@@ -207,12 +173,12 @@ async function inboxSend(targetSessionId, opts) {
       read: false,
       from: `agent:${sessionId}`,
       fromSession: sessionId,
-      to: targetSessionId,
+      to: fullTargetId,
       subject: opts?.subject,
       urgency: opts?.urgency || "normal"
     };
-    const result = await svc.sendInboxMessage(message);
-    console.log(`Inbox message sent to ${targetSessionId.slice(0, 8)} (id: ${result.messageId.slice(0, 8)})`);
+    const result = await machine.sessionRPC(fullTargetId, "sendInboxMessage", [message]);
+    console.log(`Inbox message sent to ${fullTargetId.slice(0, 8)} (id: ${result.messageId.slice(0, 8)})`);
   } finally {
     await server.disconnect();
   }
@@ -223,9 +189,9 @@ async function inboxList(opts) {
     console.error("SVAMP_SESSION_ID not set. This command must be run inside a Svamp session.");
     process.exit(1);
   }
-  const { server, svc } = await connectToSessionService(sessionId);
+  const { server, machine } = await connectToMachineService();
   try {
-    const result = await svc.getInbox({ unread: opts?.unread, limit: opts?.limit });
+    const result = await machine.sessionRPC(sessionId, "getInbox", [{ unread: opts?.unread, limit: opts?.limit }]);
     const messages = result.messages;
     if (opts?.json) {
       console.log(JSON.stringify({ messages }, null, 2));
@@ -253,9 +219,9 @@ async function inboxReply(messageId, body) {
     console.error("SVAMP_SESSION_ID not set. This command must be run inside a Svamp session.");
     process.exit(1);
   }
-  const { server, svc } = await connectToSessionService(sessionId);
+  const { server, machine } = await connectToMachineService();
   try {
-    const result = await svc.getInbox();
+    const result = await machine.sessionRPC(sessionId, "getInbox", []);
     const original = result.messages.find((m) => m.messageId === messageId || m.messageId.startsWith(messageId));
     if (!original) {
       console.error(`Message ${messageId} not found in inbox.`);
@@ -265,7 +231,6 @@ async function inboxReply(messageId, body) {
       console.error("Cannot reply: original message has no fromSession.");
       process.exit(1);
     }
-    const targetSvc = await server.getService(`svamp-session-${original.fromSession}`);
     const { randomUUID } = await import('node:crypto');
     const reply = {
       messageId: randomUUID(),
@@ -280,7 +245,7 @@ async function inboxReply(messageId, body) {
       replyTo: original.messageId,
       threadId: original.threadId || original.messageId
     };
-    const sendResult = await targetSvc.sendInboxMessage(reply);
+    const sendResult = await machine.sessionRPC(original.fromSession, "sendInboxMessage", [reply]);
     console.log(`Reply sent to ${original.fromSession.slice(0, 8)} (id: ${sendResult.messageId.slice(0, 8)})`);
   } finally {
     await server.disconnect();

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-BnFGIK0c.mjs';
+import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-DsXDjwLW.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -32,6 +32,8 @@ let daemonSubcommand = args[1];
 async function main() {
   if (subcommand === "login") {
     await loginToHypha();
+  } else if (subcommand === "logout") {
+    await logoutFromHypha();
   } else if (subcommand === "daemon") {
     if (daemonSubcommand === "restart") {
       await stopDaemon();
@@ -94,6 +96,13 @@ async function main() {
         } catch {
         }
       };
+      const supervisorPidFile = pathJoin(svampHome, "supervisor.pid");
+      try {
+        appendFileSync(supervisorPidFile, "");
+      } catch {
+      }
+      const { writeFileSync: wfs } = await import('fs');
+      wfs(supervisorPidFile, String(process.pid), "utf-8");
       const extraSyncArgs = [];
       if (args.includes("--no-auto-continue")) extraSyncArgs.push("--no-auto-continue");
       const BASE_DELAY_MS = 2e3;
@@ -164,6 +173,11 @@ async function main() {
           setTimeout(() => clearInterval(checkStop), delay + 100);
         });
       }
+      try {
+        const { unlinkSync: us } = await import('fs');
+        us(supervisorPidFile);
+      } catch {
+      }
       process.exit(0);
     } else if (daemonSubcommand === "start-sync") {
       const noAutoContinue = args.includes("--no-auto-continue");
@@ -194,10 +208,10 @@ async function main() {
   } else if (subcommand === "skills") {
     await handleSkillsCommand();
   } else if (subcommand === "service" || subcommand === "svc") {
-    const { handleServiceCommand } = await import('./commands-CADr1mQg.mjs');
+    const { handleServiceCommand } = await import('./commands-BYbuedOK.mjs');
     await handleServiceCommand();
   } else if (subcommand === "process" || subcommand === "proc") {
-    const { processCommand } = await import('./commands-7Iw1nFwf.mjs');
+    const { processCommand } = await import('./commands-Cf3mXxPZ.mjs');
     let machineId;
     const processArgs = args.slice(1);
     const mIdx = processArgs.findIndex((a) => a === "--machine" || a === "-m");
@@ -215,7 +229,7 @@ async function main() {
   } else if (!subcommand || subcommand === "start") {
     await handleInteractiveCommand();
   } else if (subcommand === "--version" || subcommand === "-v") {
-    const pkg = await import('./package-Dpz1MLO4.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-B-yM5uv2.mjs').catch(() => ({ default: { version: "unknown" } }));
     console.log(`svamp version: ${pkg.default.version}`);
   } else {
     console.error(`Unknown command: ${subcommand}`);
@@ -224,7 +238,7 @@ async function main() {
   }
 }
 async function handleInteractiveCommand() {
-  const { runInteractive } = await import('./run-B29grSMh.mjs');
+  const { runInteractive } = await import('./run-DqvxMsWh.mjs');
   const interactiveArgs = subcommand === "start" ? args.slice(1) : args;
   let directory = process.cwd();
   let resumeSessionId;
@@ -269,7 +283,7 @@ async function handleAgentCommand() {
     return;
   }
   if (agentArgs[0] === "list") {
-    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-BnFGIK0c.mjs').then(function (n) { return n.i; });
+    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-DsXDjwLW.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)`);
@@ -281,7 +295,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-BnFGIK0c.mjs').then(function (n) { return n.i; });
+  const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-DsXDjwLW.mjs').then(function (n) { return n.i; });
   let cwd = process.cwd();
   const filteredArgs = [];
   for (let i = 0; i < agentArgs.length; i++) {
@@ -305,12 +319,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-BnFGIK0c.mjs').then(function (n) { return n.j; });
+    const { CodexMcpBackend } = await import('./run-DsXDjwLW.mjs').then(function (n) { return n.j; });
     backend = new CodexMcpBackend({ cwd, log: logFn });
   } else {
-    const { AcpBackend } = await import('./run-BnFGIK0c.mjs').then(function (n) { return n.h; });
-    const { GeminiTransport } = await import('./run-BnFGIK0c.mjs').then(function (n) { return n.G; });
-    const { DefaultTransport } = await import('./run-BnFGIK0c.mjs').then(function (n) { return n.D; });
+    const { AcpBackend } = await import('./run-DsXDjwLW.mjs').then(function (n) { return n.h; });
+    const { GeminiTransport } = await import('./run-DsXDjwLW.mjs').then(function (n) { return n.G; });
+    const { DefaultTransport } = await import('./run-DsXDjwLW.mjs').then(function (n) { return n.D; });
     const transportHandler = config.agentName === "gemini" ? new GeminiTransport() : new DefaultTransport(config.agentName);
     backend = new AcpBackend({
       agentName: config.agentName,
@@ -428,7 +442,7 @@ async function handleSessionCommand() {
     printSessionHelp();
     return;
   }
-  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionInboxSend, sessionInboxList, sessionInboxRead, sessionInboxReply, sessionInboxClear } = await import('./commands-lJ8V7MJE.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionInboxSend, sessionInboxList, sessionInboxRead, sessionInboxReply, sessionInboxClear } = await import('./commands-B6FEeZeP.mjs');
   const parseFlagStr = (flag, shortFlag) => {
     for (let i = 1; i < sessionArgs.length; i++) {
       if ((sessionArgs[i] === flag || shortFlag) && i + 1 < sessionArgs.length) {
@@ -488,7 +502,7 @@ async function handleSessionCommand() {
         allowDomain.push(sessionArgs[++i]);
       }
     }
-    const { parseShareArg } = await import('./commands-lJ8V7MJE.mjs');
+    const { parseShareArg } = await import('./commands-B6FEeZeP.mjs');
     const shareEntries = share.map((s) => parseShareArg(s));
     await sessionSpawn(agent, dir, targetMachineId, {
       message,
@@ -539,13 +553,15 @@ async function handleSessionCommand() {
     await sessionAttach(sessionArgs[1], targetMachineId);
   } else if (sessionSubcommand === "send") {
     if (!sessionArgs[1] || !sessionArgs[2]) {
-      console.error("Usage: svamp session send <session-id> <message> [--wait] [--timeout N] [--json]");
+      console.error('Usage: svamp session send <session-id> <message> [--subject "..."] [--urgency urgent|normal] [--wait] [--timeout N] [--json]');
       process.exit(1);
     }
     await sessionSend(sessionArgs[1], sessionArgs[2], targetMachineId, {
       wait: hasFlag("--wait"),
       timeout: parseFlagInt("--timeout"),
-      json: hasFlag("--json")
+      json: hasFlag("--json"),
+      subject: parseFlagStr("--subject"),
+      urgency: parseFlagStr("--urgency")
     });
   } else if (sessionSubcommand === "wait") {
     if (!sessionArgs[1]) {
@@ -572,7 +588,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session approve <session-id> [request-id] [--json]");
       process.exit(1);
     }
-    const { sessionApprove } = await import('./commands-lJ8V7MJE.mjs');
+    const { sessionApprove } = await import('./commands-B6FEeZeP.mjs');
     const approveReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
     await sessionApprove(sessionArgs[1], approveReqId, targetMachineId, {
       json: hasFlag("--json")
@@ -582,7 +598,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session deny <session-id> [request-id] [--json]");
       process.exit(1);
     }
-    const { sessionDeny } = await import('./commands-lJ8V7MJE.mjs');
+    const { sessionDeny } = await import('./commands-B6FEeZeP.mjs');
     const denyReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
     await sessionDeny(sessionArgs[1], denyReqId, targetMachineId, {
       json: hasFlag("--json")
@@ -618,7 +634,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session set-title <title>");
       process.exit(1);
     }
-    const { sessionSetTitle } = await import('./agentCommands-NVZzP_Vo.mjs');
+    const { sessionSetTitle } = await import('./agentCommands-uNFhhdN1.mjs');
     await sessionSetTitle(title);
   } else if (sessionSubcommand === "set-link") {
     const url = sessionArgs[1];
@@ -627,7 +643,7 @@ async function handleSessionCommand() {
       process.exit(1);
     }
     const label = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
-    const { sessionSetLink } = await import('./agentCommands-NVZzP_Vo.mjs');
+    const { sessionSetLink } = await import('./agentCommands-uNFhhdN1.mjs');
     await sessionSetLink(url, label);
   } else if (sessionSubcommand === "notify") {
     const message = sessionArgs[1];
@@ -636,7 +652,7 @@ async function handleSessionCommand() {
       process.exit(1);
     }
     const level = parseFlagStr("--level") || "info";
-    const { sessionNotify } = await import('./agentCommands-NVZzP_Vo.mjs');
+    const { sessionNotify } = await import('./agentCommands-uNFhhdN1.mjs');
     await sessionNotify(message, level);
   } else if (sessionSubcommand === "broadcast") {
     const action = sessionArgs[1];
@@ -644,7 +660,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session broadcast <action> [args...]\nActions: open-canvas <url> [label], close-canvas, toast <message>");
       process.exit(1);
     }
-    const { sessionBroadcast } = await import('./agentCommands-NVZzP_Vo.mjs');
+    const { sessionBroadcast } = await import('./agentCommands-uNFhhdN1.mjs');
     await sessionBroadcast(action, sessionArgs.slice(2).filter((a) => !a.startsWith("--")));
   } else if (sessionSubcommand === "inbox") {
     const inboxSubcmd = sessionArgs[1];
@@ -655,7 +671,7 @@ async function handleSessionCommand() {
         process.exit(1);
       }
       if (agentSessionId) {
-        const { inboxSend } = await import('./agentCommands-NVZzP_Vo.mjs');
+        const { inboxSend } = await import('./agentCommands-uNFhhdN1.mjs');
         await inboxSend(sessionArgs[2], {
           body: sessionArgs[3],
           subject: parseFlagStr("--subject"),
@@ -670,7 +686,7 @@ async function handleSessionCommand() {
       }
     } else if (inboxSubcmd === "list" || inboxSubcmd === "ls") {
       if (agentSessionId && !sessionArgs[2]) {
-        const { inboxList } = await import('./agentCommands-NVZzP_Vo.mjs');
+        const { inboxList } = await import('./agentCommands-uNFhhdN1.mjs');
         await inboxList({
           unread: hasFlag("--unread"),
           limit: parseFlagInt("--limit"),
@@ -692,7 +708,7 @@ async function handleSessionCommand() {
         process.exit(1);
       }
       if (agentSessionId && !sessionArgs[3]) {
-        const { inboxList } = await import('./agentCommands-NVZzP_Vo.mjs');
+        const { inboxList } = await import('./agentCommands-uNFhhdN1.mjs');
         await sessionInboxRead(agentSessionId, sessionArgs[2], targetMachineId);
       } else if (sessionArgs[3]) {
         await sessionInboxRead(sessionArgs[2], sessionArgs[3], targetMachineId);
@@ -702,7 +718,7 @@ async function handleSessionCommand() {
       }
     } else if (inboxSubcmd === "reply") {
       if (agentSessionId && sessionArgs[2] && sessionArgs[3] && !sessionArgs[4]) {
-        const { inboxReply } = await import('./agentCommands-NVZzP_Vo.mjs');
+        const { inboxReply } = await import('./agentCommands-uNFhhdN1.mjs');
         await inboxReply(sessionArgs[2], sessionArgs[3]);
       } else if (sessionArgs[2] && sessionArgs[3] && sessionArgs[4]) {
         await sessionInboxReply(sessionArgs[2], sessionArgs[3], sessionArgs[4], targetMachineId);
@@ -738,7 +754,7 @@ async function handleMachineCommand() {
     return;
   }
   if (machineSubcommand === "share") {
-    const { machineShare } = await import('./commands-lJ8V7MJE.mjs');
+    const { machineShare } = await import('./commands-B6FEeZeP.mjs');
     let machineId;
     const shareArgs = [];
     for (let i = 1; i < machineArgs.length; i++) {
@@ -768,7 +784,7 @@ async function handleMachineCommand() {
     }
     await machineShare(machineId, { add, remove, list, configPath, showConfig });
   } else if (machineSubcommand === "exec") {
-    const { machineExec } = await import('./commands-lJ8V7MJE.mjs');
+    const { machineExec } = await import('./commands-B6FEeZeP.mjs');
     let machineId;
     let cwd;
     const cmdParts = [];
@@ -788,7 +804,7 @@ async function handleMachineCommand() {
     }
     await machineExec(machineId, command, cwd);
   } else if (machineSubcommand === "info") {
-    const { machineInfo } = await import('./commands-lJ8V7MJE.mjs');
+    const { machineInfo } = await import('./commands-B6FEeZeP.mjs');
     let machineId;
     for (let i = 1; i < machineArgs.length; i++) {
       if ((machineArgs[i] === "--machine" || machineArgs[i] === "-m") && i + 1 < machineArgs.length) {
@@ -808,10 +824,10 @@ async function handleMachineCommand() {
         level = machineArgs[++i];
       }
     }
-    const { machineNotify } = await import('./agentCommands-NVZzP_Vo.mjs');
+    const { machineNotify } = await import('./agentCommands-uNFhhdN1.mjs');
     await machineNotify(message, level);
   } else if (machineSubcommand === "ls") {
-    const { machineLs } = await import('./commands-lJ8V7MJE.mjs');
+    const { machineLs } = await import('./commands-B6FEeZeP.mjs');
     let machineId;
     let showHidden = false;
     let path;
@@ -965,6 +981,41 @@ You can now start the daemon: svamp daemon start`);
     process.exit(1);
   }
 }
+async function logoutFromHypha() {
+  const os = await import('os');
+  const { join } = await import('path');
+  const fs = await import('fs');
+  const homeDir = process.env.SVAMP_HOME || join(os.homedir(), ".svamp");
+  const envFile = join(homeDir, ".env");
+  console.log("Stopping daemon...");
+  try {
+    await stopDaemon();
+  } catch {
+  }
+  if (fs.existsSync(envFile)) {
+    const existing = fs.readFileSync(envFile, "utf-8").split("\n");
+    const kept = [];
+    for (const line of existing) {
+      const trimmed = line.trim();
+      if (trimmed.startsWith("HYPHA_TOKEN=") || trimmed.startsWith("HYPHA_WORKSPACE=") || trimmed.startsWith("HYPHA_SERVER_URL=")) {
+        continue;
+      }
+      kept.push(line);
+    }
+    while (kept.length > 0 && kept[kept.length - 1].trim() === "") {
+      kept.pop();
+    }
+    if (kept.length > 0) {
+      fs.writeFileSync(envFile, kept.join("\n") + "\n", "utf-8");
+    } else {
+      fs.unlinkSync(envFile);
+    }
+    console.log("Credentials removed");
+  } else {
+    console.log("No credentials found");
+  }
+  console.log("Logged out successfully");
+}
 const LAUNCHD_LABEL = "io.hypha.svamp.daemon";
 async function installDaemonService() {
   const os = await import('os');
@@ -1159,6 +1210,7 @@ Quick start \u2014 spawn an agent to do a task (use -p bypassPermissions to run
 Commands:
   svamp                              Start interactive Claude session (synced to cloud)
   svamp login [url]                  Login to Hypha (opens browser, stores token)
+  svamp logout                       Logout (stop daemon, remove credentials)
   svamp daemon start                 Start the background daemon (required for sessions)
   svamp daemon status                Show daemon status
   svamp daemon --help                Show all daemon commands

package/dist/{commands-lJ8V7MJE.mjs → commands-B6FEeZeP.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-BnFGIK0c.mjs';
+import { l as loadSecurityContextConfig, e as resolveSecurityContext, f as buildSecurityContextFromFlags, m as mergeSecurityContexts, c as connectToHypha } from './run-DsXDjwLW.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -613,12 +613,11 @@ function extractMessageText(msg) {
     createdAt: msg.createdAt || 0
   };
 }
-async function waitForIdle(server, sessionId, timeoutMs) {
-  const svc = await server.getService(`svamp-session-${sessionId}`);
+async function waitForIdle(machine, sessionId, timeoutMs) {
   const pollInterval = 2e3;
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
-    const activity = await svc.getActivityState();
+    const activity = await machine.sessionRPC(sessionId, "getActivityState", []);
     if (activity?.pendingPermissions?.length > 0) {
       return { idle: false, pendingPermissions: activity.pendingPermissions };
     }
@@ -629,14 +628,13 @@ async function waitForIdle(server, sessionId, timeoutMs) {
   }
   throw new Error("Timeout waiting for agent to become idle");
 }
-async function waitForBusyThenIdle(server, sessionId, timeoutMs = 3e5, busyTimeoutMs = 1e4) {
-  const svc = await server.getService(`svamp-session-${sessionId}`);
+async function waitForBusyThenIdle(machine, sessionId, timeoutMs = 3e5, busyTimeoutMs = 1e4) {
   const pollInterval = 2e3;
   const deadline = Date.now() + timeoutMs;
   const busyDeadline = Date.now() + busyTimeoutMs;
   let sawBusy = false;
   while (Date.now() < deadline) {
-    const activity = await svc.getActivityState();
+    const activity = await machine.sessionRPC(sessionId, "getActivityState", []);
     if (activity?.pendingPermissions?.length > 0) {
       return { idle: false, pendingPermissions: activity.pendingPermissions };
     }
@@ -934,7 +932,7 @@ async function sessionSpawn(agent, directory, machineId, opts) {
         console.log(`Message sent (seq: ${sendResult.seq})`);
         if (opts.wait) {
           console.log("Waiting for agent to become idle...");
-          await waitForBusyThenIdle(server, result.sessionId);
+          await waitForBusyThenIdle(machine, result.sessionId);
           console.log("Agent is idle.");
         }
       }
@@ -1268,18 +1266,22 @@ async function sessionSend(sessionId, message, machineId, opts) {
     const sessions = await machine.listSessions();
     const match = resolveSessionId(sessions, sessionId);
     const fullId = match.sessionId;
-    const svc = await server.getService(`svamp-session-${fullId}`);
-    const result = await svc.sendMessage(
-      JSON.stringify({
-        role: "user",
-        content: { type: "text", text: message },
-        meta: { sentFrom: "svamp-cli" }
-      })
-    );
+    const { randomUUID } = await import('node:crypto');
+    const inboxMessage = {
+      messageId: randomUUID(),
+      body: message,
+      timestamp: Date.now(),
+      read: false,
+      from: `cli:${os.userInfo().username}`,
+      to: fullId,
+      subject: opts?.subject,
+      urgency: opts?.urgency || "urgent"
+    };
+    const result = await machine.sessionRPC(fullId, "sendInboxMessage", [inboxMessage]);
     let waitResult;
     if (opts?.wait) {
       const timeoutMs = (opts.timeout || 300) * 1e3;
-      waitResult = await waitForBusyThenIdle(server, fullId, timeoutMs);
+      waitResult = await waitForBusyThenIdle(machine, fullId, timeoutMs);
     }
     if (waitResult?.pendingPermissions?.length) {
       if (opts?.json) {
@@ -1287,12 +1289,12 @@ async function sessionSend(sessionId, message, machineId, opts) {
           sessionId: fullId,
           message,
           sent: true,
-          seq: result.seq,
+          messageId: result.messageId,
           status: "permission-pending",
           pendingPermissions: waitResult.pendingPermissions
         }));
       } else {
-        console.log(`Message sent to session ${fullId.slice(0, 8)} (seq: ${result.seq})`);
+        console.log(`Message sent to session ${fullId.slice(0, 8)} (id: ${result.messageId.slice(0, 8)})`);
         console.log("Agent is waiting for permission approval:");
         for (const p of waitResult.pendingPermissions) {
           const argsStr = JSON.stringify(p.arguments || {}).slice(0, 120);
@@ -1307,12 +1309,12 @@ Use: svamp session approve ${fullId.slice(0, 8)}`);
         sessionId: fullId,
         message,
         sent: true,
-        seq: result.seq,
+        messageId: result.messageId,
         waited: !!opts.wait,
         status: opts.wait ? "idle" : "sent"
       }));
     } else {
-      console.log(`Message sent to session ${fullId.slice(0, 8)} (seq: ${result.seq})`);
+      console.log(`Message sent to session ${fullId.slice(0, 8)} (id: ${result.messageId.slice(0, 8)})`);
       if (opts?.wait) {
         console.log("Agent is idle.");
       }
@@ -1328,7 +1330,7 @@ async function sessionWait(sessionId, machineId, opts) {
     const match = resolveSessionId(sessions, sessionId);
     const fullId = match.sessionId;
     const timeoutMs = (opts?.timeout || 300) * 1e3;
-    const result = await waitForIdle(server, fullId, timeoutMs);
+    const result = await waitForIdle(machine, fullId, timeoutMs);
     if (result.pendingPermissions?.length) {
       if (opts?.json) {
         console.log(formatJson({
@@ -1712,7 +1714,6 @@ async function sessionInboxSend(sessionIdPartial, body, machineId, opts) {
     const sessions = await machine.listSessions();
     const match = resolveSessionId(sessions, sessionIdPartial);
     const fullId = match.sessionId;
-    const svc = await server.getService(`svamp-session-${fullId}`);
     const { randomUUID } = await import('node:crypto');
     const message = {
       messageId: randomUUID(),
@@ -1726,7 +1727,7 @@ async function sessionInboxSend(sessionIdPartial, body, machineId, opts) {
       replyTo: opts?.replyTo,
       threadId: opts?.threadId
     };
-    const result = await svc.sendInboxMessage(message);
+    const result = await machine.sessionRPC(fullId, "sendInboxMessage", [message]);
     if (opts?.json) {
       console.log(formatJson({ sessionId: fullId, messageId: result.messageId, sent: true }));
     } else {
@@ -1742,8 +1743,7 @@ async function sessionInboxList(sessionIdPartial, machineId, opts) {
     const sessions = await machine.listSessions();
     const match = resolveSessionId(sessions, sessionIdPartial);
     const fullId = match.sessionId;
-    const svc = await server.getService(`svamp-session-${fullId}`);
-    const result = await svc.getInbox({ unread: opts?.unread, limit: opts?.limit });
+    const result = await machine.sessionRPC(fullId, "getInbox", [{ unread: opts?.unread, limit: opts?.limit }]);
     const messages = result.messages;
     if (opts?.json) {
       console.log(formatJson({ sessionId: fullId, messages }));
@@ -1778,15 +1778,14 @@ async function sessionInboxRead(sessionIdPartial, messageId, machineId) {
     const sessions = await machine.listSessions();
     const match = resolveSessionId(sessions, sessionIdPartial);
     const fullId = match.sessionId;
-    const svc = await server.getService(`svamp-session-${fullId}`);
-    const result = await svc.getInbox();
+    const result = await machine.sessionRPC(fullId, "getInbox", []);
     const msg = result.messages.find((m) => m.messageId === messageId || m.messageId.startsWith(messageId));
     if (!msg) {
       console.error(`Message ${messageId} not found in inbox.`);
       process.exit(1);
     }
     if (!msg.read) {
-      await svc.markInboxRead(msg.messageId);
+      await machine.sessionRPC(fullId, "markInboxRead", [msg.messageId]);
     }
     console.log(`From: ${msg.from || "(unknown)"}`);
     if (msg.subject) console.log(`Subject: ${msg.subject}`);
@@ -1806,8 +1805,7 @@ async function sessionInboxReply(sessionIdPartial, messageId, body, machineId) {
     const sessions = await machine.listSessions();
     const match = resolveSessionId(sessions, sessionIdPartial);
     const fullId = match.sessionId;
-    const svc = await server.getService(`svamp-session-${fullId}`);
-    const result = await svc.getInbox();
+    const result = await machine.sessionRPC(fullId, "getInbox", []);
     const original = result.messages.find((m) => m.messageId === messageId || m.messageId.startsWith(messageId));
     if (!original) {
       console.error(`Message ${messageId} not found in inbox.`);
@@ -1817,7 +1815,6 @@ async function sessionInboxReply(sessionIdPartial, messageId, body, machineId) {
       console.error("Cannot reply: original message has no fromSession.");
       process.exit(1);
     }
-    const targetSvc = await server.getService(`svamp-session-${original.fromSession}`);
     const { randomUUID } = await import('node:crypto');
     const reply = {
       messageId: randomUUID(),
@@ -1832,7 +1829,7 @@ async function sessionInboxReply(sessionIdPartial, messageId, body, machineId) {
       replyTo: original.messageId,
       threadId: original.threadId || original.messageId
     };
-    const sendResult = await targetSvc.sendInboxMessage(reply);
+    const sendResult = await machine.sessionRPC(original.fromSession, "sendInboxMessage", [reply]);
     console.log(`Reply sent to session ${original.fromSession.slice(0, 8)} (id: ${sendResult.messageId.slice(0, 8)})`);
   } finally {
     await server.disconnect();
@@ -1844,9 +1841,8 @@ async function sessionInboxClear(sessionIdPartial, machineId, opts) {
     const sessions = await machine.listSessions();
     const match = resolveSessionId(sessions, sessionIdPartial);
     const fullId = match.sessionId;
-    const svc = await server.getService(`svamp-session-${fullId}`);
-    const result = await svc.clearInbox({ all: opts?.all });
-    console.log(`Cleared ${result.removed} message(s) from inbox on session ${fullId.slice(0, 8)}`);
+    const result = await machine.sessionRPC(fullId, "clearInbox", [{ all: opts?.all }]);
+    console.log(`Cleared inbox on session ${fullId.slice(0, 8)} (${result.remaining} remaining)`);
   } finally {
     await server.disconnect();
   }