@memfork/cli 0.1.24 → 0.1.26

package/dist/commands/ops.js

@@ -14,26 +14,6 @@ async function getClient() {
     const client = await MemForksClient.connect(toClientConfig(cfg));
     return { client, cfg };
 }
-function isTransientSuiError(e) {
-    const msg = String(e);
-    return (msg.includes("needs to be rebuilt") ||
-        msg.includes("unavailable for consumption") ||
-        msg.includes("object version"));
-}
-async function withRetry(fn, retries = 2, delayMs = 1500) {
-    for (let attempt = 1;; attempt++) {
-        try {
-            return await fn();
-        }
-        catch (e) {
-            if (isTransientSuiError(e) && attempt < retries) {
-                await new Promise((r) => setTimeout(r, delayMs));
-                continue;
-            }
-            throw e;
-        }
-    }
-}
 function currentGitBranch() {
     try {
         return execSync("git rev-parse --abbrev-ref HEAD", { encoding: "utf8" }).trim();
@@ -132,7 +112,7 @@ export async function cmdCommit(opts) {
         console.error(chalk.red("No facts to commit. Pass --facts or --from-response."));
         process.exit(1);
     }
-    const { blobId } = await withRetry(() => client.commit(branch, { facts, message: opts.message }));
+    const { blobId } = await client.commit(branch, { facts, message: opts.message });
     const out = { blobId, branch };
     if (process.stdout.isTTY) {
         console.log("");
@@ -158,7 +138,7 @@ export async function cmdMerge(from, into, opts) {
     process.stdout.write(chalk.dim(`Merging ${chalk.green(from)} → ${chalk.green(into)}`) +
         chalk.dim(governed ? "  (governed — awaiting resolver…)" : "  (LWW — self-finalizing…)") +
         "  ");
-    const { digest, mergedCount, blobId, proposalId } = await withRetry(() => client.merge(from, into));
+    const { digest, mergedCount, blobId, proposalId } = await client.merge(from, into);
     console.log(chalk.green("done"));
     console.log("");
     console.log(chalk.dim(`  facts merged: ${mergedCount}`));
@@ -594,7 +574,7 @@ export async function cmdBranch(name, opts = {}) {
     const { client, cfg } = await getClient();
     const from = opts.from ?? cfg.defaultBranch ?? currentGitBranch();
     process.stdout.write(chalk.dim(`Creating branch ${chalk.green(name)} from ${chalk.green(from)} …  `));
-    const digest = await withRetry(() => client.branch(name, { from }));
+    const digest = await client.branch(name, { from });
     console.log(chalk.green("done"));
     console.log("");
     console.log(chalk.dim(`  tx: ${digest}`));

package/dist/commands/provision.js

@@ -19,6 +19,9 @@
  * to SuiJsonRpcClient, and the MemWal SDK's internal auto-init would fail on v2.
  */
 import chalk from "chalk";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
 import { confirm } from "@inquirer/prompts";
 import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519";
 import { decodeSuiPrivateKey } from "@mysten/sui/cryptography";
@@ -31,20 +34,48 @@ function step(n, msg) {
 }
 function done() { console.log(chalk.green("done")); }
 function skip(reason) { console.log(chalk.dim("skip  " + reason)); }
+function checkpointPath() {
+    return path.join(os.homedir(), ".memfork", ".pending-init.json");
+}
+function readCheckpoint() {
+    const p = checkpointPath();
+    try {
+        return JSON.parse(fs.readFileSync(p, "utf8"));
+    }
+    catch {
+        return null;
+    }
+}
+function saveCheckpoint(data) {
+    const p = checkpointPath();
+    fs.mkdirSync(path.dirname(p), { recursive: true });
+    fs.writeFileSync(p, JSON.stringify(data, null, 2), { mode: 0o600 });
+}
+function clearCheckpoint() {
+    try {
+        fs.unlinkSync(checkpointPath());
+    }
+    catch { /* already gone */ }
+}
 export async function autoProvision(opts) {
     const network = opts.network;
     const consts = MEMWAL_CONSTANTS[network];
     const rpcUrl = getJsonRpcFullnodeUrl(network);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const suiClient = new SuiJsonRpcClient({ transport: new JsonRpcHTTPTransport({ url: rpcUrl }), network });
+    // Load any checkpoint from a previous failed attempt.
+    const ckpt = readCheckpoint();
+    // If the checkpoint is for a different network, ignore it.
+    const cp = (ckpt?.network === network) ? ckpt : { network };
     // ── 1. Keypair ──────────────────────────────────────────────────────────────
     step(1, "Generating Sui keypair");
     let keypair;
-    if (opts.existingKey) {
-        keypair = opts.existingKey.startsWith("suiprivkey")
-            ? Ed25519Keypair.fromSecretKey(decodeSuiPrivateKey(opts.existingKey).secretKey)
-            : Ed25519Keypair.fromSecretKey(Uint8Array.from(Buffer.from(opts.existingKey, "hex")));
-        skip("reusing existing key");
+    const resumeKey = opts.existingKey ?? cp.privateKey;
+    if (resumeKey) {
+        keypair = resumeKey.startsWith("suiprivkey")
+            ? Ed25519Keypair.fromSecretKey(decodeSuiPrivateKey(resumeKey).secretKey)
+            : Ed25519Keypair.fromSecretKey(Uint8Array.from(Buffer.from(resumeKey, "hex")));
+        skip(cp.privateKey && !opts.existingKey ? "resuming from checkpoint" : "reusing existing key");
     }
     else {
         keypair = new Ed25519Keypair();
@@ -53,6 +84,11 @@ export async function autoProvision(opts) {
     const address = keypair.toSuiAddress();
     const privateKey = keypair.getSecretKey(); // bech32 suiprivkey1…
     console.log(chalk.dim(`      address: ${address}`));
+    // Save keypair to checkpoint so a retry can reuse the same key.
+    if (!cp.privateKey) {
+        cp.privateKey = privateKey;
+        saveCheckpoint(cp);
+    }
     // ── 2. Fund wallet ───────────────────────────────────────────────────────────
     // sponsorBase  = root URL, used for /drip and /sponsor paths.
     // sponsorEndpoint = full URL the MemForksClient POSTs to (no path appended internally).
@@ -73,7 +109,6 @@ export async function autoProvision(opts) {
         // Mainnet: drip covers the two MemWal calls (createAccount + addDelegateKey).
         // initTree (step 6) goes through /sponsor — the MemForksClient handles that path.
         step(2, "Requesting mainnet gas from MemForks sponsor");
-        // Normalise: strip a trailing /sponsor so the base URL is always path-free.
         sponsorBase = (process.env.MEMFORK_SPONSOR_URL ?? "https://memforks-sponsor-production.up.railway.app")
             .replace(/\/sponsor\/?$/, "");
         sponsorEndpoint = `${sponsorBase}/sponsor`;
@@ -104,57 +139,79 @@ export async function autoProvision(opts) {
         }
     }
     // ── 3. MemWal account ────────────────────────────────────────────────────────
-    step(3, "Creating MemWal account on-chain");
     let accountId;
-    try {
-        const result = await createAccount({
-            packageId: consts.packageId,
-            registryId: consts.registryId,
-            suiPrivateKey: privateKey,
-            suiClient,
-        });
-        accountId = result.accountId;
-        done();
+    if (cp.accountId) {
+        step(3, "Creating MemWal account on-chain");
+        skip("resuming from checkpoint");
+        accountId = cp.accountId;
         console.log(chalk.dim(`      accountId: ${accountId}`));
     }
-    catch (e) {
-        const msg = String(e);
-        if (msg.includes("EAccountAlreadyExists") || msg.includes("MoveAbort") && msg.includes(", 3)")) {
-            // Error code 3 = EAccountAlreadyExists — fine, just fetch the existing one.
-            console.log(chalk.dim("already exists"));
-            accountId = await resolveExistingMemwalAccount(suiClient, consts.packageId, address);
+    else {
+        step(3, "Creating MemWal account on-chain");
+        try {
+            const result = await createAccount({
+                packageId: consts.packageId,
+                registryId: consts.registryId,
+                suiPrivateKey: privateKey,
+                suiClient,
+            });
+            accountId = result.accountId;
+            done();
             console.log(chalk.dim(`      accountId: ${accountId}`));
         }
-        else {
-            console.log(chalk.red("failed"));
-            throw new Error(`MemWal account creation failed: ${msg}`);
+        catch (e) {
+            const msg = String(e);
+            if (msg.includes("EAccountAlreadyExists") || msg.includes("MoveAbort") && msg.includes(", 3)")) {
+                console.log(chalk.dim("already exists"));
+                accountId = await resolveExistingMemwalAccount(suiClient, consts.packageId, address);
+                console.log(chalk.dim(`      accountId: ${accountId}`));
+            }
+            else {
+                console.log(chalk.red("failed"));
+                throw new Error(`MemWal account creation failed: ${msg}`);
+            }
         }
+        cp.accountId = accountId;
+        saveCheckpoint(cp);
     }
     // ── 4 + 5. Delegate key ───────────────────────────────────────────────────────
-    step(4, "Generating MemWal delegate key");
-    const delegate = await generateDelegateKey();
-    done();
-    step(5, "Registering delegate key with MemWal");
-    try {
-        await addDelegateKey({
-            packageId: consts.packageId,
-            accountId,
-            publicKey: delegate.publicKey,
-            label: `memfork-cli-${new Date().toISOString().slice(0, 10)}`,
-            suiPrivateKey: privateKey,
-            suiClient,
-        });
-        done();
+    let delegatePrivateKey;
+    if (cp.delegateKey) {
+        step(4, "Generating MemWal delegate key");
+        skip("resuming from checkpoint");
+        step(5, "Registering delegate key with MemWal");
+        skip("resuming from checkpoint");
+        delegatePrivateKey = cp.delegateKey;
     }
-    catch (e) {
-        const msg = String(e);
-        if (msg.includes("EDelegateKeyAlreadyExists") || msg.includes("MoveAbort") && msg.includes(", 0)")) {
-            skip("key already registered");
+    else {
+        step(4, "Generating MemWal delegate key");
+        const delegate = await generateDelegateKey();
+        done();
+        delegatePrivateKey = delegate.privateKey;
+        step(5, "Registering delegate key with MemWal");
+        try {
+            await addDelegateKey({
+                packageId: consts.packageId,
+                accountId,
+                publicKey: delegate.publicKey,
+                label: `memfork-cli-${new Date().toISOString().slice(0, 10)}`,
+                suiPrivateKey: privateKey,
+                suiClient,
+            });
+            done();
         }
-        else {
-            console.log(chalk.red("failed"));
-            throw new Error(`Failed to register delegate key: ${msg}`);
+        catch (e) {
+            const msg = String(e);
+            if (msg.includes("EDelegateKeyAlreadyExists") || msg.includes("MoveAbort") && msg.includes(", 0)")) {
+                skip("key already registered");
+            }
+            else {
+                console.log(chalk.red("failed"));
+                throw new Error(`Failed to register delegate key: ${msg}`);
+            }
         }
+        cp.delegateKey = delegatePrivateKey;
+        saveCheckpoint(cp);
     }
     // ── 6. MemoryTree ────────────────────────────────────────────────────────────
     step(6, "Creating MemoryTree on Sui");
@@ -163,19 +220,15 @@ export async function autoProvision(opts) {
         signer: privateKey,
         network,
         packageId: consts.memforksPackageId,
-        // sponsorEndpoint is the full POST URL — MemForksClient appends no path.
         ...(sponsorEndpoint ? { sponsorUrl: sponsorEndpoint } : {}),
         memwal: {
             accountId,
-            delegateKey: delegate.privateKey,
+            delegateKey: delegatePrivateKey,
             serverUrl: consts.relayer,
         },
     });
     let treeId;
     let digest;
-    // Retry once on a transient gas-coin version race: the sponsor refreshes its
-    // pool after the drip, but if initTree lands before that completes the
-    // fullnode may report a stale-object error. A short wait + retry clears it.
     const maxAttempts = 2;
     for (let attempt = 1;; attempt++) {
         try {
@@ -194,8 +247,8 @@ export async function autoProvision(opts) {
             console.log(chalk.red("failed"));
             if (msg.includes("429") || msg.toLowerCase().includes("rate limit")) {
                 throw new Error("Sponsor rate limit hit for init_tree (1/IP/day).\n" +
-                    "Wait 24 h and run `memfork init --quick` again, or fund the wallet manually:\n" +
-                    `  ${address}`);
+                    "Wait 24 h and run `memfork init --quick` again to resume — your keypair and\n" +
+                    "MemWal account are already saved and will be reused automatically.");
             }
             if (msg.includes("Sponsor error: 404")) {
                 throw new Error(`Sponsor endpoint not reachable (${sponsorEndpoint}).\n` +
@@ -210,11 +263,13 @@ export async function autoProvision(opts) {
     done();
     console.log(chalk.dim(`      treeId: ${treeId}`));
     console.log(chalk.dim(`      tx:     ${digest}`));
+    // All steps succeeded — clear the checkpoint.
+    clearCheckpoint();
     return {
         treeId,
         privateKey,
         memwalAccountId: accountId,
-        memwalKey: delegate.privateKey,
+        memwalKey: delegatePrivateKey,
         network,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memfork/cli",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "description": "MemForks CLI — init, commit, recall, merge, install plugins",
   "repository": {
     "type": "git",
@@ -35,7 +35,7 @@
   ],
   "dependencies": {
     "@inquirer/prompts": "^8.5.2",
-    "@memfork/core": "^0.1.10",
+    "@memfork/core": "^0.1.11",
     "chalk": "^5.6.2",
     "commander": "^15.0.0"
   },