svamp-cli 0.2.36 → 0.2.37

package/dist/{agentCommands-oLVbSvBZ.mjs → agentCommands-C88l82pM.mjs}

@@ -148,7 +148,7 @@ async function sessionBroadcast(action, args) {
   console.log(`Broadcast sent: ${action}`);
 }
 async function connectToMachineService() {
-  const { connectAndGetMachine } = await import('./commands-Cik0LIAl.mjs');
+  const { connectAndGetMachine } = await import('./commands-CrTDsMDZ.mjs');
   return connectAndGetMachine();
 }
 async function inboxSend(targetSessionId, opts) {
@@ -165,7 +165,7 @@ async function inboxSend(targetSessionId, opts) {
   }
   const { server, machine } = await connectToMachineService();
   try {
-    const { resolveSessionId } = await import('./commands-Cik0LIAl.mjs');
+    const { resolveSessionId } = await import('./commands-CrTDsMDZ.mjs');
     const sessions = await machine.listSessions();
     const match = resolveSessionId(sessions, targetSessionId);
     const fullTargetId = match.sessionId;

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-BKBv5P9v.mjs';
+import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-Dz0TkCj6.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -36,7 +36,7 @@ async function main() {
     await logoutFromHypha();
   } else if (subcommand === "daemon") {
     if (daemonSubcommand === "restart") {
-      const { restartDaemon } = await import('./run-BKBv5P9v.mjs').then(function (n) { return n.k; });
+      const { restartDaemon } = await import('./run-Dz0TkCj6.mjs').then(function (n) { return n.k; });
       await restartDaemon();
       process.exit(0);
     }
@@ -246,7 +246,7 @@ async function main() {
       console.error("svamp serve: Serve commands are not available in sandboxed sessions.");
       process.exit(1);
     }
-    const { handleServeCommand } = await import('./serveCommands-Cgq6Vif4.mjs');
+    const { handleServeCommand } = await import('./serveCommands-FnBtBifV.mjs');
     await handleServeCommand();
     process.exit(0);
   } else if (subcommand === "process" || subcommand === "proc") {
@@ -255,7 +255,7 @@ async function main() {
       console.error("svamp process: Process commands are not available in sandboxed sessions.");
       process.exit(1);
     }
-    const { processCommand } = await import('./commands-B4qmyXeM.mjs');
+    const { processCommand } = await import('./commands-Dz_JXrcs.mjs');
     let machineId;
     const processArgs = args.slice(1);
     const mIdx = processArgs.findIndex((a) => a === "--machine" || a === "-m");
@@ -273,7 +273,7 @@ async function main() {
   } else if (!subcommand || subcommand === "start") {
     await handleInteractiveCommand();
   } else if (subcommand === "--version" || subcommand === "-v") {
-    const pkg = await import('./package-DDUrcHYU.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-DRX_LQ92.mjs').catch(() => ({ default: { version: "unknown" } }));
     console.log(`svamp version: ${pkg.default.version}`);
   } else {
     console.error(`Unknown command: ${subcommand}`);
@@ -282,7 +282,7 @@ async function main() {
   }
 }
 async function handleInteractiveCommand() {
-  const { runInteractive } = await import('./run-sAfJWYld.mjs');
+  const { runInteractive } = await import('./run-BckEhiLq.mjs');
   const interactiveArgs = subcommand === "start" ? args.slice(1) : args;
   let directory = process.cwd();
   let resumeSessionId;
@@ -327,7 +327,7 @@ async function handleAgentCommand() {
     return;
   }
   if (agentArgs[0] === "list") {
-    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-BKBv5P9v.mjs').then(function (n) { return n.i; });
+    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-Dz0TkCj6.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)`);
@@ -339,7 +339,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-BKBv5P9v.mjs').then(function (n) { return n.i; });
+  const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-Dz0TkCj6.mjs').then(function (n) { return n.i; });
   let cwd = process.cwd();
   const filteredArgs = [];
   for (let i = 0; i < agentArgs.length; i++) {
@@ -363,12 +363,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-BKBv5P9v.mjs').then(function (n) { return n.j; });
+    const { CodexMcpBackend } = await import('./run-Dz0TkCj6.mjs').then(function (n) { return n.j; });
     backend = new CodexMcpBackend({ cwd, log: logFn });
   } else {
-    const { AcpBackend } = await import('./run-BKBv5P9v.mjs').then(function (n) { return n.h; });
-    const { GeminiTransport } = await import('./run-BKBv5P9v.mjs').then(function (n) { return n.G; });
-    const { DefaultTransport } = await import('./run-BKBv5P9v.mjs').then(function (n) { return n.D; });
+    const { AcpBackend } = await import('./run-Dz0TkCj6.mjs').then(function (n) { return n.h; });
+    const { GeminiTransport } = await import('./run-Dz0TkCj6.mjs').then(function (n) { return n.G; });
+    const { DefaultTransport } = await import('./run-Dz0TkCj6.mjs').then(function (n) { return n.D; });
     const transportHandler = config.agentName === "gemini" ? new GeminiTransport() : new DefaultTransport(config.agentName);
     backend = new AcpBackend({
       agentName: config.agentName,
@@ -495,7 +495,7 @@ async function handleSessionCommand() {
       process.exit(1);
     }
   }
-  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionInboxSend, sessionInboxList, sessionInboxRead, sessionInboxReply, sessionInboxClear } = await import('./commands-Cik0LIAl.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionInboxSend, sessionInboxList, sessionInboxRead, sessionInboxReply, sessionInboxClear } = await import('./commands-CrTDsMDZ.mjs');
   const parseFlagStr = (flag, shortFlag) => {
     for (let i = 1; i < sessionArgs.length; i++) {
       if ((sessionArgs[i] === flag || shortFlag) && i + 1 < sessionArgs.length) {
@@ -555,7 +555,7 @@ async function handleSessionCommand() {
         allowDomain.push(sessionArgs[++i]);
       }
     }
-    const { parseShareArg } = await import('./commands-Cik0LIAl.mjs');
+    const { parseShareArg } = await import('./commands-CrTDsMDZ.mjs');
     const shareEntries = share.map((s) => parseShareArg(s));
     await sessionSpawn(agent, dir, targetMachineId, {
       message,
@@ -641,7 +641,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session approve <session-id> [request-id] [--json]");
       process.exit(1);
     }
-    const { sessionApprove } = await import('./commands-Cik0LIAl.mjs');
+    const { sessionApprove } = await import('./commands-CrTDsMDZ.mjs');
     const approveReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
     await sessionApprove(sessionArgs[1], approveReqId, targetMachineId, {
       json: hasFlag("--json")
@@ -651,7 +651,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session deny <session-id> [request-id] [--json]");
       process.exit(1);
     }
-    const { sessionDeny } = await import('./commands-Cik0LIAl.mjs');
+    const { sessionDeny } = await import('./commands-CrTDsMDZ.mjs');
     const denyReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
     await sessionDeny(sessionArgs[1], denyReqId, targetMachineId, {
       json: hasFlag("--json")
@@ -687,7 +687,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session set-title <title>");
       process.exit(1);
     }
-    const { sessionSetTitle } = await import('./agentCommands-oLVbSvBZ.mjs');
+    const { sessionSetTitle } = await import('./agentCommands-C88l82pM.mjs');
     await sessionSetTitle(title);
   } else if (sessionSubcommand === "set-link") {
     const url = sessionArgs[1];
@@ -696,7 +696,7 @@ async function handleSessionCommand() {
       process.exit(1);
     }
     const label = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
-    const { sessionSetLink } = await import('./agentCommands-oLVbSvBZ.mjs');
+    const { sessionSetLink } = await import('./agentCommands-C88l82pM.mjs');
     await sessionSetLink(url, label);
   } else if (sessionSubcommand === "notify") {
     const message = sessionArgs[1];
@@ -705,7 +705,7 @@ async function handleSessionCommand() {
       process.exit(1);
     }
     const level = parseFlagStr("--level") || "info";
-    const { sessionNotify } = await import('./agentCommands-oLVbSvBZ.mjs');
+    const { sessionNotify } = await import('./agentCommands-C88l82pM.mjs');
     await sessionNotify(message, level);
   } else if (sessionSubcommand === "broadcast") {
     const action = sessionArgs[1];
@@ -713,7 +713,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-oLVbSvBZ.mjs');
+    const { sessionBroadcast } = await import('./agentCommands-C88l82pM.mjs');
     await sessionBroadcast(action, sessionArgs.slice(2).filter((a) => !a.startsWith("--")));
   } else if (sessionSubcommand === "inbox") {
     const inboxSubcmd = sessionArgs[1];
@@ -724,7 +724,7 @@ async function handleSessionCommand() {
         process.exit(1);
       }
       if (agentSessionId) {
-        const { inboxSend } = await import('./agentCommands-oLVbSvBZ.mjs');
+        const { inboxSend } = await import('./agentCommands-C88l82pM.mjs');
         await inboxSend(sessionArgs[2], {
           body: sessionArgs[3],
           subject: parseFlagStr("--subject"),
@@ -739,7 +739,7 @@ async function handleSessionCommand() {
       }
     } else if (inboxSubcmd === "list" || inboxSubcmd === "ls") {
       if (agentSessionId && !sessionArgs[2]) {
-        const { inboxList } = await import('./agentCommands-oLVbSvBZ.mjs');
+        const { inboxList } = await import('./agentCommands-C88l82pM.mjs');
         await inboxList({
           unread: hasFlag("--unread"),
           limit: parseFlagInt("--limit"),
@@ -761,7 +761,7 @@ async function handleSessionCommand() {
         process.exit(1);
       }
       if (agentSessionId && !sessionArgs[3]) {
-        const { inboxList } = await import('./agentCommands-oLVbSvBZ.mjs');
+        const { inboxList } = await import('./agentCommands-C88l82pM.mjs');
         await sessionInboxRead(agentSessionId, sessionArgs[2], targetMachineId);
       } else if (sessionArgs[3]) {
         await sessionInboxRead(sessionArgs[2], sessionArgs[3], targetMachineId);
@@ -771,7 +771,7 @@ async function handleSessionCommand() {
       }
     } else if (inboxSubcmd === "reply") {
       if (agentSessionId && sessionArgs[2] && sessionArgs[3] && !sessionArgs[4]) {
-        const { inboxReply } = await import('./agentCommands-oLVbSvBZ.mjs');
+        const { inboxReply } = await import('./agentCommands-C88l82pM.mjs');
         await inboxReply(sessionArgs[2], sessionArgs[3]);
       } else if (sessionArgs[2] && sessionArgs[3] && sessionArgs[4]) {
         await sessionInboxReply(sessionArgs[2], sessionArgs[3], sessionArgs[4], targetMachineId);
@@ -807,7 +807,7 @@ async function handleMachineCommand() {
     return;
   }
   if (machineSubcommand === "share") {
-    const { machineShare } = await import('./commands-Cik0LIAl.mjs');
+    const { machineShare } = await import('./commands-CrTDsMDZ.mjs');
     let machineId;
     const shareArgs = [];
     for (let i = 1; i < machineArgs.length; i++) {
@@ -837,7 +837,7 @@ async function handleMachineCommand() {
     }
     await machineShare(machineId, { add, remove, list, configPath, showConfig });
   } else if (machineSubcommand === "exec") {
-    const { machineExec } = await import('./commands-Cik0LIAl.mjs');
+    const { machineExec } = await import('./commands-CrTDsMDZ.mjs');
     let machineId;
     let cwd;
     const cmdParts = [];
@@ -857,7 +857,7 @@ async function handleMachineCommand() {
     }
     await machineExec(machineId, command, cwd);
   } else if (machineSubcommand === "info") {
-    const { machineInfo } = await import('./commands-Cik0LIAl.mjs');
+    const { machineInfo } = await import('./commands-CrTDsMDZ.mjs');
     let machineId;
     for (let i = 1; i < machineArgs.length; i++) {
       if ((machineArgs[i] === "--machine" || machineArgs[i] === "-m") && i + 1 < machineArgs.length) {
@@ -877,10 +877,10 @@ async function handleMachineCommand() {
         level = machineArgs[++i];
       }
     }
-    const { machineNotify } = await import('./agentCommands-oLVbSvBZ.mjs');
+    const { machineNotify } = await import('./agentCommands-C88l82pM.mjs');
     await machineNotify(message, level);
   } else if (machineSubcommand === "ls") {
-    const { machineLs } = await import('./commands-Cik0LIAl.mjs');
+    const { machineLs } = await import('./commands-CrTDsMDZ.mjs');
     let machineId;
     let showHidden = false;
     let path;

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

package/dist/{commands-B4qmyXeM.mjs → commands-Dz_JXrcs.mjs}

@@ -1,11 +1,11 @@
 import { writeFileSync, readFileSync } from 'fs';
 import { resolve } from 'path';
-import { connectAndGetMachine } from './commands-Cik0LIAl.mjs';
+import { connectAndGetMachine } from './commands-CrTDsMDZ.mjs';
 import 'node:fs';
 import 'node:child_process';
 import 'node:path';
 import 'node:os';
-import './run-BKBv5P9v.mjs';
+import './run-Dz0TkCj6.mjs';
 import 'os';
 import 'fs/promises';
 import 'url';

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { c as connectToHypha, d as daemonStatus, g as getHyphaServerUrl, r as registerMachineService, a as registerSessionService, s as startDaemon, b as stopDaemon } from './run-BKBv5P9v.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-Dz0TkCj6.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{package-DDUrcHYU.mjs → package-DRX_LQ92.mjs}

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

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

package/dist/{run-BKBv5P9v.mjs → run-Dz0TkCj6.mjs}

@@ -6440,7 +6440,7 @@ async function startDaemon(options) {
   const supervisor = new ProcessSupervisor(join(SVAMP_HOME, "processes"));
   await supervisor.init();
   const tunnels = /* @__PURE__ */ new Map();
-  const { ServeManager } = await import('./serveManager-XPnOLqQ4.mjs');
+  const { ServeManager } = await import('./serveManager-MqY_0frw.mjs');
   const serveManager = new ServeManager(SVAMP_HOME, (msg) => logger.log(`[SERVE] ${msg}`), hyphaServerUrl);
   ensureAutoInstalledSkills(logger).catch(() => {
   });

package/dist/{serveCommands-Cgq6Vif4.mjs → serveCommands-FnBtBifV.mjs}

@@ -52,7 +52,7 @@ async function handleServeCommand() {
   }
 }
 async function serveAdd(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-Cik0LIAl.mjs');
+  const { connectAndGetMachine } = await import('./commands-CrTDsMDZ.mjs');
   const pos = positionalArgs(args);
   const name = pos[0];
   if (!name) {
@@ -84,7 +84,7 @@ async function serveAdd(args, machineId) {
   }
 }
 async function serveRemove(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-Cik0LIAl.mjs');
+  const { connectAndGetMachine } = await import('./commands-CrTDsMDZ.mjs');
   const pos = positionalArgs(args);
   const name = pos[0];
   if (!name) {
@@ -104,7 +104,7 @@ async function serveRemove(args, machineId) {
   }
 }
 async function serveList(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-Cik0LIAl.mjs');
+  const { connectAndGetMachine } = await import('./commands-CrTDsMDZ.mjs');
   const all = hasFlag(args, "--all", "-a");
   const json = hasFlag(args, "--json");
   const sessionId = getFlag(args, "--session");
@@ -137,7 +137,7 @@ async function serveList(args, machineId) {
   }
 }
 async function serveInfo(machineId) {
-  const { connectAndGetMachine } = await import('./commands-Cik0LIAl.mjs');
+  const { connectAndGetMachine } = await import('./commands-CrTDsMDZ.mjs');
   const { machine, server } = await connectAndGetMachine(machineId);
   try {
     const info = await machine.serveInfo();

package/dist/{serveManager-XPnOLqQ4.mjs → serveManager-MqY_0frw.mjs}

@@ -258,13 +258,14 @@ class ServeManager {
   // auth proxy public port
   caddyPort = 0;
   // Caddy internal port
-  frpcTunnel = null;
+  /** Per-mount frpc tunnel — each mount gets its own subdomain `static-<name>-<hash>`. */
+  mountTunnels = /* @__PURE__ */ new Map();
+  /** hostname (lowercased, no port) → mount name. Updated when tunnels connect. */
+  hostToMount = /* @__PURE__ */ new Map();
   caddy = null;
   proxyServer = null;
-  serviceUrl = null;
   auth = null;
   persistFile;
-  serviceName = "static-serve";
   log;
   hyphaServerUrl;
   constructor(svampHome, logger, hyphaServerUrl) {
@@ -300,19 +301,31 @@ class ServeManager {
     if (this.caddy?.isRunning) {
       await this.caddy.addMount(name, resolvedDir);
     }
+    await this.startMountTunnel(name);
     this.persist();
     const url = this.getMountUrl(name);
-    this.log(`Mount added: ${name} \u2192 ${resolvedDir} (${url})`);
-    return { url, mount };
+    this.log(`Mount added: ${name} \u2192 ${resolvedDir} (${url ?? "tunnel pending"})`);
+    return { url: url || "", mount };
   }
   /**
-   * Remove a mount. If no mounts remain, stop Caddy + tunnel.
+   * Remove a mount. If no mounts remain, stop Caddy + auth proxy.
    */
   async removeMount(name) {
     if (!this.mounts.has(name)) {
       throw new Error(`Mount '${name}' not found`);
     }
     this.mounts.delete(name);
+    const tunnel = this.mountTunnels.get(name);
+    if (tunnel) {
+      try {
+        tunnel.destroy();
+      } catch {
+      }
+      this.mountTunnels.delete(name);
+    }
+    for (const [host, mountName] of this.hostToMount.entries()) {
+      if (mountName === name) this.hostToMount.delete(host);
+    }
     if (this.caddy?.isRunning) {
       try {
         await this.caddy.removeMount(name);
@@ -337,16 +350,21 @@ class ServeManager {
     return all;
   }
   /**
-   * Get server info (URL, port, running state, mount count).
+   * Get server info — each mount has its own URL (per-mount subdomain).
    */
   getInfo() {
     const running = this.caddy?.isRunning ?? false;
+    const firstMount = this.mounts.values().next().value;
+    const firstUrl = firstMount ? this.getMountUrl(firstMount.name) : null;
     return {
-      url: this.serviceUrl,
+      url: firstUrl,
       port: running ? this.caddy?.port ?? this.port : 0,
       running,
       mountCount: this.mounts.size,
-      mounts: Array.from(this.mounts.values())
+      mounts: Array.from(this.mounts.values()).map((m) => ({
+        ...m,
+        url: this.getMountUrl(m.name) || void 0
+      }))
     };
   }
   /**
@@ -370,6 +388,13 @@ class ServeManager {
       if (restoredCount > 0) {
         this.log(`Restoring ${restoredCount} mount(s)...`);
         await this.ensureRunning();
+        for (const m of this.mounts.values()) {
+          try {
+            await this.startMountTunnel(m.name);
+          } catch (err) {
+            this.log(`Failed to start tunnel for restored mount '${m.name}': ${err.message}`);
+          }
+        }
         this.persist();
       }
     } catch (err) {
@@ -377,14 +402,18 @@ class ServeManager {
     }
   }
   /**
-   * Shut down auth proxy + Caddy + frpc tunnel.
+   * Shut down auth proxy + Caddy + all per-mount frpc tunnels.
    */
   async shutdown() {
-    if (this.frpcTunnel) {
-      this.frpcTunnel.destroy();
-      this.frpcTunnel = null;
-      this.log("frpc tunnel stopped");
+    for (const [name, tunnel] of this.mountTunnels.entries()) {
+      try {
+        tunnel.destroy();
+      } catch {
+      }
+      this.log(`frpc tunnel for '${name}' stopped`);
     }
+    this.mountTunnels.clear();
+    this.hostToMount.clear();
     if (this.proxyServer) {
       await new Promise((resolve) => this.proxyServer.close(() => resolve()));
       this.proxyServer = null;
@@ -395,18 +424,19 @@ class ServeManager {
       this.log("Caddy stopped");
     }
     this.auth?.destroy();
-    this.serviceUrl = null;
   }
   // ── Internal ─────────────────────────────────────────────────────────
+  /** Get the public URL for a mount (mount-specific subdomain). */
   getMountUrl(name) {
-    const base = this.serviceUrl || `http://127.0.0.1:${this.port}`;
-    return `${base}/${name}/`;
+    const tunnel = this.mountTunnels.get(name);
+    const url = tunnel?.getUrls().get(this.port);
+    if (url) return `${url}/`;
+    if (this.port) return `http://127.0.0.1:${this.port}/${name}/`;
+    return null;
   }
   persist() {
     const state = {
-      mounts: Array.from(this.mounts.values()),
-      serviceName: this.serviceName,
-      serviceUrl: this.serviceUrl
+      mounts: Array.from(this.mounts.values())
     };
     try {
       fs.writeFileSync(this.persistFile, JSON.stringify(state, null, 2));
@@ -414,7 +444,7 @@ class ServeManager {
       this.log(`Error persisting serve state: ${err.message}`);
     }
   }
-  /** Start auth proxy + Caddy + frpc tunnel if not already running. */
+  /** Start auth proxy + Caddy if not already running. Per-mount tunnels are started separately. */
   async ensureRunning() {
     if (this.caddy?.isRunning) return;
     this.caddyPort = await findFreePort();
@@ -434,14 +464,27 @@ class ServeManager {
     this.log(`Caddy file server started on 127.0.0.1:${this.caddyPort}`);
     await this.startAuthProxy();
     this.log(`Auth proxy started on 127.0.0.1:${this.port}`);
-    await this.ensureTunnel();
   }
   /** Start a lightweight Node.js HTTP proxy with auth + upload support. */
   startAuthProxy() {
     return new Promise((resolve, reject) => {
       const server = http.createServer(async (req, res) => {
         const url = new URL(req.url || "/", `http://127.0.0.1:${this.port}`);
-        if (url.pathname === "/__login__") {
+        const incomingHost = (req.headers.host || "").split(":")[0].toLowerCase();
+        const hostMount = this.hostToMount.get(incomingHost);
+        let mountName;
+        let mountResolvedByHost = false;
+        let basePath;
+        if (hostMount && this.mounts.has(hostMount)) {
+          mountName = hostMount;
+          mountResolvedByHost = true;
+          basePath = url.pathname;
+        } else {
+          mountName = url.pathname.split("/").filter(Boolean)[0];
+          basePath = mountName ? url.pathname.slice(`/${mountName}`.length) || "/" : url.pathname;
+        }
+        const mount = mountName ? this.mounts.get(mountName) : void 0;
+        if (basePath === "/__login__" || url.pathname === "/__login__") {
           const returnUrl = url.searchParams.get("return") || "/";
           const safeReturn = returnUrl.startsWith("/__login__") ? "/" : returnUrl;
           const html = this.auth ? this.auth.getLoginPageHtml(safeReturn) : "<h1>Auth not configured</h1>";
@@ -452,8 +495,6 @@ class ServeManager {
           res.end(html);
           return;
         }
-        const mountName = url.pathname.split("/").filter(Boolean)[0];
-        const mount = mountName ? this.mounts.get(mountName) : void 0;
         if (mount && mount.access !== "public") {
           const userEmail = this.auth ? await this.auth.authenticate(req).catch(() => null) : null;
           const allowed = this.auth ? this.auth.isAuthorized(userEmail, mount.access, mount.ownerEmail) : false;
@@ -469,8 +510,7 @@ class ServeManager {
           }
         }
         if (req.method === "PUT" && mount) {
-          const subPath = url.pathname.slice(`/${mountName}`.length) || "/";
-          const filePath = path.join(mount.directory, subPath);
+          const filePath = path.join(mount.directory, basePath);
           fs.mkdirSync(path.dirname(filePath), { recursive: true });
           const ws = fs.createWriteStream(filePath);
           req.pipe(ws);
@@ -485,8 +525,7 @@ class ServeManager {
           return;
         }
         if (req.method === "DELETE" && mount) {
-          const subPath = url.pathname.slice(`/${mountName}`.length) || "/";
-          const filePath = path.join(mount.directory, subPath);
+          const filePath = path.join(mount.directory, basePath);
           try {
             fs.unlinkSync(filePath);
             res.writeHead(204);
@@ -497,10 +536,15 @@ class ServeManager {
           }
           return;
         }
+        let proxyPath = req.url || "/";
+        if (mountResolvedByHost && mountName) {
+          const search = url.search || "";
+          proxyPath = `/${mountName}${basePath === "/" ? "/" : basePath}${search}`;
+        }
         const proxyReq = http.request({
           hostname: "127.0.0.1",
           port: this.caddyPort,
-          path: req.url,
+          path: proxyPath,
           method: req.method,
           headers: req.headers
         }, (proxyRes) => {
@@ -520,42 +564,82 @@ class ServeManager {
       server.on("error", reject);
     });
   }
-  /** Get frpc tunnel health status, or null if no tunnel. */
+  /** Get aggregate health: returns the status of the worst-failing per-mount tunnel. */
   getTunnelHealth() {
-    return this.frpcTunnel?.status ?? null;
+    if (this.mountTunnels.size === 0) return null;
+    let worst = null;
+    for (const t of this.mountTunnels.values()) {
+      const s = t.status;
+      if (worst === null) {
+        worst = s;
+        continue;
+      }
+      if (s.failingDurationMs > worst.failingDurationMs) worst = s;
+    }
+    return worst;
   }
-  /** Destroy and recreate the frpc tunnel with fresh config. */
+  /** Destroy and recreate all per-mount tunnels with fresh configs. */
   async recreateTunnel() {
-    if (this.frpcTunnel) {
-      this.log("Recreating frpc tunnel (persistent failure detected)...");
-      this.frpcTunnel.destroy();
-      this.frpcTunnel = null;
+    this.log("Recreating all per-mount frpc tunnels (persistent failure detected)...");
+    const names = Array.from(this.mountTunnels.keys());
+    for (const name of names) {
+      const t = this.mountTunnels.get(name);
+      if (t) {
+        try {
+          t.destroy();
+        } catch {
+        }
+      }
+      this.mountTunnels.delete(name);
+    }
+    this.hostToMount.clear();
+    for (const name of names) {
+      try {
+        await this.startMountTunnel(name);
+      } catch (err) {
+        this.log(`Failed to restart tunnel for '${name}': ${err.message}`);
+      }
     }
-    await this.ensureTunnel();
   }
-  /** Start frpc tunnel for the Caddy port. */
-  async ensureTunnel() {
+  /** Start a per-mount frpc tunnel pointing the auth-proxy port to a dedicated subdomain. */
+  async startMountTunnel(mountName) {
+    if (this.mountTunnels.has(mountName)) return;
+    if (!this.port) throw new Error("Auth proxy not running \u2014 call ensureRunning() first");
+    const subdomainSafe = mountName.toLowerCase().replace(/[^a-z0-9-]/g, "-");
+    const tunnelName = `static-${subdomainSafe}`;
     try {
       const { FrpcTunnel } = await import('./frpc-DzRFx60H.mjs');
-      this.frpcTunnel = new FrpcTunnel({
-        name: this.serviceName,
+      const tunnel = new FrpcTunnel({
+        name: tunnelName,
         ports: [this.port],
-        onError: (err) => this.log(`frpc error: ${err.message}`),
+        onError: (err) => this.log(`frpc error [${mountName}]: ${err.message}`),
         onConnect: () => {
-          const url = this.frpcTunnel?.getUrls().get(this.port);
-          if (url) {
-            this.serviceUrl = url;
-            this.log(`frpc tunnel connected. URL: ${this.serviceUrl}`);
+          const url2 = tunnel.getUrls().get(this.port);
+          if (url2) {
+            try {
+              const host = new URL(url2).hostname.toLowerCase();
+              this.hostToMount.set(host, mountName);
+            } catch {
+            }
+            this.log(`frpc tunnel connected for '${mountName}'. URL: ${url2}/`);
           }
         },
-        onDisconnect: () => this.log("frpc tunnel disconnected, will auto-reconnect...")
+        onDisconnect: () => this.log(`frpc tunnel for '${mountName}' disconnected, will auto-reconnect...`)
       });
-      await this.frpcTunnel.connect();
-      this.serviceUrl = this.frpcTunnel.getUrls().get(this.port) || null;
-      this.log(`frpc tunnel started. URL: ${this.serviceUrl}`);
+      await tunnel.connect();
+      this.mountTunnels.set(mountName, tunnel);
+      const url = tunnel.getUrls().get(this.port);
+      if (url) {
+        try {
+          const host = new URL(url).hostname.toLowerCase();
+          this.hostToMount.set(host, mountName);
+        } catch {
+        }
+        this.log(`frpc tunnel started for '${mountName}'. URL: ${url}/`);
+      }
     } catch (err) {
-      this.log(`Warning: could not expose server externally: ${err.message}`);
-      this.log(`Server available locally at http://127.0.0.1:${this.port}`);
+      this.log(`Warning: could not expose mount '${mountName}' externally: ${err.message}`);
+      this.log(`Mount '${mountName}' available locally at http://127.0.0.1:${this.port}/${mountName}/`);
     }
   }
 }

package/package.json

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