@storacha/clawracha 0.2.0 → 0.2.1

package/dist/mdsync/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mdsync/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,EACL,YAAY,EAGZ,SAAS,EACV,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAsJ1C,UAAU,cAAc;IACtB,UAAU,EAAE,GAAG,CAAC;IAChB,SAAS,EAAE,KAAK,EAAE,CAAC;CACpB;AAyBD;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAU,aAAa,MAAM,KAAG,OAAO,CAAC,cAAc,CAEvE,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,GAAG,GACd,QAAQ,YAAY,EACpB,SAAS,SAAS,EAClB,KAAK,MAAM,EACX,aAAa,MAAM,KAClB,OAAO,CAAC,cAAc,GAAG,IAAI,CAkC/B,CAAC;AA0RF;;;GAGG;AACH,eAAO,MAAM,GAAG,GACd,QAAQ,YAAY,EACpB,SAAS,SAAS,EAClB,KAAK,MAAM,KACV,OAAO,CAAC,MAAM,GAAG,SAAS,CAM5B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mdsync/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,EACL,YAAY,EAGZ,SAAS,EACV,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAuJ1C,UAAU,cAAc;IACtB,UAAU,EAAE,GAAG,CAAC;IAChB,SAAS,EAAE,KAAK,EAAE,CAAC;CACpB;AAyBD;;;;GAIG;AACH,eAAO,MAAM,KAAK,GAAU,aAAa,MAAM,KAAG,OAAO,CAAC,cAAc,CAEvE,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,GAAG,GACd,QAAQ,YAAY,EACpB,SAAS,SAAS,EAClB,KAAK,MAAM,EACX,aAAa,MAAM,KAClB,OAAO,CAAC,cAAc,GAAG,IAAI,CAkC/B,CAAC;AAkSF;;;GAGG;AACH,eAAO,MAAM,GAAG,GACd,QAAQ,YAAY,EACpB,SAAS,SAAS,EAClB,KAAK,MAAM,KACV,OAAO,CAAC,MAAM,GAAG,SAAS,CAM5B,CAAC"}

package/dist/mdsync/index.js

@@ -16,7 +16,7 @@ import { MemoryBlockstore, withCache } from "@storacha/ucn/block";
 import * as CRDT from "@web3-storage/pail/crdt";
 import { CID } from "multiformats";
 import * as cbor from "@ipld/dag-cbor";
-import { fromMarkdown, encodeTree, encodeRGA, RGA, decodeRGA, decodeTree, computeChangeSet, applyRGAChangeSet, encodeChangeSet, decodeChangeSet, toMarkdown, } from "@storacha/md-merge";
+import { fromMarkdown, encodeTree, encodeRGA, RGA, decodeRGA, decodeTree, computeChangeSet, applyRGAChangeSet, encodeChangeSet, decodeChangeSet, toMarkdown, mergeRGATrees, } from "@storacha/md-merge";
 import * as Pail from "@web3-storage/pail";
 import { decode, encode } from "multiformats/block";
 import { sha256 } from "multiformats/hashes/sha2";
@@ -318,15 +318,26 @@ const resolveValue = async (blocks, current, key) => {
             const newMDEntry = await getMarkdownEntry(blocks, mdEntryCid);
             if (newMDEntry.type === "initial") {
                 // First write for this key — bootstrap from the stored entry.
+                const newEventRGA = await getEventRGAFromCID(blocks, newMDEntry.events);
+                const newRoot = await getRGATreeFromRootCID(blocks, newMDEntry.root, newEventRGA);
                 if (mdEntry) {
-                    throw new Error(`Expected no existing markdown entry for initial event, found ${mdEntryCid}`);
+                    // Concurrent initial — two branches independently created this key.
+                    // Merge event histories and merge the two RGA trees.
+                    mdEntry.events.merge(newEventRGA);
+                    const comparator = makeComparator(mdEntry.events);
+                    mdEntry = {
+                        type: "initial",
+                        events: mdEntry.events,
+                        root: mergeRGATrees(mdEntry.root, newRoot, comparator),
+                    };
+                }
+                else {
+                    mdEntry = {
+                        type: "initial",
+                        events: newEventRGA,
+                        root: newRoot,
+                    };
                 }
-                const eventRGA = await getEventRGAFromCID(blocks, newMDEntry.events);
-                mdEntry = {
-                    type: "initial",
-                    events: eventRGA,
-                    root: await getRGATreeFromRootCID(blocks, newMDEntry.root, eventRGA),
-                };
             }
             else {
                 // Update — merge event histories, then apply the changeset.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storacha/clawracha",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "OpenClaw plugin for Storacha workspace sync via UCN Pail",
   "type": "module",
   "files": [
@@ -29,7 +29,7 @@
     "@ipld/car": "^5.2.0",
     "@ipld/dag-cbor": "^9.2.5",
     "@storacha/client": "^2.0.4",
-    "@storacha/md-merge": "0.6.0",
+    "@storacha/md-merge": "0.7.0",
     "@storacha/ucn": "1.1.1-rc.3",
     "@storacha/upload-client": "^1.3.9",
     "@ucanto/interface": "^11.0.1",