@rubytech/create-maxy-code 0.1.429 → 0.1.431

package/payload/server/server.js

@@ -4375,9 +4375,12 @@ function getStatus() {
 function getSocket(accountId) {
   return connections.get(accountId)?.sock ?? null;
 }
+function findConnectionByKey(conns, accountId) {
+  return conns.find((c) => c.accountId === accountId) ?? conns.find((c) => c.platformAccountId === accountId);
+}
 function selectConnection(conns, accountId) {
   const presentKeys = conns.map((c) => c.accountId);
-  const conn = conns.find((c) => c.accountId === accountId) ?? conns.find((c) => c.platformAccountId === accountId);
+  const conn = findConnectionByKey(conns, accountId);
   if (!conn) return { ok: false, reason: "key-miss", presentKeys };
   if (!conn.sock) return { ok: false, reason: "disconnected", presentKeys };
   return { ok: true, sock: conn.sock, accountId: conn.accountId };
@@ -4385,6 +4388,13 @@ function selectConnection(conns, accountId) {
 function resolveSocket(accountId) {
   return selectConnection(Array.from(connections.values()), accountId);
 }
+function selectStoreAccountKey(conns, accountId) {
+  const conn = findConnectionByKey(conns, accountId);
+  return conn ? conn.platformAccountId : accountId;
+}
+function resolveReadStoreKey(accountId) {
+  return selectStoreAccountKey(Array.from(connections.values()), accountId);
+}
 function listConnectionPlatformAccountIds() {
   return [...connections.values()].map((conn) => conn.platformAccountId);
 }
@@ -7788,9 +7798,10 @@ app2.get("/activity", (c) => {
 });
 app2.get("/conversations", (c) => {
   try {
-    const accountId = validateAccountId(c.req.query("accountId") ?? null);
-    const denial = callerScopeDenial(c, accountId);
+    const requestedAccountId = validateAccountId(c.req.query("accountId") ?? null);
+    const denial = callerScopeDenial(c, requestedAccountId);
     if (denial) return denial;
+    const accountId = resolveReadStoreKey(requestedAccountId);
     const jids = listConversationJids(accountId);
     const conversations = jids.map((jid) => {
       const messages = getMessages(accountId, jid);
@@ -7803,7 +7814,7 @@ app2.get("/conversations", (c) => {
       };
     });
     conversations.sort((a, b) => (b.lastMessageTimestamp ?? 0) - (a.lastMessageTimestamp ?? 0));
-    console.error(`${TAG21} conversations account=${accountId} storeKeyFound=${jids.length > 0} count=${conversations.length}`);
+    console.error(`${TAG21} conversations requested=${requestedAccountId} account=${accountId} storeKeyFound=${jids.length > 0} count=${conversations.length}`);
     return c.json({ conversations });
   } catch (err) {
     console.error(`${TAG21} conversations error: ${String(err)}`);
@@ -7812,9 +7823,10 @@ app2.get("/conversations", (c) => {
 });
 app2.get("/messages", (c) => {
   try {
-    const accountId = validateAccountId(c.req.query("accountId") ?? null);
-    const denial = callerScopeDenial(c, accountId);
+    const requestedAccountId = validateAccountId(c.req.query("accountId") ?? null);
+    const denial = callerScopeDenial(c, requestedAccountId);
     if (denial) return denial;
+    const accountId = resolveReadStoreKey(requestedAccountId);
     const jid = c.req.query("jid");
     if (!jid) {
       return c.json({ error: "Missing required parameter: jid" }, 400);
@@ -7824,7 +7836,7 @@ app2.get("/messages", (c) => {
     const effectiveLimit = limit && !Number.isNaN(limit) && limit > 0 ? limit : void 0;
     const messages = getMessages(accountId, jid, effectiveLimit);
     const storeKeyFound = listConversationJids(accountId).length > 0;
-    console.error(`${TAG21} messages account=${accountId} jid=${jid} storeKeyFound=${storeKeyFound} limit=${effectiveLimit ?? "all"} returned=${messages.length}`);
+    console.error(`${TAG21} messages requested=${requestedAccountId} account=${accountId} jid=${jid} storeKeyFound=${storeKeyFound} limit=${effectiveLimit ?? "all"} returned=${messages.length}`);
     return c.json({ messages });
   } catch (err) {
     console.error(`${TAG21} messages error: ${String(err)}`);
@@ -8481,14 +8493,14 @@ function joinTextBlocks(content) {
   }
   return parts.join("");
 }
-function assistantTurns(content, ts) {
+function assistantTurns(content, ts, promoteFinal = false) {
   if (!Array.isArray(content)) return [];
   const out = [];
   for (const block of content) {
     if (!block || typeof block !== "object") continue;
     const b = block;
     if (b.type === "text" && typeof b.text === "string") {
-      out.push({ kind: "agent-text", text: b.text, ts });
+      out.push(promoteFinal && b.text.trim().length > 0 ? { kind: "agent-webchat-final", text: b.text, ts } : { kind: "agent-text", text: b.text, ts });
     } else if (b.type === "tool_use" && (b.name === WA_REPLY_TOOL || b.name === WEBCHAT_REPLY_TOOL || b.name === CHANNEL_REPLY_TOOL)) {
       const text = b.input?.text;
       out.push({ kind: "agent-reply", text: typeof text === "string" ? text : "", ts });
@@ -8539,7 +8551,7 @@ function renderOrSuppressChannelInbound(u, ts, out, queuedPendingSuppress) {
     out.push(operatorInboundTurn(u, ts));
   }
 }
-function parseTranscript(lines, queuedPendingSuppress = /* @__PURE__ */ new Map()) {
+function parseTranscript(lines, queuedPendingSuppress = /* @__PURE__ */ new Map(), turnCtx = {}) {
   const out = [];
   for (const line of lines) {
     if (!line || line[0] !== "{") continue;
@@ -8562,23 +8574,31 @@ function parseTranscript(lines, queuedPendingSuppress = /* @__PURE__ */ new Map(
         out.push({ kind: "agent-error", code, raw, ts });
         continue;
       }
-      out.push(...assistantTurns(msg?.content, ts));
+      const isEnd = msg?.stop_reason === "end_turn";
+      out.push(...assistantTurns(msg?.content, ts, isEnd && turnCtx.lastChannelSource === "webchat"));
       continue;
     }
     if (row.type === "queue-operation" && row.operation === "enqueue") {
       const content = asString(row.content);
-      if (content !== null && CHANNEL_WRAPPER2.test(content) && !isScheduleSource(content)) {
+      if (content !== null && CHANNEL_WRAPPER2.test(content)) {
         const u = unwrapChannel(content);
-        out.push(operatorInboundTurn(u, ts));
-        queuedPendingSuppress.set(u.text, (queuedPendingSuppress.get(u.text) ?? 0) + 1);
+        turnCtx.lastChannelSource = u.source;
+        if (!isScheduleSource(content)) {
+          out.push(operatorInboundTurn(u, ts));
+          queuedPendingSuppress.set(u.text, (queuedPendingSuppress.get(u.text) ?? 0) + 1);
+        }
       }
       continue;
     }
     if (row.type === "attachment") {
       const att = row.attachment;
       const isChannelQueued = att?.type === "queued_command" && att.isMeta === true && typeof att.origin === "object" && att.origin !== null && att.origin.kind === "channel" && typeof att.prompt === "string";
-      if (isChannelQueued && !isScheduleSource(att.prompt)) {
-        renderOrSuppressChannelInbound(unwrapChannel(att.prompt), ts, out, queuedPendingSuppress);
+      if (isChannelQueued) {
+        const u = unwrapChannel(att.prompt);
+        turnCtx.lastChannelSource = u.source;
+        if (!isScheduleSource(att.prompt)) {
+          renderOrSuppressChannelInbound(u, ts, out, queuedPendingSuppress);
+        }
       }
       continue;
     }
@@ -8603,8 +8623,10 @@ function parseTranscript(lines, queuedPendingSuppress = /* @__PURE__ */ new Map(
     // enqueue row AND this row both render and every channel message doubles.
     CHANNEL_WRAPPER2.test(text);
     if (isChannel) {
+      const u = unwrapChannel(text);
+      turnCtx.lastChannelSource = u.source;
       if (!isScheduleSource(text)) {
-        renderOrSuppressChannelInbound(unwrapChannel(text), ts, out, queuedPendingSuppress);
+        renderOrSuppressChannelInbound(u, ts, out, queuedPendingSuppress);
       }
     } else if (row.isMeta === true) {
       out.push({ kind: "harness-internal", text, ts });
@@ -9044,6 +9066,7 @@ data: ${JSON.stringify(obj)}
         log: (line) => console.log(line)
       });
       const queuedPendingSuppress = /* @__PURE__ */ new Map();
+      const turnCtx = {};
       const drain = () => {
         try {
           const { buf, end } = readFrom(jsonlPath, offset);
@@ -9051,7 +9074,7 @@ data: ${JSON.stringify(obj)}
           const { lines, nextOffset } = splitNewLines(buf, offset);
           offset = nextOffset;
           let n = 0;
-          for (const turn of parseTranscript(lines, queuedPendingSuppress)) {
+          for (const turn of parseTranscript(lines, queuedPendingSuppress, turnCtx)) {
             send(controller, enrichAdminAttachments(enrichDownloads(turn, scratchpadRoot)), offset);
             actx.lastParentTurns.push(turn);
             if (turn.kind === "agent-error") {
@@ -9071,7 +9094,7 @@ data: ${JSON.stringify(obj)}
           const { buf, end } = readFrom(jsonlPath, 0);
           offset = end;
           let n = 0;
-          for (const turn of parseTranscript(buf.toString("utf8").split("\n"), queuedPendingSuppress)) {
+          for (const turn of parseTranscript(buf.toString("utf8").split("\n"), queuedPendingSuppress, turnCtx)) {
             send(controller, enrichAdminAttachments(enrichDownloads(turn, scratchpadRoot)), offset);
             actx.lastParentTurns.push(turn);
             if (turn.kind === "agent-error") {
@@ -22073,7 +22096,24 @@ function createWaChannelRoutes(deps) {
     if (typeof senderId !== "string" || typeof sessionId !== "string" || typeof replied !== "boolean") {
       return c.json({ error: "senderId, sessionId and replied required" }, 400);
     }
+    const interactive = body?.interactive === true;
+    const finalText = typeof body?.finalText === "string" ? body.finalText : "";
     const sid = sessionId.slice(0, 8);
+    const deliver = interactive && finalText.trim().length > 0;
+    if (deliver) {
+      const bytes = Buffer.byteLength(finalText, "utf8");
+      try {
+        await deps.sendOutbound(senderId, finalText);
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        console.error(
+          `[whatsapp-native] op=turn-strand-anomaly senderId=${senderId} sessionId=${sid} interactive=yes bytes=${bytes} delivered=undelivered error=${message}`
+        );
+        return c.json({ ok: true, delivered: "undelivered" });
+      }
+      console.error(`[whatsapp-native] op=turn-end sessionId=${sid} replied=${replied ? "yes" : "no"} delivered=fallback bytes=${bytes}`);
+      return c.json({ ok: true, delivered: "fallback" });
+    }
     if (replied) {
       console.error(`[whatsapp-native] op=turn-end sessionId=${sid} replied=yes delivered=reply`);
       return c.json({ ok: true, delivered: "reply" });
@@ -22194,6 +22234,11 @@ var WaGateway = class {
     console.error(
       `[whatsapp-native] op=inbound senderId=${input.senderId} accountId=${input.accountId} bytes=${bytes} ${mediaField} source=${source} delivery=${willDeliverNow ? "immediate" : "queued"}`
     );
+    if (source === "schedule" && (hadSubscriber || this.spawning.has(input.senderId))) {
+      console.error(
+        `[whatsapp-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(`[whatsapp-native] op=spawn-trigger senderId=${input.senderId}`);
@@ -22500,17 +22545,20 @@ function createWebchatChannelRoutes(deps) {
     if (typeof key !== "string" || typeof sessionId !== "string" || typeof replied !== "boolean") {
       return c.json({ error: "key, sessionId and replied required" }, 400);
     }
+    const interactive = body?.interactive === true;
+    const finalBytes = typeof body?.finalBytes === "number" && Number.isFinite(body.finalBytes) ? body.finalBytes : 0;
     const k = key.slice(0, 8);
     const sid = sessionId.slice(0, 8);
+    if (interactive && finalBytes > 0) {
+      console.error(`[webchat-native] op=turn-end channel=webchat key=${k} sessionId=${sid} replied=${replied ? "yes" : "no"} delivered=fallback bytes=${finalBytes}`);
+      return c.json({ ok: true, delivered: "fallback" });
+    }
     if (replied) {
+      console.error(`[webchat-native] op=turn-end channel=webchat key=${k} sessionId=${sid} delivered=reply`);
       return c.json({ ok: true, delivered: "reply" });
     }
-    const finalBytes = typeof body?.finalBytes === "number" && Number.isFinite(body.finalBytes) ? body.finalBytes : 0;
-    if (finalBytes <= 0) {
-      return c.json({ ok: true, delivered: "none" });
-    }
-    console.error(`[webchat-native] op=turn-undelivered channel=webchat key=${k} sessionId=${sid} bytes=${finalBytes}`);
-    return c.json({ ok: true, delivered: "undelivered" });
+    console.error(`[webchat-native] op=turn-end channel=webchat key=${k} sessionId=${sid} delivered=none`);
+    return c.json({ ok: true, delivered: "none" });
   });
   return app61;
 }
@@ -23443,7 +23491,24 @@ function createTelegramChannelRoutes(deps) {
     if (typeof key !== "string" || typeof sessionId !== "string" || typeof replied !== "boolean") {
       return c.json({ error: "key, sessionId and replied required" }, 400);
     }
+    const interactive = body?.interactive === true;
+    const finalText = typeof body?.finalText === "string" ? body.finalText : "";
     const sid = sessionId.slice(0, 8);
+    const deliver = interactive && finalText.trim().length > 0;
+    if (deliver) {
+      const bytes = Buffer.byteLength(finalText, "utf8");
+      try {
+        await deps.sendOutbound(key, finalText);
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        console.error(
+          `[telegram-native] op=turn-strand-anomaly key=${key} sessionId=${sid} interactive=yes bytes=${bytes} delivered=undelivered error=${message}`
+        );
+        return c.json({ ok: true, delivered: "undelivered" });
+      }
+      console.error(`[telegram-native] op=turn-end key=${key} sessionId=${sid} replied=${replied ? "yes" : "no"} delivered=fallback bytes=${bytes}`);
+      return c.json({ ok: true, delivered: "fallback" });
+    }
     if (replied) {
       console.error(`[telegram-native] op=turn-end key=${key} sessionId=${sid} replied=yes delivered=reply`);
       return c.json({ ok: true, delivered: "reply" });
@@ -23524,6 +23589,11 @@ var TelegramGateway = class {
     console.error(
       `[telegram-native] op=inbound key=${input.senderId} accountId=${input.accountId} botType=${input.role} bytes=${bytes} source=${source} delivery=${willDeliverNow ? "immediate" : "queued"}`
     );
+    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}`);

package/payload/server/public/assets/data-BKE6Sa-g.js

@@ -1 +0,0 @@
-import{S as e,y as t}from"./useSubAccountSwitcher-DyjTbzQR.js";import"./audio-attachment-mime-BBW07eyG.js";import{t as n}from"./page-CbI1wtef.js";import"./file-download-B2B2DTar.js";import"./graph-labels-DxqDdO7G.js";var r=e(),i=t();(0,r.createRoot)(document.getElementById(`root`)).render((0,i.jsx)(n,{}));