svamp-cli 0.1.72 → 0.1.74

package/dist/{agentCommands-C6iGblcL.mjs → agentCommands-7GGmL2zY.mjs}

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync, mkdirSync, writeFileSync, renameSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import os from 'node:os';
+import 'node:crypto';
 
 const SVAMP_HOME = process.env.SVAMP_HOME || join(os.homedir(), ".svamp");
 function getConfigPath(sessionId) {

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-p-RshVII.mjs';
+import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-6QgabuQN.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -109,7 +109,7 @@ async function main() {
     const { handleServiceCommand } = await import('./commands-BLjcT1Vl.mjs');
     await handleServiceCommand();
   } else if (subcommand === "process" || subcommand === "proc") {
-    const { processCommand } = await import('./commands-DMhuR7JE.mjs');
+    const { processCommand } = await import('./commands-dKkUOvUb.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-BppQHKG7.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-CCjeil_X.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-D9fkwRb3.mjs');
+  const { runInteractive } = await import('./run-BgwhZgkT.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-p-RshVII.mjs').then(function (n) { return n.i; });
+    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-6QgabuQN.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-p-RshVII.mjs').then(function (n) { return n.i; });
+  const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-6QgabuQN.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-p-RshVII.mjs').then(function (n) { return n.j; });
+    const { CodexMcpBackend } = await import('./run-6QgabuQN.mjs').then(function (n) { return n.j; });
     backend = new CodexMcpBackend({ cwd, log: logFn });
   } else {
-    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 { AcpBackend } = await import('./run-6QgabuQN.mjs').then(function (n) { return n.h; });
+    const { GeminiTransport } = await import('./run-6QgabuQN.mjs').then(function (n) { return n.G; });
+    const { DefaultTransport } = await import('./run-6QgabuQN.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-COX5-rj3.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionQueueAdd, sessionQueueList, sessionQueueClear, sessionInboxSend, sessionInboxList, sessionInboxRead, sessionInboxReply, sessionInboxClear } = await import('./commands-ClMc3nSg.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-COX5-rj3.mjs');
+    const { parseShareArg } = await import('./commands-ClMc3nSg.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-COX5-rj3.mjs');
+    const { sessionApprove } = await import('./commands-ClMc3nSg.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-COX5-rj3.mjs');
+    const { sessionDeny } = await import('./commands-ClMc3nSg.mjs');
     const denyReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
     await sessionDeny(sessionArgs[1], denyReqId, targetMachineId, {
       json: hasFlag("--json")
@@ -530,7 +530,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session set-title <title>");
       process.exit(1);
     }
-    const { sessionSetTitle } = await import('./agentCommands-C6iGblcL.mjs');
+    const { sessionSetTitle } = await import('./agentCommands-7GGmL2zY.mjs');
     await sessionSetTitle(title);
   } else if (sessionSubcommand === "set-link") {
     const url = sessionArgs[1];
@@ -539,7 +539,7 @@ async function handleSessionCommand() {
       process.exit(1);
     }
     const label = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
-    const { sessionSetLink } = await import('./agentCommands-C6iGblcL.mjs');
+    const { sessionSetLink } = await import('./agentCommands-7GGmL2zY.mjs');
     await sessionSetLink(url, label);
   } else if (sessionSubcommand === "notify") {
     const message = sessionArgs[1];
@@ -548,7 +548,7 @@ async function handleSessionCommand() {
       process.exit(1);
     }
     const level = parseFlagStr("--level") || "info";
-    const { sessionNotify } = await import('./agentCommands-C6iGblcL.mjs');
+    const { sessionNotify } = await import('./agentCommands-7GGmL2zY.mjs');
     await sessionNotify(message, level);
   } else if (sessionSubcommand === "broadcast") {
     const action = sessionArgs[1];
@@ -556,7 +556,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-C6iGblcL.mjs');
+    const { sessionBroadcast } = await import('./agentCommands-7GGmL2zY.mjs');
     await sessionBroadcast(action, sessionArgs.slice(2).filter((a) => !a.startsWith("--")));
   } else if (sessionSubcommand === "queue") {
     const queueSubcmd = sessionArgs[1];
@@ -582,6 +582,82 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session queue <add|list|clear> <session-id> [args]");
       process.exit(1);
     }
+  } else if (sessionSubcommand === "inbox") {
+    const inboxSubcmd = sessionArgs[1];
+    if (inboxSubcmd === "send") {
+      const targetId = sessionArgs[2];
+      if (!targetId) {
+        console.error('Usage: svamp session inbox send <target-session-id> --subject "..." --body "..."');
+        process.exit(1);
+      }
+      const ccStr = parseFlagStr("--cc");
+      await sessionInboxSend(targetId, targetMachineId, {
+        subject: parseFlagStr("--subject") || "",
+        body: parseFlagStr("--body") || "",
+        urgency: parseFlagStr("--urgency") || "normal",
+        replyTo: parseFlagStr("--reply-to"),
+        cc: ccStr ? ccStr.split(",").map((s) => s.trim()).filter(Boolean) : void 0,
+        wait: hasFlag("--wait"),
+        timeout: parseFlagInt("--timeout"),
+        json: hasFlag("--json")
+      });
+    } else if (inboxSubcmd === "list" || inboxSubcmd === "ls") {
+      const targetId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : process.env.SVAMP_SESSION_ID;
+      if (!targetId) {
+        console.error("Usage: svamp session inbox list [session-id] [--unread] [--limit N] [--json]");
+        process.exit(1);
+      }
+      await sessionInboxList(targetId, targetMachineId, {
+        unread: hasFlag("--unread"),
+        limit: parseFlagInt("--limit"),
+        json: hasFlag("--json")
+      });
+    } else if (inboxSubcmd === "read") {
+      const targetId = sessionArgs[2];
+      const msgId = sessionArgs[3];
+      if (!targetId || !msgId) {
+        console.error("Usage: svamp session inbox read <session-id> <message-id>");
+        process.exit(1);
+      }
+      await sessionInboxRead(targetId, msgId, targetMachineId, {
+        json: hasFlag("--json")
+      });
+    } else if (inboxSubcmd === "reply") {
+      let targetId;
+      let msgId;
+      if (sessionArgs[3] && !sessionArgs[3].startsWith("--")) {
+        targetId = sessionArgs[2];
+        msgId = sessionArgs[3];
+      } else if (sessionArgs[2] && !sessionArgs[2].startsWith("--")) {
+        targetId = process.env.SVAMP_SESSION_ID;
+        msgId = sessionArgs[2];
+      }
+      if (!targetId || !msgId) {
+        console.error('Usage: svamp session inbox reply [session-id] <message-id> --body "..."');
+        process.exit(1);
+      }
+      await sessionInboxReply(targetId, msgId, targetMachineId, {
+        body: parseFlagStr("--body") || "",
+        urgency: parseFlagStr("--urgency") || "normal",
+        wait: hasFlag("--wait"),
+        json: hasFlag("--json")
+      });
+    } else if (inboxSubcmd === "clear") {
+      const targetId = sessionArgs[2];
+      if (!targetId) {
+        console.error("Usage: svamp session inbox clear <session-id> [--all]");
+        process.exit(1);
+      }
+      const msgId = sessionArgs[3] && !sessionArgs[3].startsWith("--") ? sessionArgs[3] : void 0;
+      await sessionInboxClear(targetId, targetMachineId, {
+        messageId: msgId,
+        all: hasFlag("--all"),
+        json: hasFlag("--json")
+      });
+    } else {
+      console.error("Usage: svamp session inbox <send|list|read|reply|clear> [args]");
+      process.exit(1);
+    }
   } else {
     console.error(`Unknown session command: ${sessionSubcommand}`);
     printSessionHelp();
@@ -597,7 +673,7 @@ async function handleMachineCommand() {
     return;
   }
   if (machineSubcommand === "share") {
-    const { machineShare } = await import('./commands-COX5-rj3.mjs');
+    const { machineShare } = await import('./commands-ClMc3nSg.mjs');
     let machineId;
     const shareArgs = [];
     for (let i = 1; i < machineArgs.length; i++) {
@@ -627,7 +703,7 @@ async function handleMachineCommand() {
     }
     await machineShare(machineId, { add, remove, list, configPath, showConfig });
   } else if (machineSubcommand === "exec") {
-    const { machineExec } = await import('./commands-COX5-rj3.mjs');
+    const { machineExec } = await import('./commands-ClMc3nSg.mjs');
     let machineId;
     let cwd;
     const cmdParts = [];
@@ -647,7 +723,7 @@ async function handleMachineCommand() {
     }
     await machineExec(machineId, command, cwd);
   } else if (machineSubcommand === "info") {
-    const { machineInfo } = await import('./commands-COX5-rj3.mjs');
+    const { machineInfo } = await import('./commands-ClMc3nSg.mjs');
     let machineId;
     for (let i = 1; i < machineArgs.length; i++) {
       if ((machineArgs[i] === "--machine" || machineArgs[i] === "-m") && i + 1 < machineArgs.length) {
@@ -667,10 +743,10 @@ async function handleMachineCommand() {
         level = machineArgs[++i];
       }
     }
-    const { machineNotify } = await import('./agentCommands-C6iGblcL.mjs');
+    const { machineNotify } = await import('./agentCommands-7GGmL2zY.mjs');
     await machineNotify(message, level);
   } else if (machineSubcommand === "ls") {
-    const { machineLs } = await import('./commands-COX5-rj3.mjs');
+    const { machineLs } = await import('./commands-ClMc3nSg.mjs');
     let machineId;
     let showHidden = false;
     let path;
@@ -1160,10 +1236,17 @@ COMMANDS:
     ralph-cancel <id>                     Cancel loop
     ralph-status <id>                     Show loop status
 
-  Message Queue:
-    queue add <id> "<message>"            Queue a message for later
-    queue list <id>                       List queued messages
-    queue clear <id>                      Clear queue
+  Inbox:
+    inbox send <target> --subject "..." --body "..."   Send inbox message
+    inbox list [session-id] [--unread] [--json]        List inbox messages
+    inbox read <session-id> <message-id>               Read a message
+    inbox reply [session-id] <message-id> --body "..."  Reply to a message
+    inbox clear <session-id> [--all]                   Clear inbox
+
+  Queue (deprecated, use inbox):
+    queue add <id> "<message>"            Queue a message (alias for inbox send)
+    queue list <id>                       List messages (alias for inbox list)
+    queue clear <id>                      Clear messages (alias for inbox clear)
 
 SPAWN OPTIONS:
   -d, --directory <path>          Working directory (REQUIRED for meaningful work)

package/dist/{commands-COX5-rj3.mjs → commands-ClMc3nSg.mjs}

@@ -1,8 +1,9 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { execSync } from 'node:child_process';
+import { randomUUID } from 'node:crypto';
 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-p-RshVII.mjs';
+import { l as loadSecurityContextConfig, e as resolveSecurityContext, f as buildSecurityContextFromFlags, m as mergeSecurityContexts, c as connectToHypha } from './run-6QgabuQN.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -10,7 +11,6 @@ import 'path';
 import 'url';
 import 'child_process';
 import 'crypto';
-import 'node:crypto';
 import '@agentclientprotocol/sdk';
 import '@modelcontextprotocol/sdk/client/index.js';
 import '@modelcontextprotocol/sdk/client/stdio.js';
@@ -1713,71 +1713,207 @@ async function sessionQueueAdd(sessionIdPartial, message, machineId) {
     const match = resolveSessionId(sessions, sessionIdPartial);
     const fullId = match.sessionId;
     const svc = await server.getService(`svamp-session-${fullId}`);
-    const { metadata, version } = await svc.getMetadata();
-    const existingQueue = metadata?.messageQueue || [];
     const newMsg = {
-      id: `cli-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
-      text: message,
-      createdAt: Date.now()
+      messageId: `msg-${randomUUID()}`,
+      body: message,
+      timestamp: Date.now(),
+      read: false
     };
-    const updatedQueue = [...existingQueue, newMsg];
-    const updatedMetadata = { ...metadata, messageQueue: updatedQueue };
-    const result = await svc.updateMetadata(updatedMetadata, version);
-    if (result.result !== "success") {
-      console.error(`Failed to add to queue: ${result.result}`);
-      process.exit(1);
-    }
-    console.log(`Message queued on session ${fullId.slice(0, 8)} (${updatedQueue.length} total)`);
+    await svc.sendInboxMessage(newMsg);
+    console.log(`Message queued on session ${fullId.slice(0, 8)}`);
   } finally {
     await server.disconnect();
   }
 }
 async function sessionQueueList(sessionIdPartial, machineId) {
+  return sessionInboxList(sessionIdPartial, machineId);
+}
+async function sessionQueueClear(sessionIdPartial, machineId) {
+  return sessionInboxClear(sessionIdPartial, machineId);
+}
+async function sessionInboxSend(targetSessionId, machineId, opts) {
+  if (!opts?.subject || !opts?.body) {
+    console.error('Usage: svamp session inbox send <target-session-id> --subject "..." --body "..."');
+    process.exit(1);
+  }
+  const { server, machine } = await connectAndGetMachine(machineId);
+  try {
+    const sessions = await machine.listSessions();
+    const match = resolveSessionId(sessions, targetSessionId);
+    const fullTargetId = match.sessionId;
+    const senderSessionId = process.env.SVAMP_SESSION_ID || "cli";
+    const senderEmail = process.env.USER_EMAIL || process.env.USER || os.userInfo().username;
+    const from = senderSessionId === "cli" ? `user:${senderEmail}` : `agent:${senderSessionId}`;
+    const message = {
+      messageId: `msg-${randomUUID()}`,
+      from,
+      fromSession: senderSessionId,
+      to: fullTargetId,
+      subject: opts.subject,
+      body: opts.body,
+      urgency: opts.urgency || "normal",
+      replyTo: opts.replyTo,
+      cc: opts.cc,
+      timestamp: Date.now(),
+      read: false,
+      threadId: opts.replyTo ? void 0 : void 0
+      // will be set by reply logic
+    };
+    const svc = await server.getService(`svamp-session-${fullTargetId}`);
+    const result = await svc.sendInboxMessage(message);
+    if (opts.wait) {
+      const timeoutMs = (opts.timeout || 300) * 1e3;
+      await waitForBusyThenIdle(server, fullTargetId, timeoutMs);
+    }
+    if (opts.json) {
+      console.log(formatJson({
+        messageId: message.messageId,
+        targetSessionId: fullTargetId,
+        subject: opts.subject,
+        urgency: message.urgency,
+        delivered: result.delivered
+      }));
+    } else {
+      console.log(`Inbox message sent to session ${fullTargetId.slice(0, 8)} [${message.urgency}]: "${opts.subject}"`);
+    }
+  } finally {
+    await server.disconnect();
+  }
+}
+async function sessionInboxList(sessionIdPartial, machineId, opts) {
   const { server, machine } = await connectAndGetMachine(machineId);
   try {
     const sessions = await machine.listSessions();
     const match = resolveSessionId(sessions, sessionIdPartial);
     const fullId = match.sessionId;
     const svc = await server.getService(`svamp-session-${fullId}`);
-    const { metadata } = await svc.getMetadata();
-    const queue = metadata?.messageQueue || [];
-    if (queue.length === 0) {
-      console.log("Queue is empty.");
-      return;
-    }
-    console.log(`Queue for session ${fullId.slice(0, 8)} (${queue.length} messages):`);
-    for (let i = 0; i < queue.length; i++) {
-      const msg = queue[i];
-      const time = new Date(msg.createdAt).toLocaleTimeString();
-      console.log(`  ${i + 1}. [${time}] ${msg.text.slice(0, 80)}${msg.text.length > 80 ? "..." : ""}`);
+    const result = await svc.getInbox({
+      unreadOnly: opts?.unread || false,
+      limit: opts?.limit || 50
+    });
+    if (opts?.json) ; else {
+      const msgs = result.messages || [];
+      if (msgs.length === 0) {
+        console.log("Inbox is empty.");
+        return;
+      }
+      console.log(`Inbox for session ${fullId.slice(0, 8)} (${msgs.length} message(s), ${result.total} total):
+`);
+      for (const msg of msgs) {
+        const readMark = msg.read ? " " : "*";
+        const date = new Date(msg.timestamp).toLocaleString();
+        console.log(`${readMark} [${msg.messageId.slice(0, 12)}] ${date}`);
+        console.log(`  From: ${msg.from} | Subject: ${msg.subject} | Urgency: ${msg.urgency}`);
+        if (msg.replyTo) console.log(`  Reply-To: ${msg.replyTo.slice(0, 12)}`);
+        console.log(`  ${msg.body.slice(0, 120)}${msg.body.length > 120 ? "..." : ""}`);
+        console.log();
+      }
     }
   } finally {
     await server.disconnect();
   }
 }
-async function sessionQueueClear(sessionIdPartial, machineId) {
+async function sessionInboxRead(sessionIdPartial, messageId, machineId, opts) {
   const { server, machine } = await connectAndGetMachine(machineId);
   try {
     const sessions = await machine.listSessions();
     const match = resolveSessionId(sessions, sessionIdPartial);
     const fullId = match.sessionId;
     const svc = await server.getService(`svamp-session-${fullId}`);
-    const { metadata, version } = await svc.getMetadata();
-    const count = (metadata?.messageQueue || []).length;
-    if (count === 0) {
-      console.log("Queue is already empty.");
-      return;
+    const result = await svc.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);
     }
-    const updatedMetadata = { ...metadata, messageQueue: void 0 };
-    const result = await svc.updateMetadata(updatedMetadata, version);
-    if (result.result !== "success") {
-      console.error(`Failed to clear queue: ${result.result}`);
+    await svc.markInboxRead([msg.messageId]);
+    if (opts?.json) {
+      console.log(formatJson(msg));
+    } else {
+      console.log(`Message-ID: ${msg.messageId}`);
+      console.log(`From: ${msg.from}`);
+      console.log(`From-Session: ${msg.fromSession}`);
+      console.log(`Subject: ${msg.subject}`);
+      console.log(`Urgency: ${msg.urgency}`);
+      console.log(`Date: ${new Date(msg.timestamp).toLocaleString()}`);
+      if (msg.replyTo) console.log(`Reply-To: ${msg.replyTo}`);
+      if (msg.cc?.length) console.log(`CC: ${msg.cc.join(", ")}`);
+      console.log(`---`);
+      console.log(msg.body);
+    }
+  } finally {
+    await server.disconnect();
+  }
+}
+async function sessionInboxReply(sessionIdPartial, messageId, machineId, opts) {
+  if (!opts?.body) {
+    console.error('Usage: svamp session inbox reply <session-id> <message-id> --body "..."');
+    process.exit(1);
+  }
+  const { server, machine } = await connectAndGetMachine(machineId);
+  try {
+    const sessions = await machine.listSessions();
+    const match = resolveSessionId(sessions, sessionIdPartial);
+    const fullId = match.sessionId;
+    const svc = await server.getService(`svamp-session-${fullId}`);
+    const inboxResult = await svc.getInbox({});
+    const originalMsg = (inboxResult.messages || []).find(
+      (m) => m.messageId === messageId || m.messageId.startsWith(messageId)
+    );
+    if (!originalMsg) {
+      console.error(`Message ${messageId} not found in inbox. Cannot reply.`);
       process.exit(1);
     }
-    console.log(`Cleared ${count} message(s) from queue on session ${fullId.slice(0, 8)}`);
+    const senderSessionId = process.env.SVAMP_SESSION_ID || fullId;
+    const senderEmail = process.env.USER_EMAIL || process.env.USER || os.userInfo().username;
+    const from = senderSessionId === "cli" ? `user:${senderEmail}` : `agent:${senderSessionId}`;
+    const reply = {
+      messageId: `msg-${randomUUID()}`,
+      from,
+      fromSession: senderSessionId,
+      to: originalMsg.fromSession,
+      subject: `Re: ${originalMsg.subject}`,
+      body: opts.body,
+      urgency: opts.urgency || "normal",
+      replyTo: originalMsg.messageId,
+      threadId: originalMsg.threadId || originalMsg.messageId,
+      timestamp: Date.now(),
+      read: false
+    };
+    const targetSvc = await server.getService(`svamp-session-${originalMsg.fromSession}`);
+    const result = await targetSvc.sendInboxMessage(reply);
+    if (opts.json) {
+      console.log(formatJson({
+        messageId: reply.messageId,
+        targetSessionId: originalMsg.fromSession,
+        subject: reply.subject,
+        urgency: reply.urgency,
+        delivered: result.delivered
+      }));
+    } else {
+      console.log(`Reply sent to session ${originalMsg.fromSession.slice(0, 8)}: "${reply.subject}"`);
+    }
+  } finally {
+    await server.disconnect();
+  }
+}
+async function sessionInboxClear(sessionIdPartial, machineId, opts) {
+  const { server, machine } = await connectAndGetMachine(machineId);
+  try {
+    const sessions = await machine.listSessions();
+    const match = resolveSessionId(sessions, sessionIdPartial);
+    const fullId = match.sessionId;
+    const svc = await server.getService(`svamp-session-${fullId}`);
+    const messageIds = opts?.messageId ? [opts.messageId] : void 0;
+    const result = await svc.clearInbox(messageIds);
+    if (opts?.json) ; else {
+      console.log(`Cleared ${result.removed} message(s) from inbox on session ${fullId.slice(0, 8)}`);
+    }
   } finally {
     await server.disconnect();
   }
 }
 
-export { connectAndGetMachine, createWorktree, generateWorktreeName, machineExec, machineInfo, machineLs, machineShare, parseShareArg, renderMessage, resolveSessionId, sessionApprove, sessionAttach, sessionDeny, sessionInfo, sessionList, sessionMachines, sessionMessages, sessionQueueAdd, sessionQueueClear, sessionQueueList, sessionRalphCancel, sessionRalphStart, sessionRalphStatus, sessionSend, sessionShare, sessionSpawn, sessionStop, sessionWait };
+export { connectAndGetMachine, createWorktree, generateWorktreeName, machineExec, machineInfo, machineLs, machineShare, parseShareArg, renderMessage, resolveSessionId, sessionApprove, sessionAttach, sessionDeny, sessionInboxClear, sessionInboxList, sessionInboxRead, sessionInboxReply, sessionInboxSend, sessionInfo, sessionList, sessionMachines, sessionMessages, sessionQueueAdd, sessionQueueClear, sessionQueueList, sessionRalphCancel, sessionRalphStart, sessionRalphStatus, sessionSend, sessionShare, sessionSpawn, sessionStop, sessionWait };

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

@@ -1,17 +1,17 @@
 import { writeFileSync, readFileSync } from 'fs';
 import { resolve } from 'path';
-import { connectAndGetMachine } from './commands-COX5-rj3.mjs';
+import { connectAndGetMachine } from './commands-ClMc3nSg.mjs';
 import 'node:fs';
 import 'node:child_process';
+import 'node:crypto';
 import 'node:path';
 import 'node:os';
-import './run-p-RshVII.mjs';
+import './run-6QgabuQN.mjs';
 import 'os';
 import 'fs/promises';
 import 'url';
 import 'child_process';
 import 'crypto';
-import 'node:crypto';
 import '@agentclientprotocol/sdk';
 import '@modelcontextprotocol/sdk/client/index.js';
 import '@modelcontextprotocol/sdk/client/stdio.js';

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-p-RshVII.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-6QgabuQN.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

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

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

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

@@ -871,6 +871,27 @@ async function registerMachineService(server, machineId, metadata, daemonState,
   };
 }
 
+function isStructuredMessage(msg) {
+  return !!(msg.from && msg.subject);
+}
+function formatInboxMessageXml(msg) {
+  if (!isStructuredMessage(msg)) return msg.body;
+  const attrs = [
+    `message-id="${msg.messageId}"`,
+    `from="${msg.from}"`,
+    `from-session="${msg.fromSession || ""}"`,
+    `to="${msg.to || ""}"`,
+    `subject="${msg.subject}"`,
+    `urgency="${msg.urgency || "normal"}"`,
+    `timestamp="${msg.timestamp}"`
+  ];
+  if (msg.replyTo) attrs.push(`reply-to="${msg.replyTo}"`);
+  if (msg.cc && msg.cc.length > 0) attrs.push(`cc="${msg.cc.join(",")}"`);
+  if (msg.threadId) attrs.push(`thread-id="${msg.threadId}"`);
+  return `<svamp-message ${attrs.join(" ")}>
+${msg.body}
+</svamp-message>`;
+}
 function loadMessages(messagesDir, sessionId) {
   const filePath = join$1(messagesDir, "messages.jsonl");
   if (!existsSync(filePath)) return [];
@@ -1247,6 +1268,24 @@ function createSessionStore(server, sessionId, initialMetadata, initialAgentStat
       });
       return await callbacks.onUpdateSecurityContext(newSecurityContext);
     },
+    /** Toggle isolation (nono/docker/podman) on or off — triggers agent restart */
+    updateIsolation: async (enabled, context) => {
+      authorizeRequest(context, metadata.sharing, "admin");
+      if (metadata.sharing && context?.user?.email && metadata.sharing.owner && context.user.email.toLowerCase() !== metadata.sharing.owner.toLowerCase()) {
+        throw new Error("Only the session owner can change isolation settings");
+      }
+      if (!callbacks.onUpdateIsolation) {
+        throw new Error("Isolation updates are not supported for this session");
+      }
+      metadata = { ...metadata, forceIsolation: enabled };
+      metadataVersion++;
+      notifyListeners({
+        type: "update-session",
+        sessionId,
+        metadata: { value: metadata, version: metadataVersion }
+      });
+      return await callbacks.onUpdateIsolation(enabled);
+    },
     /** Apply a new system prompt and restart the agent process */
     applySystemPrompt: async (prompt, context) => {
       authorizeRequest(context, metadata.sharing, "admin");
@@ -1255,6 +1294,86 @@ function createSessionStore(server, sessionId, initialMetadata, initialAgentStat
       }
       return await callbacks.onApplySystemPrompt(prompt);
     },
+    // ── Inbox Messaging ──
+    sendInboxMessage: async (message, context) => {
+      authorizeRequest(context, metadata.sharing, "interact");
+      if (!message.messageId || !message.body) {
+        throw new Error("Inbox message requires messageId and body");
+      }
+      const inbox = (metadata.inbox || []).slice();
+      inbox.push({ ...message, read: false });
+      if (inbox.length > 100) {
+        const readIdx = inbox.findIndex((m) => m.read);
+        if (readIdx >= 0) {
+          inbox.splice(readIdx, 1);
+        } else {
+          inbox.shift();
+        }
+      }
+      metadata = { ...metadata, inbox };
+      metadataVersion++;
+      notifyListeners({
+        type: "update-session",
+        sessionId,
+        metadata: { value: metadata, version: metadataVersion }
+      });
+      callbacks.onInboxMessage?.(message);
+      return { messageId: message.messageId, delivered: true };
+    },
+    getInbox: async (opts, context) => {
+      authorizeRequest(context, metadata.sharing, "view");
+      let inbox = metadata.inbox || [];
+      if (opts?.unreadOnly) {
+        inbox = inbox.filter((m) => !m.read);
+      }
+      if (opts?.limit && opts.limit > 0) {
+        inbox = inbox.slice(-opts.limit);
+      }
+      return { messages: inbox, total: (metadata.inbox || []).length };
+    },
+    markInboxRead: async (messageIds, context) => {
+      authorizeRequest(context, metadata.sharing, "interact");
+      let updated = 0;
+      const inbox = (metadata.inbox || []).map((m) => {
+        if (messageIds.includes(m.messageId) && !m.read) {
+          updated++;
+          return { ...m, read: true };
+        }
+        return m;
+      });
+      if (updated > 0) {
+        metadata = { ...metadata, inbox };
+        metadataVersion++;
+        notifyListeners({
+          type: "update-session",
+          sessionId,
+          metadata: { value: metadata, version: metadataVersion }
+        });
+      }
+      return { updated };
+    },
+    clearInbox: async (messageIds, context) => {
+      authorizeRequest(context, metadata.sharing, "interact");
+      const currentInbox = metadata.inbox || [];
+      let removed;
+      if (messageIds && messageIds.length > 0) {
+        const newInbox = currentInbox.filter((m) => !messageIds.includes(m.messageId));
+        removed = currentInbox.length - newInbox.length;
+        metadata = { ...metadata, inbox: newInbox.length > 0 ? newInbox : void 0 };
+      } else {
+        removed = currentInbox.length;
+        metadata = { ...metadata, inbox: void 0 };
+      }
+      if (removed > 0) {
+        metadataVersion++;
+        notifyListeners({
+          type: "update-session",
+          sessionId,
+          metadata: { value: metadata, version: metadataVersion }
+        });
+      }
+      return { removed };
+    },
     // ── Listener Registration ──
     registerListener: async (callback, context) => {
       authorizeRequest(context, metadata.sharing, "view");
@@ -4852,15 +4971,16 @@ function createSvampConfigChecker(directory, sessionId, getMetadata, setMetadata
         const progressRelPath = `.svamp/${sessionId}/ralph-progress.md`;
         const prompt = buildRalphPrompt(state.task, state);
         const ralphSysPrompt = buildRalphSystemPrompt(state, progressRelPath);
-        const existingQueue = getMetadata().messageQueue || [];
+        const existingInbox = getMetadata().inbox || [];
         setMetadata((m) => ({
           ...m,
           ralphLoop,
-          messageQueue: [...existingQueue, {
-            id: randomUUID$1(),
-            text: prompt,
+          inbox: [...existingInbox, {
+            messageId: randomUUID$1(),
+            body: prompt,
             displayText: state.task,
-            createdAt: Date.now(),
+            timestamp: Date.now(),
+            read: false,
             ralphSystemPrompt: ralphSysPrompt
           }]
         }));
@@ -5528,7 +5648,8 @@ async function startDaemon(options) {
             }
           });
         }, buildIsolationConfig2 = function(dir) {
-          if (!options2.forceIsolation && !sessionMetadata.sharing?.enabled) return null;
+          const forceIsolation = sessionMetadata.forceIsolation ?? options2.forceIsolation;
+          if (!forceIsolation && !sessionMetadata.sharing?.enabled) return null;
           const method = isolationCapabilities.preferred;
           if (!method) return null;
           const detail = isolationCapabilities.details[method];
@@ -5569,6 +5690,7 @@ async function startDaemon(options) {
           lifecycleState: resumeSessionId ? "idle" : "starting",
           sharing: options2.sharing,
           securityContext: options2.securityContext,
+          forceIsolation: options2.forceIsolation || void 0,
           tags: options2.tags,
           parentSessionId: options2.parentSessionId,
           ...options2.parentSessionId && (() => {
@@ -5585,6 +5707,8 @@ async function startDaemon(options) {
         let lastSpawnMeta = persisted?.spawnMeta || {};
         let sessionWasProcessing = !!options2.wasProcessing;
         let lastAssistantText = "";
+        let consecutiveRalphErrors = 0;
+        const MAX_RALPH_ERRORS = 3;
         let spawnHasReceivedInit = false;
         let startupFailureRetryPending = false;
         let startupRetryMessage;
@@ -5642,7 +5766,8 @@ async function startDaemon(options) {
           startupNonJsonLines = [];
           startupRetryMessage = initialMessage;
           let rawPermissionMode = effectiveMeta.permissionMode || agentConfig.default_permission_mode || currentPermissionMode;
-          if (options2.forceIsolation || sessionMetadata.sharing?.enabled) {
+          const forceIsolation = sessionMetadata.forceIsolation ?? options2.forceIsolation;
+          if (forceIsolation || sessionMetadata.sharing?.enabled) {
             rawPermissionMode = rawPermissionMode === "default" ? "auto-approve-all" : rawPermissionMode;
           }
           if (sessionMetadata.ralphLoop?.active) {
@@ -5679,7 +5804,7 @@ async function startDaemon(options) {
             if (wrapped.cleanupFiles) isolationCleanupFiles = wrapped.cleanupFiles;
             sessionMetadata = { ...sessionMetadata, isolationMethod: isoConfig.method };
             logger.log(`[Session ${sessionId}] Isolation: ${isoConfig.method} (binary: ${isoConfig.binaryPath})`);
-          } else if (options2.forceIsolation || sessionMetadata.sharing?.enabled) {
+          } else if (forceIsolation || sessionMetadata.sharing?.enabled) {
             logger.log(`[Session ${sessionId}] WARNING: No isolation runtime (nono/docker/podman) available. Session is NOT sandboxed.`);
             sessionMetadata = { ...sessionMetadata, isolationMethod: void 0 };
           } else {
@@ -5904,7 +6029,34 @@ async function startDaemon(options) {
                       logger.log(`[Session ${sessionId}] ${taskInfo}`);
                       sessionService.pushMessage({ type: "session_event", message: taskInfo }, "session");
                     }
-                    const queueLen = sessionMetadata.messageQueue?.length ?? 0;
+                    const queueLen = sessionMetadata.inbox?.filter((m) => !m.read)?.length ?? 0;
+                    if (msg.is_error) {
+                      const rlStateForError = readRalphState(getRalphStateFilePath(directory, sessionId));
+                      if (rlStateForError) {
+                        consecutiveRalphErrors++;
+                        logger.log(`[Session ${sessionId}] Ralph loop: error result (consecutive=${consecutiveRalphErrors}/${MAX_RALPH_ERRORS})`);
+                        if (consecutiveRalphErrors >= MAX_RALPH_ERRORS) {
+                          logger.log(`[Session ${sessionId}] Ralph loop: ${MAX_RALPH_ERRORS} consecutive errors \u2014 stopping loop`);
+                          removeRalphState(getRalphStateFilePath(directory, sessionId));
+                          if (lastSpawnMeta.appendSystemPrompt) {
+                            const { appendSystemPrompt: _, ...rest } = lastSpawnMeta;
+                            lastSpawnMeta = rest;
+                          }
+                          sessionMetadata = { ...sessionMetadata, ralphLoop: { active: false }, lifecycleState: "idle" };
+                          sessionService.updateMetadata(sessionMetadata);
+                          sessionService.pushMessage(
+                            { type: "message", message: `Ralph loop stopped \u2014 ${consecutiveRalphErrors} consecutive errors. Last error: ${msg.result || "unknown"}`, level: "error" },
+                            "event"
+                          );
+                          consecutiveRalphErrors = 0;
+                          signalProcessing(false);
+                          sessionService.sendSessionEnd();
+                          break;
+                        }
+                      }
+                    } else {
+                      consecutiveRalphErrors = 0;
+                    }
                     if (queueLen > 0 && claudeResumeId && !trackedSession.stopped) {
                       setTimeout(() => processMessageQueueRef?.(), 200);
                     } else if (claudeResumeId) {
@@ -6182,7 +6334,7 @@ The automated loop has finished. Review the progress above and let me know if yo
                 return;
               }
             }
-            const queueLen = sessionMetadata.messageQueue?.length ?? 0;
+            const queueLen = sessionMetadata.inbox?.filter((m) => !m.read)?.length ?? 0;
             if (queueLen > 0 && claudeResumeId && !trackedSession.stopped) {
               signalProcessing(false);
               setTimeout(() => processMessageQueueRef?.(), 200);
@@ -6293,10 +6445,10 @@ The automated loop has finished. Review the progress above and let me know if yo
               }
               if (isKillingClaude || isRestartingClaude || isSwitchingMode) {
                 logger.log(`[Session ${sessionId}] Message received while restarting Claude, queuing to prevent loss`);
-                const existingQueue = sessionMetadata.messageQueue || [];
+                const existingInbox = sessionMetadata.inbox || [];
                 sessionMetadata = {
                   ...sessionMetadata,
-                  messageQueue: [...existingQueue, { id: randomUUID$1(), text, createdAt: Date.now() }]
+                  inbox: [...existingInbox, { messageId: randomUUID$1(), body: text, timestamp: Date.now(), read: false }]
                 };
                 sessionService.updateMetadata(sessionMetadata);
                 signalProcessing(false);
@@ -6331,7 +6483,7 @@ The automated loop has finished. Review the progress above and let me know if yo
               }
               signalProcessing(false);
               sessionWasProcessing = false;
-              const queueLen = sessionMetadata.messageQueue?.length ?? 0;
+              const queueLen = sessionMetadata.inbox?.filter((m) => !m.read)?.length ?? 0;
               const abortMsg = queueLen > 0 ? `Aborted by user. ${queueLen} queued message(s) will be processed next.` : "Aborted by user";
               sessionService.pushMessage(
                 { type: "message", message: abortMsg },
@@ -6413,6 +6565,24 @@ The automated loop has finished. Review the progress above and let me know if yo
               sessionMetadata = { ...sessionMetadata, securityContext: newSecurityContext };
               return await restartClaudeHandler();
             },
+            onUpdateIsolation: async (enabled) => {
+              logger.log(`[Session ${sessionId}] Isolation ${enabled ? "enabled" : "disabled"} \u2014 restarting agent`);
+              sessionMetadata = { ...sessionMetadata, forceIsolation: enabled };
+              if (!trackedSession.stopped) {
+                saveSession({
+                  sessionId,
+                  directory,
+                  claudeResumeId,
+                  permissionMode: currentPermissionMode,
+                  spawnMeta: lastSpawnMeta,
+                  metadata: sessionMetadata,
+                  createdAt: Date.now(),
+                  machineId,
+                  wasProcessing: sessionWasProcessing
+                });
+              }
+              return await restartClaudeHandler();
+            },
             onSharingUpdate: (newSharing) => {
               logger.log(`[Session ${sessionId}] Sharing config updated \u2014 persisting to disk`);
               sessionMetadata = { ...sessionMetadata, sharing: newSharing };
@@ -6435,14 +6605,72 @@ The automated loop has finished. Review the progress above and let me know if yo
               lastSpawnMeta = { ...lastSpawnMeta, appendSystemPrompt: prompt };
               return await restartClaudeHandler();
             },
+            onInboxMessage: (message) => {
+              const xmlText = formatInboxMessageXml(message);
+              if (message.urgency === "urgent") {
+                logger.log(`[Session ${sessionId}] Urgent inbox message from ${message.from}: ${message.subject}`);
+                const text = xmlText;
+                if (sessionWasProcessing) {
+                  const existingInbox = sessionMetadata.inbox || [];
+                  sessionMetadata = { ...sessionMetadata, inbox: [{ messageId: message.messageId, body: text, displayText: `[Inbox] ${message.subject}`, timestamp: Date.now(), read: false, from: message.from, fromSession: message.fromSession, subject: message.subject, urgency: "urgent" }, ...existingInbox] };
+                  sessionService.updateMetadata(sessionMetadata);
+                } else {
+                  sessionWasProcessing = true;
+                  signalProcessing(true);
+                  sessionService.pushMessage(`[Inbox] ${message.subject}`, "user");
+                  userMessagePending = true;
+                  turnInitiatedByUser = true;
+                  try {
+                    if (!claudeProcess || claudeProcess.exitCode !== null) {
+                      spawnClaude(text);
+                    } else {
+                      const stdinMsg = JSON.stringify({
+                        type: "user",
+                        message: { role: "user", content: text }
+                      });
+                      claudeProcess.stdin?.write(stdinMsg + "\n");
+                    }
+                  } catch (err) {
+                    logger.log(`[Session ${sessionId}] Error injecting urgent inbox message: ${err.message}`);
+                    sessionWasProcessing = false;
+                    signalProcessing(false);
+                  }
+                }
+                const inbox = (sessionMetadata.inbox || []).map(
+                  (m) => m.messageId === message.messageId ? { ...m, read: true } : m
+                );
+                sessionMetadata = { ...sessionMetadata, inbox };
+                sessionService.updateMetadata(sessionMetadata);
+              } else {
+                logger.log(`[Session ${sessionId}] Normal inbox message from ${message.from}: ${message.subject}`);
+                if (!sessionWasProcessing && !trackedSession.stopped) {
+                  setTimeout(() => processMessageQueueRef?.(), 200);
+                }
+              }
+            },
             onKillSession: () => {
               logger.log(`[Session ${sessionId}] Kill session requested`);
               stopSession(sessionId);
             },
             onMetadataUpdate: (newMeta) => {
               const prevRalphLoop = sessionMetadata.ralphLoop;
+              const legacyQueue = newMeta.messageQueue;
+              let migratedInbox = newMeta.inbox || [];
+              if (legacyQueue && legacyQueue.length > 0) {
+                const converted = legacyQueue.map((q) => ({
+                  messageId: q.id,
+                  body: q.text,
+                  displayText: q.displayText,
+                  timestamp: q.createdAt,
+                  read: false
+                }));
+                migratedInbox = [...migratedInbox || [], ...converted];
+              }
               sessionMetadata = {
                 ...newMeta,
+                inbox: migratedInbox.length > 0 ? migratedInbox : newMeta.inbox,
+                // Clear legacy messageQueue — daemon uses inbox only
+                ...legacyQueue && legacyQueue.length > 0 ? { messageQueue: void 0 } : {},
                 // Daemon drives lifecycleState — don't let frontend overwrite with stale value
                 lifecycleState: sessionMetadata.lifecycleState,
                 // Preserve claudeSessionId set by 'system init' (frontend may not have it)
@@ -6458,8 +6686,11 @@ The automated loop has finished. Review the progress above and let me know if yo
               if (prevRalphLoop && !newMeta.ralphLoop) {
                 sessionService.updateMetadata(sessionMetadata);
               }
-              const queue = newMeta.messageQueue;
-              if (queue && queue.length > 0 && !sessionWasProcessing && !trackedSession.stopped) {
+              if (legacyQueue && legacyQueue.length > 0) {
+                sessionService.updateMetadata(sessionMetadata);
+              }
+              const unreadInbox = sessionMetadata.inbox?.filter((m) => !m.read);
+              if (unreadInbox && unreadInbox.length > 0 && !sessionWasProcessing && !trackedSession.stopped) {
                 setTimeout(() => {
                   processMessageQueueRef?.();
                 }, 200);
@@ -6582,16 +6813,18 @@ The automated loop has finished. Review the progress above and let me know if yo
           if (trackedSession?.stopped) return;
           if (isKillingClaude) return;
           if (isRestartingClaude || isSwitchingMode) return;
-          const queue = sessionMetadata.messageQueue;
-          if (queue && queue.length > 0) {
-            const next = queue[0];
-            const remaining = queue.slice(1);
-            sessionMetadata = { ...sessionMetadata, messageQueue: remaining.length > 0 ? remaining : void 0 };
+          const inbox = sessionMetadata.inbox;
+          const unreadIdx = inbox?.findIndex((m) => !m.read) ?? -1;
+          if (inbox && unreadIdx >= 0) {
+            const next = inbox[unreadIdx];
+            const updatedInbox = inbox.map((m, i) => i === unreadIdx ? { ...m, read: true } : m);
+            sessionMetadata = { ...sessionMetadata, inbox: updatedInbox };
             sessionService.updateMetadata(sessionMetadata);
-            logger.log(`[Session ${sessionId}] Processing queued message: "${next.text.slice(0, 50)}..."`);
+            const deliverText = isStructuredMessage(next) ? formatInboxMessageXml(next) : next.body;
+            logger.log(`[Session ${sessionId}] Processing inbox message: "${next.body.slice(0, 50)}..."`);
             sessionWasProcessing = true;
             signalProcessing(true);
-            sessionService.pushMessage(next.displayText || next.text, "user");
+            sessionService.pushMessage(next.displayText || next.body, "user");
             userMessagePending = true;
             turnInitiatedByUser = true;
             const queueMeta = next.ralphSystemPrompt ? { appendSystemPrompt: next.ralphSystemPrompt } : void 0;
@@ -6613,7 +6846,7 @@ The automated loop has finished. Review the progress above and let me know if yo
                   if (trackedSession?.stopped) return;
                   if (isRestartingClaude || isSwitchingMode) return;
                   claudeResumeId = void 0;
-                  spawnClaude(next.text, queueMeta);
+                  spawnClaude(deliverText, queueMeta);
                 } catch (err) {
                   logger.log(`[Session ${sessionId}] Error in fresh Ralph queue processing: ${err.message}`);
                   isKillingClaude = false;
@@ -6624,11 +6857,11 @@ The automated loop has finished. Review the progress above and let me know if yo
             } else {
               try {
                 if (!claudeProcess || claudeProcess.exitCode !== null) {
-                  spawnClaude(next.text, queueMeta);
+                  spawnClaude(deliverText, queueMeta);
                 } else {
                   const stdinMsg = JSON.stringify({
                     type: "user",
-                    message: { role: "user", content: next.text }
+                    message: { role: "user", content: deliverText }
                   });
                   claudeProcess.stdin?.write(stdinMsg + "\n");
                 }
@@ -6761,20 +6994,20 @@ The automated loop has finished. Review the progress above and let me know if yo
               }
               if (!acpBackendReady) {
                 logger.log(`[${agentName} Session ${sessionId}] Backend not ready \u2014 queuing message`);
-                const existingQueue = sessionMetadata.messageQueue || [];
+                const existingInbox = sessionMetadata.inbox || [];
                 sessionMetadata = {
                   ...sessionMetadata,
-                  messageQueue: [...existingQueue, { id: randomUUID$1(), text, createdAt: Date.now() }]
+                  inbox: [...existingInbox, { messageId: randomUUID$1(), body: text, timestamp: Date.now(), read: false }]
                 };
                 sessionService.updateMetadata(sessionMetadata);
                 return;
               }
               if (sessionMetadata.lifecycleState === "running") {
                 logger.log(`[${agentName} Session ${sessionId}] Agent busy \u2014 queuing message`);
-                const existingQueue = sessionMetadata.messageQueue || [];
+                const existingInbox = sessionMetadata.inbox || [];
                 sessionMetadata = {
                   ...sessionMetadata,
-                  messageQueue: [...existingQueue, { id: randomUUID$1(), text, createdAt: Date.now() }]
+                  inbox: [...existingInbox, { messageId: randomUUID$1(), body: text, timestamp: Date.now(), read: false }]
                 };
                 sessionService.updateMetadata(sessionMetadata);
                 return;
@@ -6831,6 +7064,10 @@ The automated loop has finished. Review the progress above and let me know if yo
               sessionMetadata = { ...sessionMetadata, securityContext: newSecurityContext };
               return { success: false, message: "Security context updates with restart are not yet supported for this agent type." };
             },
+            onUpdateIsolation: async (enabled) => {
+              sessionMetadata = { ...sessionMetadata, forceIsolation: enabled };
+              return { success: false, message: "Isolation changes with restart are not yet supported for this agent type." };
+            },
             onSharingUpdate: (newSharing) => {
               logger.log(`[${agentName} Session ${sessionId}] Sharing config updated \u2014 persisting in-memory`);
               sessionMetadata = { ...sessionMetadata, sharing: newSharing };
@@ -6838,14 +7075,59 @@ The automated loop has finished. Review the progress above and let me know if yo
             onApplySystemPrompt: async () => {
               return { success: false, message: "System prompt updates with restart are not yet supported for this agent type." };
             },
+            onInboxMessage: (message) => {
+              const xmlText = formatInboxMessageXml(message);
+              if (message.urgency === "urgent") {
+                logger.log(`[${agentName} Session ${sessionId}] Urgent inbox message from ${message.from}: ${message.subject}`);
+                if (sessionMetadata.lifecycleState === "running" || !acpBackendReady) {
+                  const existingInbox = sessionMetadata.inbox || [];
+                  sessionMetadata = { ...sessionMetadata, inbox: [{ messageId: message.messageId, body: xmlText, displayText: `[Inbox] ${message.subject}`, timestamp: Date.now(), read: false, from: message.from, fromSession: message.fromSession, subject: message.subject, urgency: "urgent" }, ...existingInbox] };
+                  sessionService.updateMetadata(sessionMetadata);
+                } else {
+                  sessionMetadata = { ...sessionMetadata, lifecycleState: "running" };
+                  sessionService.updateMetadata(sessionMetadata);
+                  sessionService.pushMessage(`[Inbox] ${message.subject}`, "user");
+                  agentBackend.sendPrompt(sessionId, xmlText).catch((err) => {
+                    logger.error(`[${agentName} Session ${sessionId}] Error sending urgent inbox: ${err.message}`);
+                    if (!acpStopped) {
+                      sessionMetadata = { ...sessionMetadata, lifecycleState: "idle" };
+                      sessionService.updateMetadata(sessionMetadata);
+                      sessionService.sendSessionEnd();
+                    }
+                  });
+                }
+                const inbox = (sessionMetadata.inbox || []).map(
+                  (m) => m.messageId === message.messageId ? { ...m, read: true } : m
+                );
+                sessionMetadata = { ...sessionMetadata, inbox };
+                sessionService.updateMetadata(sessionMetadata);
+              } else {
+                logger.log(`[${agentName} Session ${sessionId}] Normal inbox message from ${message.from}: ${message.subject}`);
+              }
+            },
             onKillSession: () => {
               logger.log(`[${agentName} Session ${sessionId}] Kill session requested`);
               stopSession(sessionId);
             },
             onMetadataUpdate: (newMeta) => {
               const prevRalphLoop = sessionMetadata.ralphLoop;
+              const legacyQueue = newMeta.messageQueue;
+              let migratedInbox = newMeta.inbox || [];
+              if (legacyQueue && legacyQueue.length > 0) {
+                const converted = legacyQueue.map((q) => ({
+                  messageId: q.id,
+                  body: q.text,
+                  displayText: q.displayText,
+                  timestamp: q.createdAt,
+                  read: false
+                }));
+                migratedInbox = [...migratedInbox || [], ...converted];
+              }
               sessionMetadata = {
                 ...newMeta,
+                inbox: migratedInbox.length > 0 ? migratedInbox : newMeta.inbox,
+                // Clear legacy messageQueue — daemon uses inbox only
+                ...legacyQueue && legacyQueue.length > 0 ? { messageQueue: void 0 } : {},
                 // Daemon drives lifecycleState — don't let frontend overwrite with stale value
                 lifecycleState: sessionMetadata.lifecycleState,
                 ...sessionMetadata.summary && !newMeta.summary ? { summary: sessionMetadata.summary } : {},
@@ -6859,17 +7141,24 @@ The automated loop has finished. Review the progress above and let me know if yo
               if (prevRalphLoop && !newMeta.ralphLoop) {
                 sessionService.updateMetadata(sessionMetadata);
               }
+              if (legacyQueue && legacyQueue.length > 0) {
+                sessionService.updateMetadata(sessionMetadata);
+              }
               if (acpStopped) return;
-              const queue = newMeta.messageQueue;
-              if (queue && queue.length > 0 && sessionMetadata.lifecycleState === "idle") {
-                const next = queue[0];
-                const remaining = queue.slice(1);
-                sessionMetadata = { ...sessionMetadata, messageQueue: remaining.length > 0 ? remaining : void 0, lifecycleState: "running" };
+              const unreadInbox = sessionMetadata.inbox?.filter((m) => !m.read);
+              if (unreadInbox && unreadInbox.length > 0 && sessionMetadata.lifecycleState === "idle") {
+                const next = unreadInbox[0];
+                sessionMetadata = {
+                  ...sessionMetadata,
+                  inbox: (sessionMetadata.inbox || []).map((m) => m.messageId === next.messageId ? { ...m, read: true } : m),
+                  lifecycleState: "running"
+                };
                 sessionService.updateMetadata(sessionMetadata);
-                logger.log(`[Session ${sessionId}] Processing queued message from metadata update: "${next.text.slice(0, 50)}..."`);
+                const deliverText = isStructuredMessage(next) ? formatInboxMessageXml(next) : next.body;
+                logger.log(`[Session ${sessionId}] Processing inbox message from metadata update: "${next.body.slice(0, 50)}..."`);
                 sessionService.sendKeepAlive(true);
-                agentBackend.sendPrompt(sessionId, next.text).catch((err) => {
-                  logger.error(`[Session ${sessionId}] Error processing queued message: ${err.message}`);
+                agentBackend.sendPrompt(sessionId, deliverText).catch((err) => {
+                  logger.error(`[Session ${sessionId}] Error processing inbox message: ${err.message}`);
                   if (!acpStopped) {
                     sessionMetadata = { ...sessionMetadata, lifecycleState: "idle" };
                     sessionService.updateMetadata(sessionMetadata);
@@ -6986,16 +7275,20 @@ The automated loop has finished. Review the progress above and let me know if yo
           () => {
             if (acpStopped) return;
             if (insideOnTurnEnd) return;
-            const queue = sessionMetadata.messageQueue;
-            if (queue && queue.length > 0 && sessionMetadata.lifecycleState === "idle") {
-              const next = queue[0];
-              const remaining = queue.slice(1);
-              sessionMetadata = { ...sessionMetadata, messageQueue: remaining.length > 0 ? remaining : void 0, lifecycleState: "running" };
+            const unreadInbox = sessionMetadata.inbox?.filter((m) => !m.read);
+            if (unreadInbox && unreadInbox.length > 0 && sessionMetadata.lifecycleState === "idle") {
+              const next = unreadInbox[0];
+              sessionMetadata = {
+                ...sessionMetadata,
+                inbox: (sessionMetadata.inbox || []).map((m) => m.messageId === next.messageId ? { ...m, read: true } : m),
+                lifecycleState: "running"
+              };
               sessionService.updateMetadata(sessionMetadata);
-              logger.log(`[Session ${sessionId}] Processing queued message (ACP ralph activation): "${next.text.slice(0, 50)}..."`);
+              const deliverText = isStructuredMessage(next) ? formatInboxMessageXml(next) : next.body;
+              logger.log(`[Session ${sessionId}] Processing inbox message (ACP ralph activation): "${next.body.slice(0, 50)}..."`);
               sessionService.sendKeepAlive(true);
-              agentBackend.sendPrompt(sessionId, next.text).catch((err) => {
-                logger.error(`[Session ${sessionId}] Error processing queued message: ${err.message}`);
+              agentBackend.sendPrompt(sessionId, deliverText).catch((err) => {
+                logger.error(`[Session ${sessionId}] Error processing inbox message: ${err.message}`);
                 if (!acpStopped) {
                   sessionMetadata = { ...sessionMetadata, lifecycleState: "idle" };
                   sessionService.updateMetadata(sessionMetadata);
@@ -7009,7 +7302,7 @@ The automated loop has finished. Review the progress above and let me know if yo
         const writeSvampConfigPatchAcp = svampConfigChecker.writeConfig;
         const permissionHandler = new HyphaPermissionHandler(shouldAutoAllow2, logger.log);
         let agentIsoConfig;
-        if ((options2.forceIsolation || sessionMetadata.sharing?.enabled) && isolationCapabilities.preferred) {
+        if (((sessionMetadata.forceIsolation ?? options2.forceIsolation) || sessionMetadata.sharing?.enabled) && isolationCapabilities.preferred) {
           const method = isolationCapabilities.preferred;
           const detail = isolationCapabilities.details[method];
           if (detail.found && detail.verified !== false) {
@@ -7077,17 +7370,21 @@ The automated loop has finished. Review the progress above and let me know if yo
                 logger.log(`[${agentName} Session ${sessionId}] ${reason}`);
                 sessionService.pushMessage({ type: "message", message: reason }, "event");
               } else {
-                const pendingQueue = sessionMetadata.messageQueue;
-                if (pendingQueue && pendingQueue.length > 0) {
-                  const next = pendingQueue[0];
-                  const remaining = pendingQueue.slice(1);
-                  sessionMetadata = { ...sessionMetadata, messageQueue: remaining.length > 0 ? remaining : void 0, lifecycleState: "running" };
+                const pendingInbox = sessionMetadata.inbox?.filter((m) => !m.read);
+                if (pendingInbox && pendingInbox.length > 0) {
+                  const next = pendingInbox[0];
+                  sessionMetadata = {
+                    ...sessionMetadata,
+                    inbox: (sessionMetadata.inbox || []).map((m) => m.messageId === next.messageId ? { ...m, read: true } : m),
+                    lifecycleState: "running"
+                  };
                   sessionService.updateMetadata(sessionMetadata);
                   sessionService.sendKeepAlive(true);
-                  sessionService.pushMessage(next.displayText || next.text, "user");
-                  logger.log(`[${agentName} Session ${sessionId}] Processing queued message (priority over Ralph advance): "${next.text.slice(0, 50)}..."`);
-                  agentBackend.sendPrompt(sessionId, next.text).catch((err) => {
-                    logger.error(`[${agentName} Session ${sessionId}] Error processing queued message (Ralph): ${err.message}`);
+                  const deliverText = isStructuredMessage(next) ? formatInboxMessageXml(next) : next.body;
+                  sessionService.pushMessage(next.displayText || next.body, "user");
+                  logger.log(`[${agentName} Session ${sessionId}] Processing inbox message (priority over Ralph advance): "${next.body.slice(0, 50)}..."`);
+                  agentBackend.sendPrompt(sessionId, deliverText).catch((err) => {
+                    logger.error(`[${agentName} Session ${sessionId}] Error processing inbox message (Ralph): ${err.message}`);
                     if (!acpStopped) {
                       sessionMetadata = { ...sessionMetadata, lifecycleState: "idle" };
                       sessionService.updateMetadata(sessionMetadata);
@@ -7154,17 +7451,21 @@ The automated loop has finished. Review the progress above and let me know if yo
                 return;
               }
             }
-            const queue = sessionMetadata.messageQueue;
-            if (queue && queue.length > 0) {
-              const next = queue[0];
-              const remaining = queue.slice(1);
-              sessionMetadata = { ...sessionMetadata, messageQueue: remaining.length > 0 ? remaining : void 0, lifecycleState: "running" };
+            const unreadInboxItems = sessionMetadata.inbox?.filter((m) => !m.read);
+            if (unreadInboxItems && unreadInboxItems.length > 0) {
+              const next = unreadInboxItems[0];
+              sessionMetadata = {
+                ...sessionMetadata,
+                inbox: (sessionMetadata.inbox || []).map((m) => m.messageId === next.messageId ? { ...m, read: true } : m),
+                lifecycleState: "running"
+              };
               sessionService.updateMetadata(sessionMetadata);
               sessionService.sendKeepAlive(true);
-              logger.log(`[Session ${sessionId}] Processing queued message: "${next.text.slice(0, 50)}..."`);
-              sessionService.pushMessage(next.displayText || next.text, "user");
-              agentBackend.sendPrompt(sessionId, next.text).catch((err) => {
-                logger.error(`[Session ${sessionId}] Error processing queued message: ${err.message}`);
+              const deliverText = isStructuredMessage(next) ? formatInboxMessageXml(next) : next.body;
+              logger.log(`[Session ${sessionId}] Processing inbox message: "${next.body.slice(0, 50)}..."`);
+              sessionService.pushMessage(next.displayText || next.body, "user");
+              agentBackend.sendPrompt(sessionId, deliverText).catch((err) => {
+                logger.error(`[Session ${sessionId}] Error processing inbox message: ${err.message}`);
                 if (!acpStopped) {
                   sessionMetadata = { ...sessionMetadata, lifecycleState: "idle" };
                   sessionService.updateMetadata(sessionMetadata);
@@ -7375,7 +7676,7 @@ The automated loop has finished. Review the progress above and let me know if yo
             // Restore sharing & security context from persisted metadata
             sharing: persisted.metadata?.sharing,
             securityContext: persisted.metadata?.securityContext,
-            forceIsolation: !!persisted.metadata?.isolationMethod,
+            forceIsolation: persisted.metadata?.forceIsolation ?? !!persisted.metadata?.isolationMethod,
             // Block queue processing until auto-continue completes
             wasProcessing: persisted.wasProcessing && !!persisted.claudeResumeId && !isOrphaned
           });

package/dist/{run-D9fkwRb3.mjs → run-BgwhZgkT.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-p-RshVII.mjs';
+import { c as connectToHypha, a as registerSessionService } from './run-6QgabuQN.mjs';
 import { createServer } from 'node:http';
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';

package/package.json

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