npm - @rubytech/create-maxy-code - Versions diffs - 0.1.397 → 0.1.400 - Mend

@@ -2475,6 +2475,21 @@ async function resolveJidToE164(jid, lidMapping) {
   }
   return null;
 }
+async function resolveCanonicalConversationJid(remoteJid, lidMapping) {
+  if (!isLidJid(remoteJid)) return { canonical: remoteJid, resolved: "none" };
+  if (lidMapping) {
+    try {
+      const mapped = await lidMapping.getPNForLID(remoteJid);
+      if (mapped) {
+        const digits = jidToE164(mapped);
+        if (digits) return { canonical: `${digits}@s.whatsapp.net`, resolved: "lid2pn" };
+      }
+    } catch (err) {
+      console.error(`[whatsapp:normalize] canonical-jid LID mapping failed jid=${remoteJid}: ${String(err)}`);
+    }
+  }
+  return { canonical: remoteJid, resolved: "none" };
+}
 // app/lib/whatsapp/inbound/lid-map.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
@@ -3215,7 +3230,7 @@ function parseLines(raw) {
   return out;
 }
 var byDateSentAsc = (a, b) => a.dateSent.localeCompare(b.dateSent);
-function appendMessage(platformAccountId, record) {
+function appendMessage(platformAccountId, record, altDedupeRemoteJids = []) {
   const file = conversationFile(platformAccountId, record.remoteJid);
   try {
     mkdirSync(dirname(file), { recursive: true });
@@ -3225,8 +3240,10 @@ function appendMessage(platformAccountId, record) {
     return { created: false };
   }
   try {
-    if (existsSync3(file)) {
-      const existing = parseLines(readFileSync4(file, "utf8"));
+    const filesToCheck = [file, ...altDedupeRemoteJids.filter((jid) => jid && jid !== record.remoteJid).map((jid) => conversationFile(platformAccountId, jid))];
+    for (const candidate of new Set(filesToCheck)) {
+      if (!existsSync3(candidate)) continue;
+      const existing = parseLines(readFileSync4(candidate, "utf8"));
       if (existing.some((r) => r.messageId === record.messageId)) {
         return { created: false };
       }
@@ -3345,6 +3362,11 @@ var sessionWriteLocks = /* @__PURE__ */ new Map();
 async function persistWhatsAppMessage(input) {
   if (!input.body || !input.msgKeyId) return null;
   const messageId = `whatsapp-live:${input.accountId}:${input.remoteJid}:${input.msgKeyId}`;
+  const canonicalRemoteJid = input.canonicalRemoteJid;
+  const keyResolved = canonicalRemoteJid !== input.remoteJid ? "lid2pn" : "none";
+  console.error(
+    `[whatsapp-message-store] op=key raw=${input.remoteJid} canonical=${canonicalRemoteJid} resolved=${keyResolved}`
+  );
   const senderTelephone = input.fromMe && input.selfPhone ? input.selfPhone : input.senderPhone;
   const dateSentIso = new Date(input.timestamp * 1e3).toISOString();
   const scope = deriveScope(input.cacheKey);
@@ -3403,14 +3425,15 @@ async function persistWhatsAppMessage(input) {
       fromMe: input.fromMe,
       senderTelephone,
       senderName: input.pushName ?? null,
-      remoteJid: input.remoteJid,
+      remoteJid: canonicalRemoteJid,
       msgKeyId: input.msgKeyId,
       quotedId: input.quoted?.id ?? null,
       quotedSender: input.quoted?.sender ?? null,
       scope,
       createdAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    const { created } = appendMessage(input.platformAccountId, diskRecord);
+    const altDedupeRemoteJids = canonicalRemoteJid !== input.remoteJid ? [input.remoteJid] : [];
+    const { created } = appendMessage(input.platformAccountId, diskRecord, altDedupeRemoteJids);
     const ms = Date.now() - t0;
     if (!created) {
       console.error(`${TAG7} noop reason=existing-message messageId=${messageId}`);
@@ -4570,10 +4593,15 @@ function monitorInbound(conn) {
               groupJid: isGroup ? remoteJid : void 0
             });
             if (merged) {
+              const { canonical: canonicalRemoteJid } = await resolveCanonicalConversationJid(
+                remoteJid,
+                conn.lidMapping
+              );
               await persistWhatsAppMessage({
                 accountId: conn.accountId,
                 platformAccountId: conn.platformAccountId,
                 remoteJid,
+                canonicalRemoteJid,
                 cacheKey,
                 sessionId: merged.sessionId,
                 msgKeyId: msg.key.id,
@@ -7622,7 +7650,7 @@ function buildStoreConversationRows(accountId, summaries) {
   for (const [remoteJid, { first, last, firstNamedSender }] of summaries) {
     const scope = last.scope;
     const isGroup = remoteJid.endsWith("@g.us");
-    const senderTelephone = isGroup ? null : first.senderTelephone;
+    const senderTelephone = isGroup ? null : remoteJid.endsWith("@s.whatsapp.net") ? jidToE164(remoteJid) ?? first.senderTelephone : first.senderTelephone;
     rows.push({
       sessionId: "",
       projectDir: "",
@@ -11225,6 +11253,13 @@ app10.post("/", async (c) => {
     "graph-labels-in-graph",
     "graph-default-view",
     "graph-nav",
+    // /graph fullscreen-overlay failure signals (Task 1417). Without these
+    // the POSTs collapse to kind=unknown, hiding the source. Both are benign
+    // telemetry (not in ERROR_KINDS) so a coverage/resize burst can't 429 a
+    // genuine error. Dims ride in `msg` since the non-event branch logs only
+    // the standard fields.
+    "graph-fullscreen-not-covering",
+    "graph-fullscreen-canvas-mismatch",
     "event"
   ]);
   const kind = allowedKinds.has(kindRaw) ? kindRaw : "unknown";

	@@ -1 +0,0 @@
1	- import"./chunk-K5T4RW27-FRzx7E5I.js";import{n as e}from"./chunk-7N4EOEYR-CCkxuP7A.js";export{e as createArchitectureServices};

	@@ -1 +0,0 @@
1	- import{it as e,rt as t}from"./chunk-ICPOFSXX-DolYDD7g.js";var n=(n,r)=>e.lang.round(t.parse(n)[r]);export{n as t};

	@@ -1 +0,0 @@
1	- import{F as e,M as t}from"./useSubAccountSwitcher-BxBlNMee.js";import"./admin-types-hioowVct.js";import"./AdminShell-C7DK87-C.js";import{n}from"./page-C_k7OZm-.js";import"./Transcript-CVPKp2J9.js";var r=e(),i=t();(0,r.createRoot)(document.getElementById(`root`)).render((0,i.jsx)(n,{}));

	@@ -1 +0,0 @@
1	- import{D as e}from"./useSubAccountSwitcher-BxBlNMee.js";var t=e(`chevron-left`,[[`path`,{d:`m15 18-6-6 6-6`,key:`1wnfg3`}]]);export{t};

	@@ -1 +0,0 @@
1	- import{h as e,p as t}from"./src-Bv7ZWAzF.js";import{b as n}from"./chunk-ICPOFSXX-DolYDD7g.js";var r=e(e=>{let{securityLevel:r}=n(),i=t(`body`);return r===`sandbox`&&(i=t((t(`#i${e}`).node()?.contentDocument??document).body)),i.select(`#${e}`)},`selectSvgElement`);export{r as t};

	@@ -1 +0,0 @@
1	- import{h as e}from"./src-Bv7ZWAzF.js";var t=class{constructor(e){this.init=e,this.records=this.init()}static{e(this,`ImperativeState`)}reset(){this.records=this.init()}};export{t};

	@@ -1 +0,0 @@
1	- import{i as e}from"./graphlib-DixeJdCf.js";var t=4;function n(n){return e(n,t)}export{n as t};

	@@ -1 +0,0 @@
1	- import"./chunk-K5T4RW27-FRzx7E5I.js";import{n as e}from"./chunk-67CJDMHE-DXxH9Snb.js";export{e as createGitGraphServices};

@rubytech/create-maxy-code 0.1.397 → 0.1.400