imsg-mcp 1.3.2 → 1.4.0

package/dist/{imessage-db-Cz8MIIpG.js → imessage-db-C8WKHFQA.js}

@@ -4,7 +4,7 @@ import Database from "better-sqlite3";
 import { createRequire } from "node:module";
 import { fileURLToPath } from "node:url";
 import { existsSync, readdirSync, mkdirSync } from "node:fs";
-import { O as OBJECT_REPLACEMENT_CHAR, p as perf, J as isGroupGuid, K as isGroupChatIdentifier, L as generateThreadSlug, T as Tables, M as AssociatedMessageType, N as macAutoTimestampToDate, P as isReactionType, Q as MAC_EPOCH_OFFSET, R as NANOS_PER_SECOND, S as parseAssociatedMessageGuid$1, U as macTimestampToDate$1 } from "./shutdown-pPAPSnk3.js";
+import { O as OBJECT_REPLACEMENT_CHAR, p as perf, M as isGroupGuid, I as isGroupChatIdentifier, N as generateThreadSlug, T as Tables, P as AssociatedMessageType, Q as macAutoTimestampToDate, R as isReactionType, S as MAC_EPOCH_OFFSET, U as NANOS_PER_SECOND, V as macTimestampToDate$1, W as parseAssociatedMessageGuid$1 } from "./shutdown-CqGQKFmr.js";
 import { parseBuffer } from "bplist-parser";
 function normalizePhoneNumber(phone) {
   const digits = phone.replace(/\D/g, "");
@@ -633,6 +633,8 @@ function getNativeParser() {
 }
 function nativeResultLooksTrustworthy(text) {
   if (/at_\d+_[0-9A-F-]{8,}/i.test(text)) return false;
+  if (/^.?[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/i.test(text)) return false;
+  if (/^.?at_[0-9A-F][0-9A-F_-]{19,}$/i.test(text)) return false;
   if (/__kIM[A-Z]/.test(text)) return false;
   if (/\$class|streamtyped|NSKeyedArchiver/.test(text)) return false;
   if (/^NS[A-Z][a-z]+/.test(text)) return false;
@@ -656,6 +658,13 @@ const METADATA_PATTERNS = [
   /^NSNumber$/,
   /^NSValue$/,
   /^at_\d+_[0-9A-F-]+$/i,
+  // Bare-UUID attribute values (sticker/attachment GUIDs), optionally with the
+  // leaked typedstream length byte in front ("$FE7B0D17-…", '$' = 0x24 = 36 =
+  // a UUID's length). No human message is exactly a bare UUID.
+  /^[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/i,
+  /^.[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/i,
+  // Transfer-GUID with leaked length byte ("Mat_BDA9FB97-…", 'M' = 77).
+  /^.at_[0-9A-F][0-9A-F_-]{19,}$/i,
   /FileTransferGUIDAttributeName/i,
   /BaseWritingDirectionAttributeName/i,
   /^\d{2}.*��/
@@ -707,23 +716,30 @@ function extractAttributedBodyText(blob) {
       if (score > prev) candidates.set(normalized, score);
     }
   };
+  let structuredTrusted = false;
   try {
     if (Date.now() < deadline) {
+      const strings = parser.parseAllNSStrings();
+      structuredTrusted = strings.some(
+        (entry) => normalizeCandidate(entry.content) !== null || /^[\uFFFC\s]+$/.test(entry.content)
+      );
       remember(
-        parser.parseAllNSStrings().map((entry) => entry.content),
+        strings.map((entry) => entry.content),
         STRUCTURED_BOOST
       );
     }
   } catch {
   }
-  try {
+  if (!structuredTrusted) {
+    try {
+      if (Date.now() < deadline) {
+        remember(parser.extractReadableText());
+      }
+    } catch {
+    }
     if (Date.now() < deadline) {
-      remember(parser.extractReadableText());
+      remember(blob.toString("utf8").split(CONTROL_SPLIT_RE));
     }
-  } catch {
-  }
-  if (Date.now() < deadline) {
-    remember(blob.toString("utf8").split(CONTROL_SPLIT_RE));
   }
   const best = [...candidates.entries()].sort((a, b) => b[1] - a[1])[0];
   return best?.[0];
@@ -760,6 +776,10 @@ function normalizeText(value) {
   const normalized = value?.replace(/\s+/g, " ").trim();
   return normalized && normalized.length >= 4 ? normalized : void 0;
 }
+function isPlausibleHumanText(s) {
+  const wordish = (s.match(/[\p{L}\p{N}\s]/gu) ?? []).length;
+  return wordish / s.length >= 0.7 && new RegExp("\\p{L}{2}", "u").test(s);
+}
 function extractNullPaddedAsciiText(blob) {
   if (!blob) return void 0;
   let best = "";
@@ -781,7 +801,8 @@ function extractNullPaddedAsciiText(blob) {
     flush();
   }
   flush();
-  return normalizeText(best);
+  const normalized = normalizeText(best);
+  return normalized && isPlausibleHumanText(normalized) ? normalized : void 0;
 }
 function extractArchivedAttributedStringText(blob) {
   if (!blob) return void 0;
@@ -1420,6 +1441,7 @@ class IMessageDB {
         m.is_read,
         m.date_read,
         m.is_delivered,
+        m.error,
         m.date_delivered,
         m.associated_message_type,
         m.associated_message_guid,
@@ -1529,13 +1551,69 @@ class IMessageDB {
     const messages = await this.getMessagesForChat(chatIdentifier, 1);
     return messages.length > 0 ? messages[messages.length - 1] : null;
   }
+  /**
+   * The service the conversation ACTUALLY works on, judged by delivery
+   * evidence: the most recent message that either came FROM the other party
+   * (any service they use reaches us) or was sent by us WITHOUT error.
+   * Failed sends are excluded — otherwise one wrong-service attempt (e.g. an
+   * iMessage 'sent' to an SMS-only number, error 22) mints a phantom leg,
+   * flips the thread's apparent service, and every later send repeats the
+   * mistake. Returns null when the conversation has no usable evidence.
+   */
+  getPreferredSendService(chatIdentifier) {
+    const chats = this.resolveChatsForConversation(chatIdentifier);
+    if (chats.length === 0) return null;
+    const placeholders = chats.map(() => "?").join(",");
+    const row = this.raw.prepare(
+      `SELECT m.service
+         FROM ${Tables.MESSAGE} m
+         JOIN ${Tables.CHAT_MESSAGE_JOIN} j ON j.message_id = m.ROWID
+         WHERE j.chat_id IN (${placeholders})
+           AND (m.associated_message_type = 0 OR m.associated_message_type IS NULL)
+           AND (m.is_from_me = 0 OR m.error = 0 OR m.error IS NULL)
+           AND m.service IN ('iMessage', 'SMS')
+         ORDER BY m.date DESC, m.ROWID DESC
+         LIMIT 1`
+    ).get(...chats.map((c) => c.ROWID));
+    if (row?.service === "SMS") return "SMS";
+    if (row?.service === "iMessage") return "iMessage";
+    return null;
+  }
+  /**
+   * Aggregate stats over ALL merged legs of a conversation — one SQL
+   * COUNT/MIN/MAX instead of materializing messages. Reactions and other
+   * associated messages are excluded (normal items only). Used by
+   * init_human to prefill first/last contact + volume.
+   */
+  getChatStats(chatIdentifier) {
+    const chats = this.resolveChatsForConversation(chatIdentifier);
+    if (chats.length === 0) return { count: 0, first: null, last: null };
+    const placeholders = chats.map(() => "?").join(",");
+    const row = this.raw.prepare(
+      `SELECT COUNT(*) as count, MIN(m.date) as first, MAX(m.date) as last
+         FROM ${Tables.MESSAGE} m
+         JOIN ${Tables.CHAT_MESSAGE_JOIN} j ON j.message_id = m.ROWID
+         WHERE j.chat_id IN (${placeholders})
+           AND (m.associated_message_type = 0 OR m.associated_message_type IS NULL)`
+    ).get(...chats.map((c) => c.ROWID));
+    return {
+      count: row.count ?? 0,
+      first: row.first != null ? macTimestampToDate(row.first) : null,
+      last: row.last != null ? macTimestampToDate(row.last) : null
+    };
+  }
   /**
    * Get messages after a specific message ID (for polling new messages).
-   * Returns incoming messages only, sorted by date ascending (chronological).
+   * Sorted by date ascending (chronological). By default returns incoming
+   * messages only; `includeSelf` also returns from-me rows (the user's own
+   * interjections from other devices) — callers using it must suppress the
+   * agent's own send echo themselves (see SentEchoRegistry).
    */
-  async getMessagesAfter(chatIdentifier, afterMessageId) {
+  async getMessagesAfter(chatIdentifier, afterMessageId, options = {}) {
     const messages = await this.getMessagesForChat(chatIdentifier, 1e3, { afterMessageId });
-    const filtered = messages.filter((m) => m.id !== afterMessageId && !m.isFromMe);
+    const filtered = messages.filter(
+      (m) => m.id !== afterMessageId && (options.includeSelf || !m.isFromMe)
+    );
     filtered.sort((a, b) => a.date.getTime() - b.date.getTime());
     return filtered;
   }
@@ -2230,6 +2308,10 @@ class IMessageDB {
       dateDelivered: macTimestampToDate(ext.date_delivered ?? null),
       isRead: ext.is_read != null ? Boolean(ext.is_read) : true,
       isDelivered: ext.is_delivered != null ? Boolean(ext.is_delivered) : true,
+      // Send failure surface: chat.db sets error != 0 (and is_sent = 0) on
+      // from-me messages that never went out — e.g. an iMessage attempt to an
+      // SMS-only number. Messages.app shows "Not Delivered"; so must we.
+      sendError: raw.is_from_me && ext.error ? ext.error : void 0,
       chatId,
       service: this.detectServiceForMessage(ext),
       isReaction,
@@ -2312,6 +2394,7 @@ class IMessageDB {
         m.is_read,
         m.date_read,
         m.is_delivered,
+        m.error,
         m.date_delivered,
         h.id as handle_id,
         h.service as handle_service,
@@ -2348,7 +2431,8 @@ class IMessageDB {
       const stmt = this.raw.prepare(`
         SELECT
           m.ROWID as _rowid,
-          m.is_read, m.date_read, m.is_delivered, m.date_delivered,
+          m.is_read, m.date_read, m.is_delivered,
+        m.error, m.date_delivered,
           h.id as handle_id, h.service as handle_service,
           m.associated_message_type, m.associated_message_guid,
           m.associated_message_emoji, m.thread_originator_guid,
@@ -2381,7 +2465,8 @@ class IMessageDB {
     const cutoffNanos = Math.floor((cutoffMs / 1e3 - MAC_EPOCH_OFFSET) * NANOS_PER_SECOND);
     const sql = `
       SELECT m.ROWID, m.guid, m.text, m.attributedBody, m.date, m.date_read, m.date_delivered,
-             m.is_read, m.is_delivered, m.is_from_me, h.id as handle_id,
+             m.is_read, m.is_delivered,
+        m.error, m.is_from_me, h.id as handle_id,
              h.service as handle_service,
              m.cache_has_attachments, m.associated_message_type,
              m.associated_message_guid, m.associated_message_emoji,
@@ -2517,6 +2602,7 @@ class IMessageDB {
   fetchAttachments(messageRowId) {
     const stmt = this.raw.prepare(`
       SELECT 
+        a.ROWID as row_id,
         a.filename,
         a.mime_type,
         a.transfer_name,
@@ -2527,6 +2613,7 @@ class IMessageDB {
     `);
     const rows = stmt.all(messageRowId);
     return rows.map((r) => ({
+      rowId: r.row_id,
       filename: r.filename || "",
       mimeType: r.mime_type,
       transferName: r.transfer_name,
@@ -2662,4 +2749,4 @@ export {
   imessageDb as i,
   normalizedPhoneVariants as n
 };
-//# sourceMappingURL=imessage-db-Cz8MIIpG.js.map
+//# sourceMappingURL=imessage-db-C8WKHFQA.js.map