@storacha/clawracha 0.1.12 → 0.1.14

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EACV,iBAAiB,EAGlB,MAAM,qBAAqB,CAAC;AAgH7B,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,EAAE,iBAAiB,QAukBpD"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EACV,iBAAiB,EAGlB,MAAM,qBAAqB,CAAC;AAgG7B,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,EAAE,iBAAiB,QA8hBpD"}

package/dist/plugin.js

@@ -13,7 +13,8 @@ import { FileWatcher } from "./watcher.js";
 import { createStorachaClient } from "./utils/client.js";
 import { decodeDelegation, encodeDelegation, readDelegationArg, } from "./utils/delegation.js";
 import { resolveAgentWorkspace, getAgentIds } from "./utils/workspace.js";
-import { readIgnoreFile } from "./utils/ignore.js";
+import { Agent, Name } from "@storacha/ucn/pail";
+import { extract } from "@storacha/client/delegation";
 const activeSyncers = new Map();
 // --- Config helpers ---
 async function loadDeviceConfig(workspace) {
@@ -35,7 +36,7 @@ async function saveDeviceConfig(workspace, config) {
     await fs.writeFile(configPath, JSON.stringify(config, null, 2));
 }
 // --- Service helpers ---
-async function startWorkspaceSync(workspace, agentId, pluginConfig, logger) {
+async function startWorkspaceSync(workspace, agentId, pluginConfig, initialAdd, logger) {
     const deviceConfig = await loadDeviceConfig(workspace);
     if (!deviceConfig || !deviceConfig.setupComplete) {
         return null;
@@ -61,23 +62,12 @@ async function startWorkspaceSync(workspace, agentId, pluginConfig, logger) {
             const updatedConfig = { ...deviceConfig, nameArchive };
             await saveDeviceConfig(workspace, updatedConfig);
         },
+        initialAdd,
     });
     await watcher.start();
     logger.info(`[${agentId}] Started syncing workspace: ${workspace}`);
     return { engine, watcher, workspace, agentId };
 }
-/**
- * Scan workspace for files, excluding patterns.
- * Returns paths relative to workspace.
- */
-async function scanWorkspaceFiles(workspace, ignorePatterns) {
-    const { glob } = await import("glob");
-    return glob("**/*", {
-        cwd: workspace,
-        nodir: true,
-        ignore: ignorePatterns.map((p) => p.includes("/") || p.includes("*") ? p : `${p}/**`),
-    });
-}
 // --- Plugin entry ---
 export default function plugin(api) {
     const pluginConfig = (api.pluginConfig ?? {});
@@ -93,7 +83,8 @@ export default function plugin(api) {
             for (const agentId of agentIds) {
                 const workspace = resolveAgentWorkspace(ctx.config, agentId);
                 try {
-                    const sync = await startWorkspaceSync(workspace, agentId, pluginConfig, ctx.logger);
+                    const sync = await startWorkspaceSync(workspace, agentId, pluginConfig, false, // Don't emit "add" events for existing files on startup (handled by initial scan)
+                    ctx.logger);
                     if (sync) {
                         activeSyncers.set(workspace, sync);
                     }
@@ -205,7 +196,6 @@ export default function plugin(api) {
                 const { agentId, workspace } = requireAgent(opts.agent);
                 const existing = await loadDeviceConfig(workspace);
                 if (existing?.agentKey) {
-                    const { Agent } = await import("@storacha/ucn/pail");
                     const agent = Agent.parse(existing.agentKey);
                     console.log(`Agent already initialized for ${agentId}.`);
                     console.log(`Agent DID: ${agent.did()}`);
@@ -219,7 +209,6 @@ export default function plugin(api) {
                     }
                     return;
                 }
-                const { Agent } = await import("@storacha/ucn/pail");
                 const agent = await Agent.generate();
                 const agentKey = Agent.format(agent);
                 await saveDeviceConfig(workspace, { agentKey });
@@ -242,7 +231,6 @@ export default function plugin(api) {
             .description("Set up a NEW workspace (first device). <delegation> is a file path or base64 CID string.")
             .requiredOption("--agent <id>", "Agent ID")
             .action(async (delegationArg, opts) => {
-            let engine = null;
             try {
                 const { agentId, workspace } = requireAgent(opts.agent);
                 const deviceConfig = await loadDeviceConfig(workspace);
@@ -265,31 +253,11 @@ export default function plugin(api) {
                 deviceConfig.setupComplete = true;
                 await saveDeviceConfig(workspace, deviceConfig);
                 // Initial upload: scan all existing workspace files and sync to Storacha
-                engine = new SyncEngine(workspace);
-                await engine.init(deviceConfig);
-                const userIgnored = await readIgnoreFile(workspace);
-                const ignorePatterns = [
-                    ".storacha",
-                    "node_modules",
-                    ".git",
-                    "dist",
-                    ...userIgnored,
-                ];
-                const allFiles = await scanWorkspaceFiles(workspace, ignorePatterns);
-                if (allFiles.length > 0) {
-                    const changes = allFiles.map((f) => ({
-                        type: "add",
-                        path: f,
-                    }));
-                    await engine.processChanges(changes);
-                    await engine.sync();
-                    console.log(`Uploaded ${allFiles.length} existing files to Storacha.`);
+                const sync = await startWorkspaceSync(workspace, agentId, pluginConfig, true, console);
+                if (!sync) {
+                    throw new Error("Failed to start sync engine");
                 }
-                // Save name archive after initial sync
-                const exportedArchive = await engine.exportNameArchive();
-                deviceConfig.nameArchive = exportedArchive;
-                await saveDeviceConfig(workspace, deviceConfig);
-                const { Agent } = await import("@storacha/ucn/pail");
+                activeSyncers.set(workspace, sync);
                 const agent = Agent.parse(deviceConfig.agentKey);
                 console.log(`🔥 Storacha workspace ready for ${agentId}!`);
                 console.log(`Agent DID: ${agent.did()}`);
@@ -299,14 +267,6 @@ export default function plugin(api) {
                 console.log("\nSync is now active (no gateway restart needed).");
             }
             catch (err) {
-                if (engine) {
-                    try {
-                        const state = await engine.inspect();
-                        console.error("\nEngine state at failure:");
-                        console.error(JSON.stringify(state, null, 2));
-                    }
-                    catch { }
-                }
                 console.error(`Error: ${err.message}`);
                 if (err.stack)
                     console.error(err.stack);
@@ -321,7 +281,6 @@ export default function plugin(api) {
             .description("Join an existing workspace from another device. Arguments are file paths or base64 CID strings.")
             .requiredOption("--agent <id>", "Agent ID")
             .action(async (uploadArg, nameArg, opts) => {
-            let engine = null;
             try {
                 const { agentId, workspace } = requireAgent(opts.agent);
                 const deviceConfig = await loadDeviceConfig(workspace);
@@ -348,15 +307,12 @@ export default function plugin(api) {
                 deviceConfig.setupComplete = true;
                 await saveDeviceConfig(workspace, deviceConfig);
                 // Pull remote state before watcher starts
+                const sync = await startWorkspaceSync(workspace, agentId, pluginConfig, false, console);
                 let pullCount = 0;
-                engine = new SyncEngine(workspace);
-                await engine.init(deviceConfig);
-                pullCount = await engine.pullRemote();
-                // Save name archive after pull
-                const exportedArchive = await engine.exportNameArchive();
-                deviceConfig.nameArchive = exportedArchive;
-                await saveDeviceConfig(workspace, deviceConfig);
-                const { Agent } = await import("@storacha/ucn/pail");
+                if (sync) {
+                    pullCount = await sync.engine.pullRemote();
+                    activeSyncers.set(workspace, sync);
+                }
                 const agent = Agent.parse(deviceConfig.agentKey);
                 console.log(`🔥 Joined existing Storacha workspace for ${agentId}!`);
                 console.log(`Agent DID: ${agent.did()}`);
@@ -365,14 +321,6 @@ export default function plugin(api) {
                 console.log("\nSync is now active (no gateway restart needed).");
             }
             catch (err) {
-                if (engine) {
-                    try {
-                        const state = await engine.inspect();
-                        console.error("\nEngine state at failure:");
-                        console.error(JSON.stringify(state, null, 2));
-                    }
-                    catch { }
-                }
                 console.error(`Error: ${err.message}`);
                 if (err.stack)
                     console.error(err.stack);
@@ -420,33 +368,29 @@ export default function plugin(api) {
                     results.push("⚠️ No upload delegation to re-delegate.");
                 }
                 // Re-delegate name capability
-                {
-                    const { Agent, Name } = await import("@storacha/ucn/pail");
-                    const { extract } = await import("@storacha/client/delegation");
-                    const agent = Agent.parse(deviceConfig.agentKey);
-                    let name;
-                    if (deviceConfig.nameArchive) {
-                        const archiveBytes = decodeDelegation(deviceConfig.nameArchive);
-                        name = await Name.extract(agent, archiveBytes);
-                    }
-                    else if (deviceConfig.nameDelegation) {
-                        const nameBytes = decodeDelegation(deviceConfig.nameDelegation);
-                        const { ok: nameDel } = await extract(nameBytes);
-                        if (nameDel) {
-                            name = Name.from(agent, [nameDel]);
-                        }
-                    }
-                    if (name) {
-                        const nameDel = await name.grant(targetDID);
-                        const { ok: archiveBytes } = await nameDel.archive();
-                        if (archiveBytes) {
-                            results.push(`Name delegation:\n${encodeDelegation(archiveBytes)}`);
-                        }
+                const agent = Agent.parse(deviceConfig.agentKey);
+                let name;
+                if (deviceConfig.nameArchive) {
+                    const archiveBytes = decodeDelegation(deviceConfig.nameArchive);
+                    name = await Name.extract(agent, archiveBytes);
+                }
+                else if (deviceConfig.nameDelegation) {
+                    const nameBytes = decodeDelegation(deviceConfig.nameDelegation);
+                    const { ok: nameDel } = await extract(nameBytes);
+                    if (nameDel) {
+                        name = Name.from(agent, [nameDel]);
                     }
-                    else {
-                        results.push("⚠️ No name state available to grant from.");
+                }
+                if (name) {
+                    const nameDel = await name.grant(targetDID);
+                    const { ok: archiveBytes } = await nameDel.archive();
+                    if (archiveBytes) {
+                        results.push(`Name delegation:\n${encodeDelegation(archiveBytes)}`);
                     }
                 }
+                else {
+                    results.push("⚠️ No name state available to grant from.");
+                }
                 console.log(`🔥 Delegations for ${targetDID}:\n`);
                 for (const r of results) {
                     console.log(r);

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;gBAE3B,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;IAoD3B;;OAEG;YACW,iBAAiB;IAe/B;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC;IAc5C;;OAEG;YACW,kBAAkB;IAUhC;;OAEG;IACH,IAAI,IAAI,IAAI;IAIZ;;;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;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;gBAE3B,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;IAyD3B;;OAEG;YACW,iBAAiB;IAe/B;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC;IAc5C;;OAEG;YACW,kBAAkB;IAUhC;;OAEG;IACH,IAAI,IAAI,IAAI;IAIZ;;;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"}

package/dist/sync.js

@@ -97,8 +97,7 @@ export class SyncEngine {
     async sync() {
         const { name } = this.requireRunning();
         const beforeEntries = await this.getPailEntries();
-        let pendingOps = this.pendingOps;
-        if (pendingOps.length === 0) {
+        if (this.pendingOps.length === 0) {
             // No pending ops — just pull remote
             try {
                 const result = await Revision.resolve(this.blocks, name, {
@@ -113,28 +112,35 @@ export class SyncEngine {
             }
         }
         else {
-            while (pendingOps.length > 0) {
-                if (!this.carFile) {
-                    throw new Error("CAR file not initialized");
-                }
-                const { current, revisionBlocks, event, remainingOps } = await applyPendingOps(this.blocks, name, this.current, pendingOps);
-                this.current = current;
-                for (const block of revisionBlocks) {
-                    await this.carFile.put(block);
-                }
-                await this.storeBlocks(revisionBlocks);
-                if (event) {
-                    await this.carFile.put(event);
-                    await this.storeBlocks([event]);
-                }
-                pendingOps = remainingOps;
-                await this.possiblyUploadCAR();
-                if (pendingOps.length > 0) {
-                    this.carFile = await makeTempCar();
+            let pendingOps = [...this.pendingOps];
+            this.pendingOps = [];
+            try {
+                while (pendingOps.length > 0) {
+                    if (!this.carFile) {
+                        throw new Error("CAR file not initialized");
+                    }
+                    const { current, revisionBlocks, event, remainingOps } = await applyPendingOps(this.blocks, name, this.current, pendingOps);
+                    this.current = current;
+                    for (const block of revisionBlocks) {
+                        await this.carFile.put(block);
+                    }
+                    await this.storeBlocks(revisionBlocks);
+                    if (event) {
+                        await this.carFile.put(event);
+                        await this.storeBlocks([event]);
+                    }
+                    pendingOps = remainingOps;
+                    await this.possiblyUploadCAR();
+                    if (pendingOps.length > 0) {
+                        this.carFile = await makeTempCar();
+                    }
                 }
             }
+            catch (err) {
+                this.pendingOps.unshift(...pendingOps);
+                throw err;
+            }
         }
-        this.pendingOps = [];
         // Apply remote changes
         const afterEntries = await this.getPailEntries();
         const remoteChanges = diffRemoteChanges(beforeEntries, afterEntries);

package/dist/watcher.d.ts

@@ -10,6 +10,7 @@ export interface WatcherOptions {
     config: SyncPluginConfig;
     onChanges: (changes: FileChange[]) => Promise<void>;
     debounceMs?: number;
+    initialAdd?: boolean;
 }
 export declare class FileWatcher {
     private watcher;

package/dist/watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../src/watcher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAErE,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,gBAAgB,CAAC;IACzB,SAAS,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAmC;IAClD,OAAO,CAAC,cAAc,CAAsC;IAC5D,OAAO,CAAC,aAAa,CAA+B;IACpD,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,UAAU,CAAS;gBAEf,OAAO,EAAE,cAAc;IAKnC;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC5B;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3B;;OAEG;IACH,OAAO,CAAC,YAAY;IAmBpB;;OAEG;YACW,KAAK;IAanB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAOlC"}
+{"version":3,"file":"watcher.d.ts","sourceRoot":"","sources":["../src/watcher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAErE,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,gBAAgB,CAAC;IACzB,SAAS,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAmC;IAClD,OAAO,CAAC,cAAc,CAAsC;IAC5D,OAAO,CAAC,aAAa,CAA+B;IACpD,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,UAAU,CAAS;gBAEf,OAAO,EAAE,cAAc;IAKnC;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC5B;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3B;;OAEG;IACH,OAAO,CAAC,YAAY;IAmBpB;;OAEG;YACW,KAAK;IAanB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAOlC"}

package/dist/watcher.js

@@ -37,7 +37,7 @@ export class FileWatcher {
         this.watcher = chokidar.watch(watchPaths, {
             ignored,
             persistent: true,
-            ignoreInitial: true,
+            ignoreInitial: !this.options.initialAdd,
             awaitWriteFinish: {
                 stabilityThreshold: 200,
                 pollInterval: 100,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storacha/clawracha",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "OpenClaw plugin for Storacha workspace sync via UCN Pail",
   "type": "module",
   "files": [
@@ -36,7 +36,6 @@
     "@web3-storage/pail": "0.6.3-rc.3",
     "carstream": "^2.3.0",
     "chokidar": "^3.6.0",
-    "glob": "^13.0.5",
     "multiformats": "^13.0.0"
   },
   "devDependencies": {