@davesheffer/hunch 1.41.1 → 1.41.2

package/dist/store/changeLedger.js

@@ -170,8 +170,14 @@ export function mergeLedgers(base, ours, theirs) {
         seen.set(k, e);
         order.push(e);
     } };
-    for (const e of base?.events ?? [])
-        add(e);
+    const ourIdentities = new Set(ours.events.map(eventIdentity));
+    const theirIdentities = new Set(theirs.events.map(eventIdentity));
+    // Base is a merge ancestor, not a source of history both clones have compacted away.
+    for (const e of base?.events ?? []) {
+        const key = eventIdentity(e);
+        if (ourIdentities.has(key) || theirIdentities.has(key) || (e.seq > ours.floor_seq && e.seq > theirs.floor_seq))
+            add(e);
+    }
     for (const e of ours.events)
         add(e);
     for (const e of theirs.events)
@@ -180,7 +186,6 @@ export function mergeLedgers(base, ours, theirs) {
     // side 1 iff theirs holds it and neither ours nor base does. Deciding by object identity
     // (`includes`) would instead put anything ours compacted away — base's object, which `add`
     // keeps — after its same-`at` siblings and silently reorder a batch both sides already had.
-    const ourIdentities = new Set(ours.events.map(eventIdentity));
     const baseIdentities = new Set((base?.events ?? []).map(eventIdentity));
     const theirsOnly = (e) => {
         const k = eventIdentity(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@davesheffer/hunch",
-  "version": "1.41.1",
+  "version": "1.41.2",
   "mcpName": "io.github.davesheffer/hunch",
   "license": "Apache-2.0",
   "author": "Dave Sheffer <dave.sheffer1@gmail.com>",

package/server.json

@@ -7,13 +7,13 @@
     "source": "github"
   },
   "websiteUrl": "https://www.hunchmemory.com",
-  "version": "1.41.1",
+  "version": "1.41.2",
   "packages": [
     {
       "registryType": "npm",
       "registryBaseUrl": "https://registry.npmjs.org",
       "identifier": "@davesheffer/hunch",
-      "version": "1.41.1",
+      "version": "1.41.2",
       "runtimeHint": "npx",
       "packageArguments": [
         {