srift-transfer 4.0.0 → 4.1.0

package/dist/daemon.js

@@ -1184,12 +1184,13 @@ function withQuery(url, q) {
   return `${url}${url.includes("?") ? "&" : "?"}${q}`;
 }
 function explainStatus(status, body) {
-  const msg = body.replace(/^SRIFT:\s*/, "").trim();
+  let msg = body.replace(/^SRIFT:\s*/, "").trim();
+  if (/^\s*<(!doctype|html)/i.test(msg)) msg = status >= 500 ? "The SRIFT server or a proxy in front of it is temporarily unavailable \u2014 retry shortly" : "";
+  if (status === 424 || status === 502 && /sender error: (the shared file|cannot read the shared file)/i.test(msg)) return new GetError(msg || "The sender can no longer serve this file.", "ESENDERFILE", status);
   if (status === 404) return new GetError(msg || "Link not found \u2014 it expired, was revoked, or the sender went offline.", "ENOTFOUND_LINK", 404);
   if (status === 410) return new GetError(msg || "Link expired or reached its download limit.", "EGONE", 410);
   if (status === 503) return new GetError(msg || "Sender is offline \u2014 their daemon must be running for relay links.", "EOFFLINE", 503);
   if (status === 409) return new GetError(msg || "The sender is still uploading \u2014 retry shortly.", "ENOTREADY", 409);
-  if (status === 502 && /sender error: (the shared file|cannot read the shared file)/i.test(msg)) return new GetError(msg, "ESENDERFILE", 502);
   return new GetError(`${msg || "Download failed"} (HTTP ${status})`, "EHTTP", status);
 }
 async function readSmallBody(res, max = 4096) {
@@ -1376,7 +1377,7 @@ async function getLink(input, opts = {}) {
   }
   const serverName = filenameFromDisposition(head["content-disposition"]) || "download.bin";
   const mode = head["x-srift-mode"] ? String(head["x-srift-mode"]) : null;
-  const total = parseInt(String(head["content-length"] || ""), 10) || 0;
+  const total = parseInt(String(head["x-srift-size"] || head["content-length"] || ""), 10) || 0;
   let received = 0;
   let lastPrint = 0;
   const progress = (n) => {
@@ -1699,10 +1700,10 @@ var init_skills_data = __esm({
   "../../lib/mcp/skills-data.mjs"() {
     "use strict";
     SOURCES = [
-      { name: "encrypted-chat", content: "---\nname: encrypted-chat\ndescription: Send and read end-to-end encrypted chat messages and manage in-session file transfers within an active SRIFT session\n---\n\n# encrypted-chat\n\nSend and read end-to-end encrypted chat messages within an active SRIFT session, plus manage in-session file transfers, via the local MCP daemon.\n\n## Requirements\n\nAn active SRIFT session (see the `session-management` skill to open or join one first). No special credentials required.\n\n## Instructions\n\nAvailable MCP tools (see `/.well-known/mcp/server-card.json` for full schemas):\n\n- `srift_send_chat` \u2014 send an E2EE chat message to peers in the current session.\n- `srift_chat_history` \u2014 read decrypted chat history for the current session.\n- `srift_send_file` \u2014 offer a file to peers already inside the session (in-session transfer, distinct from `quick-share`'s standalone link flow).\n- `srift_accept_transfer` \u2014 accept and download an inbound file offer.\n- `srift_list_transfers` \u2014 list all active and recent transfers with progress.\n- `srift_read_state` \u2014 read the raw `.srift-state.json` snapshot for debugging/observability.\n\nAll messages and file payloads are encrypted client-side with AES-256-GCM before leaving the device; the daemon never has access to plaintext.\n" },
+      { name: "encrypted-chat", content: "---\nname: encrypted-chat\ndescription: Send and read end-to-end encrypted chat messages and manage in-session file transfers within an active SRIFT session\n---\n\n# encrypted-chat\n\nSend and read end-to-end encrypted chat messages within an active SRIFT session, plus manage in-session file transfers, via the local MCP daemon.\n\n## Requirements\n\nAn active SRIFT session (see the `session-management` skill to open or join one first). No special credentials required.\n\n## Instructions\n\nAvailable MCP tools (see `/.well-known/mcp/server-card.json` for full schemas):\n\n- `srift_send_chat` \u2014 send an E2EE chat message to peers in the current session.\n- `srift_chat_history` \u2014 read decrypted chat history for the current session.\n- `srift_send_file` \u2014 offer a file to peers already inside the session (in-session transfer, distinct from `quick-share`'s standalone link flow).\n- `srift_accept_transfer` \u2014 accept and download an inbound file offer.\n- `srift_list_transfers` \u2014 list all active and recent transfers with progress.\n- `srift_read_state` \u2014 read the raw `.srift-state.json` snapshot for debugging/observability.\n\nYour local daemon (or the browser) encrypts messages and file chunks with AES-256-GCM before they leave the device, using keys derived from the session (plus the optional `roomSecret`); the relay server only forwards ciphertext and never receives the key. Without a `roomSecret` the key is derivable from the session ID (which the server sees); set one on both sides to make it participant-only.\n" },
       { name: "get-company-info", content: "---\nname: get-company-info\ndescription: Retrieve overview and core metadata for SRIFT and SRIPTO Corporation\n---\n\n# get-company-info\n\nRetrieve high-level overview and specifications about SRIFT and SRIPTO Corporation.\n\n## Requirements\n\nNo special credentials required.\n\n## Instructions\n\nRead the home page or `llms.txt` to find details about Srift (secure P2P transport), LetMeTeach, SRIX, and A\u039EI.\n" },
       { name: "quick-share", content: "---\nname: quick-share\ndescription: Zero-install file delivery: seed a file and get a public download URL, no session setup required on the recipient's end\n---\n\n# quick-share\n\nZero-install file delivery via SRIFT's local MCP server. Returns a public `https://srift.app/d/<token>` relay link that any recipient can open in a browser \u2014 no SRIFT install, no signup, no session-join UI required on their end. The bytes stream from the sender's machine through the srift.app relay on demand (pass-through, `Cache-Control: no-store`); nothing is stored on any server, so the link works while the sender's daemon (or process) runs.\n\n## Requirements\n\nNo credentials. The SRIFT local daemon binds to `127.0.0.1:3822` with zero authentication. Only outbound HTTPS/WSS on port 443 is needed.\n\n## Instructions\n\n1. Call the MCP tool `srift_quick_share` with `{ filePath: \"/absolute/path/to/file\" }` (single file) or `{ filePaths: [...] }` (up to 500 files/folders). Optional params: `bundle` (default: true = one .tar.gz link; false = one link per path, created in parallel), `bundleName`, `exclude` (string[] for glob patterns to skip), `sessionName`, `maxDownloads`, `ttlMs`, `encrypt`, `password`.\n2. The tool returns a `downloadUrl` (e.g. `https://srift.app/d/<token>`) when bundled, or `{ links: [], errors: [] }` when separate. With `encrypt: true` (or a `password`) each link is end-to-end encrypted with AES-256-GCM: the key rides in the `#k=` URL fragment, is never sent to a server, and the browser decrypts locally. Without it, links are protected by TLS in transit only \u2014 use `encrypt` for anything sensitive.\n3. Hand the URL(s) to the recipient. In order of preference, they can run:\n   - `srift get <url> [<url> ...]` (or `npx -y srift-transfer get <url>`; proxy-aware, resumable, decrypts `#k=` links, supports multiple URLs with `--concurrency N`, works where curl is broken)\n   - `wget --content-disposition <url>`\n   - PowerShell `iwr <url> -OutFile <name>`\n   - `curl -OJ <url>`\n   - or just open it in any browser.\n4. Keep the sending side running until the recipient has downloaded. From a shell, `srift quick-share <file> [<file> ...] --wait` blocks until then (`--wait-timeout 30m` exits with code 3 on timeout); `--keep-alive` serves until the TTL expires.\n\n## Sandboxed and datacenter agents\n\nIf the background daemon cannot start (the sandbox forbids local servers, blocks detached spawns or loopback, or the port is taken), `srift mcp` and `srift quick-share` host the daemon inside their own process: no local port, outbound HTTPS/WSS on 443 only. The MCP server switches automatically, so this tool keeps working. From a shell, run quick-share in the background (it exits after the download) or with `--wait`; `--foreground` forces in-process serving. Blocked UDP never breaks links. Run `srift doctor` (or the `srift_net_diagnose` tool) to diagnose connectivity; `HTTPS_PROXY`/`NO_PROXY` and `NODE_EXTRA_CA_CERTS` are honoured.\n\nSee `/openapi.json` and `/.well-known/mcp/server-card.json` for the full tool contract.\n" },
-      { name: "session-management", content: '---\nname: session-management\ndescription: Create, join, monitor, and control SRIFT end-to-end encrypted P2P sessions via the local MCP daemon\n---\n\n# session-management\n\nCreate, join, monitor, and control SRIFT end-to-end encrypted P2P sessions ("rooms") via the local MCP daemon. Covers the full session lifecycle used for in-session file transfer and encrypted chat.\n\n## Requirements\n\nNo special credentials required. The SRIFT local daemon binds to `127.0.0.1:3822` and requires zero authentication.\n\n## Instructions\n\nAvailable MCP tools (see `/.well-known/mcp/server-card.json` for full schemas):\n\n- `srift_start_session` \u2014 open a new E2EE room as host.\n- `srift_join_session` \u2014 join an existing room by its 7-character session ID.\n- `srift_session_status` \u2014 read current session, role, connected peers, and pending join requests.\n- `srift_approve_join` / `srift_reject_join` \u2014 host-only: approve or reject a guest\'s join request.\n- `srift_kick_user` \u2014 host-only: disconnect and ban a peer.\n- `srift_close_session` \u2014 tear down the session and flush all encryption keys.\n\nAll session state is ephemeral and in-memory; nothing is persisted server-side. Keys are derived locally via PBKDF2-SHA256 and never leave the client device.\n' }
+      { name: "session-management", content: '---\nname: session-management\ndescription: Create, join, monitor, and control SRIFT end-to-end encrypted P2P sessions via the local MCP daemon\n---\n\n# session-management\n\nCreate, join, monitor, and control SRIFT end-to-end encrypted P2P sessions ("rooms") via the local MCP daemon. Covers the full session lifecycle used for in-session file transfer and encrypted chat.\n\n## Requirements\n\nNo special credentials required. The SRIFT local daemon binds to `127.0.0.1:3822` and requires zero authentication.\n\n## Instructions\n\nAvailable MCP tools (see `/.well-known/mcp/server-card.json` for full schemas):\n\n- `srift_start_session` \u2014 open a new E2EE room as host.\n- `srift_join_session` \u2014 join an existing room by its 7-character session ID.\n- `srift_session_status` \u2014 read current session, role, connected peers, and pending join requests.\n- `srift_approve_join` / `srift_reject_join` \u2014 host-only: approve or reject a guest\'s join request.\n- `srift_kick_user` \u2014 host-only: remove a peer. Get their `userId` from `srift_session_status` \u2192 `participants`.\n- `srift_close_session` \u2014 tear down the session and flush all encryption keys.\n\nSessions are ephemeral: session metadata and chat ciphertext are kept server-side only until the session is deleted (host close or 7 days of inactivity), and files are never stored. Keys are derived locally via PBKDF2-SHA256 from the session ID (plus the optional `roomSecret`) and are never sent to the server; without a `roomSecret` the key is derivable from the session ID, which the server sees, so pass one to `srift_start_session` / `srift_join_session` to make it participant-only.\n' }
     ];
     MCP_SKILLS = SOURCES.map(({ name, content }) => {
       const uri = `skill://${name}/SKILL.md`;
@@ -1961,7 +1962,7 @@ var init_core = __esm({
           type: "object",
           properties: {
             sessionName: { type: "string", description: 'Human-readable session name (optional, e.g. "Project Collab")' },
-            roomSecret: { type: "string", description: "Optional shared secret for extra-strong E2EE key derivation. Never sent to server." }
+            roomSecret: { type: "string", description: "Optional shared secret mixed into key derivation. Never sent to server. Without it the key is derivable from the session ID (which the server sees); set it to make the key participant-only." }
           }
         },
         outputSchema: {
@@ -2012,15 +2013,37 @@ var init_core = __esm({
       {
         name: "srift_session_status",
         title: "Get Session Status",
-        description: "Get current session details: id, role (host/guest), connection state, pending join requests, peer count.",
+        description: "Get current session details: session { id, role (host/guest), connection state, your userId }, pending join requests (approve with srift_approve_join), and members with their userIds (remove one with srift_kick_user).",
         inputSchema: { type: "object", properties: {} },
         outputSchema: {
           type: "object",
           properties: {
-            sessionId: { type: "string", description: "Active session ID, if any" },
-            role: { type: "string", description: 'Active role: "host", "guest", or null' },
-            isConnected: { type: "boolean", description: "True if connected to signaling server" },
-            peerCount: { type: "number", description: "Number of connected peers in the room" },
+            session: {
+              type: "object",
+              description: "The active session (id is null when there is none)",
+              properties: {
+                id: { type: ["string", "null"], description: "Active session ID" },
+                name: { type: ["string", "null"], description: "Session name" },
+                role: { type: ["string", "null"], description: '"host", "guest", or null' },
+                isConnected: { type: "boolean", description: "True if connected to the signaling server" },
+                userId: { type: ["string", "null"], description: "Your user id in the session" },
+                status: { type: "string", description: 'Guest only: "pending_approval" or "approved" (hosted endpoint)' }
+              }
+            },
+            peerCount: { type: "number", description: "Number of connected sockets in the room (hosted endpoint)" },
+            participants: {
+              type: "array",
+              description: "Session members (local daemon): pass userId to srift_kick_user to remove one",
+              items: {
+                type: "object",
+                properties: {
+                  userId: { type: "string" },
+                  username: { type: "string" },
+                  isHost: { type: "boolean" },
+                  online: { type: "boolean" }
+                }
+              }
+            },
             pendingJoins: {
               type: "array",
               description: "List of pending guest join requests waiting for host approval",
@@ -2114,7 +2137,7 @@ var init_core = __esm({
       {
         name: "srift_kick_user",
         title: "Kick Peer",
-        description: "Host-only. Disconnect and ban a peer from the active room.",
+        description: "Host-only. Disconnect and remove a peer from the active room. Get the peer's userId from srift_session_status (participants).",
         inputSchema: {
           type: "object",
           properties: {
@@ -2382,6 +2405,8 @@ var init_core = __esm({
           type: "object",
           properties: {
             ok: { type: "boolean", description: "True if the diagnostic ran successfully (independent of what it found)" },
+            base: { type: "string", description: "The SRIFT server that was probed" },
+            checkedAt: { type: "string", description: "When the probe ran (ISO 8601); cached results show an older time" },
             verdict: { type: "string", description: '"ok", "degraded", or "blocked"' },
             rungs: {
               type: "array",
@@ -2527,8 +2552,13 @@ session-management, and get-company-info, \`skills/get\` to fetch one by URI, an
 ## Security model
 - AES-256-GCM, 12-byte random IV per message.
 - PBKDF2-SHA256, 100,000 iterations.
-- All keys derive locally from sessionId (+ optional roomSecret). Server never sees them.
-- File chunks transit P2P (WebTorrent for >10MB, WebSocket-relay fallback otherwise).
+- All keys derive locally from sessionId (+ optional roomSecret). The key is never sent to the
+  server, but the server sees the sessionId: without a roomSecret the key is derivable from it.
+  Pass roomSecret to srift_start_session / srift_join_session to make the key participant-only.
+- Quick-share links are end-to-end encrypted only with encrypt: true (key in the #k= fragment);
+  otherwise TLS in transit only, zero retention.
+- The CLI daemon moves file chunks over the AES-256-GCM WebSocket relay (browsers use WebRTC for
+  files >5 MB, with the relay as fallback).
 
 ## Local daemon vs hosted MCP
 If you are talking to the hosted endpoint (https://srift.app/mcp) instead of a local
@@ -2545,6 +2575,8 @@ for full file-transfer + chat capability.
 
 // ../../cli/mcp.ts
 import http3 from "http";
+import fs6 from "fs";
+import path5 from "path";
 function callDaemon(endpoint, method, body) {
   const emb = embeddedCall(method, endpoint, body);
   if (emb) return emb.then((r) => {
@@ -2595,43 +2627,60 @@ async function callTool(name, args) {
         sessionName: args.sessionName,
         roomSecret: args.roomSecret
       });
-      return `Session created.
+      const joinUrl = res.joinUrl || `https://srift.app/join-session?id=${res.sessionId}`;
+      return {
+        text: `Session created.
 Session ID: ${res.sessionId}
-Share URL: https://srift.app/join-session?id=${res.sessionId}
-You are the HOST. Approve incoming joins with srift_approve_join.`;
+Share URL: ${joinUrl}
+You are the HOST. Approve incoming joins with srift_approve_join.`,
+        structured: { sessionId: res.sessionId, url: joinUrl, role: "host" }
+      };
     }
     case "srift_join_session": {
       const res = await callDaemon("/session/join", "POST", args);
-      return `Join requested for session ${args.sessionId}. Status: ${res.success ? "awaiting host approval" : "failed"}.`;
+      return {
+        text: `Join requested for session ${args.sessionId}. Status: ${res.success ? "awaiting host approval" : "failed"}.`,
+        structured: { sessionId: args.sessionId, status: res.success ? "awaiting_approval" : "failed" }
+      };
     }
     case "srift_session_status": {
       const res = await callDaemon("/status", "GET");
-      return JSON.stringify({ session: res.session, pendingJoins: res.pendingJoins }, null, 2);
+      return JSON.stringify({ session: res.session, pendingJoins: res.pendingJoins, participants: res.participants || [] }, null, 2);
     }
     case "srift_close_session":
       await callDaemon("/session/close", "POST");
-      return "Session closed. Keys flushed.";
+      return { text: "Session closed. Keys flushed.", structured: { success: true } };
     case "srift_approve_join":
       await callDaemon("/session/approve", "POST", args);
-      return `Approved ${args.tempUserId}.`;
+      return { text: `Approved ${args.tempUserId}.`, structured: { success: true, tempUserId: args.tempUserId } };
     case "srift_reject_join":
       await callDaemon("/session/reject", "POST", args);
-      return `Rejected ${args.tempUserId}.`;
+      return { text: `Rejected ${args.tempUserId}.`, structured: { success: true, tempUserId: args.tempUserId } };
     case "srift_kick_user":
       await callDaemon("/session/kick", "POST", args);
-      return `Kicked ${args.userId}.`;
+      return { text: `Kicked ${args.userId}.`, structured: { success: true, userId: args.userId } };
     case "srift_send_file": {
       const res = await callDaemon("/send", "POST", args);
-      return `File offered.
+      return {
+        text: `File offered.
 File ID: ${res.fileId}
-The peer must call srift_accept_transfer with this fileId.`;
+The peer must call srift_accept_transfer with this fileId.`,
+        structured: { fileId: res.fileId, fileName: path5.basename(String(args.filePath || "")), fileSize: (() => {
+          try {
+            return fs6.statSync(args.filePath).size;
+          } catch {
+            return void 0;
+          }
+        })() }
+      };
     }
     case "srift_accept_transfer":
       await callDaemon("/receive", "POST", args);
-      return `Transfer ${args.fileId} accepted. Downloading\u2026`;
+      return { text: `Transfer ${args.fileId} accepted. Downloading\u2026`, structured: { success: true, fileId: args.fileId } };
     case "srift_list_transfers": {
       const res = await callDaemon("/status", "GET");
-      return JSON.stringify(res.activeTransfers || [], null, 2);
+      const transfers = res.activeTransfers || [];
+      return { text: JSON.stringify(transfers, null, 2), structured: { transfers } };
     }
     case "srift_quick_share": {
       const multi = Array.isArray(args?.filePaths) && args.filePaths.length > 0;
@@ -2725,10 +2774,11 @@ The peer must call srift_accept_transfer with this fileId.`;
     }
     case "srift_send_chat":
       await callDaemon("/chat/send", "POST", args);
-      return `Sent (E2EE): "${args.message}"`;
+      return { text: `Sent (E2EE): "${args.message}"`, structured: { success: true, timestamp: (/* @__PURE__ */ new Date()).toISOString() } };
     case "srift_chat_history": {
       const res = await callDaemon("/chat/history", "GET");
-      return JSON.stringify(res, null, 2);
+      const messages = Array.isArray(res) ? res : res?.messages || [];
+      return { text: JSON.stringify(res, null, 2), structured: { messages } };
     }
     case "srift_read_state": {
       const res = await callDaemon("/state", "GET");
@@ -2774,7 +2824,7 @@ var init_mcp = __esm({
     SERVER_INFO = {
       name: "srift-mcp-server",
       title: "SRIFT Secure P2P File Transfer",
-      version: "4.0.0"
+      version: "4.1.0"
     };
     localDaemonBackend = { callTool, readResource };
     handleMcpMessage = createMcpHandler({
@@ -2786,8 +2836,8 @@ var init_mcp = __esm({
 });
 
 // ../../cli/pack.ts
-import fs6 from "fs";
-import path5 from "path";
+import fs7 from "fs";
+import path6 from "path";
 import zlib from "zlib";
 import { pipeline } from "stream/promises";
 import { Readable } from "stream";
@@ -2811,16 +2861,16 @@ function normFileMode(m) {
 }
 function listFiles(root, excludes = DEFAULT_EXCLUDES) {
   const pats = excludes.map(globToRegExp);
-  const excluded = (rel) => pats.some((p) => p.test(rel) || p.test(path5.posix.basename(rel)));
+  const excluded = (rel) => pats.some((p) => p.test(rel) || p.test(path6.posix.basename(rel)));
   const out = [];
   const walk = (dirAbs, dirRel) => {
-    const ents = fs6.readdirSync(dirAbs, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
+    const ents = fs7.readdirSync(dirAbs, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
     for (const e of ents) {
       const rel = dirRel ? `${dirRel}/${e.name}` : e.name;
       if (excluded(rel)) continue;
-      const abs = path5.join(dirAbs, e.name);
+      const abs = path6.join(dirAbs, e.name);
       if (e.isSymbolicLink()) continue;
-      const st = fs6.lstatSync(abs);
+      const st = fs7.lstatSync(abs);
       if (e.isDirectory()) {
         out.push({ abs, rel, size: 0, mode: 493, mtime: Math.floor(st.mtimeMs / 1e3), dir: true });
         walk(abs, rel);
@@ -2882,7 +2932,7 @@ async function* tarStream(entries, prefix) {
     yield* entryHeaders(e, prefix);
     if (e.dir) continue;
     let written = 0;
-    const stream = fs6.createReadStream(e.abs);
+    const stream = fs7.createReadStream(e.abs);
     stream.on("error", () => {
     });
     try {
@@ -2903,17 +2953,17 @@ async function* tarStream(entries, prefix) {
   yield Buffer.alloc(BLOCK * 2);
 }
 async function packDirectory(dir, outFile, excludes = DEFAULT_EXCLUDES) {
-  const root = path5.resolve(dir);
+  const root = path6.resolve(dir);
   const entries = listFiles(root, excludes);
   const files = entries.filter((e) => !e.dir);
   if (!files.length) throw new Error(`Nothing to share in ${root} (empty, or everything was excluded)`);
-  const prefix = path5.basename(root) || "folder";
-  await pipeline(Readable.from(tarStream(entries, prefix)), zlib.createGzip({ level: 6 }), fs6.createWriteStream(outFile, { mode: 384 }));
+  const prefix = path6.basename(root) || "folder";
+  await pipeline(Readable.from(tarStream(entries, prefix)), zlib.createGzip({ level: 6 }), fs7.createWriteStream(outFile, { mode: 384 }));
   return { files: files.length, bytes: files.reduce((a, e) => a + e.size, 0) };
 }
 function readable(p) {
   try {
-    fs6.accessSync(p, fs6.constants.R_OK);
+    fs7.accessSync(p, fs7.constants.R_OK);
     return null;
   } catch (e) {
     return e?.code || "unreadable";
@@ -2927,7 +2977,7 @@ function listPaths(paths, excludes = DEFAULT_EXCLUDES, skipped = []) {
       used.add(name.toLowerCase());
       return name;
     }
-    const ext = path5.extname(name);
+    const ext = path6.extname(name);
     const stem = name.slice(0, name.length - ext.length);
     for (let i = 2; ; i++) {
       const c = `${stem} (${i})${ext}`;
@@ -2938,10 +2988,10 @@ function listPaths(paths, excludes = DEFAULT_EXCLUDES, skipped = []) {
     }
   };
   for (const p of paths) {
-    const abs = path5.resolve(p);
+    const abs = path6.resolve(p);
     let st;
     try {
-      st = fs6.statSync(abs);
+      st = fs7.statSync(abs);
     } catch (e) {
       skipped.push({ path: abs, reason: e?.code === "ENOENT" ? "not found" : e?.code || "stat failed" });
       continue;
@@ -2954,7 +3004,7 @@ function listPaths(paths, excludes = DEFAULT_EXCLUDES, skipped = []) {
         skipped.push({ path: abs, reason: e?.code || "unreadable folder" });
         continue;
       }
-      const name = unique(path5.basename(abs) || "item");
+      const name = unique(path6.basename(abs) || "item");
       out.push({ abs, rel: name, size: 0, mode: 493, mtime: Math.floor(st.mtimeMs / 1e3), dir: true });
       for (const e of inner) {
         const why = e.dir ? null : readable(e.abs);
@@ -2970,7 +3020,7 @@ function listPaths(paths, excludes = DEFAULT_EXCLUDES, skipped = []) {
         skipped.push({ path: abs, reason: why });
         continue;
       }
-      out.push({ abs, rel: unique(path5.basename(abs) || "item"), size: st.size, mode: normFileMode(st.mode), mtime: Math.floor(st.mtimeMs / 1e3), dir: false });
+      out.push({ abs, rel: unique(path6.basename(abs) || "item"), size: st.size, mode: normFileMode(st.mode), mtime: Math.floor(st.mtimeMs / 1e3), dir: false });
     } else {
       skipped.push({ path: abs, reason: "not a regular file or folder" });
     }
@@ -2987,7 +3037,7 @@ async function packPaths(paths, outFile, prefix, excludes = DEFAULT_EXCLUDES) {
       throw new Error(`Nothing to share${skipped.length ? ` \u2014 skipped: ${skipped.map((x) => `${x.path} (${x.reason})`).join(", ")}` : " (empty folders, or everything was excluded)"}`);
     }
     try {
-      await pipeline(Readable.from(tarStream(entries, prefix)), zlib.createGzip({ level: 6 }), fs6.createWriteStream(outFile, { mode: 384 }));
+      await pipeline(Readable.from(tarStream(entries, prefix)), zlib.createGzip({ level: 6 }), fs7.createWriteStream(outFile, { mode: 384 }));
       return { files: files.length, bytes: files.reduce((a, e) => a + e.size, 0), skipped };
     } catch (err) {
       const bad = err?.packEntry;
@@ -3028,10 +3078,10 @@ import express from "express";
 import cors from "cors";
 import { WebSocket as WebSocket2 } from "ws";
 import { webcrypto } from "crypto";
-import fs7 from "fs";
+import fs8 from "fs";
 import http4 from "http";
 import { Duplex } from "stream";
-import path6 from "path";
+import path7 from "path";
 import os4 from "os";
 import { v4 as uuidv4 } from "uuid";
 import dotenv from "dotenv";
@@ -3162,6 +3212,46 @@ async function decrypt(encB64) {
   const decrypted = await crypto5.subtle.decrypt({ name: "AES-GCM", iv: iv2 }, encryptionKey, ciphertext);
   return new TextDecoder().decode(decrypted);
 }
+function relayKey() {
+  if (!session.id) return Promise.reject(new Error("No active session"));
+  if (relayKeyCache?.sessionId !== session.id) relayKeyCache = { sessionId: session.id, key: deriveKey(session.id) };
+  return relayKeyCache.key;
+}
+function relayAad(fileId, chunkIndex, totalChunks) {
+  return new TextEncoder().encode(`${RELAY_ENC}|${fileId}|${chunkIndex}|${totalChunks}`);
+}
+async function sealRelayChunk(plain, fileId, chunkIndex, totalChunks) {
+  const iv2 = crypto5.getRandomValues(new Uint8Array(IV_LEN));
+  const ct = new Uint8Array(await crypto5.subtle.encrypt(
+    { name: "AES-GCM", iv: iv2, additionalData: relayAad(fileId, chunkIndex, totalChunks) },
+    await relayKey(),
+    plain
+  ));
+  const out = new Uint8Array(IV_LEN + ct.length);
+  out.set(iv2);
+  out.set(ct, IV_LEN);
+  return Array.from(out);
+}
+async function openRelayChunk(p) {
+  if (p.enc === void 0 || p.enc === null) {
+    if (typeof p.chunk === "string") return Buffer.from(p.chunk, "base64");
+    if (Array.isArray(p.chunk)) return Buffer.from(p.chunk);
+    throw new Error("relay chunk is neither base64 nor a byte array");
+  }
+  if (p.enc !== RELAY_ENC) throw new Error(`unsupported relay encryption scheme: ${String(p.enc)}`);
+  if (!Array.isArray(p.chunk)) throw new Error("sealed relay chunk is not a byte array");
+  const data = Uint8Array.from(p.chunk);
+  if (data.length < IV_LEN + 16) throw new Error("sealed relay chunk too short");
+  try {
+    return Buffer.from(await crypto5.subtle.decrypt(
+      { name: "AES-GCM", iv: data.slice(0, IV_LEN), additionalData: relayAad(p.fileId, p.chunkIndex, p.totalChunks) },
+      await relayKey(),
+      data.slice(IV_LEN)
+    ));
+  } catch {
+    throw new Error(`relay chunk ${p.chunkIndex} of ${p.fileId} failed authentication (wrong session key or tampered data)`);
+  }
+}
 function getTrackers(sessionId) {
   const list = [];
   try {
@@ -3200,13 +3290,13 @@ function writeStateFile() {
     })),
     lastUpdated: (/* @__PURE__ */ new Date()).toISOString()
   };
-  fs7.writeFileSync(STATE_PATH, JSON.stringify(stateData, null, 2), "utf-8");
+  fs8.writeFileSync(STATE_PATH, JSON.stringify(stateData, null, 2), "utf-8");
 }
 function pruneStaleStateOnStartup() {
-  if (!fs7.existsSync(STATE_PATH)) return;
+  if (!fs8.existsSync(STATE_PATH)) return;
   let prunedCount = 0;
   try {
-    const raw = fs7.readFileSync(STATE_PATH, "utf-8");
+    const raw = fs8.readFileSync(STATE_PATH, "utf-8");
     const parsed = JSON.parse(raw);
     const now = Date.now();
     const lastUpdatedMs = parsed?.lastUpdated ? Date.parse(parsed.lastUpdated) : NaN;
@@ -3225,7 +3315,7 @@ function pruneStaleStateOnStartup() {
     if (sessionStale || freshTransfers.length !== transfers.length) {
       parsed.activeTransfers = freshTransfers;
       parsed.lastUpdated = (/* @__PURE__ */ new Date()).toISOString();
-      fs7.writeFileSync(STATE_PATH, JSON.stringify(parsed, null, 2), "utf-8");
+      fs8.writeFileSync(STATE_PATH, JSON.stringify(parsed, null, 2), "utf-8");
     }
     if (prunedCount > 0) {
       console.log(
@@ -3235,7 +3325,7 @@ function pruneStaleStateOnStartup() {
   } catch (err) {
     console.warn("[DAEMON] Stale state file was unreadable, removing it:", err?.message || err);
     try {
-      fs7.unlinkSync(STATE_PATH);
+      fs8.unlinkSync(STATE_PATH);
     } catch {
     }
   }
@@ -3256,8 +3346,11 @@ function connectWebSocket(wsTargetUrl) {
   }
   csrfToken = null;
   console.log(`[DAEMON] Connecting to Signaler WS: ${wsTargetUrl}`);
-  wsConn = new WebSocket2(wsTargetUrl, { agent: agentFor(wsTargetUrl) });
-  wsConn.on("open", () => {
+  const sock = new WebSocket2(wsTargetUrl, { agent: agentFor(wsTargetUrl) });
+  wsConn = sock;
+  const current = () => wsConn === sock;
+  sock.on("open", () => {
+    if (!current()) return;
     console.log("[DAEMON] WebSocket connection open");
     session.isConnected = true;
     writeStateFile();
@@ -3295,7 +3388,8 @@ function connectWebSocket(wsTargetUrl) {
       }
     }, 3e4);
   });
-  wsConn.on("message", async (dataStr) => {
+  sock.on("message", async (dataStr) => {
+    if (!current()) return;
     try {
       const msg = JSON.parse(dataStr);
       const { type, payload } = msg;
@@ -3328,6 +3422,30 @@ function connectWebSocket(wsTargetUrl) {
         case "heartbeat_ack":
           lastHeartbeatAckAt = Date.now();
           break;
+        case "user_list": {
+          const users = Array.isArray(payload?.users) ? payload.users : [];
+          participants = users.map((u) => ({ userId: String(u.id), username: String(u.username || ""), isHost: !!u.is_host, online: !!u.isOnline }));
+          broadcastSSE("participants", { participants });
+          if (payload?.messageId) {
+            try {
+              sock.send(JSON.stringify({ type: "user_list_ack", payload: { messageId: payload.messageId } }));
+            } catch {
+            }
+          }
+          break;
+        }
+        case "kicked_from_session":
+          console.log(`[DAEMON] Kicked from session: ${payload?.reason || ""}`);
+          sessionTerminated = true;
+          terminationReason = payload?.reason || "You were removed from the session by the host";
+          session.isConnected = false;
+          session.userId = null;
+          csrfToken = null;
+          pendingJoins = [];
+          participants = [];
+          writeStateFile();
+          broadcastSSE("session_terminated", { reason: terminationReason });
+          break;
         case "session_deleted":
           console.log(`[DAEMON] Session deleted by host: ${payload.reason || ""}`);
           sessionTerminated = true;
@@ -3335,6 +3453,7 @@ function connectWebSocket(wsTargetUrl) {
           session = { id: null, name: null, role: null, isConnected: false, userId: null };
           activeTransfers = [];
           pendingJoins = [];
+          participants = [];
           encryptionKey = null;
           writeStateFile();
           broadcastSSE("session_terminated", { reason: terminationReason });
@@ -3351,6 +3470,7 @@ function connectWebSocket(wsTargetUrl) {
             session.isConnected = false;
             session.userId = null;
             pendingJoins = [];
+            participants = [];
             writeStateFile();
             broadcastSSE("session_terminated", { reason: terminationReason });
           }
@@ -3405,14 +3525,41 @@ function connectWebSocket(wsTargetUrl) {
           break;
         case "file_accept":
           console.log(`[DAEMON] File offer accepted by peer! ID: ${payload.fileId}`);
+          {
+            const acceptedTx = activeTransfers.find((t) => t.fileId === payload.fileId);
+            if (acceptedTx) acceptedTx.peerRelayEnc = payload.relayEnc === RELAY_ENC ? RELAY_ENC : void 0;
+          }
           startUpload(payload.fileId, payload.userId);
           break;
         case "webtorrent_info_hash":
           handleWebTorrentInfoHash(payload);
           break;
         case "file_chunk":
-          handleIncomingChunk(payload);
+          handleIncomingChunk(payload).catch((e) => {
+            console.error(`[DAEMON] Relay chunk rejected: ${e?.message || e}`);
+            const bad = activeTransfers.find((t) => t.fileId === payload?.fileId);
+            if (bad) {
+              bad.status = "error";
+              writeStateFile();
+            }
+            try {
+              sock.send(JSON.stringify({ type: "file_cancel_by_receiver", payload: { fileId: payload?.fileId } }));
+            } catch {
+            }
+          });
+          break;
+        case "file_cancelled_by_receiver":
+        case "file_cancelled_by_sender":
+        case "file_cancelled_all": {
+          const gone = activeTransfers.find((t) => t.fileId === payload?.fileId);
+          activeUploads.delete(payload?.fileId);
+          if (gone && gone.status !== "completed") {
+            gone.status = "cancelled";
+            writeStateFile();
+            broadcastSSE("transfer_progress", { fileId: gone.fileId, fileName: gone.name, size: gone.size, bytesTransferred: gone.bytesTransferred, progress: gone.progress, status: "cancelled" });
+          }
           break;
+        }
         case "file_chunk_ack":
           handleChunkAck(payload);
           break;
@@ -3424,6 +3571,7 @@ function connectWebSocket(wsTargetUrl) {
           if (entry) {
             entry.token = payload.token;
             entry.downloadUrl = payload.downloadUrl;
+            if (typeof payload.claim === "string") entry.claim = payload.claim;
             pubsharesByToken.set(payload.token, entry);
             const resolver = pubshareRegResolvers.get(payload.fileId);
             if (resolver) {
@@ -3457,7 +3605,8 @@ function connectWebSocket(wsTargetUrl) {
       console.error("[DAEMON] Error processing WS message:", err);
     }
   });
-  wsConn.on("close", () => {
+  sock.on("close", () => {
+    if (!current()) return;
     console.log("[DAEMON] WebSocket connection closed");
     session.isConnected = false;
     csrfToken = null;
@@ -3477,7 +3626,8 @@ function connectWebSocket(wsTargetUrl) {
       }
     }, 3e3);
   });
-  wsConn.on("error", (err) => {
+  sock.on("error", (err) => {
+    if (!current()) return;
     console.error("[DAEMON] WebSocket error:", err);
   });
 }
@@ -3615,7 +3765,7 @@ async function startWebSocketUpload(fileId, targetUserId) {
   const tx = activeTransfers.find((t) => t.fileId === fileId);
   if (!tx || !tx.filePath) return;
   const chunkSize = 64 * 1024;
-  const stat = fs7.statSync(tx.filePath);
+  const stat = fs8.statSync(tx.filePath);
   const totalChunks = Math.max(1, Math.ceil(stat.size / chunkSize));
   tx.status = "uploading";
   tx.startTime = Date.now();
@@ -3633,6 +3783,17 @@ async function startWebSocketUpload(fileId, targetUserId) {
   sendNextChunk(fileId);
 }
 function sendNextChunk(fileId) {
+  sendNextChunkAsync(fileId).catch((e) => {
+    console.error(`[DAEMON] Relay upload failed for ${fileId}: ${e?.message || e}`);
+    activeUploads.delete(fileId);
+    const failed = activeTransfers.find((t) => t.fileId === fileId);
+    if (failed) {
+      failed.status = "error";
+      writeStateFile();
+    }
+  });
+}
+async function sendNextChunkAsync(fileId) {
   const upload = activeUploads.get(fileId);
   if (!upload) return;
   const tx = activeTransfers.find((t) => t.fileId === fileId);
@@ -3652,18 +3813,18 @@ function sendNextChunk(fileId) {
     return;
   }
   const start = upload.currentChunk * upload.chunkSize;
-  const stat = fs7.statSync(upload.filePath);
+  const stat = fs8.statSync(upload.filePath);
   const end = Math.min(start + upload.chunkSize, stat.size);
   const buffer = Buffer.alloc(end - start);
-  const fd = fs7.openSync(upload.filePath, "r");
-  fs7.readSync(fd, buffer, 0, end - start, start);
-  fs7.closeSync(fd);
-  const chunkBase64 = buffer.toString("base64");
+  const fd = fs8.openSync(upload.filePath, "r");
+  fs8.readSync(fd, buffer, 0, end - start, start);
+  fs8.closeSync(fd);
+  const frame = tx.peerRelayEnc === RELAY_ENC ? { chunk: await sealRelayChunk(buffer, fileId, upload.currentChunk, upload.totalChunks), enc: RELAY_ENC } : { chunk: buffer.toString("base64") };
   wsConn?.send(JSON.stringify({
     type: "file_chunk",
     payload: {
       fileId,
-      chunk: chunkBase64,
+      ...frame,
       chunkIndex: upload.currentChunk,
       totalChunks: upload.totalChunks,
       targetUserId: upload.targetUserId
@@ -3697,18 +3858,21 @@ function handleChunkAck(payload) {
     sendNextChunk(fileId);
   }
 }
-function handleIncomingChunk(payload) {
-  const { fileId, chunk, chunkIndex, totalChunks, from } = payload;
+async function handleIncomingChunk(payload) {
+  const { fileId, chunkIndex, totalChunks, from } = payload;
   const tx = activeTransfers.find((t) => t.fileId === fileId);
   if (!tx) return;
+  const mode = payload.enc === void 0 || payload.enc === null ? "plain" : "sealed";
+  if (tx.relayMode && tx.relayMode !== mode) throw new Error(`transfer ${fileId} mixed sealed and plaintext chunks`);
+  tx.relayMode = mode;
+  const chunkBuffer = await openRelayChunk(payload);
   tx.status = "downloading";
   tx.totalChunks = totalChunks;
   tx.peerId = from;
-  const chunkBuffer = Buffer.from(chunk, "base64");
   tx.bytesTransferred += chunkBuffer.length;
   tx.chunksCount++;
-  const chunkPath = path6.join(TEMP_DIR, `${fileId}_chunk_${chunkIndex}`);
-  fs7.writeFileSync(chunkPath, chunkBuffer);
+  const chunkPath = path7.join(TEMP_DIR, `${fileId}_chunk_${chunkIndex}`);
+  fs8.writeFileSync(chunkPath, chunkBuffer);
   tx.progress = tx.bytesTransferred / tx.size * 100;
   const elapsed = (Date.now() - tx.startTime) / 1e3;
   if (elapsed > 0) {
@@ -3736,10 +3900,10 @@ function handleFileComplete(payload) {
   const tx = activeTransfers.find((t) => t.fileId === fileId);
   if (!tx) return;
   const destDir = tx.saveDir || process.cwd();
-  const destPath = path6.join(destDir, tx.name);
+  const destPath = path7.join(destDir, tx.name);
   try {
-    if (!fs7.existsSync(destDir)) {
-      fs7.mkdirSync(destDir, { recursive: true });
+    if (!fs8.existsSync(destDir)) {
+      fs8.mkdirSync(destDir, { recursive: true });
     }
   } catch (err) {
     console.error(`[DAEMON] Failed to create destination directory ${destDir}:`, err);
@@ -3747,7 +3911,7 @@ function handleFileComplete(payload) {
     writeStateFile();
     return;
   }
-  const writeStream = fs7.createWriteStream(destPath);
+  const writeStream = fs8.createWriteStream(destPath);
   writeStream.on("error", (err) => {
     console.error(`[DAEMON] Write stream error for ${destPath}:`, err);
     tx.status = "error";
@@ -3782,12 +3946,12 @@ function handleFileComplete(payload) {
     });
   });
   for (let i = 0; i < tx.totalChunks; i++) {
-    const chunkPath = path6.join(TEMP_DIR, `${fileId}_chunk_${i}`);
-    if (fs7.existsSync(chunkPath)) {
+    const chunkPath = path7.join(TEMP_DIR, `${fileId}_chunk_${i}`);
+    if (fs8.existsSync(chunkPath)) {
       try {
-        const chunkBuf = fs7.readFileSync(chunkPath);
+        const chunkBuf = fs8.readFileSync(chunkPath);
         writeStream.write(chunkBuf);
-        fs7.unlinkSync(chunkPath);
+        fs8.unlinkSync(chunkPath);
       } catch (err) {
         console.error(`[DAEMON] Error reading/writing chunk ${i}:`, err);
         writeStream.emit("error", err);
@@ -3797,6 +3961,20 @@ function handleFileComplete(payload) {
   }
   writeStream.end();
 }
+async function waitSignalReady(maxMs = 8e3) {
+  if (!session.id) return { status: 409, body: { success: false, error: "No active session. Call /session/start first." } };
+  if (sessionTerminated) return { status: 410, body: { success: false, error: terminationReason || "The session ended." } };
+  if (session.role === "guest" && !session.userId) {
+    return { status: 409, body: { success: false, error: "Waiting for the host to approve your join request.", retryAfterMs: 2e3 } };
+  }
+  const ready = () => !!encryptionKey && !!csrfToken && wsConn?.readyState === WebSocket2.OPEN;
+  for (let waited = 0; waited < maxMs && !ready() && session.id; waited += 100) {
+    await new Promise((r) => setTimeout(r, 100));
+  }
+  if (ready()) return null;
+  if (!encryptionKey) return { status: 409, body: { success: false, error: "Encryption key not ready. Session still initialising." } };
+  return { status: 503, body: { success: false, error: "Signaling connection not ready (WebSocket is connecting). Retry in 1\u20132 seconds.", retryAfterMs: 1500 } };
+}
 async function registerPubshare(fileId, absPath, filename, size, mime, opts = {}, timeoutMs = 5e3) {
   if (!wsConn || wsConn.readyState !== WebSocket2.OPEN) {
     throw new Error("Signaling WebSocket not connected");
@@ -3819,7 +3997,8 @@ async function registerPubshare(fileId, absPath, filename, size, mime, opts = {}
     linkKey: opts.linkKey,
     tempFile: opts.tempFile,
     displayName: opts.displayName || filename,
-    prefixLen: opts.prefixLen
+    prefixLen: opts.prefixLen,
+    claim: opts.preferClaim
   };
   pubshares.set(fileId, entry);
   const ackP = new Promise((resolve, reject) => {
@@ -3844,6 +4023,7 @@ async function registerPubshare(fileId, absPath, filename, size, mime, opts = {}
       maxDownloads,
       expiresAt,
       preferToken: opts.preferToken || void 0,
+      preferClaim: opts.preferToken && opts.preferClaim ? opts.preferClaim : void 0,
       encrypted: opts.encrypted ? true : void 0,
       prefixLen: opts.encrypted && opts.prefixLen ? opts.prefixLen : void 0
     }
@@ -3860,7 +4040,7 @@ async function reregisterPubsharesAfterReconnect() {
       pubsharesByToken.delete(entry.token);
       if (entry.tempFile) {
         try {
-          fs7.unlinkSync(entry.tempFile);
+          fs8.unlinkSync(entry.tempFile);
         } catch {
         }
       }
@@ -3871,7 +4051,7 @@ async function reregisterPubsharesAfterReconnect() {
       pubsharesByToken.delete(entry.token);
       if (entry.tempFile) {
         try {
-          fs7.unlinkSync(entry.tempFile);
+          fs8.unlinkSync(entry.tempFile);
         } catch {
         }
       }
@@ -3890,6 +4070,7 @@ async function reregisterPubsharesAfterReconnect() {
           maxDownloads: remainingMax,
           ttlMs: remainingTtl,
           preferToken: entry.token,
+          preferClaim: entry.claim,
           encrypted: entry.encrypted,
           linkKey: entry.linkKey,
           tempFile: entry.tempFile,
@@ -3915,16 +4096,16 @@ async function handlePubsharePull(payload) {
   }
   let fd;
   try {
-    fd = fs7.openSync(entry.filePath, "r");
+    fd = fs8.openSync(entry.filePath, "r");
   } catch (e) {
     throw new Error(e?.code === "ENOENT" ? "the shared file no longer exists on the sender" : `cannot read the shared file (${e?.code || e?.message})`);
   }
   try {
-    const size = fs7.fstatSync(fd).size;
+    const size = fs8.fstatSync(fd).size;
     if (size !== entry.size) throw new Error("the shared file changed after the link was created");
   } catch (e) {
     try {
-      fs7.closeSync(fd);
+      fs8.closeSync(fd);
     } catch {
     }
     throw e;
@@ -3944,7 +4125,7 @@ async function handlePubsharePull(payload) {
       }
       const len = Math.min(CHUNK, end - pos + 1);
       const buf = Buffer.alloc(len);
-      const got = fs7.readSync(fd, buf, 0, len, pos);
+      const got = fs8.readSync(fd, buf, 0, len, pos);
       if (got !== len) throw new Error("the shared file changed while it was being sent");
       const dataB64 = buf.toString("base64");
       wsConn.send(JSON.stringify({
@@ -3968,7 +4149,7 @@ async function handlePubsharePull(payload) {
     }
   } finally {
     try {
-      fs7.closeSync(fd);
+      fs8.closeSync(fd);
     } catch {
     }
     activePulls.delete(requestId);
@@ -4021,7 +4202,7 @@ async function ensureHostSessionOnce(sessionName) {
 }
 async function shareViaRelay(absPath, stat, reqBody, encrypt2) {
   await ensureHostSession(reqBody.sessionName);
-  const filename = reqBody.name || path6.basename(absPath);
+  const filename = reqBody.name || path7.basename(absPath);
   const fileId = `cli_file_${Date.now()}_${Math.random().toString(36).slice(2, 11)}`;
   let servePath = absPath;
   let serveSize = stat.size;
@@ -4031,13 +4212,13 @@ async function shareViaRelay(absPath, stat, reqBody, encrypt2) {
   if (encrypt2) {
     const key = newLinkKey();
     linkKey = b64url(key);
-    tempFile = path6.join(TEMP_DIR, `${fileId}.sre1`);
+    tempFile = path7.join(TEMP_DIR, `${fileId}.sre1`);
     const meta = { name: filename, size: stat.size, mime: "application/octet-stream" };
-    const fd = fs7.openSync(tempFile, "w", 384);
+    const fd = fs8.openSync(tempFile, "w", 384);
     try {
-      for await (const part of encryptFile(absPath, key, meta, { password: reqBody.password })) fs7.writeSync(fd, part);
+      for await (const part of encryptFile(absPath, key, meta, { password: reqBody.password })) fs8.writeSync(fd, part);
     } finally {
-      fs7.closeSync(fd);
+      fs8.closeSync(fd);
     }
     servePath = tempFile;
     serveSize = encryptedSize(stat.size, meta);
@@ -4069,7 +4250,7 @@ async function shareViaRelay(absPath, stat, reqBody, encrypt2) {
   if (reqBody._ownedPath) {
     if (encrypt2) {
       try {
-        fs7.unlinkSync(reqBody._ownedPath);
+        fs8.unlinkSync(reqBody._ownedPath);
       } catch {
       }
     } else tempFile = reqBody._ownedPath;
@@ -4108,7 +4289,7 @@ async function shareViaRelay(absPath, stat, reqBody, encrypt2) {
   } catch (e) {
     if (tempFile) {
       try {
-        fs7.unlinkSync(tempFile);
+        fs8.unlinkSync(tempFile);
       } catch {
       }
     }
@@ -4140,26 +4321,26 @@ function safeArchiveBase(name, fallback) {
 async function createShare(reqBody) {
   if (!reqBody?.filePath) throw Object.assign(new Error("filePath (or filePaths) required"), { status: 400 });
   assertRelayMode(reqBody);
-  const absPath = path6.resolve(reqBody.filePath);
+  const absPath = path7.resolve(reqBody.filePath);
   let stat;
   try {
-    stat = fs7.statSync(absPath);
+    stat = fs8.statSync(absPath);
   } catch {
     throw Object.assign(new Error(`File not found: ${absPath}`), { status: 404 });
   }
   if (stat.isDirectory()) {
-    const base = safeArchiveBase(path6.basename(absPath), "folder");
-    const out = path6.join(TEMP_DIR, `${uuidv4()}-${base}.tar.gz`);
+    const base = safeArchiveBase(path7.basename(absPath), "folder");
+    const out = path7.join(TEMP_DIR, `${uuidv4()}-${base}.tar.gz`);
     try {
       await packDirectory(absPath, out, excludesFor(reqBody));
     } catch (e) {
       try {
-        fs7.unlinkSync(out);
+        fs8.unlinkSync(out);
       } catch {
       }
       throw Object.assign(new Error(e?.message || String(e)), { status: 400 });
     }
-    return shareViaRelay(out, fs7.statSync(out), { ...reqBody, name: reqBody.name || `${base}.tar.gz`, _ownedPath: out }, shareEncrypt(reqBody));
+    return shareViaRelay(out, fs8.statSync(out), { ...reqBody, name: reqBody.name || `${base}.tar.gz`, _ownedPath: out }, shareEncrypt(reqBody));
   }
   if (!stat.isFile()) throw Object.assign(new Error(`Not a regular file or folder: ${absPath}`), { status: 400 });
   return shareViaRelay(absPath, stat, reqBody, shareEncrypt(reqBody));
@@ -4167,26 +4348,26 @@ async function createShare(reqBody) {
 async function createMultiShare(reqBody) {
   assertRelayMode(reqBody);
   const raw = Array.isArray(reqBody.filePaths) ? reqBody.filePaths : [];
-  const paths = Array.from(new Set(raw.filter((p) => typeof p === "string" && p.trim()).map((p) => path6.resolve(p))));
+  const paths = Array.from(new Set(raw.filter((p) => typeof p === "string" && p.trim()).map((p) => path7.resolve(p))));
   if (!paths.length) throw Object.assign(new Error("filePaths must be a non-empty array of paths"), { status: 400 });
   if (paths.length > MAX_MULTI_PATHS) throw Object.assign(new Error(`Too many paths (${paths.length}); max ${MAX_MULTI_PATHS}. Share a folder instead.`), { status: 400 });
-  const missing = paths.filter((p) => !fs7.existsSync(p));
+  const missing = paths.filter((p) => !fs8.existsSync(p));
   const bundle = reqBody.bundle !== false;
   if (bundle) {
     const stamp = (/* @__PURE__ */ new Date()).toISOString().slice(0, 16).replace(/[-:T]/g, "");
     const base = safeArchiveBase(reqBody.bundleName, `srift-${paths.length}-items-${stamp}`);
-    const out = path6.join(TEMP_DIR, `${uuidv4()}-${base}.tar.gz`);
+    const out = path7.join(TEMP_DIR, `${uuidv4()}-${base}.tar.gz`);
     let packed;
     try {
       packed = await packPaths(paths, out, base, excludesFor(reqBody));
     } catch (e) {
       try {
-        fs7.unlinkSync(out);
+        fs8.unlinkSync(out);
       } catch {
       }
       throw Object.assign(new Error(e?.message || String(e)), { status: 400 });
     }
-    const r = await shareViaRelay(out, fs7.statSync(out), { ...reqBody, name: `${base}.tar.gz`, _ownedPath: out }, shareEncrypt(reqBody));
+    const r = await shareViaRelay(out, fs8.statSync(out), { ...reqBody, name: `${base}.tar.gz`, _ownedPath: out }, shareEncrypt(reqBody));
     if (packed.skipped.length) console.warn(`[DAEMON] bundle skipped ${packed.skipped.length} item(s): ${packed.skipped.map((x) => x.path).join(", ")}`);
     return { ...r, bundle: true, files: packed.files, bytes: packed.bytes, paths: paths.length, skipped: packed.skipped };
   }
@@ -4255,7 +4436,7 @@ function embeddedDispatch(method, pathname, body) {
     }
   });
 }
-var _WebTorrentCtor, _webTorrentLoadError, SRIFT_HOME, EMBEDDED, STATE_PATH, logPath, logStream, logMessage, fmtLogArg, crypto5, PORT, DEFAULT_SIGNALER_URL, activeSignalerUrl, lastDiag, session, activeTransfers, chatHistory, pendingJoins, sseClients, wsConn, wsUrl, csrfToken, heartbeatInterval, lastHeartbeatAckAt, encryptionKey, sessionTerminated, terminationReason, activeTorrents, wtClient, pubshares, pubsharesByToken, activePulls, pubshareRegResolvers, TEMP_DIR, KDF_ITERATIONS, IV_LEN, STATE_STALE_MS, activeUploads, app, LOCAL_HOSTS, DAEMON_START_TIME, PACKAGE_VERSION, hostSessionInflight, MAX_MULTI_PATHS, MULTI_CONCURRENCY, embeddedReady, httpServer;
+var _WebTorrentCtor, _webTorrentLoadError, SRIFT_HOME, EMBEDDED, STATE_PATH, logPath, logStream, logMessage, fmtLogArg, crypto5, PORT, DEFAULT_SIGNALER_URL, activeSignalerUrl, lastDiag, session, activeTransfers, chatHistory, pendingJoins, participants, sseClients, wsConn, wsUrl, csrfToken, heartbeatInterval, lastHeartbeatAckAt, encryptionKey, sessionTerminated, terminationReason, activeTorrents, wtClient, pubshares, pubsharesByToken, activePulls, pubshareRegResolvers, TEMP_DIR, KDF_ITERATIONS, IV_LEN, RELAY_ENC, relayKeyCache, STATE_STALE_MS, activeUploads, app, LOCAL_HOSTS, DAEMON_START_TIME, PACKAGE_VERSION, hostSessionInflight, MAX_MULTI_PATHS, MULTI_CONCURRENCY, embeddedReady, httpServer;
 var init_daemon = __esm({
   "../../cli/daemon.ts"() {
     init_mcp();
@@ -4266,25 +4447,25 @@ var init_daemon = __esm({
     init_pack();
     _WebTorrentCtor = null;
     _webTorrentLoadError = null;
-    SRIFT_HOME = path6.join(os4.homedir(), ".srift");
+    SRIFT_HOME = path7.join(os4.homedir(), ".srift");
     try {
-      fs7.mkdirSync(SRIFT_HOME, { recursive: true, mode: 448 });
+      fs8.mkdirSync(SRIFT_HOME, { recursive: true, mode: 448 });
       try {
-        fs7.chmodSync(SRIFT_HOME, 448);
+        fs8.chmodSync(SRIFT_HOME, 448);
       } catch {
       }
     } catch (e) {
     }
     EMBEDDED = process.env.SRIFT_DAEMON_EMBEDDED === "1";
-    STATE_PATH = path6.join(SRIFT_HOME, EMBEDDED ? "state-embedded.json" : "state.json");
-    logPath = path6.join(SRIFT_HOME, "daemon.log");
+    STATE_PATH = path7.join(SRIFT_HOME, EMBEDDED ? "state-embedded.json" : "state.json");
+    logPath = path7.join(SRIFT_HOME, "daemon.log");
     try {
-      if (fs7.statSync(logPath).size > 5 * 1024 * 1024) fs7.renameSync(logPath, `${logPath}.1`);
+      if (fs8.statSync(logPath).size > 5 * 1024 * 1024) fs8.renameSync(logPath, `${logPath}.1`);
     } catch {
     }
-    logStream = fs7.createWriteStream(logPath, { flags: "a", mode: 384 });
+    logStream = fs8.createWriteStream(logPath, { flags: "a", mode: 384 });
     try {
-      fs7.chmodSync(logPath, 384);
+      fs8.chmodSync(logPath, 384);
     } catch {
     }
     logMessage = (level, message) => {
@@ -4331,6 +4512,7 @@ var init_daemon = __esm({
     activeTransfers = [];
     chatHistory = [];
     pendingJoins = [];
+    participants = [];
     sseClients = [];
     wsConn = null;
     wsUrl = null;
@@ -4346,15 +4528,15 @@ var init_daemon = __esm({
     pubsharesByToken = /* @__PURE__ */ new Map();
     activePulls = /* @__PURE__ */ new Map();
     pubshareRegResolvers = /* @__PURE__ */ new Map();
-    TEMP_DIR = path6.join(SRIFT_HOME, "tmp");
-    if (!fs7.existsSync(TEMP_DIR)) {
-      fs7.mkdirSync(TEMP_DIR, { recursive: true, mode: 448 });
+    TEMP_DIR = path7.join(SRIFT_HOME, "tmp");
+    if (!fs8.existsSync(TEMP_DIR)) {
+      fs8.mkdirSync(TEMP_DIR, { recursive: true, mode: 448 });
     }
     try {
-      for (const f of fs7.readdirSync(TEMP_DIR)) {
+      for (const f of fs8.readdirSync(TEMP_DIR)) {
         if (f.endsWith(".sre1")) {
           try {
-            fs7.unlinkSync(path6.join(TEMP_DIR, f));
+            fs8.unlinkSync(path7.join(TEMP_DIR, f));
           } catch {
           }
         }
@@ -4363,6 +4545,8 @@ var init_daemon = __esm({
     }
     KDF_ITERATIONS = 1e5;
     IV_LEN = 12;
+    RELAY_ENC = "sgcm1";
+    relayKeyCache = null;
     STATE_STALE_MS = 24 * 60 * 60 * 1e3;
     pruneStaleStateOnStartup();
     activeUploads = /* @__PURE__ */ new Map();
@@ -4381,7 +4565,7 @@ var init_daemon = __esm({
     app.use(cors({ origin: "*", maxAge: 600 }));
     app.use(express.json());
     DAEMON_START_TIME = Date.now();
-    PACKAGE_VERSION = "4.0.0";
+    PACKAGE_VERSION = "4.1.0";
     app.get("/health", (req, res) => {
       res.json({
         ok: true,
@@ -4405,6 +4589,7 @@ var init_daemon = __esm({
         },
         activeTransfers,
         pendingJoins,
+        participants,
         lastUpdated: (/* @__PURE__ */ new Date()).toISOString()
       });
     });
@@ -4432,7 +4617,7 @@ var init_daemon = __esm({
         wsUrl = data.wsUrl || `${activeSignalerUrl.replace(/^http/, "ws")}/ws`;
         if (wsUrl) connectWebSocket(wsUrl);
         writeStateFile();
-        res.json({ success: true, sessionId: data.sessionId });
+        res.json({ success: true, sessionId: data.sessionId, joinUrl: `${activeSignalerUrl.replace(/\/+$/, "")}/join-session?id=${data.sessionId}` });
       } catch (err) {
         console.error("[DAEMON] Failed to start session:", err);
         res.status(500).json({ success: false, error: err.message });
@@ -4477,7 +4662,7 @@ var init_daemon = __esm({
         res.status(500).json({ success: false, error: err.message });
       }
     });
-    app.post("/session/approve", (req, res) => {
+    app.post("/session/approve", async (req, res) => {
       const { tempUserId } = req.body;
       if (!tempUserId) {
         return res.status(400).json({ success: false, error: "tempUserId required" });
@@ -4495,7 +4680,13 @@ var init_daemon = __esm({
         payload: { sessionId: session.id, tempUserId }
       }));
       pendingJoins = pendingJoins.filter((j) => j.tempUserId !== tempUserId);
-      res.json({ success: true });
+      const before = new Set(participants.filter((p) => p.online).map((p) => p.userId));
+      const joined = () => participants.find((p) => p.online && !p.isHost && p.username === pending.username && !before.has(p.userId));
+      for (let waited = 0; waited < 8e3 && !joined() && session.id; waited += 100) {
+        await new Promise((r) => setTimeout(r, 100));
+      }
+      const member = joined();
+      res.json({ success: true, joined: !!member, userId: member?.userId ?? null, username: pending.username });
     });
     app.post("/session/reject", (req, res) => {
       const { tempUserId, reason } = req.body;
@@ -4572,13 +4763,14 @@ var init_daemon = __esm({
       activeTransfers = [];
       chatHistory = [];
       pendingJoins = [];
+      participants = [];
       csrfToken = null;
       encryptionKey = null;
       try {
-        if (fs7.existsSync(TEMP_DIR)) {
-          for (const f of fs7.readdirSync(TEMP_DIR)) {
+        if (fs8.existsSync(TEMP_DIR)) {
+          for (const f of fs8.readdirSync(TEMP_DIR)) {
             try {
-              fs7.unlinkSync(path6.join(TEMP_DIR, f));
+              fs8.unlinkSync(path7.join(TEMP_DIR, f));
             } catch {
             }
           }
@@ -4594,14 +4786,16 @@ var init_daemon = __esm({
         if (!filePath) {
           return res.status(400).json({ success: false, error: "filePath is required" });
         }
-        const absPath = path6.resolve(filePath);
-        if (!fs7.existsSync(absPath)) {
+        const absPath = path7.resolve(filePath);
+        if (!fs8.existsSync(absPath)) {
           return res.status(404).json({ success: false, error: `File not found: ${absPath}` });
         }
-        const stat = fs7.statSync(absPath);
-        const filename = path6.basename(absPath);
+        const stat = fs8.statSync(absPath);
+        const filename = path7.basename(absPath);
         const fileId = `cli_file_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
         const targetProtocol = webTorrentAllowed() && (protocol === "webtorrent" || stat.size > 10 * 1024 * 1024 && protocol !== "websocket") ? "webtorrent" : "websocket";
+        const notReady = await waitSignalReady();
+        if (notReady) return res.status(notReady.status).json(notReady.body);
         const newTx = {
           fileId,
           name: filename,
@@ -4647,13 +4841,14 @@ var init_daemon = __esm({
       if (!tx) {
         return res.status(404).json({ success: false, error: "No offer found for this fileId" });
       }
-      tx.saveDir = saveDir ? path6.resolve(saveDir) : process.cwd();
+      tx.saveDir = saveDir ? path7.resolve(saveDir) : process.cwd();
       tx.status = "downloading";
       tx.startTime = Date.now();
       console.log(`[DAEMON] Accepting file offer ${fileId}, saving to ${tx.saveDir}`);
       wsConn?.send(JSON.stringify({
         type: "file_accept",
-        payload: { fileId }
+        // relayEnc: this daemon decrypts sealed relay chunks (see openRelayChunk)
+        payload: { fileId, relayEnc: RELAY_ENC }
       }));
       res.json({ success: true });
     });
@@ -4666,16 +4861,8 @@ var init_daemon = __esm({
         if (!session.id) {
           return res.status(409).json({ success: false, error: "No active session. Call /session/start first." });
         }
-        if (!encryptionKey) {
-          return res.status(409).json({ success: false, error: "Encryption key not ready. Session still initialising." });
-        }
-        if (!wsConn || wsConn.readyState !== 1) {
-          return res.status(503).json({
-            success: false,
-            error: "Signaling connection not ready (WebSocket is connecting). Retry in 1\u20132 seconds.",
-            retryAfterMs: 1500
-          });
-        }
+        const notReady = await waitSignalReady();
+        if (notReady) return res.status(notReady.status).json(notReady.body);
         const encContent = await encrypt(message);
         wsConn.send(JSON.stringify({
           type: "chat",
@@ -4698,8 +4885,8 @@ var init_daemon = __esm({
     });
     app.get("/state", (req, res) => {
       try {
-        if (fs7.existsSync(STATE_PATH)) {
-          const raw = fs7.readFileSync(STATE_PATH, "utf-8");
+        if (fs8.existsSync(STATE_PATH)) {
+          const raw = fs8.readFileSync(STATE_PATH, "utf-8");
           res.type("application/json").send(raw);
         } else {
           res.json({ session: { id: null, isConnected: false }, activeTransfers: [], lastUpdated: null });
@@ -4779,7 +4966,7 @@ var init_daemon = __esm({
       pubshares.delete(entry.fileId);
       if (entry.tempFile) {
         try {
-          fs7.unlinkSync(entry.tempFile);
+          fs8.unlinkSync(entry.tempFile);
         } catch {
         }
       }
@@ -4891,7 +5078,7 @@ data: /mcp/messages
         servers: [{ url: `http://127.0.0.1:${PORT}` }],
         paths: {
           "/health": { get: { summary: "Liveness probe", description: "Returns {ok,version,uptime_ms,mcp,webrtc,webtorrent}", responses: { "200": { description: "OK" } } } },
-          "/status": { get: { summary: "Get session + transfers + pending joins", responses: { "200": { description: "OK" } } } },
+          "/status": { get: { summary: "Get session, transfers, pending joins and participants (members with userId, for /session/kick)", responses: { "200": { description: "OK" } } } },
           "/state": { get: { summary: "Workspace state snapshot (.srift-state.json)", responses: { "200": { description: "OK" } } } },
           "/transfers": { get: { summary: "Live transfer list with speed and ETA. Optional ?fileId= to filter.", responses: { "200": { description: "OK" } } } },
           "/transfers/{fileId}": { get: { summary: "Per-transfer drill-down", parameters: [{ name: "fileId", in: "path", required: true, schema: { type: "string" } }], responses: { "200": { description: "OK" }, "404": { description: "Transfer not found" } } } },
@@ -4899,9 +5086,11 @@ data: /mcp/messages
           "/metrics": { get: { summary: "Prometheus-format counters (no auth)", responses: { "200": { description: "text/plain Prometheus format" } } } },
           "/logs": { get: { summary: "NDJSON daemon log tail. ?lines=N (default 100)", responses: { "200": { description: "application/x-ndjson" } } } },
           "/reset": { post: { summary: "Wipe all state and flush encryption keys", responses: { "200": { description: "{ok:true}" } } } },
-          "/session/start": { post: { summary: "Create new session (becomes host)", requestBody: { content: { "application/json": { schema: { type: "object", properties: { sessionName: { type: "string" }, roomSecret: { type: "string" } } } } } }, responses: { "200": { description: "{success:true,sessionId}" } } } },
+          "/v1/diag": { get: { summary: "Network diagnosis (same as `srift doctor --json`); ?fresh=1 re-probes", responses: { "200": { description: "Diagnosis report" } } } },
+          "/daemon/stop": { post: { summary: "Stop this daemon", responses: { "200": { description: "OK" } } } },
+          "/session/start": { post: { summary: "Create new session (becomes host); returns sessionId and joinUrl", requestBody: { content: { "application/json": { schema: { type: "object", properties: { sessionName: { type: "string" }, roomSecret: { type: "string" } } } } } }, responses: { "200": { description: "{success:true,sessionId}" } } } },
           "/session/join": { post: { summary: "Join existing session", requestBody: { content: { "application/json": { schema: { type: "object", required: ["sessionId"], properties: { sessionId: { type: "string" }, username: { type: "string" }, roomSecret: { type: "string" } } } } } }, responses: { "200": { description: "OK" }, "400": { description: "Missing sessionId" }, "404": { description: "Session not found" } } } },
-          "/session/approve": { post: { summary: "Host approves a pending join request", requestBody: { content: { "application/json": { schema: { type: "object", required: ["tempUserId"], properties: { tempUserId: { type: "string" } } } } } }, responses: { "200": { description: "OK" }, "400": { description: "tempUserId required" }, "403": { description: "Not host" }, "404": { description: "No such pending request" } } } },
+          "/session/approve": { post: { summary: "Host approves a pending join request; returns {success, joined, userId} once the guest is in the room (max 8 s)", requestBody: { content: { "application/json": { schema: { type: "object", required: ["tempUserId"], properties: { tempUserId: { type: "string" } } } } } }, responses: { "200": { description: "OK" }, "400": { description: "tempUserId required" }, "403": { description: "Not host" }, "404": { description: "No such pending request" } } } },
           "/session/reject": { post: { summary: "Host rejects a pending join request", requestBody: { content: { "application/json": { schema: { type: "object", required: ["tempUserId"], properties: { tempUserId: { type: "string" }, reason: { type: "string" } } } } } }, responses: { "200": { description: "OK" }, "400": { description: "tempUserId required" }, "403": { description: "Not host" } } } },
           "/session/kick": { post: { summary: "Host kicks a peer", requestBody: { content: { "application/json": { schema: { type: "object", required: ["userId"], properties: { userId: { type: "string" } } } } } }, responses: { "200": { description: "OK" }, "400": { description: "userId required" }, "403": { description: "Not host" } } } },
           "/session/close": { post: { summary: "Tear down the session and flush keys", responses: { "200": { description: "OK" } } } },
@@ -4982,8 +5171,8 @@ data: /mcp/messages
     app.get("/logs", (req, res) => {
       const lines = parseInt(req.query.lines || "100", 10);
       try {
-        if (!fs7.existsSync(logPath)) return res.json([]);
-        const content = fs7.readFileSync(logPath, "utf-8");
+        if (!fs8.existsSync(logPath)) return res.json([]);
+        const content = fs8.readFileSync(logPath, "utf-8");
         const all = content.split("\n").filter(Boolean);
         const tail = all.slice(-Math.min(lines, all.length));
         res.set("Content-Type", "application/x-ndjson");
@@ -5018,15 +5207,16 @@ data: /mcp/messages
       activeTransfers = [];
       chatHistory = [];
       pendingJoins = [];
+      participants = [];
       csrfToken = null;
       encryptionKey = null;
       wsUrl = null;
       let cleanedChunks = 0;
       try {
-        if (fs7.existsSync(TEMP_DIR)) {
-          for (const f of fs7.readdirSync(TEMP_DIR)) {
+        if (fs8.existsSync(TEMP_DIR)) {
+          for (const f of fs8.readdirSync(TEMP_DIR)) {
             try {
-              fs7.unlinkSync(path6.join(TEMP_DIR, f));
+              fs8.unlinkSync(path7.join(TEMP_DIR, f));
               cleanedChunks++;
             } catch {
             }
@@ -5088,16 +5278,17 @@ data: /mcp/messages
         activeTransfers = [];
         chatHistory = [];
         pendingJoins = [];
+        participants = [];
         encryptionKey = null;
         wsUrl = null;
         writeStateFile();
       } catch {
       }
       try {
-        if (fs7.existsSync(TEMP_DIR)) {
-          for (const f of fs7.readdirSync(TEMP_DIR)) {
+        if (fs8.existsSync(TEMP_DIR)) {
+          for (const f of fs8.readdirSync(TEMP_DIR)) {
             try {
-              fs7.unlinkSync(path6.join(TEMP_DIR, f));
+              fs8.unlinkSync(path7.join(TEMP_DIR, f));
             } catch {
             }
           }
@@ -5112,7 +5303,7 @@ data: /mcp/messages
       process.on("exit", () => {
         for (const e of pubshares.values()) if (e.tempFile) {
           try {
-            fs7.unlinkSync(e.tempFile);
+            fs8.unlinkSync(e.tempFile);
           } catch {
           }
         }