@rubytech/create-maxy-code 0.1.309 → 0.1.311

package/payload/server/server.js

@@ -4871,6 +4871,10 @@ function crossesForeignAccountPartition(relPath, accountId) {
   if (!ACCOUNT_UUID_RE.test(owner)) return false;
   return owner !== accountId;
 }
+function isWithinOwnAccountPartition(relPath, accountId) {
+  const segs = relPath.split("/").filter(Boolean);
+  return segs.length >= 2 && segs[0] === "accounts" && segs[1] === accountId;
+}
 function resolveUnderRoot(raw, rootAbs, rootLabel) {
   const cleaned = normalize("/" + (raw ?? "").replace(/\\/g, "/")).replace(/^\/+/, "");
   const absolute = resolve5(rootAbs, cleaned);
@@ -6591,12 +6595,32 @@ import { basename as basename2, dirname, join as join10, resolve as resolve11, s
 // server/routes/admin/sidebar-sessions.ts
 import { readdirSync as readdirSync4, readFileSync as readFileSync9, statSync as statSync2 } from "fs";
 import { join as join8, resolve as resolve10 } from "path";
+
+// app/lib/whatsapp-reader/select-sessions.ts
+function isReaderChannelSession(role, channel) {
+  return role === "admin" && (channel === "whatsapp" || channel === "telegram") || role === "public" && (channel === "whatsapp" || channel === "webchat");
+}
+function selectReaderChannelSessions(rows) {
+  return rows.filter((r) => isReaderChannelSession(r.role, r.channel)).sort((a, b) => b.startedAt.localeCompare(a.startedAt)).map((r) => ({
+    sessionId: r.sessionId,
+    projectDir: r.projectDir,
+    title: r.title,
+    senderId: r.senderId,
+    startedAt: r.startedAt,
+    channel: r.channel,
+    role: r.role,
+    operatorName: null,
+    whatsappName: null,
+    lastMessageAt: r.lastMessageAt,
+    modelGated: r.modelGated
+  }));
+}
+
+// server/routes/admin/sidebar-sessions.ts
 var SESSION_ID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\.jsonl$/i;
 var CLI_MARKER_PREFIXES = ["<local-command-", "<command-name>", "<command-message>"];
-var PUBLIC_ROLE = "public";
 var ADMIN_ROLE = "admin";
 var WEBCHAT_CHANNEL = "webchat";
-var WHATSAPP_CHANNEL = "whatsapp";
 var app3 = new Hono();
 function claudeConfigDir() {
   return process.env.CLAUDE_CONFIG_DIR ?? null;
@@ -6814,8 +6838,8 @@ app3.get("/", requireAdminSession, async (c) => {
   const seenIds = /* @__PURE__ */ new Set();
   let liveCount = 0;
   let subagentCount = 0;
-  let nonResumableCount = 0;
   let archivedCount = 0;
+  let excludedChannelCount = 0;
   const titleSourceCounts = { user: 0, ai: 0, "first-message": 0, prefix: 0 };
   const personIdBySession = /* @__PURE__ */ new Map();
   const adminUserIdBySession = /* @__PURE__ */ new Map();
@@ -6843,7 +6867,10 @@ app3.get("/", requireAdminSession, async (c) => {
     titleSourceCounts[resolved.source] += 1;
     const metaPath = join8(projectDir, `${sessionId}.meta.json`);
     const { bridgeIds, role, channel: sidecarChannel, personId, adminUserId } = readSidecarMeta(metaPath);
-    const resumable = !(role === PUBLIC_ROLE && (sidecarChannel === WEBCHAT_CHANNEL || sidecarChannel === WHATSAPP_CHANNEL));
+    if (isReaderChannelSession(role, sidecarChannel)) {
+      excludedChannelCount += 1;
+      continue;
+    }
     if (personId) personIdBySession.set(sessionId, personId);
     if (adminUserId && role === ADMIN_ROLE && sidecarChannel === WEBCHAT_CHANNEL) {
       adminUserIdBySession.set(sessionId, adminUserId);
@@ -6858,14 +6885,12 @@ app3.get("/", requireAdminSession, async (c) => {
       pid,
       projectDir,
       bridgeIds,
-      resumable,
       archived,
       channel: resolved.channel,
       personName: null
     });
     if (live) liveCount += 1;
     if (isSubagent) subagentCount += 1;
-    if (!resumable) nonResumableCount += 1;
     if (archived) archivedCount += 1;
   }
   let personNameCount = 0;
@@ -6896,29 +6921,12 @@ app3.get("/", requireAdminSession, async (c) => {
   }
   rows.sort((a, b) => a.startedAt < b.startedAt ? 1 : -1);
   console.log(
-    `[admin-sessions-list] rows=${rows.length} live=${liveCount} subagents=${subagentCount} archived=${archivedCount} nonResumable=${nonResumableCount} titles user=${titleSourceCounts.user} ai=${titleSourceCounts.ai} first=${titleSourceCounts["first-message"]} prefix=${titleSourceCounts.prefix} personNames=${personNameCount} adminNames=${adminNameCount} accountId=${accountId ? accountId.slice(0, 8) : "unset"}`
+    `[admin-sessions-list] rows=${rows.length} live=${liveCount} subagents=${subagentCount} archived=${archivedCount} excludedChannel=${excludedChannelCount} titles user=${titleSourceCounts.user} ai=${titleSourceCounts.ai} first=${titleSourceCounts["first-message"]} prefix=${titleSourceCounts.prefix} personNames=${personNameCount} adminNames=${adminNameCount} accountId=${accountId ? accountId.slice(0, 8) : "unset"}`
   );
   return c.json({ sessions: rows, accountId });
 });
 var sidebar_sessions_default = app3;
 
-// app/lib/whatsapp-reader/select-sessions.ts
-function selectReaderChannelSessions(rows) {
-  return rows.filter((r) => r.role === "admin" && (r.channel === "whatsapp" || r.channel === "telegram") || r.role === "public" && (r.channel === "whatsapp" || r.channel === "webchat")).sort((a, b) => b.startedAt.localeCompare(a.startedAt)).map((r) => ({
-    sessionId: r.sessionId,
-    projectDir: r.projectDir,
-    title: r.title,
-    senderId: r.senderId,
-    startedAt: r.startedAt,
-    channel: r.channel,
-    role: r.role,
-    operatorName: null,
-    whatsappName: null,
-    lastMessageAt: r.lastMessageAt,
-    modelGated: r.modelGated
-  }));
-}
-
 // app/lib/admin-identity/pin-validator.ts
 import { createHash } from "crypto";
 import { existsSync as existsSync6, readFileSync as readFileSync10, readdirSync as readdirSync5, statSync as statSync3 } from "fs";
@@ -7121,6 +7129,7 @@ function isModelGated(turns) {
 }
 function parseTranscript(lines) {
   const out = [];
+  const queuedPendingSuppress = /* @__PURE__ */ new Map();
   for (const line of lines) {
     if (!line || line[0] !== "{") continue;
     let row;
@@ -7145,12 +7154,26 @@ function parseTranscript(lines) {
       out.push(...assistantTurns(msg?.content, ts));
       continue;
     }
+    if (row.type === "queue-operation" && row.operation === "enqueue") {
+      const content = asString(row.content);
+      if (content !== null && CHANNEL_WRAPPER2.test(content)) {
+        const u = unwrapChannel(content);
+        out.push({ kind: "operator-inbound", text: u.text, ts, ...u.source ? { source: u.source } : {} });
+        queuedPendingSuppress.set(u.text, (queuedPendingSuppress.get(u.text) ?? 0) + 1);
+      }
+      continue;
+    }
     if (row.type === "attachment") {
       const att = row.attachment;
       const isChannelQueued = att?.type === "queued_command" && att.isMeta === true && typeof att.origin === "object" && att.origin !== null && att.origin.kind === "channel" && typeof att.prompt === "string";
       if (isChannelQueued) {
         const u = unwrapChannel(att.prompt);
-        out.push({ kind: "operator-inbound", text: u.text, ts, ...u.source ? { source: u.source } : {} });
+        const armed = queuedPendingSuppress.get(u.text) ?? 0;
+        if (armed > 0) {
+          queuedPendingSuppress.set(u.text, armed - 1);
+        } else {
+          out.push({ kind: "operator-inbound", text: u.text, ts, ...u.source ? { source: u.source } : {} });
+        }
       }
       continue;
     }
@@ -7208,9 +7231,7 @@ app4.get("/conversations", requireAdminSession, async (c) => {
     const sessionId = basename2(path2).replace(/\.jsonl$/, "");
     const projectDir = dirname(path2);
     const meta = readSidecarMeta(join10(projectDir, `${sessionId}.meta.json`));
-    const isAdminChannel = meta.role === "admin" && (meta.channel === "whatsapp" || meta.channel === "telegram");
-    const isPublicChannel = meta.role === "public" && (meta.channel === "whatsapp" || meta.channel === "webchat");
-    if (!isAdminChannel && !isPublicChannel) continue;
+    if (!isReaderChannelSession(meta.role, meta.channel)) continue;
     let body = "";
     try {
       body = readFileSync11(path2, "utf8");
@@ -7463,8 +7484,11 @@ function filterDeliveredFrames(lines) {
   const turns = [];
   let dropped = 0;
   for (const turn of parseTranscript(lines)) {
-    if (isDeliveredKind(turn.kind, PUBLIC_DELIVERED_KINDS)) turns.push(turn);
-    else dropped++;
+    if (!isDeliveredKind(turn.kind, PUBLIC_DELIVERED_KINDS)) {
+      dropped++;
+      continue;
+    }
+    turns.push(turn.kind === "agent-error" ? { ...turn, raw: "" } : turn);
   }
   return { turns, dropped };
 }
@@ -7627,7 +7651,7 @@ var public_reader_default = app5;
 // server/routes/webchat.ts
 import { basename as basename4, dirname as dirname3 } from "path";
 import { join as join13 } from "path";
-import { existsSync as existsSync8, readdirSync as readdirSync7, readFileSync as readFileSync13, renameSync as renameSync2, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync8, readdirSync as readdirSync7, readFileSync as readFileSync13, renameSync as renameSync2, statSync as statSync6, writeFileSync as writeFileSync6 } from "fs";
 
 // server/canonical-webchat-override.ts
 import { readFileSync as readFileSync12, writeFileSync as writeFileSync5, renameSync } from "fs";
@@ -7700,6 +7724,14 @@ function locateSidecar(sessionId) {
 function sessionSidecarExists(sessionId) {
   return locateSidecar(sessionId) !== null;
 }
+function jsonlSizeBytes(projectDir, sessionId) {
+  if (projectDir === null) return null;
+  try {
+    return statSync6(join13(projectDir, `${sessionId}.jsonl`)).size;
+  } catch {
+    return null;
+  }
+}
 function conflictingBinding(channel) {
   return channel !== null && channel !== "webchat" ? channel : null;
 }
@@ -7787,6 +7819,8 @@ async function reapplyLeversViaManager() {
     return false;
   }
 }
+var WEBCHAT_SEND_TURN_WINDOW_MS = Number(process.env.WEBCHAT_SEND_TURN_WINDOW_MS ?? String(15e3));
+var sendSeq = 0;
 function createWebchatRoutes(deps) {
   const app51 = new Hono();
   app51.post("/send", requireAdminSession, async (c) => {
@@ -7918,6 +7952,30 @@ ${note}` : note;
     } else {
       await deps.handleInbound({ role: "admin", accountId, key: deliveryKey, text });
     }
+    const sendId = ++sendSeq;
+    let turnSessionId = deliverySessionId;
+    if (turnSessionId === void 0) {
+      let canonAccount;
+      try {
+        canonAccount = resolveAccount();
+      } catch {
+        canonAccount = null;
+      }
+      turnSessionId = resolveCanonicalSessionId(accountId, canonAccount?.accountDir ?? null);
+    }
+    const keyDisplay2 = deliveryKey.startsWith("session:") ? deliveryKey.slice(0, "session:".length + 8) : WEBCHAT_ADMIN_KEY;
+    const baseline = jsonlSizeBytes(locateSession(turnSessionId).projectDir, turnSessionId);
+    console.error(`[webchat:inbound] op=send-accepted key=${keyDisplay2} sendId=${sendId} baselineBytes=${baseline ?? "absent"}`);
+    const turnTimer = setTimeout(() => {
+      const now = jsonlSizeBytes(locateSession(turnSessionId).projectDir, turnSessionId);
+      const grew = now !== null && (baseline === null || now > baseline);
+      if (grew) {
+        console.error(`[webchat:inbound] op=send-turned key=${keyDisplay2} sendId=${sendId} bytes=${now}`);
+      } else {
+        console.error(`[webchat:inbound] op=send-no-turn key=${keyDisplay2} sendId=${sendId} baselineBytes=${baseline ?? "absent"}`);
+      }
+    }, WEBCHAT_SEND_TURN_WINDOW_MS);
+    if (turnTimer.unref) turnTimer.unref();
     return c.json({ ok: true });
   });
   app51.post("/settings", requireAdminSession, async (c) => {
@@ -7977,7 +8035,7 @@ ${note}` : note;
       const { projectDir: projectDir2, channel } = locateSession(target);
       const known = projectDir2 !== null || sessionSidecarExists(target);
       const indicators2 = await fetchComposerIndicators(target);
-      return c.json({ sessionId: target, projectDir: projectDir2, channelBinding: conflictingBinding(channel), known, ...indicators2, ...readLevers() });
+      return c.json({ sessionId: target, projectDir: projectDir2, channelBinding: conflictingBinding(channel), known, sizeBytes: jsonlSizeBytes(projectDir2, target), ...indicators2, ...readLevers() });
     }
     let account;
     try {
@@ -7997,7 +8055,7 @@ ${note}` : note;
       }
     }
     const indicators = await fetchComposerIndicators(sessionId);
-    return c.json({ sessionId, projectDir, ...indicators, ...readLevers(account) });
+    return c.json({ sessionId, projectDir, sizeBytes: jsonlSizeBytes(projectDir, sessionId), ...indicators, ...readLevers(account) });
   });
   return app51;
 }
@@ -9138,7 +9196,7 @@ import { openSync as openSync3, closeSync as closeSync3, writeFileSync as writeF
 import { createHash as createHash3, randomUUID as randomUUID8 } from "crypto";
 
 // ../lib/admins-write/src/index.ts
-import { existsSync as existsSync11, readFileSync as readFileSync16, writeFileSync as writeFileSync7, renameSync as renameSync3, mkdirSync as mkdirSync2, readdirSync as readdirSync9, statSync as statSync6 } from "fs";
+import { existsSync as existsSync11, readFileSync as readFileSync16, writeFileSync as writeFileSync7, renameSync as renameSync3, mkdirSync as mkdirSync2, readdirSync as readdirSync9, statSync as statSync7 } from "fs";
 import { dirname as dirname4, join as join16 } from "path";
 function logLine(input, result) {
   const userIdShort = input.userId.slice(0, 8);
@@ -9238,7 +9296,7 @@ function checkAdminAuthInvariant(input) {
       if (entry.startsWith(".")) continue;
       const accountDir = join16(input.accountsDir, entry);
       try {
-        if (!statSync6(accountDir).isDirectory()) continue;
+        if (!statSync7(accountDir).isDirectory()) continue;
       } catch {
         continue;
       }
@@ -9530,7 +9588,7 @@ app8.delete("/set-pin", async (c) => {
 var onboarding_default = app8;
 
 // server/routes/client-error.ts
-import { appendFileSync, existsSync as existsSync13, renameSync as renameSync4, statSync as statSync7 } from "fs";
+import { appendFileSync, existsSync as existsSync13, renameSync as renameSync4, statSync as statSync8 } from "fs";
 import { join as join17 } from "path";
 var CLIENT_ERRORS_LOG = join17(LOG_DIR, "client-errors.log");
 var MAX_LOG_SIZE = 10 * 1024 * 1024;
@@ -9576,7 +9634,7 @@ function stackHead(stack) {
 function rotateIfNeeded() {
   try {
     if (!existsSync13(CLIENT_ERRORS_LOG)) return;
-    const stats = statSync7(CLIENT_ERRORS_LOG);
+    const stats = statSync8(CLIENT_ERRORS_LOG);
     if (stats.size < MAX_LOG_SIZE) return;
     renameSync4(CLIENT_ERRORS_LOG, CLIENT_ERRORS_LOG + ".1");
   } catch (err) {
@@ -9857,7 +9915,7 @@ app10.post("/", async (c) => {
 var session_default = app10;
 
 // server/routes/admin/logs.ts
-import { existsSync as existsSync15, readdirSync as readdirSync10, readFileSync as readFileSync18, statSync as statSync8 } from "fs";
+import { existsSync as existsSync15, readdirSync as readdirSync10, readFileSync as readFileSync18, statSync as statSync9 } from "fs";
 import { resolve as resolve16, basename as basename5 } from "path";
 
 // app/lib/logs-read-resolve.ts
@@ -9897,7 +9955,7 @@ app11.get("/", async (c) => {
       searched.push(filePath);
       try {
         const buffer = readFileSync18(filePath);
-        const onDiskBytes = statSync8(filePath).size;
+        const onDiskBytes = statSync9(filePath).size;
         const headers = {
           "Content-Type": "text/plain; charset=utf-8",
           "Content-Length": String(buffer.byteLength)
@@ -9962,7 +10020,7 @@ app11.get("/", async (c) => {
       try {
         const filename = basename5(hit.path);
         const buffer = readFileSync18(hit.path);
-        const onDiskBytes = statSync8(hit.path).size;
+        const onDiskBytes = statSync9(hit.path).size;
         const headers = {
           "Content-Type": "text/plain; charset=utf-8",
           "Content-Length": String(buffer.byteLength)
@@ -10005,7 +10063,7 @@ app11.get("/", async (c) => {
       console.warn(`[admin/logs] readdir-fail dir=${dir} reason=${reason}`);
       continue;
     }
-    files.filter((f) => !seen.has(f)).map((f) => ({ name: f, mtime: statSync8(resolve16(dir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime).forEach(({ name }) => {
+    files.filter((f) => !seen.has(f)).map((f) => ({ name: f, mtime: statSync9(resolve16(dir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime).forEach(({ name }) => {
       seen.add(name);
       try {
         const content = readFileSync18(resolve16(dir, name));
@@ -10868,7 +10926,7 @@ app15.put("/:id/label", requireAdminSession, async (c) => {
 var sessions_default = app15;
 
 // app/lib/claude-agent/spawn-context.ts
-import { existsSync as existsSync19, readFileSync as readFileSync20, readdirSync as readdirSync12, statSync as statSync9 } from "fs";
+import { existsSync as existsSync19, readFileSync as readFileSync20, readdirSync as readdirSync12, statSync as statSync10 } from "fs";
 import { dirname as dirname5, resolve as resolve19, join as join19 } from "path";
 async function resolveOwnerProfileBlock(accountId, userId) {
   if (!userId) return { ok: false, reason: "missing-user-id" };
@@ -10883,6 +10941,18 @@ async function resolveOwnerProfileBlock(accountId, userId) {
     return { ok: false, reason: "neo4j-unreachable" };
   }
 }
+async function resolveAuthenticatedName(accountId, userId) {
+  if (!userId) return void 0;
+  try {
+    const res = await loadAdminUserName(accountId, userId);
+    return res.source === "neo4j" ? res.joined : void 0;
+  } catch (err) {
+    console.error(
+      `[spawn-context] resolveAuthenticatedName failed: ${err instanceof Error ? err.message : String(err)}`
+    );
+    return void 0;
+  }
+}
 function frontmatterField(manifest, field2) {
   const fm = manifest.match(/^---\r?\n([\s\S]*?)\r?\n---/);
   if (!fm) return null;
@@ -10959,7 +11029,7 @@ function listPluginDirs() {
     for (const name of readdirSync12(platformPlugins)) {
       const dir = join19(platformPlugins, name);
       try {
-        if (statSync9(dir).isDirectory()) out.set(name, dir);
+        if (statSync10(dir).isDirectory()) out.set(name, dir);
       } catch {
       }
     }
@@ -10973,7 +11043,7 @@ function listPluginDirs() {
         for (const name of readdirSync12(bundlePlugins)) {
           const dir = join19(bundlePlugins, name);
           try {
-            if (statSync9(dir).isDirectory()) out.set(name, dir);
+            if (statSync10(dir).isDirectory()) out.set(name, dir);
           } catch {
           }
         }
@@ -11410,7 +11480,7 @@ var events_default = app18;
 
 // server/routes/admin/files.ts
 import { createReadStream as createReadStream2 } from "fs";
-import { readdir as readdir3, readFile as readFile4, stat as stat4, mkdir as mkdir3, writeFile as writeFile4, unlink as unlink2 } from "fs/promises";
+import { readdir as readdir3, readFile as readFile4, stat as stat4, mkdir as mkdir3, writeFile as writeFile4, unlink as unlink2, rename } from "fs/promises";
 import { realpathSync as realpathSync4 } from "fs";
 import { basename as basename7, dirname as dirname6, join as join21, resolve as resolve22, sep as sep6 } from "path";
 import { Readable as Readable2 } from "stream";
@@ -12273,6 +12343,44 @@ function isProtectedFromDeletion(relPath) {
   }
   return { protected: false };
 }
+function isProtectedFromRename(relPath) {
+  if (isProtectedFromDeletion(relPath).protected) return true;
+  const segments = relPath.split("/").filter(Boolean);
+  const base = segments[segments.length - 1] ?? "";
+  if (segments.length === 2 && segments[0] === "accounts") return true;
+  if (segments.length === 3 && segments[0] === "accounts" && segments[2] === "uploads") {
+    return true;
+  }
+  if (segments.length === 4 && segments[0] === "accounts" && segments[2] === "uploads" && UUID_RE3.test(segments[3])) {
+    return true;
+  }
+  if (parseAttachmentPath(relPath) !== null) return true;
+  if (UUID_RE3.test(base.replace(/\.meta\.json$/, "")) && base.endsWith(".meta.json")) {
+    return true;
+  }
+  return false;
+}
+function isValidEntryName(name) {
+  if (typeof name !== "string" || name.length === 0) return false;
+  if (name === "." || name === "..") return false;
+  return !/[\\/\0]/.test(name);
+}
+function resolveOwnAccountWrite(rawPath, accountId, endpoint) {
+  const res = resolveDataPath(rawPath);
+  if (!res.ok) {
+    if (res.status === 403) console.error(`[data] path-traversal-blocked requested="${rawPath}" resolved="${res.resolved ?? "n/a"}"`);
+    return { ok: false, status: res.status, error: res.error };
+  }
+  if (crossesForeignAccountPartition(res.relative, accountId)) {
+    console.error(`[data] account-scope-blocked endpoint="${endpoint}" path="${res.relative}" account=${accountId.slice(0, 8)}\u2026`);
+    return { ok: false, status: 404, error: "Not found" };
+  }
+  if (!isWithinOwnAccountPartition(res.relative, accountId)) {
+    console.error(`[data] write-scope-blocked endpoint="${endpoint}" path="${res.relative}" account=${accountId.slice(0, 8)}\u2026`);
+    return { ok: false, status: 403, error: "Path is outside your account folder" };
+  }
+  return { ok: true, absolute: res.absolute, relative: res.relative };
+}
 async function knowledgeDocOwnedByAccount(accountId, attachmentId) {
   if (!attachmentId) return false;
   const session = getSession();
@@ -12456,14 +12564,18 @@ app19.post("/upload", requireAdminSession, async (c) => {
   }
   const safeName = basename7(file.name).replace(/[\0/\\]/g, "_");
   const finalName = `${Date.now()}-${safeName}`;
-  const destDir = resolve22(DATA_ROOT, "accounts", accountId, "uploads");
+  const rawDir = formData.get("path");
+  const dest = resolveOwnAccountWrite(typeof rawDir === "string" ? rawDir : "", accountId, "POST /api/admin/files/upload");
+  if (!dest.ok) return c.json({ error: dest.error }, dest.status);
+  const destDir = dest.absolute;
   const destPath = resolve22(destDir, finalName);
   try {
-    await mkdir3(destDir, { recursive: true });
+    const info = await stat4(destDir);
+    if (!info.isDirectory()) return c.json({ error: "Upload destination is not a directory" }, 400);
     const dataRootReal = realpathSync4(DATA_ROOT);
     const destDirReal = realpathSync4(destDir);
     if (destDirReal !== dataRootReal && !destDirReal.startsWith(dataRootReal + sep6)) {
-      console.error(`[data] path-traversal-blocked requested="accounts/${accountId}/uploads" resolved="${destDirReal}"`);
+      console.error(`[data] path-traversal-blocked requested="${dest.relative}" resolved="${destDirReal}"`);
       return c.json({ error: "Upload destination escapes DATA_ROOT" }, 403);
     }
     const buffer = Buffer.from(await file.arrayBuffer());
@@ -12473,7 +12585,7 @@ app19.post("/upload", requireAdminSession, async (c) => {
     console.error(`[data] file-upload error filename="${safeName}" err="${message}"`);
     return c.json({ error: message }, 500);
   }
-  const relativeDest = `accounts/${accountId}/uploads/${finalName}`;
+  const relativeDest = `${dest.relative}/${finalName}`;
   console.error(`[data] file-upload filename="${safeName}" size=${file.size} dest="${relativeDest}"`);
   void indexFile(accountId, relativeDest).catch((err) => {
     console.error(`[data] file-upload index-failed dest="${relativeDest}" err="${err instanceof Error ? err.message : String(err)}"`);
@@ -12561,6 +12673,91 @@ app19.delete("/", requireAdminSession, async (c) => {
     return c.json({ error: message }, 500);
   }
 });
+app19.post("/folder", requireAdminSession, async (c) => {
+  const cacheKey = c.var.cacheKey;
+  const accountId = getAccountIdForSession(cacheKey);
+  if (!accountId) {
+    console.error(`[data] auth-rejected endpoint="POST /api/admin/files/folder" reason="no account for session"`);
+    return c.json({ error: "Account not found for session" }, 401);
+  }
+  let body;
+  try {
+    body = await c.req.json();
+  } catch {
+    return c.json({ error: "Invalid JSON body" }, 400);
+  }
+  const rawPath = typeof body.path === "string" ? body.path : "";
+  const name = typeof body.name === "string" ? body.name : "";
+  if (!isValidEntryName(name)) return c.json({ error: "Invalid folder name" }, 400);
+  const parent = resolveOwnAccountWrite(rawPath, accountId, "POST /api/admin/files/folder");
+  if (!parent.ok) return c.json({ error: parent.error }, parent.status);
+  const newAbs = resolve22(parent.absolute, name);
+  const newRel = `${parent.relative}/${name}`;
+  try {
+    const info = await stat4(parent.absolute);
+    if (!info.isDirectory()) return c.json({ error: "Parent is not a directory" }, 400);
+    await mkdir3(newAbs, { recursive: false });
+  } catch (err) {
+    const code = err.code;
+    if (code === "EEXIST") return c.json({ error: "A file or folder with that name already exists" }, 409);
+    if (code === "ENOENT") return c.json({ error: "Not found" }, 404);
+    const message = err instanceof Error ? err.message : String(err);
+    console.error(`[data] folder-create error path="${newRel}" err="${message}"`);
+    return c.json({ error: message }, 500);
+  }
+  console.error(`[data] folder-create path="${newRel}"`);
+  return c.json({ path: newRel });
+});
+app19.post("/rename", requireAdminSession, async (c) => {
+  const cacheKey = c.var.cacheKey;
+  const accountId = getAccountIdForSession(cacheKey);
+  if (!accountId) {
+    console.error(`[data] auth-rejected endpoint="POST /api/admin/files/rename" reason="no account for session"`);
+    return c.json({ error: "Account not found for session" }, 401);
+  }
+  let body;
+  try {
+    body = await c.req.json();
+  } catch {
+    return c.json({ error: "Invalid JSON body" }, 400);
+  }
+  const rawPath = typeof body.path === "string" ? body.path : "";
+  const newName = typeof body.newName === "string" ? body.newName : "";
+  if (!isValidEntryName(newName)) return c.json({ error: "Invalid name" }, 400);
+  const src = resolveOwnAccountWrite(rawPath, accountId, "POST /api/admin/files/rename");
+  if (!src.ok) return c.json({ error: src.error }, src.status);
+  if (isProtectedFromRename(src.relative)) {
+    console.error(`[data] file-rename blocked path="${src.relative}" reason="protected"`);
+    return c.json({ error: "Protected entry \u2014 refusing to rename" }, 403);
+  }
+  const destAbs = resolve22(dirname6(src.absolute), newName);
+  const newRel = `${dirname6(src.relative)}/${newName}`.replace(/^\.\//, "");
+  if (isProtectedFromRename(newRel)) {
+    console.error(`[data] file-rename blocked path="${newRel}" reason="protected-target"`);
+    return c.json({ error: "That name is reserved" }, 403);
+  }
+  try {
+    let collision = true;
+    try {
+      await stat4(destAbs);
+    } catch (e) {
+      if (e.code === "ENOENT") collision = false;
+    }
+    if (collision) return c.json({ error: "A file or folder with that name already exists" }, 409);
+    await rename(src.absolute, destAbs);
+  } catch (err) {
+    const code = err.code;
+    if (code === "ENOENT") return c.json({ error: "Not found" }, 404);
+    const message = err instanceof Error ? err.message : String(err);
+    console.error(`[data] file-rename error from="${src.relative}" to="${newRel}" err="${message}"`);
+    return c.json({ error: message }, 500);
+  }
+  console.error(`[data] file-rename from="${src.relative}" to="${newRel}"`);
+  void reconcileFileIndex(accountId).catch((err) => {
+    console.error(`[data] file-rename reconcile-failed account=${accountId.slice(0, 8)}\u2026 err="${err instanceof Error ? err.message : String(err)}"`);
+  });
+  return c.json({ path: newRel });
+});
 var files_default = app19;
 
 // ../lib/graph-search/src/index.ts
@@ -14871,7 +15068,7 @@ var session_archive_default = app29;
 
 // server/routes/admin/session-rc-spawn.ts
 import { randomUUID as randomUUID10 } from "crypto";
-function resolveSpawnPlan(host, operatorDomains, body, mintId = randomUUID10, adminUserId) {
+function resolveSpawnPlan(host, operatorDomains, body, mintId = randomUUID10, adminUserId, authenticatedName) {
   const operator = isOperatorHost(host, operatorDomains);
   const resumeId = typeof body.sessionId === "string" && body.sessionId.length > 0 ? body.sessionId : void 0;
   const name = typeof body.name === "string" && body.name.length > 0 ? body.name : void 0;
@@ -14890,6 +15087,7 @@ function resolveSpawnPlan(host, operatorDomains, body, mintId = randomUUID10, ad
     payload.webchatChannel = webchatChannelDescriptor(key);
     if (name) payload.name = name;
     if (adminUserId) payload.adminUserId = adminUserId;
+    if (authenticatedName) payload.authenticatedName = authenticatedName;
   } else {
     sessionId = resumeId;
     payload.sessionId = resumeId;
@@ -14899,7 +15097,9 @@ function resolveSpawnPlan(host, operatorDomains, body, mintId = randomUUID10, ad
 }
 function shapeWebchatResponse(sessionId, manager) {
   const outcome = typeof manager?.outcome === "string" ? manager.outcome : "bound";
-  return { sessionId, outcome, target: `/chat?session=${sessionId}` };
+  const redirected = manager?.redirected === true && typeof manager?.sessionId === "string";
+  const landed = redirected ? manager.sessionId : sessionId;
+  return { sessionId: landed, outcome, target: `/chat?session=${landed}` };
 }
 var app30 = new Hono();
 app30.post("/", requireAdminSession, async (c) => {
@@ -14912,7 +15112,9 @@ app30.post("/", requireAdminSession, async (c) => {
   const host = (c.req.header("host") ?? "").split(":")[0];
   const cacheKey = c.get("cacheKey");
   const adminUserId = cacheKey ? getUserIdForSession(cacheKey) : void 0;
-  const plan = resolveSpawnPlan(host, getOperatorDomains(), body, randomUUID10, adminUserId);
+  const accountId = cacheKey ? getAccountIdForSession(cacheKey) : void 0;
+  const authenticatedName = accountId ? await resolveAuthenticatedName(accountId, adminUserId) : void 0;
+  const plan = resolveSpawnPlan(host, getOperatorDomains(), body, randomUUID10, adminUserId, authenticatedName);
   const spawnReqId = randomUUID10();
   console.log(
     `[chat-spawn] op=request spawnReqId=${spawnReqId} origin=${plan.origin} kind=${plan.kind} sessionId=${plan.kind === "new" ? "new" : plan.sessionId}`
@@ -14980,7 +15182,7 @@ function isSelectableModel(id) {
 }
 
 // server/routes/admin/session-reseat.ts
-function resolveReseatPlan(body, mintId = randomUUID11, adminUserId) {
+function resolveReseatPlan(body, mintId = randomUUID11, adminUserId, authenticatedName) {
   const sessionId = mintId();
   const key = `session:${sessionId}`;
   const payload = {
@@ -14994,6 +15196,7 @@ function resolveReseatPlan(body, mintId = randomUUID11, adminUserId) {
   };
   if (body.name) payload.name = body.name;
   if (adminUserId) payload.adminUserId = adminUserId;
+  if (authenticatedName) payload.authenticatedName = authenticatedName;
   return { sessionId, payload };
 }
 var app31 = new Hono();
@@ -15016,7 +15219,9 @@ app31.post("/", requireAdminSession, async (c) => {
   try {
     const cacheKey = c.get("cacheKey");
     const adminUserId = cacheKey ? getUserIdForSession(cacheKey) : void 0;
-    const plan = resolveReseatPlan({ fromSessionId, model }, randomUUID11, adminUserId);
+    const accountId = cacheKey ? getAccountIdForSession(cacheKey) : void 0;
+    const authenticatedName = accountId ? await resolveAuthenticatedName(accountId, adminUserId) : void 0;
+    const plan = resolveReseatPlan({ fromSessionId, model }, randomUUID11, adminUserId, authenticatedName);
     const reseatReqId = randomUUID11();
     console.log(`[chat-reseat] op=request reseatReqId=${reseatReqId} from=${fromSessionId} to-model=${model} new=${plan.sessionId}`);
     let res;
@@ -15046,8 +15251,8 @@ app31.post("/", requireAdminSession, async (c) => {
     try {
       const account = resolveAccount();
       if (account) {
-        const accountId = resolvePlatformAccountId();
-        const canonicalId = adminSessionIdFor(accountId, WEBCHAT_ADMIN_KEY);
+        const accountId2 = resolvePlatformAccountId();
+        const canonicalId = adminSessionIdFor(accountId2, WEBCHAT_ADMIN_KEY);
         const currentOverride = readCanonicalOverrideId(account.accountDir);
         if (fromSessionId === canonicalId || fromSessionId === currentOverride) {
           writeCanonicalOverrideId(account.accountDir, plan.sessionId);
@@ -16057,7 +16262,7 @@ app44.route("/request-magic-link", request_magic_link_default);
 var access_default = app44;
 
 // server/routes/sites.ts
-import { existsSync as existsSync23, readFileSync as readFileSync23, realpathSync as realpathSync5, statSync as statSync10 } from "fs";
+import { existsSync as existsSync23, readFileSync as readFileSync23, realpathSync as realpathSync5, statSync as statSync11 } from "fs";
 import { resolve as resolve26 } from "path";
 var SAFE_SEG_RE = /^[a-z0-9_][a-z0-9_.-]{0,99}$/i;
 var MIME = {
@@ -16123,7 +16328,7 @@ app45.get("/:rel{.*}", (c) => {
   }
   let stat7;
   try {
-    stat7 = existsSync23(filePath) ? statSync10(filePath) : null;
+    stat7 = existsSync23(filePath) ? statSync11(filePath) : null;
   } catch {
     stat7 = null;
   }
@@ -17251,7 +17456,7 @@ async function startFileWatcher(opts = {}) {
 }
 
 // app/lib/migrate-uploads.ts
-import { mkdir as mkdir5, readdir as readdir5, rename, rm as rm3 } from "fs/promises";
+import { mkdir as mkdir5, readdir as readdir5, rename as rename2, rm as rm3 } from "fs/promises";
 import { dirname as dirname8, relative as relative4, resolve as resolve29 } from "path";
 var ACCOUNT_UUID_RE3 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 async function walkFiles(dir) {
@@ -17285,7 +17490,7 @@ async function relocateTree(srcDir, destDir, dataRoot, accountId, session) {
     const suffix = relative4(srcDir, oldAbs);
     const newAbs = resolve29(destDir, suffix);
     await mkdir5(dirname8(newAbs), { recursive: true });
-    await rename(oldAbs, newAbs);
+    await rename2(oldAbs, newAbs);
     moved++;
     const oldRel = relative4(dataRoot, oldAbs);
     const newRel = relative4(dataRoot, newAbs);
@@ -17374,7 +17579,7 @@ async function migrateUploads(opts = {}) {
 }
 
 // app/lib/migrate-admin-webchat-sidecars.ts
-import { readdir as readdir6, readFile as readFile6, rename as rename2, writeFile as writeFile5, unlink as unlink3 } from "fs/promises";
+import { readdir as readdir6, readFile as readFile6, rename as rename3, writeFile as writeFile5, unlink as unlink3 } from "fs/promises";
 import { existsSync as existsSync26 } from "fs";
 import { join as join24 } from "path";
 var ADMIN_ROLE2 = "admin";
@@ -17402,7 +17607,7 @@ async function writeRaw(path2, obj) {
   const tmp = `${path2}.tmp.${process.pid}.${Date.now()}`;
   try {
     await writeFile5(tmp, JSON.stringify(obj, null, 2), "utf8");
-    await rename2(tmp, path2);
+    await rename3(tmp, path2);
   } catch (err) {
     try {
       if (existsSync26(tmp)) await unlink3(tmp);
@@ -18537,7 +18742,7 @@ function broadcastAdminShutdown(reason) {
 
 // ../lib/entitlement/src/index.ts
 import { createPublicKey, createHash as createHash5, verify as cryptoVerify } from "crypto";
-import { existsSync as existsSync27, readFileSync as readFileSync26, statSync as statSync11 } from "fs";
+import { existsSync as existsSync27, readFileSync as readFileSync26, statSync as statSync12 } from "fs";
 import { resolve as resolve30 } from "path";
 
 // ../lib/entitlement/src/canonicalize.ts
@@ -18589,7 +18794,7 @@ function resolveEntitlement(brand, account) {
   if (!existsSync27(entitlementPath)) {
     return logResolved(anonymousFallback("missing"), { reason: "missing" });
   }
-  const stat7 = statSync11(entitlementPath);
+  const stat7 = statSync12(entitlementPath);
   const key = memoKey(stat7.mtimeMs, account);
   if (memo && memo.key === key) {
     return memo.result;