@storacha/clawracha 0.1.14 → 0.1.16

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;AAgG7B,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,EAAE,iBAAiB,QA8hBpD"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EACV,iBAAiB,EAIlB,MAAM,qBAAqB,CAAC;AAwJ7B,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,GAAG,EAAE,iBAAiB,QAsmBpD"}

package/dist/plugin.js

@@ -8,6 +8,7 @@
  */
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import { json as consumeJson } from "stream/consumers";
 import { SyncEngine } from "./sync.js";
 import { FileWatcher } from "./watcher.js";
 import { createStorachaClient } from "./utils/client.js";
@@ -15,8 +16,13 @@ import { decodeDelegation, encodeDelegation, readDelegationArg, } from "./utils/
 import { resolveAgentWorkspace, getAgentIds } from "./utils/workspace.js";
 import { Agent, Name } from "@storacha/ucn/pail";
 import { extract } from "@storacha/client/delegation";
+import * as z from "zod";
 const activeSyncers = new Map();
 // --- Config helpers ---
+const UpdateParams = z.object({
+    agentId: z.string(),
+    workspace: z.string(),
+});
 async function loadDeviceConfig(workspace) {
     const configPath = path.join(workspace, ".storacha", "config.json");
     try {
@@ -29,6 +35,45 @@ async function loadDeviceConfig(workspace) {
         throw err;
     }
 }
+async function requestWorkspaceUpdate(workspace, agentId, gatewayConfig) {
+    // Mirror resolveGatewayPort from openclaw core
+    const DEFAULT_GATEWAY_PORT = 18789;
+    let port = DEFAULT_GATEWAY_PORT;
+    const envRaw = process.env.OPENCLAW_GATEWAY_PORT?.trim() ||
+        process.env.CLAWDBOT_GATEWAY_PORT?.trim();
+    if (envRaw) {
+        const parsed = Number.parseInt(envRaw, 10);
+        if (Number.isFinite(parsed) && parsed > 0)
+            port = parsed;
+    }
+    else if (typeof gatewayConfig.port === "number" &&
+        Number.isFinite(gatewayConfig.port) &&
+        gatewayConfig.port > 0) {
+        port = gatewayConfig.port;
+    }
+    const url = `http://127.0.0.1:${port}/api/channels/clawracha/workspace-update`;
+    const headers = {
+        "Content-Type": "application/json",
+    };
+    // Auth: /api/channels/ routes get gateway auth middleware
+    const token = gatewayConfig.auth?.token ?? gatewayConfig.auth?.password;
+    if (token) {
+        headers["Authorization"] = `Bearer ${token}`;
+    }
+    try {
+        const res = await fetch(url, {
+            method: "POST",
+            headers,
+            body: JSON.stringify({ agentId, workspace }),
+        });
+        if (!res.ok) {
+            console.warn(`Warning: Failed to notify gateway (${res.status}). Restart the gateway to pick up changes.`);
+        }
+    }
+    catch (err) {
+        console.warn(`Warning: Could not reach gateway at ${url}: ${err.message}. Restart the gateway to pick up changes.`);
+    }
+}
 async function saveDeviceConfig(workspace, config) {
     const configDir = path.join(workspace, ".storacha");
     await fs.mkdir(configDir, { recursive: true });
@@ -72,6 +117,41 @@ async function startWorkspaceSync(workspace, agentId, pluginConfig, initialAdd,
 export default function plugin(api) {
     const pluginConfig = (api.pluginConfig ?? {});
     // --- Background service: one syncer per agent workspace ---
+    api.registerHttpHandler(async (req, res) => {
+        const url = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
+        // Only handle /api/channels/clawracha/workspace-update
+        if (!url.pathname.startsWith("/api/channels/clawracha/workspace-update")) {
+            return false;
+        }
+        // only handle post requests
+        if (req.method !== "POST") {
+            return false;
+        }
+        const body = await consumeJson(req);
+        const paramsResult = UpdateParams.safeParse(body);
+        if (paramsResult.success === false) {
+            res.statusCode = 400;
+            res.end(JSON.stringify({
+                error: "Invalid parameters",
+                details: paramsResult.error,
+            }));
+            return true;
+        }
+        const updateParams = paramsResult.data;
+        const sync = activeSyncers.get(updateParams.workspace);
+        if (sync) {
+            // stop active sync engine if present
+            // waiting for any active syncs to flush.
+            await sync.watcher.stop();
+            await sync.watcher.forceFlush();
+            await sync.engine.stop();
+        }
+        const newSync = await startWorkspaceSync(updateParams.workspace, updateParams.agentId, pluginConfig, false, api.logger);
+        if (newSync) {
+            activeSyncers.set(updateParams.workspace, newSync);
+        }
+        return true;
+    });
     api.registerService({
         id: "storacha-sync",
         async start(ctx) {
@@ -102,8 +182,9 @@ export default function plugin(api) {
         },
         async stop(ctx) {
             for (const [workspace, sync] of activeSyncers) {
-                sync.engine.stop();
                 await sync.watcher.stop();
+                await sync.watcher.forceFlush();
+                await sync.engine.stop();
                 ctx.logger.info(`[${sync.agentId}] Stopped syncing: ${workspace}`);
             }
             activeSyncers.clear();
@@ -257,7 +338,17 @@ export default function plugin(api) {
                 if (!sync) {
                     throw new Error("Failed to start sync engine");
                 }
-                activeSyncers.set(workspace, sync);
+                // Wait for initial files to flush through, then stop the watcher
+                await sync.watcher.waitForReady();
+                await sync.watcher.stop();
+                // force out changes then stop the engine, which will wait for last
+                // sync to complete
+                await sync.watcher.forceFlush();
+                await sync.engine.stop();
+                // post to the endpoint to tell the service to start syncing this space
+                if (config.gateway) {
+                    await requestWorkspaceUpdate(workspace, agentId, config.gateway);
+                }
                 const agent = Agent.parse(deviceConfig.agentKey);
                 console.log(`🔥 Storacha workspace ready for ${agentId}!`);
                 console.log(`Agent DID: ${agent.did()}`);
@@ -309,9 +400,16 @@ export default function plugin(api) {
                 // Pull remote state before watcher starts
                 const sync = await startWorkspaceSync(workspace, agentId, pluginConfig, false, console);
                 let pullCount = 0;
-                if (sync) {
-                    pullCount = await sync.engine.pullRemote();
-                    activeSyncers.set(workspace, sync);
+                if (!sync) {
+                    throw new Error("Failed to start sync engine");
+                }
+                pullCount = await sync.engine.pullRemote();
+                await sync.watcher.stop();
+                await sync.watcher.forceFlush();
+                await sync.engine.stop();
+                // post to the endpoint to tell the service to start syncing this space
+                if (config.gateway) {
+                    await requestWorkspaceUpdate(workspace, agentId, config.gateway);
                 }
                 const agent = Agent.parse(deviceConfig.agentKey);
                 console.log(`🔥 Joined existing Storacha workspace for ${agentId}!`);

package/dist/sync.d.ts

@@ -18,6 +18,7 @@ export declare class SyncEngine {
     private pendingOps;
     private carFile;
     private lastSync;
+    private syncLock;
     constructor(workspace: string);
     /**
      * Initialize sync engine with device config.
@@ -37,6 +38,7 @@ export declare class SyncEngine {
      * Execute sync: generate revision, publish, upload, apply remote changes.
      */
     sync(): Promise<void>;
+    private _syncInner;
     /**
      * Create CAR and upload to Storacha.
      */
@@ -52,7 +54,7 @@ export declare class SyncEngine {
     /**
      * Mark the engine as stopped.
      */
-    stop(): void;
+    stop(): Promise<void>;
     /**
      * Pull all remote state and write to local filesystem.
      * Used by join to overwrite local with remote before watcher starts.

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;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"}
+{"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"}

package/dist/sync.js

@@ -26,6 +26,7 @@ export class SyncEngine {
     pendingOps = [];
     carFile = null;
     lastSync = null;
+    syncLock = Promise.resolve();
     constructor(workspace) {
         this.workspace = workspace;
         this.blocks = createWorkspaceBlockstore(workspace);
@@ -95,6 +96,11 @@ export class SyncEngine {
      * Execute sync: generate revision, publish, upload, apply remote changes.
      */
     async sync() {
+        const op = this.syncLock.then(() => this._syncInner());
+        this.syncLock = op.catch(() => { }); // heal chain so subsequent syncs run
+        return op;
+    }
+    async _syncInner() {
         const { name } = this.requireRunning();
         const beforeEntries = await this.getPailEntries();
         if (this.pendingOps.length === 0) {
@@ -193,8 +199,11 @@ export class SyncEngine {
     /**
      * Mark the engine as stopped.
      */
-    stop() {
-        this.state = { running: false };
+    async stop() {
+        this.syncLock = this.syncLock.then(() => {
+            this.state = { running: false };
+        });
+        return this.syncLock;
     }
     /**
      * Pull all remote state and write to local filesystem.

package/dist/watcher.d.ts

@@ -16,6 +16,7 @@ export declare class FileWatcher {
     private watcher;
     private pendingChanges;
     private debounceTimer;
+    private readyPromise;
     private options;
     private debounceMs;
     constructor(options: WatcherOptions);
@@ -23,6 +24,10 @@ export declare class FileWatcher {
      * Start watching the workspace
      */
     start(): Promise<void>;
+    /**
+     * Wait for chokidar to finish its initial scan
+     */
+    waitForReady(): Promise<void>;
     /**
      * Stop watching
      */

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;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"}
+{"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,YAAY,CAA8B;IAClD,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,UAAU,CAAS;gBAEf,OAAO,EAAE,cAAc;IAKnC;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAuC5B;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAOnC;;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

@@ -11,6 +11,7 @@ export class FileWatcher {
     watcher = null;
     pendingChanges = new Map();
     debounceTimer = null;
+    readyPromise = null;
     options;
     debounceMs;
     constructor(options) {
@@ -43,12 +44,24 @@ export class FileWatcher {
                 pollInterval: 100,
             },
         });
+        this.readyPromise = new Promise((resolve) => {
+            this.watcher.on("ready", () => resolve());
+        });
         this.watcher
             .on("add", (filePath) => this.handleChange("add", filePath))
             .on("change", (filePath) => this.handleChange("change", filePath))
             .on("unlink", (filePath) => this.handleChange("unlink", filePath))
             .on("error", (err) => console.error("Watcher error:", err));
     }
+    /**
+     * Wait for chokidar to finish its initial scan
+     */
+    async waitForReady() {
+        if (!this.readyPromise) {
+            throw new Error("Watcher not started");
+        }
+        return this.readyPromise;
+    }
     /**
      * Stop watching
      */

package/package.json

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