@rubytech/create-maxy-code 0.1.492 → 0.1.493

package/payload/server/server.js

@@ -3498,6 +3498,16 @@ import {
   getContentType,
   normalizeMessageContent
 } from "@whiskeysockets/baileys";
+function extractQuoted(ctx) {
+  const quoted = ctx?.quotedMessage;
+  if (!quoted) return void 0;
+  const qc = extractMessageContent(quoted);
+  return {
+    id: ctx?.stanzaId ?? "",
+    text: qc?.conversation ?? qc?.extendedTextMessage?.text ?? qc?.imageMessage?.caption ?? void 0,
+    sender: ctx?.participant ?? void 0
+  };
+}
 function extractMessage(msg) {
   const result = {
     text: "",
@@ -3516,15 +3526,7 @@ function extractMessage(msg) {
   } else if (inner.extendedTextMessage) {
     result.text = inner.extendedTextMessage.text ?? "";
     result.mentionedJids = inner.extendedTextMessage.contextInfo?.mentionedJid ?? [];
-    const quoted = inner.extendedTextMessage.contextInfo?.quotedMessage;
-    if (quoted) {
-      const quotedContent = extractMessageContent(quoted);
-      result.quotedMessage = {
-        id: inner.extendedTextMessage.contextInfo?.stanzaId ?? "",
-        text: quotedContent?.conversation ?? quotedContent?.extendedTextMessage?.text ?? quotedContent?.imageMessage?.caption ?? void 0,
-        sender: inner.extendedTextMessage.contextInfo?.participant ?? void 0
-      };
-    }
+    result.quotedMessage = extractQuoted(inner.extendedTextMessage.contextInfo);
   }
   if (inner.imageMessage) {
     result.mediaType = "image";
@@ -3532,16 +3534,19 @@ function extractMessage(msg) {
     result.caption = inner.imageMessage.caption ?? void 0;
     if (!result.text && result.caption) result.text = result.caption;
     result.mentionedJids = inner.imageMessage.contextInfo?.mentionedJid ?? result.mentionedJids;
+    result.quotedMessage = extractQuoted(inner.imageMessage.contextInfo);
   }
   if (inner.audioMessage) {
     result.mediaType = "audio";
     result.mimetype = inner.audioMessage.mimetype ?? void 0;
+    result.quotedMessage = extractQuoted(inner.audioMessage.contextInfo);
   }
   if (inner.videoMessage) {
     result.mediaType = "video";
     result.mimetype = inner.videoMessage.mimetype ?? void 0;
     result.caption = inner.videoMessage.caption ?? void 0;
     if (!result.text && result.caption) result.text = result.caption;
+    result.quotedMessage = extractQuoted(inner.videoMessage.contextInfo);
   }
   if (inner.documentMessage) {
     result.mediaType = "document";
@@ -3550,6 +3555,7 @@ function extractMessage(msg) {
     if (!result.text) {
       result.text = result.caption ?? `[document: ${inner.documentMessage.fileName ?? "file"}]`;
     }
+    result.quotedMessage = extractQuoted(inner.documentMessage.contextInfo);
   }
   if (inner.stickerMessage) {
     result.mediaType = "sticker";
@@ -10752,6 +10758,18 @@ async function pushAccount(opts) {
   );
   const current = Number(state[0]?.currentGeneration ?? 0);
   const next = current + 1;
+  const orphan = await client.query(
+    "SELECT COUNT(*) AS n FROM directory WHERE accountId = ? AND generation = ?",
+    [accountId, next]
+  );
+  const orphanCount = Number(orphan[0]?.n ?? 0);
+  if (orphanCount > 0) {
+    await client.query("DELETE FROM directory WHERE accountId = ? AND generation = ?", [
+      accountId,
+      next
+    ]);
+    log2(`${TAG27} op=stage-clear account=${accountId} generation=${next} cleared=${orphanCount}`);
+  }
   for (const row of rows) {
     await client.query(
       "INSERT INTO directory (accountId, relPath, sizeBytes, modifiedAt, indexedAt, isDir, generation) VALUES (?, ?, ?, ?, ?, ?, ?)",
@@ -13651,7 +13669,7 @@ async function managerActivity(sessionId) {
     return null;
   }
 }
-async function managerInterrupt(sessionId, trigger) {
+async function managerInterrupt(sessionId, trigger, escalate = false) {
   let port2;
   try {
     port2 = requirePortEnv("CLAUDE_SESSION_MANAGER_PORT", { tag: "webchat:interrupt" });
@@ -13662,7 +13680,7 @@ async function managerInterrupt(sessionId, trigger) {
     const res = await fetch(`http://127.0.0.1:${port2}/${sessionId}/interrupt`, {
       method: "POST",
       headers: { "content-type": "application/json" },
-      body: JSON.stringify({ byte: "esc", trigger }),
+      body: JSON.stringify({ byte: "esc", trigger, ...escalate ? { escalate: true } : {} }),
       signal: AbortSignal.timeout(INTERRUPT_TIMEOUT_MS)
     });
     if (!res.ok) return { ok: false, stopped: false, intId: null, deadChild: false };
@@ -13943,21 +13961,12 @@ ${note}` : note;
       }
       console.log(`[webchat:inbound] op=send-parsed kind=${kind} files=${stored.length} bytes=${Buffer.byteLength(text, "utf8")}`);
     }
-    let deliveredIntId = null;
     if (deliverySessionId !== void 0 && await managerActivity(deliverySessionId) === "busy") {
-      const outcome = await managerInterrupt(deliverySessionId, "mid-turn-send");
-      if (!outcome.stopped) {
-        console.error(`[webchat-interrupt] op=deliver-refused sessionId=${deliverySessionId.slice(0, 8)} intId=${outcome.intId ?? "none"} reason=${outcome.ok ? "not-stopped" : "interrupt-call-failed"}`);
-        return c.json({ error: "interrupt-failed" }, 409);
-      }
-      deliveredIntId = outcome.intId;
+      console.log(`[webchat:inbound] op=queued-busy sessionId=${deliverySessionId.slice(0, 8)} key=${deliveryKey}`);
     }
     const adminUserId = requesterUserId ?? void 0;
     const inboundStartedAt = Date.now();
     const inbound = deliverySessionId !== void 0 ? await deps.handleInbound({ role: "admin", accountId: deliveryAccountId, key: deliveryKey, text, sessionId: deliverySessionId, adminUserId }) : await deps.handleInbound({ role: "admin", accountId: bootstrapAccountId, key: deliveryKey, text, adminUserId });
-    if (deliveredIntId !== null) {
-      console.log(`[webchat-interrupt] op=delivered intId=${deliveredIntId} sessionId=${deliverySessionId.slice(0, 8)}`);
-    }
     const sendId = sendIdFromResolve ?? ++sendSeq;
     let turnSessionId = deliverySessionId;
     if (turnSessionId === void 0) {
@@ -14008,7 +14017,7 @@ ${note}` : note;
     if (target === void 0) {
       return c.json({ error: "no active session" }, 404);
     }
-    const outcome = await managerInterrupt(target, "stop-button");
+    const outcome = await managerInterrupt(target, "stop-button", true);
     if (!outcome.ok) {
       return c.json({ error: "interrupt-failed" }, 502);
     }
@@ -24261,8 +24270,8 @@ app55.post("/", async (c) => {
     return c.json({ message: VISITOR_MESSAGE }, 200);
   }
   const host = c.req.header("host") ?? "";
-  const proto = (c.req.header("x-forwarded-proto") ?? "https").toLowerCase();
-  const magicUrl = `${proto}://${host}/${agentSlug}?token=${token}`;
+  const proto2 = (c.req.header("x-forwarded-proto") ?? "https").toLowerCase();
+  const magicUrl = `${proto2}://${host}/${agentSlug}?token=${token}`;
   const subject = `Your link to ${grant.agentSlug}`;
   const bodyText = [
     grant.displayName ? `Hi ${grant.displayName},` : "Hello,",
@@ -29754,8 +29763,8 @@ var lastRemoteAuthDisplayName = "";
 function originFrom(c) {
   const host = c.req.header("host");
   if (!host) return void 0;
-  const proto = (c.req.header("x-forwarded-proto") ?? "https").split(",")[0].trim().toLowerCase() || "https";
-  return `${proto}://${host}`;
+  const proto2 = (c.req.header("x-forwarded-proto") ?? "https").split(",")[0].trim().toLowerCase() || "https";
+  return `${proto2}://${host}`;
 }
 function resolveRemoteAuthOpts(c) {
   const origin = originFrom(c);