svamp-cli 0.2.28 → 0.2.30

package/dist/{agentCommands-C2yYtmsz.mjs → agentCommands-BEKP7D0N.mjs}

@@ -148,7 +148,7 @@ async function sessionBroadcast(action, args) {
   console.log(`Broadcast sent: ${action}`);
 }
 async function connectToMachineService() {
-  const { connectAndGetMachine } = await import('./commands-Bs2vXq8f.mjs');
+  const { connectAndGetMachine } = await import('./commands-BZK0QJdM.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-Bs2vXq8f.mjs');
+    const { resolveSessionId } = await import('./commands-BZK0QJdM.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-D_OwNYZr.mjs';
+import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-zAG5iduC.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-D_OwNYZr.mjs').then(function (n) { return n.k; });
+      const { restartDaemon } = await import('./run-zAG5iduC.mjs').then(function (n) { return n.k; });
       await restartDaemon();
       process.exit(0);
     }
@@ -238,7 +238,7 @@ async function main() {
       console.error("svamp service: Service commands are not available in sandboxed sessions.");
       process.exit(1);
     }
-    const { handleServiceCommand } = await import('./commands-DauapAbb.mjs');
+    const { handleServiceCommand } = await import('./commands-BHZveuUk.mjs');
     await handleServiceCommand();
   } else if (subcommand === "serve") {
     const { isSandboxed: isSandboxedServe } = await import('./sandboxDetect-DNTcbgWD.mjs');
@@ -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-DlblUnsT.mjs');
+    const { handleServeCommand } = await import('./serveCommands-9ZQgXdCA.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-CGfaeJTY.mjs');
+    const { processCommand } = await import('./commands-bDntDDNU.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-CU3zzvb7.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-Ck8FHA97.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-B6CGgKUJ.mjs');
+  const { runInteractive } = await import('./run-C6wKZrsx.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-D_OwNYZr.mjs').then(function (n) { return n.i; });
+    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-zAG5iduC.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-D_OwNYZr.mjs').then(function (n) { return n.i; });
+  const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-zAG5iduC.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-D_OwNYZr.mjs').then(function (n) { return n.j; });
+    const { CodexMcpBackend } = await import('./run-zAG5iduC.mjs').then(function (n) { return n.j; });
     backend = new CodexMcpBackend({ cwd, log: logFn });
   } else {
-    const { AcpBackend } = await import('./run-D_OwNYZr.mjs').then(function (n) { return n.h; });
-    const { GeminiTransport } = await import('./run-D_OwNYZr.mjs').then(function (n) { return n.G; });
-    const { DefaultTransport } = await import('./run-D_OwNYZr.mjs').then(function (n) { return n.D; });
+    const { AcpBackend } = await import('./run-zAG5iduC.mjs').then(function (n) { return n.h; });
+    const { GeminiTransport } = await import('./run-zAG5iduC.mjs').then(function (n) { return n.G; });
+    const { DefaultTransport } = await import('./run-zAG5iduC.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-Bs2vXq8f.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionInboxSend, sessionInboxList, sessionInboxRead, sessionInboxReply, sessionInboxClear } = await import('./commands-BZK0QJdM.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-Bs2vXq8f.mjs');
+    const { parseShareArg } = await import('./commands-BZK0QJdM.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-Bs2vXq8f.mjs');
+    const { sessionApprove } = await import('./commands-BZK0QJdM.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-Bs2vXq8f.mjs');
+    const { sessionDeny } = await import('./commands-BZK0QJdM.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-C2yYtmsz.mjs');
+    const { sessionSetTitle } = await import('./agentCommands-BEKP7D0N.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-C2yYtmsz.mjs');
+    const { sessionSetLink } = await import('./agentCommands-BEKP7D0N.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-C2yYtmsz.mjs');
+    const { sessionNotify } = await import('./agentCommands-BEKP7D0N.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-C2yYtmsz.mjs');
+    const { sessionBroadcast } = await import('./agentCommands-BEKP7D0N.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-C2yYtmsz.mjs');
+        const { inboxSend } = await import('./agentCommands-BEKP7D0N.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-C2yYtmsz.mjs');
+        const { inboxList } = await import('./agentCommands-BEKP7D0N.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-C2yYtmsz.mjs');
+        const { inboxList } = await import('./agentCommands-BEKP7D0N.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-C2yYtmsz.mjs');
+        const { inboxReply } = await import('./agentCommands-BEKP7D0N.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-Bs2vXq8f.mjs');
+    const { machineShare } = await import('./commands-BZK0QJdM.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-Bs2vXq8f.mjs');
+    const { machineExec } = await import('./commands-BZK0QJdM.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-Bs2vXq8f.mjs');
+    const { machineInfo } = await import('./commands-BZK0QJdM.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-C2yYtmsz.mjs');
+    const { machineNotify } = await import('./agentCommands-BEKP7D0N.mjs');
     await machineNotify(message, level);
   } else if (machineSubcommand === "ls") {
-    const { machineLs } = await import('./commands-Bs2vXq8f.mjs');
+    const { machineLs } = await import('./commands-BZK0QJdM.mjs');
     let machineId;
     let showHidden = false;
     let path;

package/dist/{commands-DauapAbb.mjs → commands-BHZveuUk.mjs}

@@ -55,7 +55,7 @@ async function serviceExpose(args) {
     console.error("Usage: svamp service expose <name> --port <port> [--port <port2>] [options]");
     process.exit(1);
   }
-  const { runFrpcTunnel } = await import('./frpc-BhS2e6r-.mjs');
+  const { runFrpcTunnel } = await import('./frpc-DI5V-ecs.mjs');
   await runFrpcTunnel(name, ports, void 0, {
     group,
     groupKey,
@@ -88,7 +88,7 @@ async function serviceServe(args) {
     };
     process.on("SIGINT", cleanup);
     process.on("SIGTERM", cleanup);
-    const { runFrpcTunnel } = await import('./frpc-BhS2e6r-.mjs');
+    const { runFrpcTunnel } = await import('./frpc-DI5V-ecs.mjs');
     await runFrpcTunnel(name, [caddyPort]);
   } catch (err) {
     console.error(`Error serving directory: ${err.message}`);

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

package/dist/{commands-CGfaeJTY.mjs → commands-bDntDDNU.mjs}

@@ -1,11 +1,11 @@
 import { writeFileSync, readFileSync } from 'fs';
 import { resolve } from 'path';
-import { connectAndGetMachine } from './commands-Bs2vXq8f.mjs';
+import { connectAndGetMachine } from './commands-BZK0QJdM.mjs';
 import 'node:fs';
 import 'node:child_process';
 import 'node:path';
 import 'node:os';
-import './run-D_OwNYZr.mjs';
+import './run-zAG5iduC.mjs';
 import 'os';
 import 'fs/promises';
 import 'url';

package/dist/{frpc-BhS2e6r-.mjs → frpc-DI5V-ecs.mjs}

@@ -1,9 +1,31 @@
 import { spawn, execSync } from 'child_process';
 import { mkdirSync, writeFileSync, unlinkSync, existsSync, chmodSync } from 'fs';
 import { join } from 'path';
-import { homedir, platform, arch } from 'os';
+import { homedir, platform, arch, networkInterfaces, hostname } from 'os';
 import { createHash } from 'crypto';
 
+function getMachineFingerprint() {
+  try {
+    const ifaces = networkInterfaces();
+    const macs = [];
+    for (const name of Object.keys(ifaces).sort()) {
+      const addrs = ifaces[name] || [];
+      for (const addr of addrs) {
+        if (addr.internal) continue;
+        if (!addr.mac || addr.mac === "00:00:00:00:00:00") continue;
+        macs.push(addr.mac);
+      }
+    }
+    if (macs.length > 0) return `mac:${macs[0]}`;
+  } catch {
+  }
+  try {
+    const hn = hostname();
+    if (hn) return `host:${hn}`;
+  } catch {
+  }
+  return `home:${homedir()}`;
+}
 const FRP_VERSION = "0.68.0";
 const BIN_DIR = join(homedir(), ".svamp", "bin");
 const FRPC_BIN = join(BIN_DIR, platform() === "win32" ? "frpc.exe" : "frpc");
@@ -199,11 +221,12 @@ class FrpcTunnel {
         'Hypha token required for frpc authentication. Run "svamp login" or set HYPHA_TOKEN.'
       );
     }
-    const machineId = homedir();
-    const machineHash = createHash("sha256").update(machineId).digest("hex").slice(0, 6);
+    const machineFingerprint = getMachineFingerprint();
+    const machineHash = createHash("sha256").update(machineFingerprint).digest("hex").slice(0, 6);
     this.proxies = options.ports.map((port) => {
-      const subdomain = options.subdomains?.get(port) || (options.group ? `${options.group}-${createHash("sha256").update(options.group).digest("hex").slice(0, 8)}` : `${options.name}-${port}-${createHash("sha256").update(`${options.name}-${port}-${machineId}`).digest("hex").slice(0, 8)}`);
-      const proxyName = options.group ? `${options.name}-${port}-${machineHash}` : `${options.name}-${port}`;
+      const standaloneHash = createHash("sha256").update(`${options.name}|${machineFingerprint}`).digest("hex").slice(0, 8);
+      const subdomain = options.subdomains?.get(port) || (options.group ? `${options.group}-${createHash("sha256").update(options.group).digest("hex").slice(0, 8)}` : `${options.name}-${standaloneHash}`);
+      const proxyName = options.group ? `${options.name}-${port}-${machineHash}` : `${options.name}-${port}-${machineHash}`;
       return {
         name: proxyName,
         type: "http",

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

package/dist/{package-CU3zzvb7.mjs → package-Ck8FHA97.mjs}

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

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

package/dist/{run-D_OwNYZr.mjs → run-zAG5iduC.mjs}

@@ -1107,7 +1107,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
         const tunnels = handlers.tunnels;
         if (!tunnels) throw new Error("Tunnel management not available");
         if (tunnels.has(params.name)) throw new Error(`Tunnel '${params.name}' already running`);
-        const { FrpcTunnel } = await import('./frpc-BhS2e6r-.mjs');
+        const { FrpcTunnel } = await import('./frpc-DI5V-ecs.mjs');
         const tunnel = new FrpcTunnel({
           name: params.name,
           ports: params.ports,
@@ -6424,7 +6424,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-CdJgafp4.mjs');
+  const { ServeManager } = await import('./serveManager-C6exOzqc.mjs');
   const serveManager = new ServeManager(SVAMP_HOME, (msg) => logger.log(`[SERVE] ${msg}`), hyphaServerUrl);
   ensureAutoInstalledSkills(logger).catch(() => {
   });

package/dist/{serveCommands-DlblUnsT.mjs → serveCommands-9ZQgXdCA.mjs}

@@ -52,7 +52,7 @@ async function handleServeCommand() {
   }
 }
 async function serveAdd(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-Bs2vXq8f.mjs');
+  const { connectAndGetMachine } = await import('./commands-BZK0QJdM.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-Bs2vXq8f.mjs');
+  const { connectAndGetMachine } = await import('./commands-BZK0QJdM.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-Bs2vXq8f.mjs');
+  const { connectAndGetMachine } = await import('./commands-BZK0QJdM.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-Bs2vXq8f.mjs');
+  const { connectAndGetMachine } = await import('./commands-BZK0QJdM.mjs');
   const { machine, server } = await connectAndGetMachine(machineId);
   try {
     const info = await machine.serveInfo();

package/dist/{serveManager-CdJgafp4.mjs → serveManager-C6exOzqc.mjs}

@@ -153,24 +153,27 @@ class ServeAuth {
 <html><head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width,initial-scale=1">
-<title>Login \u2014 Svamp File Server</title>
+<title>Sign in \u2014 Svamp File Server</title>
 <style>
 *{box-sizing:border-box;margin:0;padding:0}
-body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif;display:flex;align-items:center;justify-content:center;min-height:100vh;background:#f6f8fa;color:#24292f}
-.card{background:#fff;border:1px solid #d0d7de;border-radius:12px;padding:32px;max-width:400px;width:100%;text-align:center;box-shadow:0 4px 12px rgba(31,35,40,0.06)}
+body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif;display:flex;align-items:center;justify-content:center;min-height:100vh;background:#f6f8fa;color:#24292f;padding:16px}
+.card{background:#fff;border:1px solid #d0d7de;border-radius:12px;padding:32px;max-width:420px;width:100%;text-align:center;box-shadow:0 4px 12px rgba(31,35,40,0.06)}
 h1{font-size:1.25rem;margin-bottom:8px}
 .subtitle{color:#656d76;font-size:0.9rem;margin-bottom:24px}
 button{background:#0969da;color:#fff;border:none;border-radius:8px;padding:12px 24px;font-size:1rem;cursor:pointer;font-weight:500;width:100%}
 button:hover{background:#0860c4}
 button:disabled{background:#94d3a2;cursor:wait}
-.status{margin-top:16px;color:#656d76;font-size:0.85rem;min-height:20px}
+.status{margin-top:16px;color:#656d76;font-size:0.85rem;min-height:20px;word-break:break-word}
 .error{color:#cf222e}
+.ok{color:#1a7f37}
+a{color:#0969da;text-decoration:none}
+a:hover{text-decoration:underline}
 </style>
 </head><body>
 <div class="card">
-  <h1>Svamp File Server</h1>
-  <p class="subtitle">Authentication required to access this content.</p>
-  <button id="login-btn" onclick="startLogin()">Sign in with Hypha</button>
+  <h1>Sign in required</h1>
+  <p class="subtitle">This resource is private. Sign in with your Hypha account to continue.</p>
+  <button id="login-btn">Sign in with Hypha</button>
   <div class="status" id="status"></div>
 </div>
 <script>
@@ -178,57 +181,94 @@ const hyphaServer = ${JSON.stringify(this.hyphaServerUrl)};
 const redirectUrl = ${JSON.stringify(redirectUrl)};
 const cookieName = ${JSON.stringify(COOKIE_NAME)};
 
-async function startLogin() {
-    const btn = document.getElementById('login-btn');
-    const status = document.getElementById('status');
+const btn = document.getElementById('login-btn');
+const status = document.getElementById('status');
+
+function setError(msg, linkUrl) {
+    if (linkUrl) {
+        status.innerHTML = '<span class="error">' + msg + '</span><br><a href="' + linkUrl + '" target="_blank" rel="noopener">Open login in new tab</a>';
+    } else {
+        status.innerHTML = '<span class="error">' + msg + '</span>';
+    }
+    btn.disabled = false;
+}
+
+btn.addEventListener('click', () => {
+    // IMPORTANT: open the popup SYNCHRONOUSLY inside the click handler so
+    // browsers do not flag it as a blocked popup. We then navigate it once
+    // the login URL comes back from the server.
+    const popup = window.open('about:blank', 'hypha-login', 'width=560,height=720');
+    if (!popup || popup.closed) {
+        setError('Popup blocked. Please allow popups for this site and try again.');
+        return;
+    }
+    startLogin(popup);
+});
+
+async function startLogin(popup) {
     btn.disabled = true;
-    status.textContent = 'Starting login...';
+    status.textContent = 'Starting login\u2026';
 
+    let key, loginUrl;
     try {
-        // Call hypha-login.start()
         const startResp = await fetch(hyphaServer + '/public/services/hypha-login/start');
-        if (!startResp.ok) throw new Error('Failed to start login');
-        const { key, login_url } = await startResp.json();
+        if (!startResp.ok) throw new Error('HTTP ' + startResp.status + ' from hypha-login/start');
+        const data = await startResp.json();
+        key = data.key;
+        loginUrl = data.login_url;
+        if (!key || !loginUrl) throw new Error('Invalid response from hypha-login/start');
+    } catch (err) {
+        try { popup.close(); } catch {}
+        setError('Failed to contact Hypha: ' + (err && err.message ? err.message : err));
+        return;
+    }
 
-        status.textContent = 'Redirecting to login...';
+    // Navigate the already-opened popup to the login URL.
+    try { popup.location.href = loginUrl; } catch {
+        setError('Could not open login window.', loginUrl);
+        return;
+    }
 
-        // Open login in a popup
-        const popup = window.open(login_url, 'hypha-login', 'width=500,height=600');
+    status.textContent = 'Waiting for you to sign in\u2026';
 
-        // Poll for token
-        status.textContent = 'Waiting for authentication...';
-        let attempts = 0;
-        const maxAttempts = 120; // 2 minutes
-        const poll = setInterval(async () => {
-            attempts++;
-            if (attempts > maxAttempts) {
-                clearInterval(poll);
-                status.innerHTML = '<span class="error">Login timed out. Please try again.</span>';
-                btn.disabled = false;
-                return;
-            }
-            try {
-                const checkResp = await fetch(
-                    hyphaServer + '/public/services/hypha-login/check?key=' + encodeURIComponent('"' + key + '"') + '&timeout=' + encodeURIComponent('"0"')
-                );
-                if (!checkResp.ok) return;
-                const result = await checkResp.json();
-                if (result && result.token) {
-                    clearInterval(poll);
-                    if (popup && !popup.closed) popup.close();
+    // Poll hypha-login/check for the token. Pass key and timeout as plain
+    // query-string values (the HTTP proxy does NOT JSON-decode query params
+    // for hypha-login \u2014 wrapping the key in quotes breaks the lookup).
+    const checkUrl = hyphaServer
+        + '/public/services/hypha-login/check?key=' + encodeURIComponent(key)
+        + '&timeout=0';
 
-                    // Set cookie (session cookie \u2014 no explicit expiry)
-                    document.cookie = cookieName + '=' + result.token + '; path=/; SameSite=Lax; Secure';
+    const deadline = Date.now() + 5 * 60 * 1000; // 5 minutes
+    let lastErr = null;
 
-                    status.textContent = 'Login successful! Redirecting...';
-                    setTimeout(() => { window.location.href = redirectUrl; }, 500);
+    // Intentionally do NOT bail out when popup.closed \u2014 the Hypha login popup
+    // closes itself immediately after posting the token, and the token often
+    // arrives on the *next* poll. Just keep polling until the deadline.
+    while (Date.now() < deadline) {
+        try {
+            const resp = await fetch(checkUrl, { cache: 'no-store' });
+            if (resp.ok) {
+                const result = await resp.json();
+                if (result && typeof result === 'object' && result.token) {
+                    try { if (!popup.closed) popup.close(); } catch {}
+                    // Session cookie \u2014 cleared when browser closes.
+                    const secure = location.protocol === 'https:' ? '; Secure' : '';
+                    document.cookie = cookieName + '=' + result.token + '; path=/; SameSite=Lax' + secure;
+                    status.innerHTML = '<span class="ok">Signed in. Redirecting\u2026</span>';
+                    setTimeout(() => { window.location.replace(redirectUrl); }, 300);
+                    return;
                 }
-            } catch { /* ignore polling errors */ }
-        }, 1000);
-    } catch (err) {
-        status.innerHTML = '<span class="error">Login failed: ' + err.message + '</span>';
-        btn.disabled = false;
+            } else {
+                lastErr = 'HTTP ' + resp.status;
+            }
+        } catch (err) {
+            lastErr = err && err.message ? err.message : String(err);
+        }
+        await new Promise(r => setTimeout(r, 1200));
     }
+
+    try { if (!popup.closed) popup.close(); } catch {}
+    setError('Login timed out' + (lastErr ? ' (' + lastErr + ')' : '') + '. Please try again.');
 }
 <\/script>
 </body></html>`;
@@ -444,26 +484,17 @@ class ServeManager {
   /** Start a lightweight Node.js HTTP proxy with auth + upload support. */
   startAuthProxy() {
     return new Promise((resolve, reject) => {
-      const LOGIN_PAGE = `<!DOCTYPE html>
-<html><head><meta charset="utf-8"><title>Sign In \u2014 Svamp</title>
-<style>body{font-family:system-ui,sans-serif;max-width:400px;margin:80px auto;text-align:center}
-input{width:100%;padding:8px;margin:8px 0;box-sizing:border-box}
-button{padding:10px 24px;background:#0969da;color:#fff;border:none;border-radius:4px;cursor:pointer}
-</style></head>
-<body><h2>Sign In</h2>
-<p>Paste your Hypha token to access this resource.</p>
-<form method="GET">
-<input type="text" name="token" placeholder="Bearer token or Hypha token" autofocus>
-<input type="hidden" name="return" id="return-field">
-<button type="submit">Access</button>
-</form>
-<script>document.getElementById('return-field').value=new URLSearchParams(location.search).get('return')||'/';<\/script>
-</body></html>`;
       const server = http.createServer(async (req, res) => {
         const url = new URL(req.url || "/", `http://127.0.0.1:${this.port}`);
         if (url.pathname === "/__login__") {
-          res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
-          res.end(LOGIN_PAGE);
+          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>";
+          res.writeHead(200, {
+            "Content-Type": "text/html; charset=utf-8",
+            "Cache-Control": "no-store"
+          });
+          res.end(html);
           return;
         }
         const mountName = url.pathname.split("/").filter(Boolean)[0];
@@ -546,7 +577,7 @@ button{padding:10px 24px;background:#0969da;color:#fff;border:none;border-radius
   /** Start frpc tunnel for the Caddy port. */
   async ensureTunnel() {
     try {
-      const { FrpcTunnel } = await import('./frpc-BhS2e6r-.mjs');
+      const { FrpcTunnel } = await import('./frpc-DI5V-ecs.mjs');
       this.frpcTunnel = new FrpcTunnel({
         name: this.serviceName,
         ports: [this.port],

package/package.json

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