proton-mail-bridge-client 2.0.6 → 2.0.7

package/dist/services/local-index-service.d.ts

@@ -95,6 +95,7 @@ export declare class LocalIndexService {
     private loadCheckpointsSync;
     private loadMessages;
     private loadThreadCandidateMessages;
+    private hasUnresolvedReferenceCandidate;
     private loadAllMessages;
     private expandCandidatesToFullThreads;
     private loadSnapshot;

package/dist/services/local-index-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-index-service.d.ts","sourceRoot":"","sources":["../../src/services/local-index-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"local-index-service.d.ts","sourceRoot":"","sources":["../../src/services/local-index-service.ts"],"names":[],"mappings":"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"}

package/dist/services/local-index-service.js

@@ -118,8 +118,16 @@ function matchesIndexedSearch(email, filters) {
     ]
         .join("\n")
         .toLowerCase();
-    if (normalizedFilters.query && !haystacks.includes(normalizedFilters.query.toLowerCase())) {
-        return false;
+    // searchFtsIds() ANDs every whitespace-separated query token as its own quoted FTS5 term
+    // (so "invoice payment" matches a preview like "payment for the invoice is overdue"), but
+    // this post-filter used to require the ENTIRE joined query as one literal substring —
+    // rejecting anything FTS already matched whose words were merely out of order or separated
+    // by other words. Match FTS's own AND-of-terms semantics instead of a single-phrase substring.
+    if (normalizedFilters.query) {
+        const terms = normalizedFilters.query.toLowerCase().split(/\s+/).filter(Boolean);
+        if (terms.length > 0 && !terms.every((term) => haystacks.includes(term))) {
+            return false;
+        }
     }
     if (normalizedFilters.subject &&
         !email.subject.toLowerCase().includes(normalizedFilters.subject.toLowerCase())) {
@@ -279,13 +287,18 @@ function isOutgoingMessage(message, ownerEmail) {
     }
     return message.from.some((address) => lowerCaseAddress(address.address) === owner);
 }
-// ponytail: cheap local-part heuristic, no schema change (no stored List-Unsubscribe/Precedence
-// header). Catches the bulk of automated senders (auction/shipping/billing notifications, etc.)
-// that were otherwise all counted as threads "pending on you" forever, since a one-way automated
-// message is never replied to and never ages out. Upgrade path: store List-Unsubscribe/Precedence
-// at index time and use that instead if this substring heuristic proves too coarse in practice.
+// ponytail: the upgrade path has been taken — messages.is_automated now stores the real
+// List-Unsubscribe/List-Id/Precedence/Auto-Submitted verdict captured at index time
+// (EmailSummary.isAutomated), and it wins whenever present. This local-part heuristic is kept
+// only as the fallback for rows indexed before that column existed (is_automated NULL), which
+// stay on the heuristic until a full re-sync backfills them. It proved too coarse live: it cut
+// "pending on you" from 49,026 to 38,532 of ~57k threads, but transactional senders like an
+// order-confirmation address with no no-reply marker are invisible to it.
 const AUTOMATED_SENDER_PATTERN = /(^|[._-])(no-?reply|donotreply|do-not-reply|notification|powiadomien|mailer-daemon|postmaster|bounce)/i;
 function isLikelyAutomatedSender(message) {
+    if (message.isAutomated !== undefined) {
+        return message.isAutomated;
+    }
     return message.from.some((address) => AUTOMATED_SENDER_PATTERN.test(address.address ?? ""));
 }
 function actionableThreadScore(thread, ownerEmail) {
@@ -673,7 +686,17 @@ export class LocalIndexService {
             messagesCapped = messages.length >= DEFAULT_SNAPSHOT_LIMIT;
         }
         const snapshot = { ownerEmail, updatedAt, folders, indexedFolders, syncCheckpoints, messages };
-        const threads = this.buildThreads(snapshot).filter((thread) => {
+        // includeMessages:true so the query check below can look at EVERY message's subject, not
+        // just thread.subject (which buildThreads derives from the single LATEST message). Found
+        // live via the fix above: once loadThreadCandidateMessages() correctly pulls in a
+        // reference-chain thread's full membership even when the query only matched its root, this
+        // filter's old `thread.subject` check started wrongly excluding that thread entirely — the
+        // root's subject may share nothing with the thread's most recent reply (e.g. root "Invoice
+        // 03/2026" vs. latest reply "Question about VAT"). Checking every message means a thread
+        // the SQL prefilter already proved relevant is never re-excluded by which message happened
+        // to be newest. `messages` is stripped back off in the final return below — callers still
+        // get plain ThreadSummary shapes, not the full per-message detail.
+        const threads = this.buildThreads(snapshot, true).filter((thread) => {
             if (input.label) {
                 const labelNeedle = input.label.toLowerCase();
                 if (!thread.normalizedLabels.some((label) => label.toLowerCase() === labelNeedle)) {
@@ -681,14 +704,15 @@ export class LocalIndexService {
                 }
             }
             if (input.query) {
-                const haystack = [
-                    thread.subject,
+                const queryNeedle = input.query.toLowerCase();
+                const threadLevelHaystack = [
                     ...thread.participants.map((participant) => `${participant.name ?? ""} ${participant.address ?? ""}`),
                     ...thread.normalizedLabels,
                 ]
                     .join("\n")
                     .toLowerCase();
-                if (!haystack.includes(input.query.toLowerCase())) {
+                const matchesAnyMessage = thread.messages.some((message) => message.subject.toLowerCase().includes(queryNeedle));
+                if (!matchesAnyMessage && !threadLevelHaystack.includes(queryNeedle)) {
                     return false;
                 }
             }
@@ -697,10 +721,11 @@ export class LocalIndexService {
         const limit = input.limit ?? 100;
         const offset = 0;
         const totalCount = threads.length;
+        const summaries = threads.map(({ messages: _messages, ...summary }) => summary);
         return {
             total: totalCount,
             hasMore: totalCount > offset + limit,
-            threads: threads.slice(offset, offset + limit),
+            threads: summaries.slice(offset, offset + limit),
             ...this.indexFreshnessFields(snapshot.updatedAt),
             ...(messagesCapped ? { messagesCapped: true } : {}),
         };
@@ -1302,11 +1327,13 @@ export class LocalIndexService {
       INSERT INTO messages (
         email_id, folder, uid, seq, message_id, in_reply_to, references_json, thread_id, subject,
         from_json, to_json, cc_json, bcc_json, reply_to_json, date, internal_date,
-        is_read, is_starred, flags_json, size, preview, has_attachments, attachments_json, attachment_text, labels_json
+        is_read, is_starred, flags_json, size, preview, has_attachments, attachments_json, attachment_text, labels_json,
+        is_automated
       ) VALUES (
         @email_id, @folder, @uid, @seq, @message_id, @in_reply_to, @references_json, @thread_id, @subject,
         @from_json, @to_json, @cc_json, @bcc_json, @reply_to_json, @date, @internal_date,
-        @is_read, @is_starred, @flags_json, @size, @preview, @has_attachments, @attachments_json, @attachment_text, @labels_json
+        @is_read, @is_starred, @flags_json, @size, @preview, @has_attachments, @attachments_json, @attachment_text, @labels_json,
+        @is_automated
       )
       ON CONFLICT(email_id) DO UPDATE SET
         folder = excluded.folder,
@@ -1336,7 +1363,10 @@ export class LocalIndexService {
         has_attachments = excluded.has_attachments,
         attachments_json = excluded.attachments_json,
         attachment_text = COALESCE(excluded.attachment_text, messages.attachment_text),
-        labels_json = excluded.labels_json
+        labels_json = excluded.labels_json,
+        -- Same reasoning: a flags-only refresh fetches no headers, so is_automated arrives
+        -- NULL; the headers of a fixed UID never change, so keeping the stored verdict is safe.
+        is_automated = COALESCE(excluded.is_automated, messages.is_automated)
       RETURNING preview, attachment_text
     `);
         const upsertSyncState = db.prepare(`
@@ -1552,6 +1582,7 @@ export class LocalIndexService {
                     attachments_json: JSON.stringify(email.attachments),
                     attachment_text: email.attachmentText ?? legacyAttachmentText,
                     labels_json: JSON.stringify(email.labels),
+                    is_automated: email.isAutomated === undefined ? null : email.isAutomated ? 1 : 0,
                 });
                 const mergedPreview = persisted.preview ?? "";
                 const search = emailToSearchParts({ ...email, attachmentText: persisted.attachment_text ?? undefined });
@@ -1670,7 +1701,8 @@ export class LocalIndexService {
         has_attachments INTEGER NOT NULL,
         attachments_json TEXT NOT NULL,
         attachment_text TEXT,
-        labels_json TEXT NOT NULL
+        labels_json TEXT NOT NULL,
+        is_automated INTEGER
       );
 
       CREATE TABLE IF NOT EXISTS sync_state (
@@ -1716,6 +1748,12 @@ export class LocalIndexService {
         if (!columns.has("attachment_text")) {
             db.exec(`ALTER TABLE messages ADD COLUMN attachment_text TEXT`);
         }
+        // Nullable on purpose: existing rows read back as NULL (= isAutomated undefined) so the
+        // actionable-thread scorer falls back to the sender regex for them instead of treating
+        // every pre-migration message as human. A full re-sync backfills the real value.
+        if (!columns.has("is_automated")) {
+            db.exec(`ALTER TABLE messages ADD COLUMN is_automated INTEGER`);
+        }
         const syncStateColumns = new Set(db.prepare(`PRAGMA table_info(sync_state)`).all().map((row) => row.name));
         if (!syncStateColumns.has("backfilled_to_uid")) {
             db.exec(`ALTER TABLE sync_state ADD COLUMN backfilled_to_uid INTEGER`);
@@ -1826,8 +1864,14 @@ export class LocalIndexService {
             params.push(filters.threadId);
         }
         if (filters.dateFrom) {
+            // Same bug class as dateTo below: dateFrom used to be pushed raw and compared as a
+            // string against full ISO timestamps ("internal_date" is always a full ISO string).
+            // A caller-supplied value that isn't already exactly that shape (a bare date, a value
+            // with a timezone offset, an English date like "March 24, 2026") does a wrong
+            // lexicographic comparison instead of a real date comparison, silently dropping
+            // matching messages with no error. Normalize the same way dateTo already does.
             conditions.push(`COALESCE(internal_date, date) >= ?`);
-            params.push(filters.dateFrom);
+            params.push(new Date(filters.dateFrom).toISOString());
         }
         if (filters.dateTo) {
             // dateTo is commonly a bare date ("2026-09-02") without a time
@@ -1982,8 +2026,11 @@ export class LocalIndexService {
             messageParams.push(options.isRead ? 1 : 0);
         }
         if (options.since) {
+            // Same normalization as the dateFrom fix in loadCandidateEmails() above — options.since
+            // is fed straight from a caller's dateFrom (see the threadId search path), so it needs
+            // the identical ISO normalization to avoid a wrong string comparison.
             messageConditions.push(`COALESCE(internal_date, date) >= ?`);
-            messageParams.push(options.since);
+            messageParams.push(new Date(options.since).toISOString());
         }
         if (messageConditions.length > 0) {
             messageSqlParts.push(`WHERE ${messageConditions.join(" AND ")}`);
@@ -2049,14 +2096,43 @@ export class LocalIndexService {
         // is present, pull in the full, uncapped message set — the same source
         // getThreadById() now uses for these threads — so the thread is always built
         // from its complete membership, filtered query or not.
-        const hasUnresolvedReferenceCandidate = candidates.some((email) => !email.threadId?.trim() && (email.inReplyTo || (email.references?.length ?? 0) > 0));
-        if (hasUnresolvedReferenceCandidate) {
+        if (this.hasUnresolvedReferenceCandidate(db, candidates)) {
             for (const email of this.loadAllMessages(db)) {
                 byId.set(email.id, email);
             }
         }
         return [...byId.values()];
     }
+    // The check above only looked at the candidate's OWN inReplyTo/references — but a
+    // candidate that IS the root of a reference chain has neither (it started the thread),
+    // while a reply elsewhere in the mailbox points AT it via In-Reply-To. Found live: a
+    // getThreads({query}) match on the root message alone built a 1-message thread instead of
+    // the real 3-message thread, because the root has no headers to trip the original check and
+    // no persisted thread_id to expand through. A candidate lacking a persisted thread_id is
+    // genuinely resolved by full-membership-via-references in exactly two cases: it references
+    // something else (the original check), or something else references IT. The in_reply_to
+    // column is indexed (idx_messages_in_reply_to), so this stays a targeted lookup per
+    // reference-less candidate rather than paying for the full scan on the common case where
+    // every candidate already has a native thread_id.
+    hasUnresolvedReferenceCandidate(db, candidates) {
+        return candidates.some((email) => {
+            if (email.threadId?.trim()) {
+                return false;
+            }
+            if (email.inReplyTo || (email.references?.length ?? 0) > 0) {
+                return true;
+            }
+            if (email.messageId) {
+                const referencedByOther = db
+                    .prepare(`SELECT 1 FROM messages WHERE in_reply_to = ? LIMIT 1`)
+                    .get(email.messageId);
+                if (referencedByOther) {
+                    return true;
+                }
+            }
+            return false;
+        });
+    }
     // Uncapped message read, unlike loadMessages() (deliberately capped at
     // DEFAULT_SNAPSHOT_LIMIT). Used only where correctness requires seeing every
     // message regardless of index size — resolving a fallback/reference-chain
@@ -2093,8 +2169,10 @@ export class LocalIndexService {
                 byId.set(email.id, email);
             }
         }
-        const hasUnresolvedReferenceCandidate = candidates.some((email) => !email.threadId?.trim() && (email.inReplyTo || (email.references?.length ?? 0) > 0));
-        if (hasUnresolvedReferenceCandidate) {
+        // See hasUnresolvedReferenceCandidate()'s comment above (loadThreadCandidateMessages) for
+        // why this must also check whether some OTHER message's In-Reply-To points at a
+        // header-less candidate, not just the candidate's own inReplyTo/references.
+        if (this.hasUnresolvedReferenceCandidate(db, candidates)) {
             for (const email of this.loadAllMessages(db)) {
                 byId.set(email.id, email);
             }
@@ -2156,6 +2234,7 @@ export class LocalIndexService {
             attachments: safeJsonParse(row.attachments_json, []),
             attachmentText: row.attachment_text ?? undefined,
             labels: safeJsonParse(row.labels_json, []),
+            isAutomated: row.is_automated === null || row.is_automated === undefined ? undefined : Boolean(row.is_automated),
         };
     }
     toStatus(snapshot, counts) {