@toon-protocol/rig 2.5.0 → 2.6.0

package/dist/cli/rig.js

@@ -18,7 +18,7 @@ import {
   setHeadSymref,
   updateRef,
   writeGitObjects
-} from "../chunk-PTXKCR5R.js";
+} from "../chunk-NIRC5LFS.js";
 import {
   DEFAULT_KEYSTORE_PASSWORD,
   MissingIdentityError,
@@ -36,7 +36,7 @@ import {
 } from "../chunk-SW7ZHMGS.js";
 import {
   MAX_OBJECT_SIZE
-} from "../chunk-X2CZPPDM.js";
+} from "../chunk-B5ISARMU.js";
 import {
   COMMENT_KIND,
   authorizedStatusAuthors,
@@ -60,6 +60,9 @@ import { createRequire } from "module";
 import { parseArgs as parseArgs3 } from "util";
 
 // src/cli/daemon-session.ts
+function daemonSupportsGit(probe) {
+  return Array.isArray(probe.capabilities) && probe.capabilities.includes("git");
+}
 function daemonBaseUrl(env) {
   const raw = env["TOON_CLIENT_HTTP_PORT"];
   const parsed = raw ? Number(raw) : NaN;
@@ -84,6 +87,11 @@ async function probeDaemon(env, fetchImpl, timeoutMs = 1500) {
     if (typeof body?.feePerEvent === "string" && body.feePerEvent !== "") {
       probe.feePerEvent = body.feePerEvent;
     }
+    if (Array.isArray(body?.capabilities)) {
+      probe.capabilities = body.capabilities.filter(
+        (c) => typeof c === "string"
+      );
+    }
     return probe;
   } catch {
     return { baseUrl, reachable: false };
@@ -99,6 +107,19 @@ var DaemonRouteError = class extends Error {
   status;
   envelope;
 };
+var DaemonTooOldForGitError = class extends Error {
+  constructor(baseUrl, pubkey) {
+    const holds = pubkey !== void 0 && pubkey !== "" ? ` holds this identity (${pubkey.slice(0, 8)}\u2026)` : " holds this identity";
+    super(
+      `toon-clientd at ${baseUrl}${holds} but is too old to handle git operations (missing /git routes). Upgrade the daemon (npm i -g @toon-protocol/client-mcp@latest, then restart it) \u2014 or stop it to let rig run standalone.`
+    );
+    this.baseUrl = baseUrl;
+    this.pubkey = pubkey;
+    this.name = "DaemonTooOldForGitError";
+  }
+  baseUrl;
+  pubkey;
+};
 var DaemonUnreachableError = class extends Error {
   constructor(baseUrl, cause) {
     super(
@@ -110,12 +131,14 @@ var DaemonUnreachableError = class extends Error {
   baseUrl;
 };
 var DaemonGitClient = class {
-  constructor(baseUrl, fetchImpl) {
+  constructor(baseUrl, fetchImpl, pubkey) {
     this.baseUrl = baseUrl;
     this.fetchImpl = fetchImpl;
+    this.pubkey = pubkey;
   }
   baseUrl;
   fetchImpl;
+  pubkey;
   gitEstimate(req) {
     return this.post("/git/estimate", req);
   }
@@ -145,6 +168,9 @@ var DaemonGitClient = class {
     } catch (err) {
       throw new DaemonUnreachableError(this.baseUrl, err);
     }
+    if (res.status === 404) {
+      throw new DaemonTooOldForGitError(this.baseUrl, this.pubkey);
+    }
     const text = await res.text();
     let parsed;
     try {
@@ -175,12 +201,15 @@ async function resolvePaidSession(options) {
       warn: options.warn
     });
     if (identity.pubkey === probe.identity) {
+      if (!daemonSupportsGit(probe)) {
+        throw new DaemonTooOldForGitError(probe.baseUrl, identity.pubkey);
+      }
       options.warn(
         `rig: paid path: daemon \u2014 toon-clientd at ${probe.baseUrl} holds this identity (${identity.pubkey.slice(0, 8)}\u2026), delegating`
       );
       return {
         path: "daemon",
-        client: new DaemonGitClient(probe.baseUrl, fetchImpl),
+        client: new DaemonGitClient(probe.baseUrl, fetchImpl, identity.pubkey),
         baseUrl: probe.baseUrl,
         identity: {
           pubkey: identity.pubkey,
@@ -402,6 +431,18 @@ function describeError(err, command = "push") {
       json: { error: "daemon_unreachable", detail: err.message }
     };
   }
+  if (err instanceof DaemonTooOldForGitError) {
+    return {
+      code: "daemon_too_old_for_git",
+      lines: err.message.split("\n"),
+      json: {
+        error: "daemon_too_old_for_git",
+        detail: err.message,
+        baseUrl: err.baseUrl,
+        ...err.pubkey !== void 0 ? { pubkey: err.pubkey } : {}
+      }
+    };
+  }
   const name = err instanceof Error ? err.name : "";
   const message = err instanceof Error ? err.message : String(err);
   if (name === "DaemonIdentityConflictError") {
@@ -508,8 +549,9 @@ function renderPlan(plan) {
   for (const update of plan.refUpdates) lines.push(refLine(update));
   const est = plan.estimate;
   const skipped = Object.keys(plan.knownShaToTxId).length;
+  const emptySkipped = est.skippedEmptyCount ?? 0;
   lines.push(
-    `Objects: ${est.objectCount} to upload (${formatNumber(est.totalObjectBytes)} bytes)` + (skipped > 0 ? `; ${skipped} already on Arweave (free)` : "")
+    `Objects: ${est.objectCount} to upload (${formatNumber(est.totalObjectBytes)} bytes)` + (skipped > 0 ? `; ${skipped} already on Arweave (free)` : "") + (emptySkipped > 0 ? `; ${emptySkipped} empty blob${emptySkipped === 1 ? "" : "s"} skipped (reconstructed on clone)` : "")
   );
   lines.push("Fees (base units):");
   lines.push(
@@ -555,6 +597,12 @@ function renderResult(result) {
   lines.push(
     `Uploads: ${paid.length} paid, ${skipped.length} skipped (content-addressed).`
   );
+  const emptySkipped = result.estimate.skippedEmptyCount ?? 0;
+  if (emptySkipped > 0) {
+    lines.push(
+      `Empty blobs: ${emptySkipped} skipped (zero-byte, not uploaded \u2014 reconstructed on clone).`
+    );
+  }
   if (result.announceReceipt) {
     lines.push(
       `Announcement (kind:30617): ${result.announceReceipt.eventId}  paid ${formatNumber(result.announceReceipt.feePaid)}`
@@ -609,7 +657,12 @@ async function resolveRepoRoot(cwd) {
   }
 }
 async function initGitRepository(dir) {
-  await git(dir, ["init"]);
+  try {
+    await git(dir, ["init", "--initial-branch=main"]);
+  } catch {
+    await git(dir, ["init"]);
+    await git(dir, ["symbolic-ref", "HEAD", "refs/heads/main"]);
+  }
 }
 async function readToonConfig(repoPath) {
   const [repoId, owner, relays] = await Promise.all([
@@ -913,7 +966,7 @@ function loadPaidSession(deps, relayUrl) {
   });
 }
 var defaultLoadStandalone = async (options) => {
-  const mod = await import("../standalone-mode-BIFFNDH3.js");
+  const mod = await import("../standalone-mode-WEMJBHME.js");
   return mod.createStandaloneContext(options);
 };
 function identityReport(ctx) {
@@ -954,7 +1007,20 @@ Options:
   --repo-id <id>     repository id / NIP-34 d-tag (default: git config
                      toon.repoid \u2014 run \`rig init\` to set it)
   -h, --help         show this help`;
-async function selectRefspecs(reader, positionals, all, tags) {
+function noSuchRefMessage(spec, head, refs, remoteName) {
+  const branches = refs.filter((r) => r.refname.startsWith("refs/heads/")).map((r) => r.refname.slice("refs/heads/".length));
+  const current = head && head.startsWith("refs/heads/") ? head.slice("refs/heads/".length) : void 0;
+  let msg = `no local branch or tag ${JSON.stringify(spec)}`;
+  if (current) {
+    msg += ` \u2014 your current branch is ${JSON.stringify(current)} (did you mean \`rig push ${remoteName} ${current}\`?)`;
+  } else if (branches.length > 0) {
+    msg += ` \u2014 local branches: ${branches.join(", ")}`;
+  } else {
+    msg += " \u2014 this repository has no branches yet (make a commit first)";
+  }
+  return msg;
+}
+async function selectRefspecs(reader, positionals, all, tags, remoteName = "origin") {
   const { head, refs } = await reader.listRefs();
   const byName = new Set(refs.map((r) => r.refname));
   const selected = [];
@@ -968,10 +1034,12 @@ async function selectRefspecs(reader, positionals, all, tags) {
       add(`refs/heads/${spec}`);
     } else if (byName.has(`refs/tags/${spec}`)) {
       add(`refs/tags/${spec}`);
-    } else {
+    } else if (spec.startsWith(":")) {
       throw new Error(
-        `refspec ${JSON.stringify(spec)} matches no local branch or tag (ref deletion is out of scope in v1)`
+        `deleting remote refs (${JSON.stringify(spec)}) is out of scope in v1`
       );
+    } else {
+      throw new Error(noSuchRefMessage(spec, head, refs, remoteName));
     }
   }
   if (all) {
@@ -1068,7 +1136,8 @@ async function runPush(args, deps) {
       reader,
       refspecArgs,
       flags.all,
-      flags.tags
+      flags.tags,
+      remoteName ?? "origin"
     );
     const resolved = await resolveRelays({
       relayFlags: flags.relay,
@@ -3462,24 +3531,37 @@ import { join as join2 } from "path";
 import { parseArgs as parseArgs9 } from "util";
 var DEVNET_FAUCET_URL = "https://faucet.devnet.toonprotocol.dev";
 var CHAINS = ["evm", "solana", "mina"];
+var CHAIN_CHOICES = [...CHAINS, "all"];
+var NATIVE_COIN = {
+  evm: "ETH",
+  solana: "SOL",
+  mina: "MINA"
+};
 var FUND_USAGE = `Usage: rig fund [options]
 
 Drip devnet test funds to the active identity's wallet \u2014 free (the faucet
-pays). The identity comes from RIG_MNEMONIC (env or a project .env) or the
+pays). By default funds ALL supported chains (evm + solana + mina), each drip
+covering the native coin AND USDC, so the wallet matches the multi-chain
+\`rig balance\` view in one run. The per-chain drips run in parallel and are
+independent \u2014 one chain's faucet failing does not abort the others (exit 0
+only when every targeted chain funded; exit 1 if any failed, with the
+per-chain breakdown always shown).
+
+The identity comes from RIG_MNEMONIC (env or a project .env) or the
 ~/.toon-client keystore/config; the faucet from TOON_CLIENT_FAUCET_URL, the
 faucetUrl config field, or the deployed devnet faucet when the network is
 devnet \u2014 including when a configured *.devnet.toonprotocol.dev origin infers
 it (a devnet relay/proxy/btp endpoint, or the git origin remote from
 \`rig remote add origin <devnet relay>\`). The faucet drips a FIXED amount per
-chain (there is no --amount). On a
-network without a faucet, prints the wallet address(es) to fund externally
-instead.
+chain (there is no --amount). On a network without a faucet, prints the wallet
+address(es) to fund externally instead.
 
 Options:
-  --chain <chain>      evm | solana | mina (default: TOON_CLIENT_CHAIN, the
-                       \`chain\` config field, else evm)
+  --chain <chain>      evm | solana | mina | all \u2014 fund one chain, or all
+                       (default: all supported chains)
   --address <address>  fund this address instead of the identity's own
-  --json               machine-readable envelope
+                       (requires an explicit single --chain)
+  --json               machine-readable envelope (per-chain results array)
   -h, --help           show this help`;
 var SHARED_DEVNET_SUFFIX = ".devnet.toonprotocol.dev";
 function devnetHost(url) {
@@ -3573,9 +3655,14 @@ async function runFund(args, deps) {
     chainFlag = values.chain;
     addressFlag = values.address;
     json = values.json ?? false;
-    if (chainFlag !== void 0 && !CHAINS.includes(chainFlag)) {
+    if (chainFlag !== void 0 && !CHAIN_CHOICES.includes(chainFlag)) {
       throw new Error(
-        `--chain must be one of ${CHAINS.join(" | ")}, got ${JSON.stringify(chainFlag)}`
+        `--chain must be one of ${CHAIN_CHOICES.join(" | ")}, got ${JSON.stringify(chainFlag)}`
+      );
+    }
+    if (addressFlag !== void 0 && (chainFlag === void 0 || chainFlag === "all")) {
+      throw new Error(
+        "--address requires an explicit single --chain (evm | solana | mina) \u2014 a single address cannot fund every chain"
       );
     }
   } catch (err) {
@@ -3585,12 +3672,7 @@ async function runFund(args, deps) {
   }
   try {
     const { file } = readFundConfig(env);
-    const chain = chainFlag ?? env["TOON_CLIENT_CHAIN"] ?? file.chain ?? "evm";
-    if (!CHAINS.includes(chain)) {
-      throw new Error(
-        `configured settlement chain ${JSON.stringify(chain)} has no faucet \u2014 pass --chain ${CHAINS.join(" | ")}`
-      );
-    }
+    const targetChains = chainFlag === void 0 || chainFlag === "all" ? [...CHAINS] : [chainFlag];
     const network = env["TOON_CLIENT_NETWORK"] ?? file.network;
     const canInfer = network === void 0 || network === "custom";
     const originRelays = canInfer ? await resolveOriginRelays(deps.cwd) : [];
@@ -3626,7 +3708,6 @@ async function runFund(args, deps) {
           identity,
           funded: false,
           network: network ?? null,
-          chain,
           addresses,
           guidance
         });
@@ -3640,46 +3721,85 @@ async function runFund(args, deps) {
       io2.out(`  mina    ${addresses.mina ?? "(no key derived \u2014 optional mina-signer dependency missing)"}`);
       return 0;
     }
-    const address = addressFlag ?? addresses[chain];
-    if (!address) {
-      throw new Error(
-        `no ${chain} address could be derived for this identity \u2014 pass an explicit --address (for mina, install the optional mina-signer dependency)`
-      );
-    }
     const timeoutEnv = env["TOON_CLIENT_FAUCET_TIMEOUT_MS"];
-    const timeout = timeoutEnv && Number.isFinite(Number(timeoutEnv)) ? Number(timeoutEnv) : file.faucetTimeoutMs ?? (chain === "mina" ? 13e4 : 9e4);
+    const timeoutFor = (chain) => {
+      if (timeoutEnv && Number.isFinite(Number(timeoutEnv))) return Number(timeoutEnv);
+      if (file.faucetTimeoutMs !== void 0) return file.faucetTimeoutMs;
+      return chain === "mina" ? 13e4 : 9e4;
+    };
     if (!json && inferredDevnet) {
       io2.out(
         `Inferred network 'devnet' from the configured origin ${devnetOrigin} (network was ${JSON.stringify(network ?? "custom")}). Set TOON_CLIENT_NETWORK explicitly to override.`
       );
     }
     if (!json) {
+      const list = targetChains.join(", ");
       io2.out(
-        `Requesting ${chain} drip from ${faucetUrl} for ${address} \u2026` + (chain === "mina" ? " (mina settles slowly; this can take ~2 minutes)" : "")
+        `Requesting ${targetChains.length === 1 ? "" : "parallel "}drip${targetChains.length === 1 ? "" : "s"} from ${faucetUrl} for ${list} \u2026` + (targetChains.includes("mina") ? " (mina settles slowly; this can take ~2 minutes)" : "")
       );
     }
-    const { response } = await client.fundWallet(faucetUrl, address, chain, {
-      timeout,
-      ...deps.fetchImpl ? { fetchImpl: deps.fetchImpl } : {}
+    const singleChain = targetChains.length === 1;
+    const drips = targetChains.map(async (chain) => {
+      const address = (singleChain ? addressFlag : void 0) ?? addresses[chain];
+      if (!address) {
+        return {
+          chain,
+          funded: false,
+          address: null,
+          error: `no ${chain} address could be derived for this identity` + (chain === "mina" ? " (install the optional mina-signer dependency)" : "")
+        };
+      }
+      const started = Date.now();
+      try {
+        const { response } = await client.fundWallet(faucetUrl, address, chain, {
+          timeout: timeoutFor(chain),
+          ...deps.fetchImpl ? { fetchImpl: deps.fetchImpl } : {}
+        });
+        return {
+          chain,
+          funded: true,
+          address,
+          response,
+          elapsedMs: Date.now() - started
+        };
+      } catch (err) {
+        return {
+          chain,
+          funded: false,
+          address,
+          error: err instanceof Error ? err.message : String(err),
+          elapsedMs: Date.now() - started
+        };
+      }
     });
+    const results = await Promise.all(drips);
+    const allFunded = results.every((r) => r.funded);
     if (json) {
       io2.emitJson({
         command: "fund",
         identity,
-        funded: true,
+        funded: allFunded,
         network: effectiveNetwork ?? null,
-        chain,
-        address,
         faucetUrl,
-        response,
+        results,
         ...inferredDevnet ? { inferredDevnetFrom: devnetOrigin } : {}
       });
-      return 0;
+      return allFunded ? 0 : 1;
+    }
+    for (const r of results) {
+      const label = r.chain.padEnd(6);
+      const addr = r.address ? ` \u2192 ${r.address}` : "";
+      if (r.funded) {
+        const slow = r.elapsedMs !== void 0 && r.elapsedMs >= 5e3;
+        const time = slow ? ` (${Math.round(r.elapsedMs / 1e3)}s)` : "";
+        io2.out(`  ${label} \u2713 funded (${NATIVE_COIN[r.chain]} + USDC)${addr}${time}`);
+      } else {
+        io2.out(`  ${label} \u2717${addr} \u2014 ${r.error ?? "failed"}`);
+      }
     }
-    io2.out(`Faucet drip succeeded: ${chain} \u2192 ${address}`);
     io2.out(renderIdentityLine(identity));
     io2.out("Re-check with `rig balance` (a drip can take a few blocks to land).");
-    return 0;
+    return allFunded ? 0 : 1;
   } catch (err) {
     return emitCliError(io2, json, "fund", err);
   }