Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix: reconcile newly available browser child identities (#11150)

Adam Eivy55f7d459324b
diff --git a/server/lib/messageBrowserIdentity.js b/server/lib/messageBrowserIdentity.js
index 3ad5b79f7e..70f8643919 100644
--- a/server/lib/messageBrowserIdentity.js
+++ b/server/lib/messageBrowserIdentity.js
@@ -205,15 +205,17 @@ export function matchBrowserMessage(messages, incoming, batch = [incoming]) {
if (exact.length === 1 && batch.filter(message => messageIngestionIdentity(message) === key).length === 1) return exact[0];
if (exact.length) return null;
const compatible = (message, candidate) => {
- const summaryBecomesMember = message.providerRowId && message.providerRowId === candidate.providerRowId
- && candidate.browserMessageKind === 'member' && !message.bodyFull
+ const memberEvidence = message.providerRowId && message.providerRowId === candidate.providerRowId
+ && candidate.browserMessageKind === 'member'
+ && (!message.providerMessageId || !candidate.providerMessageId)
&& Number.isFinite(Date.parse(message.date)) && Date.parse(message.date) === Date.parse(candidate.date)
&& (message.from?.email && candidate.from?.email
? message.from.email.trim().toLowerCase() === candidate.from.email.trim().toLowerCase()
: message.from?.name && message.from.name === candidate.from?.name);
- return (message.externalId === candidate.externalId || summaryBecomesMember)
+ return (message.externalId === candidate.externalId || memberEvidence)
&& !(candidate.browserMessageKind === 'row' && (message.browserMessageKind === 'member' || (message.bodyFull && message.threadId)))
&& (!message.providerRowId || !candidate.providerRowId || message.providerRowId === candidate.providerRowId)
+ && (!message.providerMessageId || !candidate.providerMessageId || message.providerMessageId === candidate.providerMessageId)
&& !message.browserMemberDisambiguator && !candidate.browserMemberDisambiguator;
};
const fallback = messages.filter(message => compatible(message, incoming));
diff --git a/server/services/messageSync.js b/server/services/messageSync.js
index 42abad8c6c..a7dc804a10 100644
--- a/server/services/messageSync.js
+++ b/server/services/messageSync.js
@@ -240,7 +240,7 @@ export async function syncAccount(accountId, io, options = {}) {
existing.activityIdentity ||= messageIngestionIdentity(existing);
// Adopt canonical identity without replacing local ID or evaluation.
for (const key of ['externalId', 'browserMessageKind', 'providerMessageId', 'browserMemberDisambiguator', 'browserSummaryExternalId', 'from', 'date', 'subject']) {
- if (msg[key] !== undefined) existing[key] = msg[key];
+ if (msg[key] !== undefined && (key !== 'providerMessageId' || msg[key])) existing[key] = msg[key];
}
// Update flags and provider identity on existing message
if (msg.providerRowId) existing.providerRowId = msg.providerRowId;
@@ -385,6 +385,7 @@ function mergeRefreshedMessage(cache, accountId, source, message, detail) {
|| (!message.providerRowId && identities.length === 1
&& browserSummaryId(message.date || '', message.from?.name || '', message.subject || '') === identity.externalId
? message : null);
+ if (existing?.providerMessageId) identity.providerMessageId ||= existing.providerMessageId;
// API IDs remain authoritative; a browser refresh supplies content only.
if (existing?.externalId && !existing.providerRowId && !identity.providerRowId) identity.externalId = existing.externalId;
const updated = existing || {
diff --git a/server/services/messageSync.test.js b/server/services/messageSync.test.js
index c44d1a075d..234ba41ac7 100644
--- a/server/services/messageSync.test.js
+++ b/server/services/messageSync.test.js
@@ -1155,6 +1155,24 @@ describe('browser ingestion identity across sync, cache, and activity (#11150)',
expect([...f.events.keys()]).toEqual([`msg:${VALID_UUID}:pw-legacy`]);
});
+ it('adopts a newly available child ID by unique canonical evidence and retains it if the provider later omits it', async () => {
+ const legacy = { id: 'legacy-member', externalId: 'pw-old-display', providerRowId: 'row-a',
+ threadId: 'legacy-thread', bodyFull: true, bodyText: 'old body', date: summary.date,
+ from: { name: summary.from, email: summary.fromEmail }, subject: summary.subject, evaluation: { score: 8 } };
+ const f = await fixture([legacy]);
+ const details = [{ providerMessageId: 'child-a', from: 'Renamed', fromEmail: summary.fromEmail,
+ date: '2026-01-01T07:00:00-05:00', body: 'new body' }];
+ scrape([{ ...summary, providerRowId: 'row-a' }], details);
+ await syncAccount(VALID_UUID);
+ expect(f.stored().messages).toHaveLength(1);
+ expect(f.stored().messages[0]).toMatchObject({ id: legacy.id, providerMessageId: 'child-a', evaluation: { score: 8 }, bodyText: 'new body' });
+ expect(f.events.size).toBe(1);
+ refreshMessageDetail.mockResolvedValue(details.map(({ providerMessageId, ...detail }) => detail));
+ await refreshMessage(VALID_UUID, legacy.id);
+ expect(f.stored().messages).toHaveLength(1);
+ expect(f.stored().messages[0].providerMessageId).toBe('child-a');
+ });
+
it('upgrades a summary to its unambiguous child without adding a second activity event', async () => {
const f = await fixture();
scrape([{ ...summary, providerRowId: 'row-a' }]);