@rubytech/create-sitedesk-code 0.1.512 → 0.1.513

package/payload/server/server.js

@@ -118,7 +118,7 @@ import {
   vncLog,
   walkPremiumBundles,
   writeAdminUserAndPerson
-} from "./chunk-2WAXM5N2.js";
+} from "./chunk-S6HYTIU3.js";
 import {
   D1_MAX_SQL_STATEMENT_BYTES,
   D1_QUERY_MAX_BODY_BYTES,
@@ -5105,6 +5105,18 @@ function resolvePlatformAccountId(accountsDir = ACCOUNTS_DIR) {
   return routed ?? houseId;
 }
 
+// app/lib/whatsapp/account-id-shape.ts
+var UUID_RE2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+function isUuidAccountId(id) {
+  return UUID_RE2.test(id);
+}
+function warnNonUuidAccount(caller2, accountId) {
+  if (isUuidAccountId(accountId)) return;
+  console.error(
+    `[whatsapp-account-scope] op=non-uuid-account caller=${caller2} accountId=${accountId}`
+  );
+}
+
 // app/lib/managed-service.ts
 import { join as join7 } from "path";
 import { readFileSync as readFileSync9 } from "fs";
@@ -6221,8 +6233,9 @@ function buildSelfChatDispatch(input) {
       isGroup: false
     }),
     media: [],
-    // Self-chat is the owner: the session scopes to the house account (Task 1383).
-    effectiveAccountId: input.accountId,
+    // Self-chat is the owner: the session scopes to the house account (Task 1383),
+    // named by its platform UUID (Task 1850).
+    effectiveAccountId: input.platformAccountId,
     // Task 1575 — self-chat is unambiguously the owner, so attribute the spawn
     // to the owner userId even when the owner phone is unbound in users.json.
     ownerSelfPhone: true
@@ -6353,20 +6366,26 @@ function resolveReadStoreKey(accountId) {
 }
 function resolveInboundPersistAccount(args) {
   const result = args.accessResult;
-  if (result?.allowed && result.reason === "account-manager" && result.effectiveAccountId) {
-    return result.effectiveAccountId;
-  }
-  return args.connPlatformAccountId;
+  const account = result?.allowed && result.reason === "account-manager" && result.effectiveAccountId ? result.effectiveAccountId : args.connPlatformAccountId;
+  warnNonUuidAccount("inbound-persist", account);
+  return account;
 }
 function resolveConversationPersistAccount(sendAccountId, counterpartyPhone) {
   const conn = findConnectionByKey(Array.from(connections2.values()), sendAccountId);
-  if (!conn) return sendAccountId;
+  if (!conn) {
+    warnNonUuidAccount("reply-append-no-connection", sendAccountId);
+    return sendAccountId;
+  }
   const access = checkDmAccess({
     senderPhone: counterpartyPhone,
     selfPhone: conn.selfPhone ?? "",
     config: whatsAppConfig,
+    // The per-number sub-config is keyed by the credential DIRNAME.
     accountConfig: whatsAppConfig.accounts?.[conn.accountId],
-    accountId: conn.accountId,
+    // Task 1850 — the account SCOPE is the platform UUID. The gate assigns this
+    // to `effectiveAccountId` for every non-manager admit, and that value reaches
+    // the graph and the spawn; the dirname is a credential path, not an account.
+    accountId: conn.platformAccountId,
     isValidAccount: (id) => isValidAccountId(id)
   });
   return resolveInboundPersistAccount({
@@ -6700,8 +6719,11 @@ function monitorInbound(conn) {
             senderPhone,
             selfPhone: conn.selfPhone ?? "",
             config: whatsAppConfig,
+            // Keyed by the credential DIRNAME — a per-number sub-config.
             accountConfig: whatsAppConfig.accounts?.[conn.accountId],
-            accountId: conn.accountId,
+            // Task 1850 — the account SCOPE is the platform UUID, never the
+            // dirname. See resolveConversationPersistAccount.
+            accountId: conn.platformAccountId,
             isValidAccount: (id) => isValidAccountId(id)
           });
           const persistAccountId = resolveInboundPersistAccount({
@@ -6894,6 +6916,7 @@ function monitorInbound(conn) {
             };
             dispatchInboundPayload(conn, buildSelfChatDispatch({
               accountId: conn.accountId,
+              platformAccountId: conn.platformAccountId,
               selfPhone: conn.selfPhone,
               remoteJid,
               text: decision.text,
@@ -7043,7 +7066,7 @@ async function handleInboundMessage(conn, msg) {
       selfPhone,
       config: whatsAppConfig,
       accountConfig: whatsAppConfig.accounts?.[conn.accountId],
-      accountId: conn.accountId,
+      accountId: conn.platformAccountId,
       isValidAccount: (id) => isValidAccountId(id),
       resolvePersonByPhone
     });
@@ -8152,6 +8175,11 @@ function createScheduleInjectRoutes(deps) {
 // server/index.ts
 var import_dist9 = __toESM(require_dist(), 1);
 
+// app/lib/whatsapp/gateway/manages-account.ts
+function managesAccountFor(effectiveAccountId, connPlatformAccountId) {
+  return effectiveAccountId === connPlatformAccountId ? "none" : effectiveAccountId;
+}
+
 // app/lib/whatsapp/socket-resolution-error.ts
 function formatPresentKeys(presentKeys) {
   return presentKeys.join(",") || "none";
@@ -11569,13 +11597,13 @@ async function runPortalIndexPush(root) {
 import { existsSync as existsSync12, readdirSync as readdirSync9, statSync as statSync5 } from "fs";
 import { join as join17 } from "path";
 var GOOGLE_PENDING_LIFETIME_SEC = 600;
-var UUID_RE2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+var UUID_RE3 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function runGooglePendingAudit(accountsDir, nowMs, emit, readMtimeMs = (path3) => statSync5(path3).mtimeMs) {
   let scanned = 0;
   let stranded = 0;
   if (existsSync12(accountsDir)) {
     for (const accountId of readdirSync9(accountsDir)) {
-      if (!UUID_RE2.test(accountId)) continue;
+      if (!UUID_RE3.test(accountId)) continue;
       const pendingPath2 = join17(accountsDir, accountId, "secrets", "google", "pending-oauth.enc");
       try {
         if (!existsSync12(pendingPath2)) continue;
@@ -11721,8 +11749,8 @@ async function loadTitleCacheOutcome(accountDir) {
 async function loadTitleCache(accountDir) {
   return (await loadTitleCacheOutcome(accountDir)).cache;
 }
-async function saveTitleCacheMerged(accountDir, updates) {
-  if (updates.size === 0) return;
+async function saveTitleCacheMerged(accountDir, updates, evict) {
+  if (updates.size === 0 && (evict === void 0 || evict.size === 0)) return 0;
   const path3 = titleCachePath(accountDir);
   let merged;
   try {
@@ -11732,6 +11760,12 @@ async function saveTitleCacheMerged(accountDir, updates) {
     merged = /* @__PURE__ */ new Map();
   }
   for (const [sessionId, entry] of updates) merged.set(sessionId, entry);
+  let evicted = 0;
+  if (evict !== void 0) {
+    for (const sessionId of evict) {
+      if (merged.delete(sessionId)) evicted += 1;
+    }
+  }
   const tmp = `${path3}.tmp.${process.pid}.${Date.now()}.${nextTmpSeq()}`;
   try {
     await writeFile5(tmp, serializeTitleCache(merged), "utf8");
@@ -11747,6 +11781,7 @@ async function saveTitleCacheMerged(accountDir, updates) {
     }
     throw err;
   }
+  return evicted;
 }
 function lastAiTitleIn(text, initial) {
   let aiTitle = initial;
@@ -11986,13 +12021,14 @@ function findSessionProjectDir(sessionId) {
   const jsonlPath = findExistingJsonlForSessionId(cfg, sessionId);
   return jsonlPath ? dirname5(jsonlPath) : null;
 }
-function enumerateJsonls(projectsRoot) {
+function enumerateJsonlsWithSkips(projectsRoot) {
   const out = [];
+  let skipped = 0;
   let slugs;
   try {
     slugs = readdirSync12(projectsRoot, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
   } catch (err) {
-    if (err.code === "ENOENT") return out;
+    if (err.code === "ENOENT") return { files: out, skipped };
     throw err;
   }
   for (const slug of slugs) {
@@ -12003,6 +12039,7 @@ function enumerateJsonls(projectsRoot) {
     } catch (err) {
       const code = err.code ?? "unknown";
       console.error(`[admin-sessions-list] slug-skipped slug=${slug} code=${code}`);
+      skipped += 1;
       continue;
     }
     for (const entry of entries2) {
@@ -12016,6 +12053,7 @@ function enumerateJsonls(projectsRoot) {
         } catch (err) {
           const code = err.code ?? "unknown";
           console.error(`[admin-sessions-list] subagents-skipped slug=${slug} code=${code}`);
+          skipped += 1;
           continue;
         }
         for (const sub of subEntries) {
@@ -12031,6 +12069,7 @@ function enumerateJsonls(projectsRoot) {
         } catch (err) {
           const code = err.code ?? "unknown";
           console.error(`[admin-sessions-list] archive-skipped slug=${slug} code=${code}`);
+          skipped += 1;
           continue;
         }
         for (const arc of archiveEntries) {
@@ -12041,7 +12080,10 @@ function enumerateJsonls(projectsRoot) {
       }
     }
   }
-  return out;
+  return { files: out, skipped };
+}
+function enumerateJsonls(projectsRoot) {
+  return enumerateJsonlsWithSkips(projectsRoot).files;
 }
 async function fetchLiveSessions() {
   const out = /* @__PURE__ */ new Map();
@@ -12182,7 +12224,6 @@ async function computeSessionList(scopeAccountId) {
     return { sessions: [], accountId: scopeAccountId };
   }
   const projectsRoot = join21(configDir2, "projects");
-  const jsonls = enumerateJsonls(projectsRoot);
   const liveSessions = await fetchLiveSessions();
   const accountDir = scopeAccountId ? resolve15(ACCOUNTS_DIR, scopeAccountId) : null;
   const userTitles = await loadUserTitlesAsync(accountDir);
@@ -12216,6 +12257,7 @@ async function computeSessionList(scopeAccountId) {
   const cacheLoad = await loadTitleCacheOutcome(titleCacheDir);
   const titleCache = cacheLoad.cache;
   const cacheUpdates = /* @__PURE__ */ new Map();
+  const { files: jsonls, skipped: enumSkipped } = enumerateJsonlsWithSkips(projectsRoot);
   let enumeratedCount = 0;
   let scopedCount = 0;
   let titleCacheHits = 0;
@@ -12227,6 +12269,7 @@ async function computeSessionList(scopeAccountId) {
   let tailReadFails = 0;
   let tailBytes = 0;
   let cacheWriteFails = 0;
+  let evicted = 0;
   const walkStartedAt = Date.now();
   for (const { path: path3, isSubagent, archived } of jsonls) {
     const lastSlash = path3.lastIndexOf("/");
@@ -12389,9 +12432,13 @@ async function computeSessionList(scopeAccountId) {
     console.error(`[admin-sessions-list] op=channel-name-unresolved sessionId=${m.sessionId.slice(0, 8)} channel=${m.channel} senderId= reason=no-senderId`);
   }
   rows.sort((a, b) => a.startedAt < b.startedAt ? 1 : -1);
-  if (titleCacheDir && cacheUpdates.size > 0) {
+  const evictIds = /* @__PURE__ */ new Set();
+  if (enumSkipped === 0 && seenIds.size > 0) {
+    for (const sessionId of titleCache.keys()) if (!seenIds.has(sessionId)) evictIds.add(sessionId);
+  }
+  if (titleCacheDir && (cacheUpdates.size > 0 || evictIds.size > 0)) {
     try {
-      await saveTitleCacheMerged(titleCacheDir, cacheUpdates);
+      evicted = await saveTitleCacheMerged(titleCacheDir, cacheUpdates, evictIds);
     } catch (err) {
       cacheWriteFails += 1;
       console.error(
@@ -12401,7 +12448,7 @@ async function computeSessionList(scopeAccountId) {
   }
   const bytesMB = (titleBytes + tailBytes) / (1024 * 1024);
   console.log(
-    `[admin-sessions-list] op=list-walk enumerated=${enumeratedCount} scoped=${scopedCount} cacheLoad=${cacheLoad.state} cacheEntries=${titleCache.size} cacheDropped=${cacheLoad.dropped} titleCacheHits=${titleCacheHits} bodyScans=${bodyScans} titleReadFails=${titleReadFails} tailReads=${tailReads} tailModelMiss=${tailModelMiss} tailReadFails=${tailReadFails} titleBytesMB=${(titleBytes / (1024 * 1024)).toFixed(3)} bytesMB=${bytesMB.toFixed(3)} cacheWriteFails=${cacheWriteFails} ms=${Date.now() - walkStartedAt}`
+    `[admin-sessions-list] op=list-walk enumerated=${enumeratedCount} scoped=${scopedCount} cacheLoad=${cacheLoad.state} cacheEntries=${titleCache.size} cacheDropped=${cacheLoad.dropped} titleCacheHits=${titleCacheHits} bodyScans=${bodyScans} titleReadFails=${titleReadFails} tailReads=${tailReads} tailModelMiss=${tailModelMiss} tailReadFails=${tailReadFails} titleBytesMB=${(titleBytes / (1024 * 1024)).toFixed(3)} bytesMB=${bytesMB.toFixed(3)} cacheWriteFails=${cacheWriteFails} evicted=${evicted} enumSkipped=${enumSkipped} ms=${Date.now() - walkStartedAt}`
   );
   console.log(
     `[admin-sessions-list] rows=${rows.length} live=${liveCount} subagents=${subagentCount} archived=${archivedCount} channelInList=whatsapp:${channelInList.whatsapp},telegram:${channelInList.telegram},webchat:${channelInList.webchat} channelNameCandidates=${channelNameCandidates} channelNamesResolved=${channelNamesResolved} (operator=${operatorResolvedCount} store=${storeResolvedCount}) unknownChannel=${unknownChannelCount} excludedPublicWebchat=${excludedPublicWebchatCount} titles user=${titleSourceCounts.user} ai=${titleSourceCounts.ai} first=${titleSourceCounts["first-message"]} prefix=${titleSourceCounts.prefix} personNames=${personNameCount} adminNames=${adminNameCount} accountId=${scopeAccountId ? scopeAccountId.slice(0, 8) : "unset"}`
@@ -19460,7 +19507,7 @@ async function restoreNode(params) {
 }
 
 // app/lib/file-delete-cascade.ts
-var UUID_RE3 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+var UUID_RE4 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function parseAttachmentPath(relPath) {
   const segments = relPath.split("/").filter(Boolean);
   if (segments.length !== 5) return null;
@@ -19468,7 +19515,7 @@ function parseAttachmentPath(relPath) {
   const accountId = segments[1];
   const attachmentId = segments[3];
   const filename = segments[4];
-  if (!UUID_RE3.test(accountId) || !UUID_RE3.test(attachmentId)) return null;
+  if (!UUID_RE4.test(accountId) || !UUID_RE4.test(attachmentId)) return null;
   const dot = filename.lastIndexOf(".");
   if (dot === -1) return null;
   const stem = filename.slice(0, dot);
@@ -20076,7 +20123,7 @@ function classifyAccountRoot(schemaMd, rootEntries) {
 
 // server/routes/admin/files.ts
 var UPLOAD_TMP_DIR = ".uploads-tmp";
-var UUID_RE4 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+var UUID_RE5 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 async function readMeta(absDir, baseName) {
   try {
     const raw = await readFile9(join38(absDir, `${baseName}.meta.json`), "utf8");
@@ -20098,7 +20145,7 @@ async function readAccountNames() {
     return map;
   }
   for (const name of names) {
-    if (!UUID_RE4.test(name)) continue;
+    if (!UUID_RE5.test(name)) continue;
     const configPath2 = resolve27(accountsDir, name, "account.json");
     try {
       const raw = await readFile9(configPath2, "utf8");
@@ -20133,7 +20180,7 @@ async function servableFilesIn(dirAbs, uuid) {
   return out;
 }
 async function enrich(absolute, entry, accountNames) {
-  if (entry.kind === "directory" && UUID_RE4.test(entry.name)) {
+  if (entry.kind === "directory" && UUID_RE5.test(entry.name)) {
     const dirAbs = join38(absolute, entry.name);
     const meta = await readMeta(dirAbs, entry.name);
     if (meta?.filename) {
@@ -20168,7 +20215,7 @@ async function enrich(absolute, entry, accountNames) {
   if (entry.kind === "file") {
     const dot = entry.name.lastIndexOf(".");
     const base = dot === -1 ? entry.name : entry.name.slice(0, dot);
-    if (UUID_RE4.test(base)) {
+    if (UUID_RE5.test(base)) {
       const meta = await readMeta(absolute, base);
       if (meta?.filename) {
         entry.displayName = meta.filename;
@@ -20181,7 +20228,7 @@ async function enrich(absolute, entry, accountNames) {
 function buildDisplayPath(relPath, accountNames) {
   if (relPath === "." || relPath === "") return [];
   return relPath.split("/").filter(Boolean).map((seg) => {
-    const dn = UUID_RE4.test(seg) ? accountNames.get(seg) : void 0;
+    const dn = UUID_RE5.test(seg) ? accountNames.get(seg) : void 0;
     return dn ? { name: seg, displayName: dn } : { name: seg };
   });
 }
@@ -20193,13 +20240,13 @@ function parseGroupPath(raw, sessionAccountId) {
   }
   const segs = trimmed.split("/").filter(Boolean);
   if (segs.length !== 3) return null;
-  if (segs[0] !== "accounts" || !UUID_RE4.test(segs[1])) return null;
+  if (segs[0] !== "accounts" || !UUID_RE5.test(segs[1])) return null;
   if (segs[2] !== "@home" && segs[2] !== "@system") return null;
   return { view: segs[2].slice(1), accountRel: `accounts/${segs[1]}` };
 }
 function isAccountRoot(relPath) {
   const segs = relPath.split("/").filter(Boolean);
-  return segs.length === 2 && segs[0] === "accounts" && UUID_RE4.test(segs[1]);
+  return segs.length === 2 && segs[0] === "accounts" && UUID_RE5.test(segs[1]);
 }
 function sortDirEntries(entries2) {
   entries2.sort((a, b) => {
@@ -20247,11 +20294,11 @@ function isProtectedFromRename(relPath) {
   if (segments.length === 3 && segments[0] === "accounts" && segments[2] === "uploads") {
     return true;
   }
-  if (segments.length === 4 && segments[0] === "accounts" && segments[2] === "uploads" && UUID_RE4.test(segments[3])) {
+  if (segments.length === 4 && segments[0] === "accounts" && segments[2] === "uploads" && UUID_RE5.test(segments[3])) {
     return true;
   }
   if (parseAttachmentPath(relPath) !== null) return true;
-  if (UUID_RE4.test(base.replace(/\.meta\.json$/, "")) && base.endsWith(".meta.json")) {
+  if (UUID_RE5.test(base.replace(/\.meta\.json$/, "")) && base.endsWith(".meta.json")) {
     return true;
   }
   return false;
@@ -20327,10 +20374,10 @@ app23.get("/", requireAdminSession, async (c) => {
     const isAccountParent = segs.length === 1 && segs[0] === "accounts";
     const entries2 = [];
     for (const name of names) {
-      if (UUID_RE4.test(name.replace(/\.meta\.json$/, "")) && name.endsWith(".meta.json")) {
+      if (UUID_RE5.test(name.replace(/\.meta\.json$/, "")) && name.endsWith(".meta.json")) {
         continue;
       }
-      if (isAccountParent && UUID_RE4.test(name) && name !== accountId) {
+      if (isAccountParent && UUID_RE5.test(name) && name !== accountId) {
         continue;
       }
       const childRel = relPath === "" || relPath === "." ? name : `${relPath}/${name}`;
@@ -21050,8 +21097,8 @@ app23.delete("/", requireAdminSession, async (c) => {
     const dot = base.lastIndexOf(".");
     const stem = dot === -1 ? base : base.slice(0, dot);
     const containerDir = dirname13(absolute);
-    const sidecarPath = UUID_RE4.test(stem) && base !== `${stem}.meta.json` ? join38(containerDir, `${stem}.meta.json`) : null;
-    const isAttachmentContainer = UUID_RE4.test(stem) && basename11(containerDir) === stem;
+    const sidecarPath = UUID_RE5.test(stem) && base !== `${stem}.meta.json` ? join38(containerDir, `${stem}.meta.json`) : null;
+    const isAttachmentContainer = UUID_RE5.test(stem) && basename11(containerDir) === stem;
     await unlink4(absolute);
     if (sidecarPath) {
       try {
@@ -27652,7 +27699,7 @@ var visitor_event_default = app65;
 // server/routes/session.ts
 import { resolve as resolve37 } from "path";
 import { existsSync as existsSync43, writeFileSync as writeFileSync16, mkdirSync as mkdirSync10 } from "fs";
-var UUID_RE5 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+var UUID_RE6 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 function writeBrandingCache(accountId, agentSlug, branding) {
   try {
     const cacheDir = resolve37(MAXY_DIR, "branding-cache", accountId);
@@ -27667,7 +27714,7 @@ function parseVisitorCookie2(cookieHeader) {
   const match = cookieHeader.match(/(?:^|;\s*)maxy_visitor=([^;]*)/);
   if (!match) return null;
   const value = decodeURIComponent(match[1]).trim();
-  return UUID_RE5.test(value) ? value : null;
+  return UUID_RE6.test(value) ? value : null;
 }
 function parseAccessSessionId2(cookieHeader) {
   if (!cookieHeader) return null;
@@ -27765,7 +27812,7 @@ app66.post("/", async (c) => {
       );
     }
   }
-  if (body.session_key && typeof body.session_key === "string" && UUID_RE5.test(body.session_key)) {
+  if (body.session_key && typeof body.session_key === "string" && UUID_RE6.test(body.session_key)) {
     if (visitorId) {
       const recent = await findRecentConversation(visitorId, accountId, agentSlug).catch(() => null);
       if (recent) {
@@ -32126,6 +32173,7 @@ var waGateway = new WaGateway({
     return result.ok ? { ok: true, messageId: result.messageId } : { ok: false, error: result.error };
   },
   ensureChannelSession: async ({ accountId, effectiveAccountId, senderId, role, personId, gatewayUrl, serverPath, passive, text, msgId, ownerSelfPhone, replyContext }) => {
+    warnNonUuidAccount("channel-spawn", effectiveAccountId);
     if (passive) {
       const phoneHash = createHash8("sha256").update(senderId).digest("hex").slice(0, 12);
       const prompt = (text ?? "").trim();
@@ -32174,7 +32222,7 @@ var waGateway = new WaGateway({
       return;
     }
     if (role === "admin") {
-      const managesAccount = effectiveAccountId !== accountId ? effectiveAccountId : "none";
+      const managesAccount = managesAccountFor(effectiveAccountId, resolveReadStoreKey(accountId));
       console.error(`[whatsapp-native] op=account-manager-route senderId=${senderId} managesAccount=${managesAccount} effectiveAccount=${effectiveAccountId} source=gate`);
     }
     const req = buildWaSpawnRequest({