@storacha/clawracha 0.2.0 → 0.2.2

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/dist/sync.d.ts

@@ -29,6 +29,10 @@ export declare class SyncEngine {
      * Require running state or throw.
      */
     private requireRunning;
+    /**
+     * Require state is initialized or throw.
+     */
+    private requireInitialized;
     /**
      * Process a batch of file changes.
      * Can be called even when not running (accumulates pending ops).
@@ -60,6 +64,7 @@ export declare class SyncEngine {
      * Used by join to overwrite local with remote before watcher starts.
      */
     pullRemote(): Promise<number>;
+    private _pullRemoteInner;
     /**
      * Inspect internal state for debugging.
      */

package/dist/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAOH,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EAEV,YAAY,EACb,MAAM,kBAAkB,CAAC;AAS1B,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAWxE,qBAAa,UAAU;IACrB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,QAAQ,CAAoC;gBAExC,SAAS,EAAE,MAAM;IAK7B;;;OAGG;IACG,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC/C;;OAEG;IACH,OAAO,CAAC,cAAc;IAOtB;;;OAGG;IACG,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAe1D;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAMb,UAAU;IAyDxB;;OAEG;YACW,iBAAiB;IAe/B;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC;IAc5C;;OAEG;YACW,kBAAkB;IAUhC;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IA0BnC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC;QACvB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QACpB,SAAS,EAAE;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC/B,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,UAAU,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC5D,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;IAkBI,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC;IAW5B,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;YAM5B,WAAW;CAK1B"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAOH,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EAEV,YAAY,EACb,MAAM,kBAAkB,CAAC;AAS1B,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAgBxE,qBAAa,UAAU;IACrB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,KAAK,CAAiD;IAC9D,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,QAAQ,CAAoC;gBAExC,SAAS,EAAE,MAAM;IAK7B;;;OAGG;IACG,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC/C;;OAEG;IACH,OAAO,CAAC,cAAc;IAOtB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;;OAGG;IACG,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAe1D;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAMb,UAAU;IAwDxB;;OAEG;YACW,iBAAiB;IAe/B;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC;IAc5C;;OAEG;YACW,kBAAkB;IAUhC;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;YAMrB,gBAAgB;IA0B9B;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC;QACvB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QACpB,SAAS,EAAE;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC/B,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,UAAU,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC5D,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;IAkBI,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC;IAW5B,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;YAM5B,WAAW;CAK1B"}

package/dist/sync.js

@@ -21,7 +21,7 @@ import { decodeDelegation, encodeDelegation } from "./utils/delegation.js";
 export class SyncEngine {
     workspace;
     blocks;
-    state = { running: false };
+    state = { initialized: false, running: false };
     current = null;
     pendingOps = [];
     carFile = null;
@@ -57,7 +57,7 @@ export class SyncEngine {
             // First device — create a new name
             name = await Name.create(agent);
         }
-        this.state = { running: true, name, storachaClient };
+        this.state = { initialized: true, running: true, name, storachaClient };
         try {
             const result = await Revision.resolve(this.blocks, name);
             this.current = result.value;
@@ -77,6 +77,15 @@ export class SyncEngine {
      */
     requireRunning() {
         if (!this.state.running) {
+            throw new Error("Sync engine not running");
+        }
+        return this.state;
+    }
+    /**
+     * Require state is initialized or throw.
+     */
+    requireInitialized() {
+        if (!this.state.initialized) {
             throw new Error("Sync engine not initialized");
         }
         return this.state;
@@ -201,7 +210,14 @@ export class SyncEngine {
      */
     async stop() {
         this.syncLock = this.syncLock.then(() => {
-            this.state = { running: false };
+            this.state = this.state.initialized
+                ? {
+                    initialized: true,
+                    running: false,
+                    name: this.state.name,
+                    storachaClient: this.state.storachaClient,
+                }
+                : { initialized: false, running: false };
         });
         return this.syncLock;
     }
@@ -210,6 +226,11 @@ export class SyncEngine {
      * Used by join to overwrite local with remote before watcher starts.
      */
     async pullRemote() {
+        const op = this.syncLock.then(() => this._pullRemoteInner());
+        this.syncLock = op.then(() => void 0).catch(() => { }); // heal chain so subsequent syncs run
+        return op;
+    }
+    async _pullRemoteInner() {
         const { name } = this.requireRunning();
         try {
             const result = await Revision.resolve(this.blocks, name, {
@@ -263,7 +284,7 @@ export class SyncEngine {
         };
     }
     async exportNameArchive() {
-        const { name } = this.requireRunning();
+        const { name } = this.requireInitialized();
         const bytes = await name.archive();
         return encodeDelegation(bytes);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storacha/clawracha",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "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",