@rubytech/create-maxy-code 0.1.377 → 0.1.379

package/payload/server/server.js

@@ -41,6 +41,7 @@ import {
   embed,
   emitMissingOnResolve,
   ensureConversation,
+  fetchAccountName,
   fetchBranding,
   findMissingPlugins,
   findRecentConversation,
@@ -71,7 +72,6 @@ import {
   loadAdminUserName,
   loadPersonNameByElementId,
   loadUserProfile,
-  loadWhatsappSenderName,
   migrateLegacyRemotePassword,
   persistMessage,
   projectAgent,
@@ -109,7 +109,7 @@ import {
   vncLog,
   walkPremiumBundles,
   writeAdminUserAndPerson
-} from "./chunk-Y4SHSFGK.js";
+} from "./chunk-ZYS5V5QG.js";
 import {
   __commonJS,
   __toESM
@@ -1868,6 +1868,24 @@ 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 };
+  }
+}
 async function clearAuth(authDir) {
   try {
     await fs.access(authDir);
@@ -2026,13 +2044,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({
@@ -2053,6 +2080,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 = [];
@@ -2068,17 +2098,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) {
@@ -2142,6 +2195,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";
@@ -3101,6 +3160,9 @@ var STORE_ROOT = () => join3(process.env.MAXY_DIR_OVERRIDE ?? MAXY_DIR, "data",
 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")) {
@@ -6054,6 +6116,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);
@@ -6062,6 +6131,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) {
@@ -6078,6 +6148,7 @@ async function loginConnectionLoop(accountId, login) {
           current.error = formatError(err);
         }
         current.errorStatus = getStatusCode(err);
+        logTerminal("error", current.error);
         return;
       }
       attempt++;
@@ -6089,14 +6160,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;
       }
     }
@@ -6104,11 +6180,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";
@@ -6147,21 +6225,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);
@@ -6169,6 +6258,7 @@ async function startLogin(opts) {
         });
       }
     });
+    socketOpenTs = Date.now();
   } catch (err) {
     clearTimeout(codeTimer);
     resetActiveLogin(accountId);
@@ -6178,7 +6268,7 @@ async function startLogin(opts) {
     accountId,
     authDir,
     accountDir,
-    id: randomUUID6(),
+    id: loginId,
     sock,
     startedAt: Date.now(),
     phone: digits,
@@ -6473,6 +6563,10 @@ function reconcileCredsOnDisk(opts) {
   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) {
+      console.error(`${TAG19} op=half-registered account=${accountId} registered=true hasAccount=false`);
+    }
     const selfPhone = readSelfId(authDir).e164 ?? void 0;
     const configured = accountDir ? isAccountConfigured(accountDir, accountId) : false;
     console.error(
@@ -6946,9 +7040,39 @@ function selectReaderChannelSessions(rows) {
     lastMessageAt: r.lastMessageAt,
     modelGated: r.modelGated,
     model: r.model,
-    rowType: "session"
+    source: "session"
   }));
 }
+function buildStoreConversationRows(accountId, convos) {
+  const rows = [];
+  for (const [remoteJid, messages] of convos) {
+    if (messages.length === 0) continue;
+    const last = messages[messages.length - 1];
+    const scope = last.scope;
+    const isGroup = remoteJid.endsWith("@g.us");
+    const senderTelephone = isGroup ? null : messages[0].senderTelephone;
+    const senderName = messages.find((m) => m.senderName)?.senderName ?? null;
+    rows.push({
+      sessionId: "",
+      projectDir: "",
+      title: remoteJid,
+      senderId: senderTelephone,
+      startedAt: messages[0].dateSent,
+      channel: "whatsapp",
+      role: scope === "admin" ? "admin" : "public",
+      operatorName: null,
+      whatsappName: senderName,
+      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;
@@ -7743,7 +7867,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) {
@@ -7756,13 +7880,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);
@@ -7770,57 +7892,19 @@ 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, readAllConversations(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;
@@ -8160,7 +8244,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) {
@@ -8175,16 +8259,108 @@ 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 statSync4(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;
 
@@ -8714,9 +8890,9 @@ var WEBCHAT_ADMIN_KEY = "webchat-admin";
 var UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 function locateSession(sessionId) {
   const dir = findSessionProjectDir(sessionId);
-  if (!dir) return { projectDir: null, channel: null };
+  if (!dir) return { projectDir: null, channel: null, accountId: null };
   const meta = readSidecarMeta(join18(dir, `${sessionId}.meta.json`));
-  return { projectDir: dir, channel: meta.channel };
+  return { projectDir: dir, channel: meta.channel, accountId: meta.accountId };
 }
 function locateSidecar(sessionId) {
   const cfg = claudeConfigDir();
@@ -8732,7 +8908,7 @@ function locateSidecar(sessionId) {
     const metaPath = join18(projectsRoot, slug, `${sessionId}.meta.json`);
     if (existsSync10(metaPath)) {
       const meta = readSidecarMeta(metaPath);
-      return { channel: meta.channel, adminUserId: meta.adminUserId };
+      return { channel: meta.channel, adminUserId: meta.adminUserId, accountId: meta.accountId };
     }
   }
   return null;
@@ -9010,6 +9186,7 @@ function createWebchatRoutes(deps) {
     }
     let deliveryKey = WEBCHAT_ADMIN_KEY;
     let deliverySessionId;
+    let deliveryAccountId = accountId;
     const explicitTarget = target !== void 0;
     if (target === void 0) {
       const latest = latestAdminWebchatSessionId(requesterUserId, primaryUserId, scopeAccountId, multiAccount);
@@ -9022,7 +9199,7 @@ function createWebchatRoutes(deps) {
       }
     }
     if (target !== void 0) {
-      let { projectDir, channel } = locateSession(target);
+      let { projectDir, channel, accountId: sessionAccountId } = locateSession(target);
       if (projectDir === null) {
         const sidecar = locateSidecar(target);
         if (sidecar === null) {
@@ -9030,6 +9207,7 @@ function createWebchatRoutes(deps) {
           return c.json({ error: "session not found" }, 404);
         }
         channel = sidecar.channel;
+        sessionAccountId = sidecar.accountId;
       }
       const binding = conflictingBinding(channel);
       if (binding !== null) {
@@ -9038,6 +9216,7 @@ function createWebchatRoutes(deps) {
       }
       deliveryKey = `session:${target}`;
       deliverySessionId = target;
+      deliveryAccountId = sessionAccountId ?? accountId;
     }
     if (isMultipart) {
       const kind = files.some((f) => isAudioMime(f.type)) ? "voice" : "files";
@@ -9114,7 +9293,7 @@ ${note}` : note;
     }
     const adminUserId = requesterUserId ?? void 0;
     if (deliverySessionId !== void 0) {
-      await deps.handleInbound({ role: "admin", accountId, key: deliveryKey, text, sessionId: deliverySessionId, adminUserId });
+      await deps.handleInbound({ role: "admin", accountId: deliveryAccountId, key: deliveryKey, text, sessionId: deliverySessionId, adminUserId });
     } else {
       await deps.handleInbound({ role: "admin", accountId: bootstrapAccountId, key: deliveryKey, text, adminUserId });
     }
@@ -10443,12 +10622,7 @@ async function createAdminSession(accountId, thinkingView, userId, userName, rol
   const cacheKey = fingerprintSessionKey(signedSessionToken);
   registerSession(cacheKey, "admin", accountId, void 0, userId, userName, role);
   if (userId) setWantsPriorConversation(cacheKey);
-  let businessName;
-  try {
-    const branding = await fetchBranding(accountId);
-    businessName = branding?.name || void 0;
-  } catch {
-  }
+  const businessName = await fetchAccountName(accountId) || void 0;
   let initialSessionId = null;
   try {
     const ensured = await ensureConversation(
@@ -10486,12 +10660,7 @@ function operatorRoleFor(config, userId) {
 async function buildAccountOptionList(accounts, userId) {
   return Promise.all(
     accounts.map(async (a) => {
-      let businessName;
-      try {
-        const branding = await fetchBranding(a.accountId);
-        businessName = branding?.name || void 0;
-      } catch {
-      }
+      const businessName = await fetchAccountName(a.accountId) || void 0;
       return { accountId: a.accountId, businessName, role: operatorRoleFor(a.config, userId) };
     })
   );
@@ -10512,12 +10681,7 @@ app11.get("/", async (c) => {
   }
   const account = resolveAccount();
   const thinkingView = account?.config.thinkingView ?? "default";
-  let businessName;
-  try {
-    const branding = await fetchBranding(accountId);
-    businessName = branding?.name || void 0;
-  } catch {
-  }
+  const businessName = await fetchAccountName(accountId) || void 0;
   const role = getRoleForSession(cacheKey);
   console.log(`[admin-session] role=${role ?? "null"} cacheKey=${cacheKey.slice(0, 8)} phase=restore`);
   const restoredUserId = getUserIdForSession(cacheKey);
@@ -16292,8 +16456,10 @@ app29.post("/", requireAdminSession, async (c) => {
     return c.json({ error: "sessionId must be a v4 UUID" }, 400);
   }
   const base = managerBase("session-delete:wrapper");
+  const accountId = getAccountIdForSession(c.var.cacheKey);
+  const acctQuery = accountId ? `?accountId=${encodeURIComponent(accountId)}` : "";
   try {
-    const stop = await fetch(`${base}/${sessionId}/stop`, { method: "POST" });
+    const stop = await fetch(`${base}/${sessionId}/stop${acctQuery}`, { method: "POST" });
     if (stop.status !== 204 && stop.status !== 200 && stop.status !== 404) {
       console.error(`[session-delete] sessionId=${sessionId} stop-status=${stop.status}`);
       return c.json({ error: `stop-failed-${stop.status}` }, 502);
@@ -16304,7 +16470,7 @@ app29.post("/", requireAdminSession, async (c) => {
   }
   let del;
   try {
-    del = await fetch(`${base}/${sessionId}`, { method: "DELETE" });
+    del = await fetch(`${base}/${sessionId}${acctQuery}`, { method: "DELETE" });
   } catch (err) {
     console.error(`[session-delete] sessionId=${sessionId} delete-unreachable err=${err instanceof Error ? err.message : String(err)}`);
     return c.json({ error: "manager-unreachable" }, 502);
@@ -16333,9 +16499,11 @@ app30.post("/", requireAdminSession, async (c) => {
   if (!SESSION_ID_RE2.test(sessionId)) {
     return c.json({ error: "sessionId must be a v4 UUID" }, 400);
   }
+  const accountId = getAccountIdForSession(c.var.cacheKey);
+  const acctQuery = accountId ? `?accountId=${encodeURIComponent(accountId)}` : "";
   let res;
   try {
-    res = await fetch(`${managerBase("session-stop:wrapper")}/${sessionId}/stop`, { method: "POST" });
+    res = await fetch(`${managerBase("session-stop:wrapper")}/${sessionId}/stop${acctQuery}`, { method: "POST" });
   } catch (err) {
     console.error(`[session-stop] sessionId=${sessionId} manager-unreachable err=${err instanceof Error ? err.message : String(err)}`);
     return c.json({ error: "manager-unreachable" }, 502);
@@ -20416,6 +20584,12 @@ function buildWaSpawnRequest(input) {
     role: input.role,
     channel: "whatsapp",
     personId,
+    // Task 1325 — the account whose WhatsApp received this inbound is the
+    // session's own account (the sessionId hashes it). Threading it as
+    // targetAccountId makes a message-triggered resume of a client-account
+    // session resolve under that account, not the manager's boot-time house
+    // default (which fired for every non-webchat resume before this).
+    targetAccountId: input.accountId,
     waChannel: { senderId: input.senderId, gatewayUrl: input.gatewayUrl, serverPath: input.serverPath },
     logContext: `channel=whatsapp-native role=${input.role} senderId=${input.senderId}`
   };
@@ -21725,6 +21899,12 @@ function buildTelegramSpawnRequest(input) {
     role: input.role,
     channel: "telegram",
     personId,
+    // Task 1325 — the account whose Telegram bot received this inbound is the
+    // session's own account (the sessionId hashes it). Threading it as
+    // targetAccountId makes a message-triggered resume of a client-account
+    // session resolve under that account, not the manager's boot-time house
+    // default. Mirror of the WhatsApp builder.
+    targetAccountId: input.accountId,
     telegramChannel: { senderId: input.senderId, gatewayUrl: input.gatewayUrl, serverPath: input.serverPath },
     logContext: `channel=telegram-native role=${input.role} senderId=${input.senderId}`
   };
@@ -22503,12 +22683,14 @@ var webchatGateway = new WebchatGateway({
       senderId: key,
       adminUserId,
       webchatChannel: { key, gatewayUrl, serverPath },
-      // Task 1318 — the manager tags the spawned session's sidecar
+      // Task 1318 / 1325 — the manager tags the spawned session's sidecar
       // (meta.accountId) and scopes its ACCOUNT_DIR from this. `accountId`
-      // here is exactly what POST /send resolved for this inbound: HOUSE for
-      // an existing-session delivery, the viewer's scoped sub-account for a
-      // fresh bootstrap — the same value the sessionId hash above already
-      // used, so the two never disagree.
+      // here is exactly what POST /send resolved for this inbound: the target
+      // session's OWN account for an existing-session delivery (Task 1325 —
+      // read from its sidecar, so a client-account session resumes under its
+      // own account, never house), the viewer's scoped sub-account for a fresh
+      // bootstrap — the same value the sessionId hash above already used, so
+      // the two never disagree.
       targetAccountId: accountId,
       logContext: `channel=webchat key=${key} role=${role}`
     });
@@ -23272,6 +23454,10 @@ app55.get("/graph", (c) => {
 });
 app55.get("/chat", (c) => {
   const host = (c.req.header("host") ?? "").split(":")[0];
+  if (isOperatorHost(host, getOperatorDomains())) {
+    console.log(`[host-class] host=${host} class=operator served=operator.html`);
+    return c.html(cachedHtml("operator.html"));
+  }
   if (isPublicHost(host)) return c.text("Not found", 404);
   return c.html(cachedHtml("chat.html"));
 });