@rubytech/create-maxy-code 0.1.378 → 0.1.382

package/payload/server/server.js

@@ -72,7 +72,6 @@ import {
   loadAdminUserName,
   loadPersonNameByElementId,
   loadUserProfile,
-  loadWhatsappSenderName,
   migrateLegacyRemotePassword,
   persistMessage,
   projectAgent,
@@ -110,7 +109,7 @@ import {
   vncLog,
   walkPremiumBundles,
   writeAdminUserAndPerson
-} from "./chunk-AQO6KLIH.js";
+} from "./chunk-ZYS5V5QG.js";
 import {
   __commonJS,
   __toESM
@@ -1869,6 +1868,32 @@ function readSelfId(authDir) {
     return { e164: null, jid: null, lid: null };
   }
 }
+function credsCensus(authDir) {
+  const raw = readCredsJsonRaw(resolveCredsPath(authDir));
+  if (!raw) return { credsPresent: false, registered: false, hasAccountSignature: false, e164: null };
+  try {
+    const parsed = JSON.parse(raw);
+    const registered = parsed?.registered === true;
+    const hasAccountSignature = parsed?.account != null;
+    let e164 = null;
+    const jid = parsed?.me?.id;
+    if (jid) {
+      const match = jid.match(/^(\d+)(?::\d+)?@s\.whatsapp\.net$/i);
+      if (match) e164 = match[1];
+    }
+    return { credsPresent: true, registered, hasAccountSignature, e164 };
+  } catch {
+    return { credsPresent: true, registered: false, hasAccountSignature: false, e164: null };
+  }
+}
+function getAuthAgeMs(authDir) {
+  try {
+    const stats = fsSync.statSync(resolveCredsPath(authDir));
+    return Date.now() - stats.mtimeMs;
+  } catch {
+    return null;
+  }
+}
 async function clearAuth(authDir) {
   try {
     await fs.access(authDir);
@@ -1880,6 +1905,17 @@ async function clearAuth(authDir) {
   console.error(`${TAG} cleared credentials at ${authDir}`);
   return true;
 }
+function discardAuthDirSync(authDir) {
+  try {
+    if (!fsSync.existsSync(authDir)) return false;
+    fsSync.rmSync(authDir, { recursive: true, force: true });
+    console.error(`${TAG} discarded credential dir ${authDir}`);
+    return true;
+  } catch (err) {
+    console.warn(`${TAG} discardAuthDirSync failed authDir=${authDir}: ${String(err)}`);
+    return false;
+  }
+}
 function listCredentialAccountIds(configDir2) {
   const credsRoot = path.join(os.homedir(), configDir2, "credentials", "whatsapp");
   try {
@@ -2027,13 +2063,22 @@ function enqueueSaveCreds(authDir, saveCreds) {
   });
 }
 async function createWaSocket(opts) {
-  const { authDir, onQr, onConnectionUpdate, silent } = opts;
+  const { authDir, onQr, onConnectionUpdate, silent, correlationId, account, getCodeIssuedTs } = opts;
+  const cid = correlationId ?? "none";
+  const acct = account ?? "unknown";
   await fs2.mkdir(authDir, { recursive: true });
   maybeRestoreCredsFromBackup(authDir);
   const { state, saveCreds } = await useMultiFileAuthState(authDir);
   const { version } = await fetchLatestBaileysVersion();
+  if (!silent) {
+    const preCensus = credsCensus(authDir);
+    console.error(
+      `${TAG2} op=creds-pre cid=${cid} account=${acct} credsPresent=${preCensus.credsPresent} registered=${preCensus.registered} hasAccount=${preCensus.hasAccountSignature}`
+    );
+  }
+  const openTs = Date.now();
   console.error(
-    `${TAG2} creating socket authDir=${authDir} baileysVersion=${baileysPkgVersion} waProtocolVersion=${version.join(".")}`
+    `${TAG2} op=socket-open cid=${cid} account=${acct} baileysVersion=${baileysPkgVersion} waProtocolVersion=${version.join(".")} openTs=${openTs}`
   );
   const baileysLogger = createBaileysLogger();
   const sock = makeWASocket({
@@ -2054,6 +2099,9 @@ async function createWaSocket(opts) {
     enqueueSaveCreds(authDir, saveCreds);
   });
   let qrSequence = 0;
+  let everOpen = false;
+  let lastQrTs = 0;
+  let pairSuccessLogged = false;
   sock.ev.on("connection.update", (update) => {
     try {
       const parts = [];
@@ -2069,17 +2117,40 @@ async function createWaSocket(opts) {
       if (!silent && parts.length > 0) {
         console.error(`${TAG2} connection.update ${parts.join(" ")}`);
       }
+      if (update.qr && !silent) {
+        const now = Date.now();
+        const sinceLastRefMs = lastQrTs ? now - lastQrTs : null;
+        lastQrTs = now;
+        console.error(
+          `${TAG2} op=qr cid=${cid} qr=#${qrSequence} sinceOpenMs=${now - openTs} sinceLastRefMs=${sinceLastRefMs ?? "n/a"}`
+        );
+      }
+      if (update.isNewLogin === true && !pairSuccessLogged && !silent) {
+        pairSuccessLogged = true;
+        const codeIssuedTs = getCodeIssuedTs?.();
+        const sinceCodeIssuedMs = codeIssuedTs ? Date.now() - codeIssuedTs : null;
+        const afterCensus = credsCensus(authDir);
+        console.error(
+          `${TAG2} op=pair-success cid=${cid} account=${acct} sinceCodeIssuedMs=${sinceCodeIssuedMs ?? "n/a"} hasAccountAfter=${afterCensus.hasAccountSignature}`
+        );
+      }
       if (update.qr && onQr) {
         onQr(update.qr);
       }
       if (update.connection === "close") {
         const status = getStatusCode(update.lastDisconnect?.error);
+        if (!silent) {
+          console.error(
+            `${TAG2} op=close cid=${cid} account=${acct} status=${status ?? "unknown"} reason="${formatError(update.lastDisconnect?.error)}" socketLifeMs=${Date.now() - openTs} kind=${closeKind(status, everOpen)}`
+          );
+        }
         if (status === DisconnectReason.loggedOut && !silent) {
           console.error(`${TAG2} session logged out (401) \u2014 re-link required`);
         }
       }
-      if (update.connection === "open" && !silent) {
-        console.error(`${TAG2} connected`);
+      if (update.connection === "open") {
+        everOpen = true;
+        if (!silent) console.error(`${TAG2} connected`);
       }
       onConnectionUpdate?.(update);
     } catch (err) {
@@ -2143,6 +2214,12 @@ function extractBoomDetails(err) {
   if (!statusCode && !error && !message) return null;
   return { statusCode, error, message };
 }
+function closeKind(status, everOpen) {
+  if (status === DisconnectReason.restartRequired) return "restart-required-515";
+  if (status === DisconnectReason.loggedOut) return "logged-out-401";
+  if (status === 408) return everOpen ? "conn-lost-408" : "qr-refs-ended-408";
+  return "other";
+}
 
 // app/lib/whatsapp/reconnect.ts
 import { DisconnectReason as DisconnectReason2 } from "@whiskeysockets/baileys";
@@ -3096,12 +3173,15 @@ async function sendMediaMessage(sock, to, media, opts) {
 }
 
 // app/lib/whatsapp/message-store.ts
-import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync4, appendFileSync, readdirSync } from "fs";
+import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync4, appendFileSync, readdirSync, statSync as statSync2 } from "fs";
 import { dirname, join as join3 } from "path";
 var STORE_ROOT = () => join3(process.env.MAXY_DIR_OVERRIDE ?? MAXY_DIR, "data", "whatsapp-messages");
 function conversationFile(platformAccountId, remoteJid) {
   return join3(STORE_ROOT(), platformAccountId, `${remoteJid}.jsonl`);
 }
+function conversationFilePath(platformAccountId, remoteJid) {
+  return conversationFile(platformAccountId, remoteJid);
+}
 function parseLines(raw) {
   const out = [];
   for (const line of raw.split("\n")) {
@@ -3114,6 +3194,7 @@ function parseLines(raw) {
   }
   return out;
 }
+var byDateSentAsc = (a, b) => a.dateSent.localeCompare(b.dateSent);
 function appendMessage(platformAccountId, record) {
   const file = conversationFile(platformAccountId, record.remoteJid);
   try {
@@ -3148,13 +3229,79 @@ function readConversation(platformAccountId, remoteJid) {
   const file = conversationFile(platformAccountId, remoteJid);
   try {
     if (!existsSync3(file)) return [];
-    return parseLines(readFileSync4(file, "utf8")).sort((a, b) => a.dateSent.localeCompare(b.dateSent));
+    return parseLines(readFileSync4(file, "utf8")).sort(byDateSentAsc);
   } catch (err) {
     const reason = err instanceof Error ? err.message : String(err);
     console.error(`[whatsapp-message-store] FAIL op=read reason=${reason.slice(0, 100)} remoteJid=${remoteJid}`);
     return [];
   }
 }
+var summaryCache = /* @__PURE__ */ new Map();
+function summariseRecords(records) {
+  if (records.length === 0) return null;
+  const sorted = records.slice().sort(byDateSentAsc);
+  return {
+    first: sorted[0],
+    last: sorted[sorted.length - 1],
+    firstNamedSender: sorted.find((r) => r.senderName)?.senderName ?? null
+  };
+}
+function readConversationSummaries(platformAccountId) {
+  const dir = join3(STORE_ROOT(), platformAccountId);
+  const out = /* @__PURE__ */ new Map();
+  const seen = /* @__PURE__ */ new Set();
+  let fullReads = 0;
+  let cacheHits = 0;
+  let bytesRead = 0;
+  try {
+    if (!existsSync3(dir)) return out;
+    for (const entry of readdirSync(dir)) {
+      if (!entry.endsWith(".jsonl")) continue;
+      const remoteJid = entry.slice(0, -".jsonl".length);
+      const file = join3(dir, entry);
+      seen.add(file);
+      let size;
+      let mtimeMs;
+      try {
+        const st = statSync2(file);
+        size = st.size;
+        mtimeMs = st.mtimeMs;
+      } catch {
+        continue;
+      }
+      const cached2 = summaryCache.get(file);
+      if (cached2 && cached2.size === size && cached2.mtimeMs === mtimeMs) {
+        cacheHits++;
+        out.set(remoteJid, cached2.summary);
+        continue;
+      }
+      let summary;
+      try {
+        const raw = readFileSync4(file, "utf8");
+        bytesRead += Buffer.byteLength(raw);
+        fullReads++;
+        summary = summariseRecords(parseLines(raw));
+      } catch (err) {
+        const reason = err instanceof Error ? err.message : String(err);
+        console.error(`[whatsapp-message-store] FAIL op=summarise reason=${reason.slice(0, 100)} remoteJid=${remoteJid}`);
+        continue;
+      }
+      if (!summary) continue;
+      summaryCache.set(file, { size, mtimeMs, summary });
+      out.set(remoteJid, summary);
+    }
+    for (const key of summaryCache.keys()) {
+      if (dirname(key) === dir && !seen.has(key)) summaryCache.delete(key);
+    }
+  } catch (err) {
+    const reason = err instanceof Error ? err.message : String(err);
+    console.error(`[whatsapp-message-store] FAIL op=summaries reason=${reason.slice(0, 100)} platformAccountId=${platformAccountId}`);
+  }
+  console.log(
+    `[whatsapp-message-store] op=summaries accountId=${platformAccountId} conversations=${out.size} fullReads=${fullReads} cacheHits=${cacheHits} bytesRead=${bytesRead}`
+  );
+  return out;
+}
 function readAllConversations(platformAccountId) {
   const dir = join3(STORE_ROOT(), platformAccountId);
   const out = /* @__PURE__ */ new Map();
@@ -6055,6 +6202,13 @@ async function runPostPairing(login) {
 }
 async function loginConnectionLoop(accountId, login) {
   let attempt = 0;
+  const cidShort = login.id.slice(0, 8);
+  const logTerminal = (outcome, errMsg) => {
+    const fc = credsCensus(login.authDir);
+    console.error(
+      `${TAG17} op=terminal cid=${cidShort} outcome=${outcome} credsFinal={registered=${fc.registered},account=${fc.hasAccountSignature},me=${fc.e164 ?? "null"}}` + (errMsg ? ` error="${errMsg}"` : "")
+    );
+  };
   while (true) {
     try {
       await waitForConnection(login.sock);
@@ -6063,6 +6217,7 @@ async function loginConnectionLoop(accountId, login) {
         await runPostPairing(current);
         current.connected = true;
         console.error(`${TAG17} loginConnectionLoop: connected account=${accountId} attempt=${attempt} configPersisted=${current.configPersisted}`);
+        logTerminal("connected");
       }
       return;
     } catch (err) {
@@ -6079,6 +6234,7 @@ async function loginConnectionLoop(accountId, login) {
           current.error = formatError(err);
         }
         current.errorStatus = getStatusCode(err);
+        logTerminal("error", current.error);
         return;
       }
       attempt++;
@@ -6090,14 +6246,19 @@ async function loginConnectionLoop(accountId, login) {
       await new Promise((r) => setTimeout(r, delay));
       const afterDelay = activeLogins.get(accountId);
       if (afterDelay?.id !== login.id) return;
+      const rc = credsCensus(login.authDir);
+      console.error(
+        `${TAG17} op=reconnect cid=${cidShort} attempt=${attempt}/${LOGIN_MAX_RECONNECTS} withRegistered=${rc.registered} withAccount=${rc.hasAccountSignature}`
+      );
       try {
-        const newSock = await createWaSocket({ authDir: login.authDir });
+        const newSock = await createWaSocket({ authDir: login.authDir, correlationId: cidShort, account: accountId });
         current.sock = newSock;
       } catch (sockErr) {
         console.error(
           `${TAG17} reconnect socket creation failed (attempt ${attempt}/${LOGIN_MAX_RECONNECTS}): ${String(sockErr)}`
         );
         current.error = `Reconnection failed: ${String(sockErr)}`;
+        logTerminal("error", current.error);
         return;
       }
     }
@@ -6105,11 +6266,13 @@ async function loginConnectionLoop(accountId, login) {
 }
 async function startLogin(opts) {
   const { accountId, authDir, phone, accountDir = null, force, timeoutMs = 3e4 } = opts;
+  const loginId = randomUUID6();
+  const cid = loginId.slice(0, 8);
   const existing0 = activeLogins.get(accountId);
   const hasAuth = await authExists(authDir);
   const selfId = readSelfId(authDir);
   console.error(
-    `${TAG17} startLogin account=${accountId} force=${!!force} hasAuth=${hasAuth}` + (existing0 ? ` activeLogin={id=${existing0.id.slice(0, 8)},age=${Math.round((Date.now() - existing0.startedAt) / 1e3)}s,hasCode=${!!existing0.pairingCode}}` : " activeLogin=none")
+    `${TAG17} op=start cid=${cid} account=${accountId} force=${!!force} hasAuth=${hasAuth}` + (existing0 ? ` activeLogin={id=${existing0.id.slice(0, 8)},age=${Math.round((Date.now() - existing0.startedAt) / 1e3)}s,hasCode=${!!existing0.pairingCode}}` : " activeLogin=none")
   );
   if (hasAuth && !force) {
     const who = selfId.e164 ?? selfId.jid ?? "unknown";
@@ -6148,21 +6311,32 @@ async function startLogin(opts) {
   );
   let requested = false;
   let sock;
+  let socketOpenTs = 0;
+  let codeIssuedTs;
   try {
     sock = await createWaSocket({
       authDir,
+      correlationId: cid,
+      account: accountId,
+      getCodeIssuedTs: () => codeIssuedTs,
       // The first QR event means the noise handshake is complete and the
       // socket can send the pairing IQ — the safe moment to request the code.
       // We never render the QR; it is only a readiness signal.
       onQr: () => {
         if (requested) return;
         requested = true;
+        console.error(
+          `${TAG17} op=pairing-request cid=${cid} account=${accountId} qrRef=#1 sinceOpenMs=${socketOpenTs ? Date.now() - socketOpenTs : 0}`
+        );
         void sock.requestPairingCode(digits).then((code) => {
           clearTimeout(codeTimer);
+          codeIssuedTs = Date.now();
           const current = activeLogins.get(accountId);
           if (current?.id !== login.id) return;
           if (!current.pairingCode) current.pairingCode = code;
-          console.error(`${TAG17} pairing-code-issued account=${accountId} phone=${maskPhone(digits)} codeLen=${code.length}`);
+          console.error(
+            `${TAG17} op=code-issued cid=${cid} account=${accountId} phone=${maskPhone(digits)} codeLen=${code.length} sinceOpenMs=${socketOpenTs ? codeIssuedTs - socketOpenTs : 0}`
+          );
           resolveCode?.(code);
         }).catch((err) => {
           clearTimeout(codeTimer);
@@ -6170,6 +6344,7 @@ async function startLogin(opts) {
         });
       }
     });
+    socketOpenTs = Date.now();
   } catch (err) {
     clearTimeout(codeTimer);
     resetActiveLogin(accountId);
@@ -6179,7 +6354,7 @@ async function startLogin(opts) {
     accountId,
     authDir,
     accountDir,
-    id: randomUUID6(),
+    id: loginId,
     sock,
     startedAt: Date.now(),
     phone: digits,
@@ -6260,6 +6435,13 @@ async function waitForLogin(opts) {
   console.error(`${TAG17} waitForLogin poll timeout account=${accountId} elapsed=${elapsed}s \u2014 login kept alive (pairing code still valid)`);
   return { connected: false, message: "Still waiting for you to enter the pairing code. The code is still valid \u2014 ask me to keep waiting, or request a new code.", configPersisted: false };
 }
+function listActiveLoginAccountIds() {
+  const ids = [];
+  for (const [accountId, login] of activeLogins) {
+    if (isLoginFresh(login)) ids.push(accountId);
+  }
+  return ids;
+}
 
 // app/lib/whatsapp/outbound/send-document.ts
 import { realpathSync as realpathSync3 } from "fs";
@@ -6456,6 +6638,7 @@ function serializeWhatsAppSchema() {
 import { readdirSync as readdirSync3 } from "fs";
 import { join as join9 } from "path";
 var TAG19 = "[whatsapp:reconcile]";
+var HALF_REGISTERED_MIN_AGE_MS = 5 * 6e4;
 function listCredsAccountIds(credsRoot) {
   try {
     return readdirSync3(credsRoot, { withFileTypes: true }).filter((e) => e.isDirectory() && hasCredsSync(join9(credsRoot, e.name))).map((e) => e.name);
@@ -6469,11 +6652,29 @@ function isAccountConfigured(accountDir, accountId) {
   return !!accounts && Object.prototype.hasOwnProperty.call(accounts, accountId);
 }
 function reconcileCredsOnDisk(opts) {
-  const { credsRoot, accountDir, liveAccountIds } = opts;
+  const { credsRoot, accountDir, liveAccountIds, activeLoginAccountIds } = opts;
   const entries = [];
   for (const accountId of listCredsAccountIds(credsRoot)) {
     if (liveAccountIds.has(accountId)) continue;
     const authDir = join9(credsRoot, accountId);
+    const census = credsCensus(authDir);
+    if (census.registered && !census.hasAccountSignature) {
+      const inFlight = activeLoginAccountIds.has(accountId);
+      const ageMs = getAuthAgeMs(authDir);
+      const abandoned = !inFlight && ageMs !== null && ageMs >= HALF_REGISTERED_MIN_AGE_MS;
+      if (!abandoned) {
+        console.error(`${TAG19} op=half-registered account=${accountId} registered=true hasAccount=false inFlight=${inFlight} ageMs=${ageMs ?? "null"}`);
+        entries.push({ accountId, connected: false, linkedUnconfigured: true });
+        continue;
+      }
+      console.error(`${TAG19} op=discard-half-registered account=${accountId} registered=true hasAccount=false ageMs=${ageMs}`);
+      const removed = discardAuthDirSync(authDir);
+      if (!removed) {
+        console.error(`${TAG19} op=discard-half-registered-failed account=${accountId} \u2014 residue persists`);
+        entries.push({ accountId, connected: false, linkedUnconfigured: true });
+      }
+      continue;
+    }
     const selfPhone = readSelfId(authDir).e164 ?? void 0;
     const configured = accountDir ? isAccountConfigured(accountDir, accountId) : false;
     console.error(
@@ -6500,9 +6701,10 @@ app2.get("/status", (c) => {
   try {
     const live = getStatus();
     const liveIds = new Set(live.map((a) => a.accountId));
+    const activeLoginIds = new Set(listActiveLoginAccountIds());
     const credsRoot = join10(MAXY_DIR, "credentials", "whatsapp");
     const accountDir = resolveAccount()?.accountDir ?? null;
-    const reconciled = reconcileCredsOnDisk({ credsRoot, accountDir, liveAccountIds: liveIds });
+    const reconciled = reconcileCredsOnDisk({ credsRoot, accountDir, liveAccountIds: liveIds, activeLoginAccountIds: activeLoginIds });
     const accounts = [...live, ...reconciled];
     const summary = accounts.map((a) => `${a.accountId}:${a.connected ? "up" : a.linkedUnconfigured ? "linked-unconfigured" : "down"}`).join(", ");
     console.error(`${TAG20} status accounts=${accounts.length} [${summary}]`);
@@ -6922,11 +7124,11 @@ app2.get("/group-info", async (c) => {
 var whatsapp_default = app2;
 
 // server/routes/whatsapp-reader.ts
-import { readFileSync as readFileSync15, watch, statSync as statSync4, openSync, readSync, closeSync, existsSync as existsSync8, readdirSync as readdirSync8, realpathSync as realpathSync4 } from "fs";
+import { readFileSync as readFileSync15, watch, statSync as statSync5, openSync, readSync, closeSync, existsSync as existsSync8, readdirSync as readdirSync8, realpathSync as realpathSync4 } from "fs";
 import { basename as basename4, dirname as dirname3, isAbsolute, join as join14, relative as relative2, resolve as resolve12, sep as sep3 } from "path";
 
 // server/routes/admin/sidebar-sessions.ts
-import { readdirSync as readdirSync5, readFileSync as readFileSync12, statSync as statSync2 } from "fs";
+import { readdirSync as readdirSync5, readFileSync as readFileSync12, statSync as statSync3 } from "fs";
 import { basename as basename3, dirname as dirname2, join as join11, resolve as resolve11 } from "path";
 
 // app/lib/whatsapp-reader/select-sessions.ts
@@ -6947,9 +7149,36 @@ function selectReaderChannelSessions(rows) {
     lastMessageAt: r.lastMessageAt,
     modelGated: r.modelGated,
     model: r.model,
-    rowType: "session"
+    source: "session"
   }));
 }
+function buildStoreConversationRows(accountId, summaries) {
+  const rows = [];
+  for (const [remoteJid, { first, last, firstNamedSender }] of summaries) {
+    const scope = last.scope;
+    const isGroup = remoteJid.endsWith("@g.us");
+    const senderTelephone = isGroup ? null : first.senderTelephone;
+    rows.push({
+      sessionId: "",
+      projectDir: "",
+      title: remoteJid,
+      senderId: senderTelephone,
+      startedAt: first.dateSent,
+      channel: "whatsapp",
+      role: scope === "admin" ? "admin" : "public",
+      operatorName: null,
+      whatsappName: firstNamedSender,
+      lastMessageAt: last.dateSent,
+      modelGated: false,
+      model: null,
+      source: "store",
+      accountId,
+      remoteJid,
+      scope
+    });
+  }
+  return rows.sort((a, b) => (b.lastMessageAt ?? "").localeCompare(a.lastMessageAt ?? ""));
+}
 
 // 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;
@@ -7189,26 +7418,10 @@ app3.get("/", requireAdminSession, async (c) => {
   const scopeAccountId = getAccountIdForSession(cacheKey) ?? null;
   const validAccounts = listValidAccounts();
   const multiAccount = validAccounts.length > 1;
-  const accounts = [];
-  for (const a of validAccounts) {
-    let businessName = null;
-    try {
-      const branding = await fetchBranding(a.accountId);
-      businessName = branding?.name || null;
-    } catch {
-    }
-    accounts.push({
-      accountId: a.accountId,
-      role: a.config.role ?? "",
-      businessName,
-      isHouse: a.config.role === "house"
-    });
-  }
-  console.log(`[admin-sessions-list] accounts=${accounts.length}`);
   const configDir2 = claudeConfigDir();
   if (!configDir2) {
     console.error("[admin-sessions-list] CLAUDE_CONFIG_DIR not set; returning empty list");
-    return c.json({ sessions: [], accountId: scopeAccountId, accounts });
+    return c.json({ sessions: [], accountId: scopeAccountId });
   }
   const projectsRoot = join11(configDir2, "projects");
   const jsonls = enumerateJsonls(projectsRoot);
@@ -7239,7 +7452,7 @@ app3.get("/", requireAdminSession, async (c) => {
     let mtimeMs;
     try {
       body = readFileSync12(path2, "utf8");
-      mtimeMs = statSync2(path2).mtimeMs;
+      mtimeMs = statSync3(path2).mtimeMs;
     } catch {
       continue;
     }
@@ -7317,13 +7530,13 @@ app3.get("/", requireAdminSession, async (c) => {
   if (multiAccount) {
     console.log(`[admin-sessions-list] untagged-accountId-rows=${untaggedCount}`);
   }
-  return c.json({ sessions: rows, accountId: scopeAccountId, accounts });
+  return c.json({ sessions: rows, accountId: scopeAccountId });
 });
 var sidebar_sessions_default = app3;
 
 // app/lib/admin-identity/pin-validator.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync7, readFileSync as readFileSync13, readdirSync as readdirSync6, statSync as statSync3 } from "fs";
+import { existsSync as existsSync7, readFileSync as readFileSync13, readdirSync as readdirSync6, statSync as statSync4 } from "fs";
 import { join as join12 } from "path";
 function hashPin(pin) {
   return createHash("sha256").update(pin).digest("hex");
@@ -7744,7 +7957,7 @@ app4.get("/conversations", requireAdminSession, async (c) => {
       model: lastAssistantModel(body)
     });
   }
-  const selected = selectReaderChannelSessions(rows);
+  const sessionRows = selectReaderChannelSessions(rows).filter((r) => r.channel !== "whatsapp");
   const account = resolveAccount();
   let users = [];
   if (account) {
@@ -7757,13 +7970,11 @@ app4.get("/conversations", requireAdminSession, async (c) => {
   }
   const admins = account?.config.admins ?? [];
   const nameBySender = /* @__PURE__ */ new Map();
-  const whatsappNameBySender = /* @__PURE__ */ new Map();
-  const distinct = [...new Set(selected.map((r) => r.senderId).filter((s) => !!s))];
+  const distinct = [...new Set(sessionRows.map((r) => r.senderId).filter((s) => !!s))];
   await Promise.all(
     distinct.map(async (senderId) => {
       if (!account) {
         nameBySender.set(senderId, null);
-        whatsappNameBySender.set(senderId, null);
         return;
       }
       const idRes = classifyAdminUserId(users, admins, senderId);
@@ -7771,60 +7982,22 @@ app4.get("/conversations", requireAdminSession, async (c) => {
       const { name, reason } = resolveOperatorDisplay(idRes, nameRes);
       if (reason) console.error(`[wa-reader] op=operator-unresolved senderId=${senderId} reason=${reason}`);
       nameBySender.set(senderId, name);
-      if (!name) {
-        const waName = await loadWhatsappSenderName(account.accountId, senderId);
-        if (waName) console.error(`[wa-reader] op=operator-name-fallback senderId=${senderId} source=whatsapp-pushname`);
-        whatsappNameBySender.set(senderId, waName);
-      } else {
-        whatsappNameBySender.set(senderId, null);
-      }
     })
   );
-  const conversations = selected.map((r) => ({
+  const sessionConversations = sessionRows.map((r) => ({
     ...r,
-    operatorName: r.senderId ? nameBySender.get(r.senderId) ?? null : null,
-    whatsappName: r.senderId ? whatsappNameBySender.get(r.senderId) ?? null : null,
-    rowType: "session"
+    operatorName: r.senderId ? nameBySender.get(r.senderId) ?? null : null
   }));
-  const includePersistedOnly = c.req.query("includePersistedOnly") === "1";
-  let persistedOnlyRows = [];
-  if (includePersistedOnly && account) {
-    const allConvos = readAllConversations(account.accountId);
-    const coveredSenderIds = new Set(
-      conversations.filter((cv) => cv.role === "public" && cv.channel === "whatsapp" && cv.senderId).map((cv) => cv.senderId)
-    );
-    for (const [remoteJid, messages] of allConvos) {
-      if (messages.length === 0) continue;
-      const isGroup = remoteJid.endsWith("@g.us");
-      const senderTelephone = isGroup ? null : messages[0].senderTelephone;
-      if (!isGroup && senderTelephone && coveredSenderIds.has(senderTelephone)) continue;
-      const last = messages[messages.length - 1];
-      const resolvedName = isGroup ? null : messages.find((m) => m.senderName)?.senderName ?? null;
-      persistedOnlyRows.push({
-        sessionId: `persisted:${account.accountId}:${remoteJid}`,
-        projectDir: "",
-        title: remoteJid,
-        senderId: senderTelephone,
-        startedAt: messages[0].dateSent,
-        channel: "whatsapp",
-        role: "public",
-        operatorName: null,
-        whatsappName: resolvedName,
-        lastMessageAt: last.dateSent,
-        modelGated: false,
-        model: null,
-        rowType: "persisted-only",
-        accountId: account.accountId,
-        remoteJid
-      });
-    }
-  }
-  const allRows = [...conversations, ...persistedOnlyRows];
-  console.log(`[wa-reader] op=full-list accountId=${account?.accountId ?? "null"} sessionRows=${conversations.length} persistedOnlyRows=${persistedOnlyRows.length}`);
-  return c.json({ conversations: allRows });
+  const storeRows = account ? buildStoreConversationRows(account.accountId, readConversationSummaries(account.accountId)) : [];
+  const adminScope = storeRows.filter((r) => r.scope === "admin").length;
+  const publicScope = storeRows.length - adminScope;
+  console.log(
+    `[wa-reader] op=list accountId=${account?.accountId ?? "null"} conversations=${storeRows.length} adminScope=${adminScope} publicScope=${publicScope}`
+  );
+  return c.json({ conversations: [...sessionConversations, ...storeRows] });
 });
 function readFrom(path2, from) {
-  const end = statSync4(path2).size;
+  const end = statSync5(path2).size;
   if (end <= from) return { buf: Buffer.alloc(0), end: from };
   const fd = openSync(path2, "r");
   try {
@@ -7941,7 +8114,7 @@ function runActivityTick(c) {
     let size = 0;
     let mtimeMs = 0;
     try {
-      const st = statSync4(join14(c.subagentsDir, name));
+      const st = statSync5(join14(c.subagentsDir, name));
       size = st.size;
       mtimeMs = st.mtimeMs;
     } catch {
@@ -8007,7 +8180,7 @@ data: ${JSON.stringify(turn)}
     start(controller) {
       const fileEnd0 = (() => {
         try {
-          return statSync4(jsonlPath).size;
+          return statSync5(jsonlPath).size;
         } catch {
           return 0;
         }
@@ -8136,7 +8309,7 @@ app4.get("/directives", requireAdminSession, (c) => {
     const pid = Number(pidPart);
     let len = 0;
     try {
-      len = statSync4(join14(dir, name)).size;
+      len = statSync5(join14(dir, name)).size;
     } catch {
     }
     return { name, secs, pid, ts: Number.isFinite(secs) ? new Date(secs * 1e3).toISOString() : null, len };
@@ -8161,7 +8334,7 @@ app4.get("/directive", requireAdminSession, (c) => {
   }
   return c.text(body);
 });
-app4.get("/persisted-messages", requireAdminSession, async (c) => {
+app4.get("/store-stream", requireAdminSession, (c) => {
   const accountIdRaw = c.req.query("accountId");
   const remoteJid = c.req.query("remoteJid");
   if (!accountIdRaw || !remoteJid) {
@@ -8176,21 +8349,113 @@ app4.get("/persisted-messages", requireAdminSession, async (c) => {
   if (!isUserJid(remoteJid) && !isGroupJid(remoteJid)) {
     return c.json({ error: "invalid remoteJid" }, 400);
   }
-  const messages = readConversation(accountId, remoteJid);
-  const turns = messages.map((m) => ({
+  const file = conversationFilePath(accountId, remoteJid);
+  const encoder = new TextEncoder();
+  const connId = `${remoteJid.slice(0, 12)}-${process.hrtime.bigint().toString(36).slice(-6)}`;
+  const startedAt = Date.now();
+  const lastEventId = c.req.header("Last-Event-ID");
+  const toTurn = (r) => ({
     kind: "whatsapp-persisted",
-    text: m.body,
-    ts: m.dateSent,
-    fromMe: m.fromMe,
-    senderName: m.senderName
-  }));
-  console.log(`[wa-reader] op=persisted-messages accountId=${accountId} remoteJid=${remoteJid} count=${turns.length}`);
-  return c.json({ turns });
+    text: r.body,
+    ts: r.dateSent,
+    fromMe: r.fromMe,
+    senderName: r.senderName
+  });
+  const readable = new ReadableStream({
+    start(controller) {
+      const send = (turn, id) => {
+        try {
+          controller.enqueue(encoder.encode(`id: ${id}
+data: ${JSON.stringify(turn)}
+
+`));
+        } catch {
+        }
+      };
+      const fileEnd0 = (() => {
+        try {
+          return statSync5(file).size;
+        } catch {
+          return 0;
+        }
+      })();
+      let offset = resumeOffset(lastEventId, fileEnd0);
+      if (offset === 0) {
+        const records = [];
+        try {
+          const { buf, end } = readFrom(file, 0);
+          offset = end;
+          for (const line of buf.toString("utf8").split("\n")) {
+            if (!line.trim()) continue;
+            try {
+              records.push(JSON.parse(line));
+            } catch {
+            }
+          }
+        } catch {
+          offset = fileEnd0;
+        }
+        records.sort((a, b) => a.dateSent.localeCompare(b.dateSent));
+        const scope = records.length ? records[records.length - 1].scope : "none";
+        for (const m of records) send(toTurn(m), offset);
+        console.log(
+          `[wa-reader] op=open remoteJid=${remoteJid} scope=${scope} messages=${records.length} source=store`
+        );
+      }
+      const drain = () => {
+        try {
+          const { buf, end } = readFrom(file, offset);
+          if (end <= offset) return;
+          const { lines, nextOffset } = splitNewLines(buf, offset);
+          offset = nextOffset;
+          let n = 0;
+          for (const line of lines) {
+            if (!line.trim()) continue;
+            let rec;
+            try {
+              rec = JSON.parse(line);
+            } catch {
+              continue;
+            }
+            send(toTurn(rec), offset);
+            n++;
+          }
+          if (n > 0) console.log(`[wa-reader] op=store-drain conn=${connId} turns=${n}`);
+        } catch {
+        }
+      };
+      let watcher = null;
+      try {
+        watcher = watch(file, drain);
+      } catch {
+      }
+      const poll = setInterval(drain, 1e3);
+      const heartbeat = setInterval(() => {
+        try {
+          controller.enqueue(encoder.encode(": ping\n\n"));
+        } catch {
+        }
+      }, 2e4);
+      c.req.raw.signal.addEventListener("abort", () => {
+        watcher?.close();
+        clearInterval(poll);
+        clearInterval(heartbeat);
+        console.log(`[wa-reader] op=store-close conn=${connId} ranMs=${Date.now() - startedAt}`);
+        try {
+          controller.close();
+        } catch {
+        }
+      });
+    }
+  });
+  return new Response(readable, {
+    headers: { "Content-Type": "text/event-stream", "Cache-Control": "no-cache", Connection: "keep-alive" }
+  });
 });
 var whatsapp_reader_default = app4;
 
 // server/routes/public-reader.ts
-import { statSync as statSync5, openSync as openSync2, readSync as readSync2, closeSync as closeSync2, watch as watch2, readFileSync as readFileSync16, readdirSync as readdirSync9 } from "fs";
+import { statSync as statSync6, openSync as openSync2, readSync as readSync2, closeSync as closeSync2, watch as watch2, readFileSync as readFileSync16, readdirSync as readdirSync9 } from "fs";
 import { basename as basename5, dirname as dirname4, join as join15, resolve as resolve13, sep as sep4 } from "path";
 
 // app/lib/whatsapp-reader/delivered-kinds.ts
@@ -8324,7 +8589,7 @@ function enrichPublicAttachments(turns, sessionAttachments, cursor) {
   }
 }
 function readFrom2(path2, from) {
-  const end = statSync5(path2).size;
+  const end = statSync6(path2).size;
   if (end <= from) return { buf: Buffer.alloc(0), end: from };
   const fd = openSync2(path2, "r");
   try {
@@ -8487,7 +8752,7 @@ var public_reader_default = app5;
 // server/routes/webchat.ts
 import { basename as basename6, dirname as dirname5 } from "path";
 import { join as join18 } from "path";
-import { existsSync as existsSync10, readdirSync as readdirSync11, readFileSync as readFileSync19, renameSync as renameSync3, statSync as statSync6, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync10, readdirSync as readdirSync11, readFileSync as readFileSync19, renameSync as renameSync3, statSync as statSync7, writeFileSync as writeFileSync7 } from "fs";
 
 // server/canonical-webchat-override.ts
 import { readFileSync as readFileSync17, writeFileSync as writeFileSync5, renameSync } from "fs";
@@ -8757,7 +9022,7 @@ function sessionSidecarExists(sessionId) {
 function jsonlSizeBytes(projectDir, sessionId) {
   if (projectDir === null) return null;
   try {
-    return statSync6(join18(projectDir, `${sessionId}.jsonl`)).size;
+    return statSync7(join18(projectDir, `${sessionId}.jsonl`)).size;
   } catch {
     return null;
   }
@@ -8901,7 +9166,7 @@ function latestAdminWebchatSessionId(requesterUserId, primaryUserId, scopeAccoun
     if (multiAccount && meta.accountId !== scopeAccountId) continue;
     let mtimeMs;
     try {
-      mtimeMs = statSync6(path2).mtimeMs;
+      mtimeMs = statSync7(path2).mtimeMs;
     } catch {
       continue;
     }
@@ -9733,7 +9998,7 @@ import { openSync as openSync3, closeSync as closeSync3, writeFileSync as writeF
 import { createHash as createHash3, randomUUID as randomUUID7 } from "crypto";
 
 // ../lib/admins-write/src/index.ts
-import { existsSync as existsSync14, readFileSync as readFileSync23, writeFileSync as writeFileSync9, renameSync as renameSync5, mkdirSync as mkdirSync5, readdirSync as readdirSync13, statSync as statSync7, appendFileSync as appendFileSync2 } from "fs";
+import { existsSync as existsSync14, readFileSync as readFileSync23, writeFileSync as writeFileSync9, renameSync as renameSync5, mkdirSync as mkdirSync5, readdirSync as readdirSync13, statSync as statSync8, appendFileSync as appendFileSync2 } from "fs";
 import { dirname as dirname6, join as join22 } from "path";
 function id8(value) {
   return value.slice(0, 8);
@@ -9856,7 +10121,7 @@ function computeAdminStoreDivergence(input) {
       if (entry.startsWith(".")) continue;
       const accountDir = join22(input.accountsDir, entry);
       try {
-        if (!statSync7(accountDir).isDirectory()) continue;
+        if (!statSync8(accountDir).isDirectory()) continue;
       } catch {
         continue;
       }
@@ -10256,7 +10521,7 @@ ${body.newPin}
 var onboarding_default = app9;
 
 // server/routes/client-error.ts
-import { appendFileSync as appendFileSync3, existsSync as existsSync16, renameSync as renameSync6, statSync as statSync8 } from "fs";
+import { appendFileSync as appendFileSync3, existsSync as existsSync16, renameSync as renameSync6, statSync as statSync9 } from "fs";
 import { join as join23 } from "path";
 var CLIENT_ERRORS_LOG = join23(LOG_DIR, "client-errors.log");
 var MAX_LOG_SIZE = 10 * 1024 * 1024;
@@ -10307,7 +10572,7 @@ function stackHead(stack) {
 function rotateIfNeeded() {
   try {
     if (!existsSync16(CLIENT_ERRORS_LOG)) return;
-    const stats = statSync8(CLIENT_ERRORS_LOG);
+    const stats = statSync9(CLIENT_ERRORS_LOG);
     if (stats.size < MAX_LOG_SIZE) return;
     renameSync6(CLIENT_ERRORS_LOG, CLIENT_ERRORS_LOG + ".1");
   } catch (err) {
@@ -10613,7 +10878,7 @@ app12.get("/", requireAdminSession, async (c) => {
 var accounts_default = app12;
 
 // server/routes/admin/logs.ts
-import { existsSync as existsSync18, readdirSync as readdirSync14, readFileSync as readFileSync25, statSync as statSync9 } from "fs";
+import { existsSync as existsSync18, readdirSync as readdirSync14, readFileSync as readFileSync25, statSync as statSync10 } from "fs";
 import { resolve as resolve16, basename as basename7 } from "path";
 
 // app/lib/logs-read-resolve.ts
@@ -10653,7 +10918,7 @@ app13.get("/", async (c) => {
       searched.push(filePath);
       try {
         const buffer = readFileSync25(filePath);
-        const onDiskBytes = statSync9(filePath).size;
+        const onDiskBytes = statSync10(filePath).size;
         const headers = {
           "Content-Type": "text/plain; charset=utf-8",
           "Content-Length": String(buffer.byteLength)
@@ -10718,7 +10983,7 @@ app13.get("/", async (c) => {
       try {
         const filename = basename7(hit.path);
         const buffer = readFileSync25(hit.path);
-        const onDiskBytes = statSync9(hit.path).size;
+        const onDiskBytes = statSync10(hit.path).size;
         const headers = {
           "Content-Type": "text/plain; charset=utf-8",
           "Content-Length": String(buffer.byteLength)
@@ -10761,7 +11026,7 @@ app13.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: statSync9(resolve16(dir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime).forEach(({ name }) => {
+    files.filter((f) => !seen.has(f)).map((f) => ({ name: f, mtime: statSync10(resolve16(dir, f)).mtimeMs })).sort((a, b) => b.mtime - a.mtime).forEach(({ name }) => {
       seen.add(name);
       try {
         const content = readFileSync25(resolve16(dir, name));
@@ -11646,7 +11911,7 @@ app17.put("/:id/label", requireAdminSession, async (c) => {
 var sessions_default = app17;
 
 // app/lib/claude-agent/spawn-context.ts
-import { existsSync as existsSync22, readFileSync as readFileSync27, readdirSync as readdirSync16, statSync as statSync10 } from "fs";
+import { existsSync as existsSync22, readFileSync as readFileSync27, readdirSync as readdirSync16, statSync as statSync11 } from "fs";
 import { dirname as dirname7, resolve as resolve19, join as join25 } from "path";
 async function resolveOwnerProfileBlock(accountId, userId) {
   if (!userId) return { ok: false, reason: "missing-user-id" };
@@ -11749,7 +12014,7 @@ function listPluginDirs() {
     for (const name of readdirSync16(platformPlugins)) {
       const dir = join25(platformPlugins, name);
       try {
-        if (statSync10(dir).isDirectory()) out.set(name, dir);
+        if (statSync11(dir).isDirectory()) out.set(name, dir);
       } catch {
       }
     }
@@ -11763,7 +12028,7 @@ function listPluginDirs() {
         for (const name of readdirSync16(bundlePlugins)) {
           const dir = join25(bundlePlugins, name);
           try {
-            if (statSync10(dir).isDirectory()) out.set(name, dir);
+            if (statSync11(dir).isDirectory()) out.set(name, dir);
           } catch {
           }
         }
@@ -18350,7 +18615,7 @@ app48.route("/request-magic-link", request_magic_link_default);
 var access_default = app48;
 
 // server/routes/sites.ts
-import { existsSync as existsSync28, readFileSync as readFileSync31, realpathSync as realpathSync6, statSync as statSync11 } from "fs";
+import { existsSync as existsSync28, readFileSync as readFileSync31, realpathSync as realpathSync6, statSync as statSync12 } from "fs";
 import { resolve as resolve26 } from "path";
 var SAFE_SEG_RE = /^[a-z0-9_][a-z0-9_.-]{0,99}$/i;
 var MIME = {
@@ -18416,7 +18681,7 @@ app49.get("/:rel{.*}", (c) => {
   }
   let stat8;
   try {
-    stat8 = existsSync28(filePath) ? statSync11(filePath) : null;
+    stat8 = existsSync28(filePath) ? statSync12(filePath) : null;
   } catch {
     stat8 = null;
   }
@@ -22112,7 +22377,7 @@ function broadcastAdminShutdown(reason) {
 
 // ../lib/entitlement/src/index.ts
 import { createPublicKey, createHash as createHash5, verify as cryptoVerify } from "crypto";
-import { existsSync as existsSync32, readFileSync as readFileSync34, statSync as statSync12 } from "fs";
+import { existsSync as existsSync32, readFileSync as readFileSync34, statSync as statSync13 } from "fs";
 import { resolve as resolve32 } from "path";
 
 // ../lib/entitlement/src/canonicalize.ts
@@ -22164,7 +22429,7 @@ function resolveEntitlement(brand, account) {
   if (!existsSync32(entitlementPath)) {
     return logResolved(anonymousFallback("missing"), { reason: "missing" });
   }
-  const stat8 = statSync12(entitlementPath);
+  const stat8 = statSync13(entitlementPath);
   const key = memoKey(stat8.mtimeMs, account);
   if (memo && memo.key === key) {
     return memo.result;