@storacha/clawracha 0.0.1 → 0.0.2

package/dist/plugin.js

@@ -8,8 +8,10 @@
  */
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import { extract as extractDelegation } from "@storacha/client/delegation";
 import { SyncEngine } from "./sync.js";
 import { FileWatcher } from "./watcher.js";
+import { createStorachaClient } from "./utils/client.js";
 // Global state
 let syncEngine = null;
 let fileWatcher = null;
@@ -53,11 +55,12 @@ export default function plugin(api) {
                 return;
             }
             const deviceConfig = await loadDeviceConfig(workspace);
-            if (!deviceConfig) {
-                ctx.logger.info("No device config found. Run /storacha-init first.");
+            if (!deviceConfig || !deviceConfig.setupComplete) {
+                ctx.logger.info("Setup not complete. Run /storacha-init or /storacha-join first.");
                 return;
             }
-            syncEngine = new SyncEngine(workspace);
+            const storachaClient = await createStorachaClient(deviceConfig);
+            syncEngine = new SyncEngine(storachaClient, workspace);
             await syncEngine.init(deviceConfig);
             fileWatcher = new FileWatcher({
                 workspace,
@@ -105,7 +108,7 @@ export default function plugin(api) {
                     content: [
                         {
                             type: "text",
-                            text: "Sync not initialized. Run /storacha-init first.",
+                            text: "Sync not initialized. Run /storacha-init or /storacha-join first.",
                         },
                     ],
                     details: null,
@@ -131,7 +134,7 @@ export default function plugin(api) {
                     content: [
                         {
                             type: "text",
-                            text: "Sync not initialized. Run /storacha-init first.",
+                            text: "Sync not initialized. Run /storacha-init or /storacha-join first.",
                         },
                     ],
                     details: null,
@@ -150,65 +153,260 @@ export default function plugin(api) {
             };
         },
     });
-    // Register slash commands
+    // --- Slash Commands ---
     api.registerCommand({
         name: "storacha-init",
-        description: "Initialize Storacha sync for this workspace",
-        handler: async (ctx) => {
+        description: "Initialize a NEW Storacha workspace (first device). Usage: /storacha-init <upload-delegation-b64>",
+        acceptsArgs: true,
+        handler: async (_ctx) => {
             const workspace = workspaceDir;
             if (!workspace)
                 return { text: "No workspace configured." };
+            const b64 = _ctx.args?.trim();
+            if (!b64) {
+                return {
+                    text: [
+                        "Usage: `/storacha-init <upload-delegation-b64>`",
+                        "",
+                        "This creates a **new** workspace. If you're syncing from an existing device, use `/storacha-join` instead.",
+                    ].join("\n"),
+                };
+            }
+            // Validate delegation
+            const bytes = Buffer.from(b64, "base64");
+            const { ok: delegation, error } = await extractDelegation(bytes);
+            if (!delegation) {
+                return { text: `Invalid delegation: ${error}` };
+            }
             const { Agent } = await import("@storacha/ucn/pail");
             const agent = await Agent.generate();
             const agentKey = Agent.format(agent);
-            const config = { agentKey };
+            const spaceDID = delegation.capabilities[0]?.with;
+            const config = {
+                agentKey,
+                uploadDelegation: b64,
+                spaceDID: spaceDID ?? undefined,
+                setupComplete: true,
+            };
             await saveDeviceConfig(workspace, config);
             return {
                 text: [
-                    "🔥 Storacha sync initialized!",
+                    "\u{1f525} Storacha workspace initialized!",
                     `Agent DID: \`${agent.did()}\``,
+                    `Space: \`${spaceDID ?? "unknown"}\``,
                     "",
-                    "Next: get a delegation from a space owner, then run /storacha-delegate",
+                    "Restart the gateway to start syncing.",
+                    "",
+                    "To add another device, run `/storacha-grant <their-agent-DID>` here,",
+                    "then `/storacha-join <upload-b64> <name-b64>` on the other device.",
                 ].join("\n"),
             };
         },
     });
     api.registerCommand({
-        name: "storacha-delegate",
-        description: "Import a delegation to sync with a Storacha space",
+        name: "storacha-join",
+        description: "Join an existing Storacha workspace from another device. Usage: /storacha-join <upload-delegation-b64> <name-delegation-b64>",
         acceptsArgs: true,
-        handler: async (ctx) => {
+        handler: async (_ctx) => {
             const workspace = workspaceDir;
             if (!workspace)
                 return { text: "No workspace configured." };
-            const delegationB64 = ctx.args?.trim();
-            if (!delegationB64)
-                return { text: "Usage: /storacha-delegate <base64-delegation>" };
-            const config = await loadDeviceConfig(workspace);
-            if (!config)
-                return { text: "Not initialized. Run /storacha-init first." };
-            config.delegation = delegationB64;
+            const args = _ctx.args?.trim();
+            if (!args) {
+                return {
+                    text: [
+                        "Usage: `/storacha-join <upload-delegation-b64> <name-delegation-b64>`",
+                        "",
+                        "Get both delegations by running `/storacha-grant` on the existing device.",
+                        "If you're setting up a **new** workspace, use `/storacha-init` instead.",
+                    ].join("\n"),
+                };
+            }
+            const spaceIdx = args.indexOf(" ");
+            if (spaceIdx === -1) {
+                return {
+                    text: "Two arguments required: `/storacha-join <upload-b64> <name-b64>`",
+                };
+            }
+            const uploadB64 = args.slice(0, spaceIdx).trim();
+            const nameB64 = args.slice(spaceIdx + 1).trim();
+            if (!uploadB64 || !nameB64) {
+                return {
+                    text: "Two arguments required: `/storacha-join <upload-b64> <name-b64>`",
+                };
+            }
+            // Validate upload delegation
+            const uploadBytes = Buffer.from(uploadB64, "base64");
+            const { ok: uploadDelegation, error: uploadErr } = await extractDelegation(uploadBytes);
+            if (!uploadDelegation) {
+                return { text: `Invalid upload delegation: ${uploadErr}` };
+            }
+            // Validate name delegation
+            const nameBytes = Buffer.from(nameB64, "base64");
+            const { ok: nameDelegation, error: nameErr } = await extractDelegation(nameBytes);
+            if (!nameDelegation) {
+                return { text: `Invalid name delegation: ${nameErr}` };
+            }
+            const { Agent } = await import("@storacha/ucn/pail");
+            const agent = await Agent.generate();
+            const agentKey = Agent.format(agent);
+            const spaceDID = uploadDelegation.capabilities[0]?.with;
+            const config = {
+                agentKey,
+                uploadDelegation: uploadB64,
+                nameDelegation: nameB64,
+                spaceDID: spaceDID ?? undefined,
+                setupComplete: true,
+            };
             await saveDeviceConfig(workspace, config);
+            // Pull remote state immediately before watcher starts
+            let pullCount = 0;
+            try {
+                const storachaClient = await createStorachaClient(config);
+                const engine = new SyncEngine(storachaClient, workspace);
+                await engine.init(config);
+                pullCount = await engine.pullRemote();
+                // Save name archive after pull
+                const nameArchive = await engine.exportNameArchive();
+                config.nameArchive = nameArchive;
+                await saveDeviceConfig(workspace, config);
+            }
+            catch (err) {
+                return {
+                    text: [
+                        "\u26a0\ufe0f Delegations saved but initial pull failed:",
+                        `\`${err.message}\``,
+                        "",
+                        "Restart the gateway to retry.",
+                    ].join("\n"),
+                };
+            }
             return {
-                text: "✅ Delegation imported! Restart the gateway to start syncing.",
+                text: [
+                    "\u{1f525} Joined existing Storacha workspace!",
+                    `Agent DID: \`${agent.did()}\``,
+                    `Space: \`${spaceDID ?? "unknown"}\``,
+                    `Pulled ${pullCount} files from remote.`,
+                    "",
+                    "Restart the gateway to start syncing.",
+                ].join("\n"),
+            };
+        },
+    });
+    api.registerCommand({
+        name: "storacha-grant",
+        description: "Grant another device access. Usage: /storacha-grant <target-DID>",
+        acceptsArgs: true,
+        handler: async (_ctx) => {
+            const workspace = workspaceDir;
+            if (!workspace)
+                return { text: "No workspace configured." };
+            const targetDID = _ctx.args?.trim();
+            if (!targetDID || !targetDID.startsWith("did:")) {
+                return { text: "Usage: `/storacha-grant <did:key:z...>`" };
+            }
+            const config = await loadDeviceConfig(workspace);
+            if (!config) {
+                return {
+                    text: "Not initialized. Run `/storacha-init` or `/storacha-join` first.",
+                };
+            }
+            const results = [];
+            // Re-delegate upload capability
+            if (config.uploadDelegation) {
+                try {
+                    const storachaClient = await createStorachaClient(config);
+                    const audience = { did: () => targetDID };
+                    const uploadDelegation = await storachaClient.createDelegation(audience, [
+                        "space/blob/add",
+                        "space/index/add",
+                        "upload/add",
+                        "filecoin/offer",
+                    ]);
+                    const { ok: archiveBytes } = await uploadDelegation.archive();
+                    if (archiveBytes) {
+                        const b64 = Buffer.from(archiveBytes).toString("base64");
+                        results.push("**Upload delegation:**\n```\n" + b64 + "\n```");
+                    }
+                }
+                catch (err) {
+                    results.push(`\u274c Failed to create upload delegation: ${err.message}`);
+                }
+            }
+            else {
+                results.push("\u26a0\ufe0f No upload delegation to re-delegate.");
+            }
+            // Re-delegate name (pail sync) capability
+            if (config.nameDelegation) {
+                try {
+                    const { Agent, Name } = await import("@storacha/ucn/pail");
+                    const agent = Agent.parse(config.agentKey);
+                    let name;
+                    if (config.nameArchive) {
+                        const archiveBytes = Buffer.from(config.nameArchive, "base64");
+                        name = await Name.extract(agent, archiveBytes);
+                    }
+                    else {
+                        const nameBytes = Buffer.from(config.nameDelegation, "base64");
+                        const { ok: nameDel } = await extractDelegation(nameBytes);
+                        if (!nameDel) {
+                            results.push("\u274c Failed to extract name delegation.");
+                        }
+                        else {
+                            name = Name.from(agent, [nameDel]);
+                        }
+                    }
+                    if (name) {
+                        const nameDel = await name.grant(targetDID);
+                        const { ok: archiveBytes } = await nameDel.archive();
+                        if (archiveBytes) {
+                            const b64 = Buffer.from(archiveBytes).toString("base64");
+                            results.push("**Name delegation:**\n```\n" + b64 + "\n```");
+                        }
+                    }
+                }
+                catch (err) {
+                    results.push(`\u274c Failed to create name delegation: ${err.message}`);
+                }
+            }
+            else {
+                results.push("\u26a0\ufe0f No name delegation to re-delegate.");
+            }
+            if (results.length === 0) {
+                return { text: "Nothing to grant. Set up this device first." };
+            }
+            return {
+                text: [
+                    `\u{1f525} Delegations for \`${targetDID}\`:`,
+                    "",
+                    ...results,
+                    "",
+                    "The target device should run:",
+                    "`/storacha-join <upload-b64> <name-b64>`",
+                ].join("\n"),
             };
         },
     });
     api.registerCommand({
         name: "storacha-status",
         description: "Show Storacha sync status",
-        handler: async (ctx) => {
+        handler: async (_ctx) => {
             const workspace = workspaceDir;
             if (!workspace)
                 return { text: "No workspace configured." };
             const config = await loadDeviceConfig(workspace);
             if (!config)
-                return { text: "Not initialized. Run /storacha-init first." };
+                return {
+                    text: "Not initialized. Run /storacha-init or /storacha-join first.",
+                };
             const lines = [
-                "🔥 Storacha Sync Status",
+                "\u{1f525} Storacha Sync Status",
                 `Agent: configured`,
-                `Delegation: ${config.delegation ? "imported" : "not set"}`,
+                `Upload delegation: ${config.uploadDelegation ? "\u2705" : "\u274c not set"}`,
+                `Name delegation: ${config.nameDelegation ? "\u2705" : "\u274c not set"}`,
+                `Space DID: ${config.spaceDID ?? "unknown"}`,
                 `Name Archive: ${config.nameArchive ? "saved" : "not created"}`,
+                `Setup complete: ${config.setupComplete ? "\u2705" : "\u274c"}`,
             ];
             if (syncEngine) {
                 const status = await syncEngine.status();

package/dist/sync.d.ts

@@ -8,18 +8,20 @@
  * 5. Upload all blocks as CAR
  * 6. Apply remote changes to local filesystem
  */
-import type { SyncState, FileChange, DeviceConfig } from "./types.js";
-import { type PailEntries } from "./differ.js";
+import type { SyncState, FileChange, DeviceConfig } from "./types/index.js";
+import { type PailEntries } from "./utils/differ.js";
+import { Client } from "@storacha/client";
 export declare class SyncEngine {
     private workspace;
     private blocks;
     private name;
     private current;
     private pendingOps;
-    private allBlocks;
+    private carFile;
     private running;
     private lastSync;
-    constructor(workspace: string);
+    private storachaClient;
+    constructor(storachaClient: Client, workspace: string);
     /**
      * Initialize sync engine with device config
      */
@@ -35,7 +37,7 @@ export declare class SyncEngine {
     /**
      * Create CAR and upload to Storacha
      */
-    private uploadCAR;
+    private possiblyUploadCAR;
     /**
      * Get current pail entries as map
      */
@@ -44,6 +46,11 @@ export declare class SyncEngine {
      * Apply remote changes to local filesystem
      */
     private applyRemoteChanges;
+    /**
+     * Pull all remote state and write to local filesystem.
+     * Used by /storacha-join to overwrite local with remote before watcher starts.
+     */
+    pullRemote(): Promise<number>;
     status(): Promise<SyncState>;
     exportNameArchive(): Promise<string>;
     private storeBlocks;

package/dist/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAYH,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAU,YAAY,EAAE,MAAM,YAAY,CAAC;AAO9E,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAiBlE,qBAAa,UAAU;IACrB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,IAAI,CAAyB;IACrC,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,SAAS,CAAe;IAChC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAuB;gBAE3B,SAAS,EAAE,MAAM;IAK7B;;OAEG;IACG,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB/C;;OAEG;IACG,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqC1D;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA4H3B;;OAEG;YACW,SAAS;IAwCvB;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC;IAc5C;;OAEG;YACW,kBAAkB;IAsB1B,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;AAExE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,qBAAa,UAAU;IACrB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,IAAI,CAAyB;IACrC,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,cAAc,CAAS;gBAEnB,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAMrD;;OAEG;IACG,IAAI,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAgC/C;;OAEG;IACG,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAe1D;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAkD3B;;OAEG;YACW,iBAAiB;IAc/B;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC;IAc5C;;OAEG;YACW,kBAAkB;IAWhC;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IA0B7B,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC;IAW5B,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;YAM5B,WAAW;CAK1B"}