@rubytech/create-maxy-code 0.1.462 → 0.1.463

package/payload/server/public/chat.html

@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Chat — Maxy</title>
   <link rel="icon" href="/favicon.ico">
-  <script type="module" crossorigin src="/assets/chat-CufidiBQ.js"></script>
+  <script type="module" crossorigin src="/assets/chat-DYT5H81o.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/chunk-Ck5AOu5v.js">
   <link rel="modulepreload" crossorigin href="/assets/useSubAccountSwitcher-CU-lOxTd.js">
   <link rel="modulepreload" crossorigin href="/assets/useSelectionMode-DDmLmPph.js">
@@ -17,7 +17,7 @@
   <link rel="modulepreload" crossorigin href="/assets/useCopyFeedback-rOWd_lzl.js">
   <link rel="modulepreload" crossorigin href="/assets/chevron-left-BnpVBu51.js">
   <link rel="modulepreload" crossorigin href="/assets/rotate-ccw-D_5cETGt.js">
-  <link rel="modulepreload" crossorigin href="/assets/page-84Fdwiu_.js">
+  <link rel="modulepreload" crossorigin href="/assets/page-BoPorLg-.js">
   <link rel="stylesheet" crossorigin href="/assets/useSubAccountSwitcher-pu0jjLCz.css">
   <link rel="stylesheet" href="/brand-defaults.css">
 </head>

package/payload/server/public/operator.html

@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Operator — Maxy</title>
   <link rel="icon" href="/favicon.ico">
-  <script type="module" crossorigin src="/assets/operator-Cj0B_usT.js"></script>
+  <script type="module" crossorigin src="/assets/operator-gm2eP4r6.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/chunk-Ck5AOu5v.js">
   <link rel="modulepreload" crossorigin href="/assets/useSubAccountSwitcher-CU-lOxTd.js">
   <link rel="modulepreload" crossorigin href="/assets/useSelectionMode-DDmLmPph.js">
@@ -19,7 +19,7 @@
   <link rel="modulepreload" crossorigin href="/assets/useCopyFeedback-rOWd_lzl.js">
   <link rel="modulepreload" crossorigin href="/assets/chevron-left-BnpVBu51.js">
   <link rel="modulepreload" crossorigin href="/assets/rotate-ccw-D_5cETGt.js">
-  <link rel="modulepreload" crossorigin href="/assets/page-84Fdwiu_.js">
+  <link rel="modulepreload" crossorigin href="/assets/page-BoPorLg-.js">
   <link rel="stylesheet" crossorigin href="/assets/useSubAccountSwitcher-pu0jjLCz.css">
   <link rel="stylesheet" crossorigin href="/assets/AdminLoginScreens-CWMpccrR.css">
   <link rel="stylesheet" href="/brand-defaults.css">

package/payload/server/public/public.html

@@ -5,7 +5,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Maxy</title>
   <link rel="icon" href="/favicon.ico">
-  <script type="module" crossorigin src="/assets/public-BkNW9e9T.js"></script>
+  <script type="module" crossorigin src="/assets/public-DqJk6qgW.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/chunk-Ck5AOu5v.js">
   <link rel="modulepreload" crossorigin href="/assets/useSubAccountSwitcher-CU-lOxTd.js">
   <link rel="modulepreload" crossorigin href="/assets/useSelectionMode-DDmLmPph.js">
@@ -17,7 +17,7 @@
   <link rel="modulepreload" crossorigin href="/assets/useCopyFeedback-rOWd_lzl.js">
   <link rel="modulepreload" crossorigin href="/assets/chevron-left-BnpVBu51.js">
   <link rel="modulepreload" crossorigin href="/assets/rotate-ccw-D_5cETGt.js">
-  <link rel="modulepreload" crossorigin href="/assets/page-84Fdwiu_.js">
+  <link rel="modulepreload" crossorigin href="/assets/page-BoPorLg-.js">
   <link rel="stylesheet" crossorigin href="/assets/useSubAccountSwitcher-pu0jjLCz.css">
   <link rel="stylesheet" href="/brand-defaults.css">
 </head>

package/payload/server/server.js

@@ -2188,6 +2188,7 @@ import {
 } from "@whiskeysockets/baileys";
 import { createRequire } from "module";
 var TAG2 = "[whatsapp:session]";
+var WIRE_TAG = "[whatsapp:wire]";
 var baileysPkgVersion = (() => {
   try {
     const req = createRequire(import.meta.url);
@@ -2408,6 +2409,12 @@ async function createWaSocket(opts) {
     sock.ws.on("error", (err) => {
       console.error(`${TAG2} WebSocket error: ${String(err)}`);
     });
+    sock.ws.on("CB:message", (node) => {
+      const attrs = node?.attrs ?? {};
+      console.error(
+        `${WIRE_TAG} op=stanza msgId=${attrs.id ?? "none"} from=${attrs.from ?? "none"} type=${attrs.type ?? "none"} offline=${attrs.offline ?? "none"} account=${acct}`
+      );
+    });
   }
   return sock;
 }
@@ -5271,14 +5278,6 @@ async function registerLoginSocket(accountId, sock, authDir) {
     throw err;
   }
   await stopConnection(accountId);
-  const selfId = readSelfId(authDir);
-  const rawLidMapping = sock.signalRepository?.lidMapping ?? null;
-  const lidMapping = withSelfLidShortcut(rawLidMapping, selfId.lid, selfId.jid);
-  if (selfId.lid) {
-    console.error(`[whatsapp:lid] resolved self-lid accountId=${accountId} selfLid=${selfId.lid} source=creds`);
-  } else {
-    console.error(`[whatsapp:lid] FAIL self-lid-resolution accountId=${accountId} reason=creds-missing-lid`);
-  }
   const conn = {
     accountId,
     platformAccountId,
@@ -5286,16 +5285,18 @@ async function registerLoginSocket(accountId, sock, authDir) {
     authDir,
     sock,
     connected: true,
-    selfPhone: selfId.e164,
-    selfJid: selfId.jid,
-    selfLid: selfId.lid,
+    selfPhone: null,
+    selfJid: null,
+    selfLid: null,
     reconnectAttempts: 0,
     lastConnectedAt: Date.now(),
     abortController: new AbortController(),
     debouncer: null,
-    lidMapping
+    lidMapping: null
   };
+  applySelfIdentity(conn, sock, "register");
   connections.set(accountId, conn);
+  monitorInbound(conn);
   try {
     await sock.sendPresenceUpdate("available");
     console.error(`${TAG13} presence set to available account=${accountId}`);
@@ -5309,10 +5310,9 @@ async function registerLoginSocket(accountId, sock, authDir) {
     attempt: 0,
     signal: conn.abortController.signal
   });
-  monitorInbound(conn);
   watchForDisconnect(conn);
   attachSelfIdRefreshOnCredsUpdate(conn);
-  console.error(`${TAG13} registered login socket for account=${accountId} phone=${selfId.e164 ?? "unknown"}`);
+  console.error(`${TAG13} registered login socket for account=${accountId} phone=${conn.selfPhone ?? "unknown"}`);
 }
 function attachSelfIdRefreshOnCredsUpdate(conn) {
   if (!conn.sock) return;
@@ -5392,30 +5392,27 @@ async function connectWithReconnect(conn) {
     let connectedAt;
     try {
       console.error(`${TAG13} connecting account=${conn.accountId} attempt=${conn.reconnectAttempts}`);
+      if (conn.debouncer) {
+        await conn.debouncer.destroy();
+        conn.debouncer = null;
+      }
       const sock = await createWaSocket({
         authDir: conn.authDir,
-        silent: true
+        silent: true,
+        account: conn.accountId
       });
       conn.sock = sock;
+      applySelfIdentity(conn, sock, "pre-listener");
+      monitorInbound(conn);
       console.error(`${TAG13} socket created account=${conn.accountId} \u2014 waiting for connection`);
       await waitForConnection(sock);
-      const selfId = readSelfId(conn.authDir);
       connectedAt = Date.now();
       conn.connected = true;
-      conn.selfPhone = selfId.e164;
-      conn.selfJid = selfId.jid;
-      conn.selfLid = selfId.lid;
       conn.lastConnectedAt = connectedAt;
       conn.lastError = void 0;
       conn.terminalReason = void 0;
-      const rawLidMapping = sock.signalRepository?.lidMapping ?? null;
-      conn.lidMapping = withSelfLidShortcut(rawLidMapping, selfId.lid, selfId.jid);
-      if (selfId.lid) {
-        console.error(`[whatsapp:lid] resolved self-lid accountId=${conn.accountId} selfLid=${selfId.lid} source=creds`);
-      } else {
-        console.error(`[whatsapp:lid] FAIL self-lid-resolution accountId=${conn.accountId} reason=creds-missing-lid`);
-      }
-      console.error(`${TAG13} connected account=${conn.accountId} phone=${selfId.e164 ?? "unknown"}`);
+      applySelfIdentity(conn, sock, "post-connect");
+      console.error(`${TAG13} connected account=${conn.accountId} phone=${conn.selfPhone ?? "unknown"}`);
       try {
         await sock.sendPresenceUpdate("available");
         console.error(`${TAG13} presence set to available account=${conn.accountId}`);
@@ -5429,11 +5426,6 @@ async function connectWithReconnect(conn) {
         attempt: conn.reconnectAttempts,
         signal: conn.abortController.signal
       });
-      if (conn.debouncer) {
-        await conn.debouncer.destroy();
-        conn.debouncer = null;
-      }
-      monitorInbound(conn);
       attachSelfIdRefreshOnCredsUpdate(conn);
       await waitForDisconnectEvent(conn);
       uptimeMs = Date.now() - connectedAt;
@@ -5526,6 +5518,23 @@ function watchForDisconnect(conn) {
     }
   });
 }
+function applySelfIdentity(conn, sock, phase) {
+  const selfId = readSelfId(conn.authDir);
+  conn.selfPhone = selfId.e164;
+  conn.selfJid = selfId.jid;
+  conn.selfLid = selfId.lid;
+  const rawLidMapping = sock.signalRepository?.lidMapping ?? null;
+  conn.lidMapping = withSelfLidShortcut(rawLidMapping, selfId.lid, selfId.jid);
+  if (selfId.lid) {
+    console.error(
+      `[whatsapp:lid] resolved self-lid accountId=${conn.accountId} selfLid=${selfId.lid} source=creds phase=${phase}`
+    );
+  } else {
+    console.error(
+      `[whatsapp:lid] FAIL self-lid-resolution accountId=${conn.accountId} reason=creds-missing-lid phase=${phase}`
+    );
+  }
+}
 function monitorInbound(conn) {
   if (!conn.sock || !onInboundMessage) return;
   const sock = conn.sock;
@@ -6866,7 +6875,6 @@ function parseScheduleProvenance(v) {
 
 // server/routes/channel/schedule-inject.ts
 var TAG16 = "[schedule-inject]";
-var UUID_V4 = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 function isLoopbackAddr(addr) {
   return addr === "127.0.0.1" || addr === "::1" || addr === "::ffff:127.0.0.1";
 }
@@ -6899,7 +6907,6 @@ function createScheduleInjectRoutes(deps) {
     const prompt = typeof body.prompt === "string" ? body.prompt : "";
     const eventId = typeof body.eventId === "string" ? body.eventId : "";
     const scheduleProvenance = parseScheduleProvenance(body.scheduleProvenance);
-    const overrideSessionId = typeof body.sessionId === "string" && UUID_V4.test(body.sessionId) ? body.sessionId : void 0;
     if (channel !== "whatsapp" && channel !== "telegram" || !destination || !prompt) {
       console.error(`${TAG16} reject reason=bad-request channel=${String(channel)} hasDestination=${Boolean(destination)} hasPrompt=${Boolean(prompt)}`);
       return c.json({ ok: false, error: "schedule-inject-bad-request" }, 400);
@@ -6918,7 +6925,7 @@ function createScheduleInjectRoutes(deps) {
         return c.json({ ok: false, error: "account-manager-unresolved" }, 403);
       }
       console.error(`${TAG16} op=effective-account eventId=${eventId} effectiveAccount=${effectiveAccount2}`);
-      const sessionId2 = overrideSessionId ?? adminSessionIdFor(effectiveAccount2, destination);
+      const sessionId2 = adminSessionIdFor(effectiveAccount2, normalizeTarget(destination) ?? destination);
       const reply2 = (text) => deps.sendWhatsAppText(houseAccountId, destination, text);
       try {
         await deps.waHandleInbound({
@@ -6936,7 +6943,6 @@ function createScheduleInjectRoutes(deps) {
           media: [],
           source: "schedule",
           scheduleProvenance,
-          scheduledSessionId: overrideSessionId,
           reply: reply2
         });
       } catch (err) {
@@ -6954,7 +6960,7 @@ function createScheduleInjectRoutes(deps) {
       return c.json({ ok: false, error: "no-admin-bot-token" }, 400);
     }
     const chatId = Number(destination);
-    const sessionId = overrideSessionId ?? adminSessionIdFor(effectiveAccount, destination);
+    const sessionId = adminSessionIdFor(effectiveAccount, destination);
     const reply = (text) => deps.sendTelegramText(botToken, chatId, text);
     try {
       await deps.tgHandleInbound({
@@ -6966,7 +6972,6 @@ function createScheduleInjectRoutes(deps) {
         text: prompt,
         source: "schedule",
         scheduleProvenance,
-        scheduledSessionId: overrideSessionId,
         reply
       });
     } catch (err) {
@@ -24211,14 +24216,14 @@ var WaGateway = class {
       },
       Date.now()
     );
+    const resolvedSessionId = adminSessionIdFor(
+      input.effectiveAccountId,
+      senderId,
+      input.role === "public" && input.personId ? input.personId : void 0
+    );
     console.error(
-      `[whatsapp-native] op=inbound senderId=${senderId} accountId=${input.accountId} bytes=${bytes} ${mediaField} source=${source} delivery=${willDeliverNow ? "immediate" : "queued"}`
+      `[whatsapp-native] op=inbound senderId=${senderId} accountId=${input.accountId} bytes=${bytes} ${mediaField} source=${source} delivery=${willDeliverNow ? "immediate" : "queued"} sessionId=${resolvedSessionId}`
     );
-    if (source === "schedule" && (hadSubscriber || this.spawning.has(senderId))) {
-      console.error(
-        `[whatsapp-native] op=coalesced-onto-live-session eventId=${input.scheduleProvenance?.eventId ?? "-"} senderId=${senderId} droppedSeat=${input.scheduledSessionId ?? "-"} reason=${hadSubscriber ? "live-subscriber" : "spawn-in-flight"}`
-      );
-    }
     if (!hadSubscriber && !this.spawning.has(senderId)) {
       this.spawning.add(senderId);
       console.error(`[whatsapp-native] op=spawn-trigger senderId=${senderId}`);
@@ -24231,8 +24236,6 @@ var WaGateway = class {
           personId: input.personId ?? null,
           gatewayUrl: this.deps.gatewayUrl,
           serverPath: this.deps.serverPath,
-          // Task 1526 — a scheduled firing's per-firing seat id; absent on real inbound.
-          sessionIdOverride: input.scheduledSessionId,
           // Task 1575 — the gate's owner-self verdict; drives owner attribution
           // for an unbound owner self-phone at the spawn site.
           ownerSelfPhone: input.ownerSelfPhone
@@ -24286,7 +24289,12 @@ function logDuplicateSenderGroups(groups) {
 function buildWaSpawnRequest(input) {
   const personId = input.role === "public" && input.personId ? input.personId : void 0;
   return {
-    sessionId: input.sessionIdOverride && input.sessionIdOverride.length > 0 ? input.sessionIdOverride : adminSessionIdFor(input.accountId, input.senderId, personId),
+    // Task 1746 — the deterministic per-sender id is the ONLY id a sender's
+    // session ever has. Task 1526's per-firing seat override used to replace it
+    // on a scheduled cold start, which spawned a second session for the sender;
+    // that session then attached under the sender's own hub key and swallowed
+    // their real messages until it detached, splitting the conversation in two.
+    sessionId: adminSessionIdFor(input.accountId, input.senderId, personId),
     role: input.role,
     channel: "whatsapp",
     personId,
@@ -25773,14 +25781,14 @@ var TelegramGateway = class {
       { key: input.senderId, text: input.text, messageId: `tg-${++this.seq}`, source, standingRules, scheduleProvenance: input.scheduleProvenance },
       Date.now()
     );
+    const resolvedSessionId = adminSessionIdFor(
+      input.accountId,
+      input.senderId,
+      input.role === "public" && input.personId ? input.personId : void 0
+    );
     console.error(
-      `[telegram-native] op=inbound key=${input.senderId} accountId=${input.accountId} botType=${input.role} bytes=${bytes} source=${source} delivery=${willDeliverNow ? "immediate" : "queued"}`
+      `[telegram-native] op=inbound key=${input.senderId} accountId=${input.accountId} botType=${input.role} bytes=${bytes} source=${source} delivery=${willDeliverNow ? "immediate" : "queued"} sessionId=${resolvedSessionId}`
     );
-    if (source === "schedule" && (hadSubscriber || this.spawning.has(input.senderId))) {
-      console.error(
-        `[telegram-native] op=coalesced-onto-live-session eventId=${input.scheduleProvenance?.eventId ?? "-"} senderId=${input.senderId} droppedSeat=${input.scheduledSessionId ?? "-"} reason=${hadSubscriber ? "live-subscriber" : "spawn-in-flight"}`
-      );
-    }
     if (!hadSubscriber && !this.spawning.has(input.senderId)) {
       this.spawning.add(input.senderId);
       console.error(`[telegram-native] op=spawn-trigger key=${input.senderId} role=${input.role}`);
@@ -25792,9 +25800,7 @@ var TelegramGateway = class {
           personId: input.personId ?? null,
           chatId: input.chatId,
           gatewayUrl: this.deps.gatewayUrl,
-          serverPath: this.deps.serverPath,
-          // Task 1526 — a scheduled firing's per-firing seat id; absent on real inbound.
-          sessionIdOverride: input.scheduledSessionId
+          serverPath: this.deps.serverPath
         });
       } finally {
         this.spawning.delete(input.senderId);
@@ -25812,7 +25818,10 @@ var TelegramGateway = class {
 function buildTelegramSpawnRequest(input) {
   const personId = input.role === "public" && input.personId ? input.personId : void 0;
   return {
-    sessionId: input.sessionIdOverride && input.sessionIdOverride.length > 0 ? input.sessionIdOverride : adminSessionIdFor(input.accountId, input.senderId, personId),
+    // Task 1746 — the deterministic per-sender id is the ONLY id a sender's
+    // session ever has. Mirror of the WhatsApp builder; see its comment for why
+    // Task 1526's per-firing override was removed.
+    sessionId: adminSessionIdFor(input.accountId, input.senderId, personId),
     role: input.role,
     channel: "telegram",
     personId,
@@ -26600,7 +26609,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, sessionIdOverride, ownerSelfPhone }) => {
+  ensureChannelSession: async ({ accountId, effectiveAccountId, senderId, role, personId, gatewayUrl, serverPath, passive, text, msgId, ownerSelfPhone }) => {
     if (passive) {
       const phoneHash = createHash7("sha256").update(senderId).digest("hex").slice(0, 12);
       const prompt = (text ?? "").trim();
@@ -26648,7 +26657,7 @@ var waGateway = new WaGateway({
       const managesAccount = effectiveAccountId !== accountId ? effectiveAccountId : "none";
       console.error(`[whatsapp-native] op=account-manager-route senderId=${senderId} managesAccount=${managesAccount} effectiveAccount=${effectiveAccountId} source=gate`);
     }
-    const req = buildWaSpawnRequest({ accountId: effectiveAccountId, senderId, role, personId, gatewayUrl, serverPath, sessionIdOverride });
+    const req = buildWaSpawnRequest({ accountId: effectiveAccountId, senderId, role, personId, gatewayUrl, serverPath });
     const userId = role === "admin" ? resolveAdminUserId({ accountId: effectiveAccountId, senderPhone: senderId }) ?? (ownerSelfPhone ? resolveOwnerUserId(effectiveAccountId) ?? void 0 : void 0) : void 0;
     if (role === "admin") {
       const attribution = userId ?? (ownerSelfPhone ? "owner-self-unresolved" : "unbound-empty");
@@ -26804,8 +26813,8 @@ var telegramGateway = new TelegramGateway({
   fetchStandingRules: fetchAccountStandingRules,
   gatewayUrl: telegramGatewayUrl(),
   serverPath: telegramServerPath(),
-  ensureChannelSession: async ({ accountId, senderId, role, personId, chatId, gatewayUrl, serverPath, sessionIdOverride }) => {
-    const req = buildTelegramSpawnRequest({ accountId, senderId, role, personId, gatewayUrl, serverPath, sessionIdOverride });
+  ensureChannelSession: async ({ accountId, senderId, role, personId, chatId, gatewayUrl, serverPath }) => {
+    const req = buildTelegramSpawnRequest({ accountId, senderId, role, personId, gatewayUrl, serverPath });
     const result = await managerRcSpawn(req);
     if ("error" in result) {
       console.error(`[telegram-native] spawn-failed senderId=${senderId} role=${role} error=${result.error} status=${result.status}`);