@toon-protocol/rig 4.0.0 → 4.1.0

package/dist/cli/rig.js

@@ -18,7 +18,7 @@ import {
   setHeadSymref,
   updateRef,
   writeGitObjects
-} from "../chunk-ZZBA5VVL.js";
+} from "../chunk-7VCVR4GK.js";
 import {
   DEFAULT_KEYSTORE_PASSWORD,
   MissingIdentityError,
@@ -39,9 +39,10 @@ import {
   buildRepoAnnouncement,
   buildStatus,
   fetchRemoteState,
+  isValidEvmPayoutAddress,
   parseMaintainers,
   queryRelay
-} from "../chunk-2KJJ7LSO.js";
+} from "../chunk-NCEMQUPA.js";
 import {
   ChannelMapStore,
   RIG_STANDALONE_ENV,
@@ -1110,7 +1111,7 @@ function loadPaidSession(deps, relayUrl) {
   });
 }
 var defaultLoadStandalone = async (options) => {
-  const mod = await import("../standalone-mode-LEAC4A2L.js");
+  const mod = await import("../standalone-mode-KTYRTUS6.js");
   return mod.createStandaloneContext(options);
 };
 function identityReport(ctx) {
@@ -5498,33 +5499,10 @@ async function runInit(args, deps) {
 
 // src/cli/maintainers.ts
 import { parseArgs as parseArgs14 } from "util";
-var HEX64_RE3 = /^[0-9a-f]{64}$/;
-var WS_URL_RE4 = /^wss?:\/\//i;
-var MAINTAINERS_USAGE = `Usage: rig maintainers <list|add|remove> [<pubkey>] [options]
-
-Manage a repo's declared maintainers (#287). Status authority is consumer-side:
-rig and rig-web honor an issue/PR status (kind:1630-1633) ONLY when its author
-is the repo owner or a declared maintainer. The owner is always an implicit
-maintainer; this command edits the explicit set on the kind:30617 announcement.
-
-Subcommands:
-  list             show the owner + declared maintainers \u2014 FREE (relay read)
-  add <pubkey>     add a maintainer (npub or 64-char hex) \u2014 PAID: republishes
-                   the kind:30617 (permanent, non-refundable)
-  remove <pubkey>  remove a maintainer \u2014 PAID: republishes the kind:30617
-
-add/remove must run under the repo OWNER's identity (only the owner's
-announcement is authoritative).
 
-Options:
-  --repo-id <id>       repository id / NIP-34 d-tag (default: git config)
-  --owner <pubkey>     repository owner (npub or hex; default: git config)
-  --remote <name>      publish/read via this configured git remote (default: origin)
-  --relay <url>        ad-hoc relay override (exactly one for add/remove)
-  --yes                skip the fee confirmation (required when not a TTY)
-  --json               machine-readable envelope
-  -h, --help           show this help`;
-var MAINT_OPTIONS = {
+// src/cli/repo-command.ts
+var WS_URL_RE4 = /^wss?:\/\//i;
+var REPO_COMMAND_OPTIONS = {
   json: { type: "boolean", default: false },
   yes: { type: "boolean", default: false },
   relay: { type: "string", multiple: true },
@@ -5533,7 +5511,7 @@ var MAINT_OPTIONS = {
   owner: { type: "string" },
   help: { type: "boolean", short: "h", default: false }
 };
-function pickFlags(values) {
+function pickRepoCommandFlags(values) {
   const flags = {
     json: values["json"] === true,
     yes: values["yes"] === true,
@@ -5546,7 +5524,7 @@ function pickFlags(values) {
     flags.owner = ownerToHex(values["owner"]);
   return flags;
 }
-async function resolveContext(flags, deps) {
+async function resolveRepoContext(flags, deps) {
   let repoRoot;
   let toonConfig = {
     relays: []
@@ -5575,6 +5553,33 @@ async function resolveContext(flags, deps) {
     ...repoRoot !== void 0 ? { repoRoot } : {}
   };
 }
+
+// src/cli/maintainers.ts
+var HEX64_RE3 = /^[0-9a-f]{64}$/;
+var MAINTAINERS_USAGE = `Usage: rig maintainers <list|add|remove> [<pubkey>] [options]
+
+Manage a repo's declared maintainers (#287). Status authority is consumer-side:
+rig and rig-web honor an issue/PR status (kind:1630-1633) ONLY when its author
+is the repo owner or a declared maintainer. The owner is always an implicit
+maintainer; this command edits the explicit set on the kind:30617 announcement.
+
+Subcommands:
+  list             show the owner + declared maintainers \u2014 FREE (relay read)
+  add <pubkey>     add a maintainer (npub or 64-char hex) \u2014 PAID: republishes
+                   the kind:30617 (permanent, non-refundable)
+  remove <pubkey>  remove a maintainer \u2014 PAID: republishes the kind:30617
+
+add/remove must run under the repo OWNER's identity (only the owner's
+announcement is authoritative).
+
+Options:
+  --repo-id <id>       repository id / NIP-34 d-tag (default: git config)
+  --owner <pubkey>     repository owner (npub or hex; default: git config)
+  --remote <name>      publish/read via this configured git remote (default: origin)
+  --relay <url>        ad-hoc relay override (exactly one for add/remove)
+  --yes                skip the fee confirmation (required when not a TTY)
+  --json               machine-readable envelope
+  -h, --help           show this help`;
 async function runMaintainers(args, deps) {
   const { io: io2 } = deps;
   const [sub, ...rest] = args;
@@ -5604,13 +5609,13 @@ async function runList2(args, deps) {
   try {
     const { values, positionals } = parseArgs14({
       args,
-      options: MAINT_OPTIONS,
+      options: REPO_COMMAND_OPTIONS,
       allowPositionals: true
     });
     if (positionals.length > 0) {
       throw new Error("rig maintainers list takes no positional arguments");
     }
-    flags = pickFlags(values);
+    flags = pickRepoCommandFlags(values);
   } catch (err) {
     io2.err(err instanceof Error ? err.message : String(err));
     io2.err(MAINTAINERS_USAGE);
@@ -5621,7 +5626,7 @@ async function runList2(args, deps) {
     return 0;
   }
   try {
-    const ctx = await resolveContext(flags, deps);
+    const ctx = await resolveRepoContext(flags, deps);
     const wsRelays = ctx.relays.filter((url) => WS_URL_RE4.test(url));
     if (wsRelays.length === 0) {
       throw new InvalidRelayUrlError(
@@ -5671,10 +5676,10 @@ async function runMutate(op, args, deps) {
   try {
     const { values, positionals } = parseArgs14({
       args,
-      options: MAINT_OPTIONS,
+      options: REPO_COMMAND_OPTIONS,
       allowPositionals: true
     });
-    flags = pickFlags(values);
+    flags = pickRepoCommandFlags(values);
     if (flags.help) {
       io2.out(MAINTAINERS_USAGE);
       return 0;
@@ -5693,7 +5698,7 @@ async function runMutate(op, args, deps) {
   }
   let standaloneCtx;
   try {
-    const ctx = await resolveContext(flags, deps);
+    const ctx = await resolveRepoContext(flags, deps);
     if (ctx.relays.length > 1) {
       io2.err(singleRelayRefusal(ctx.resolved, "Nothing was published or paid."));
       return 1;
@@ -5748,7 +5753,13 @@ async function runMutate(op, args, deps) {
     const next = op === "add" ? [...current, pubkey] : current.filter((m) => m !== pubkey);
     const name = remote.name ?? ctx.repoId;
     const description = remote.description ?? "";
-    const event = buildRepoAnnouncement(ctx.repoId, name, description, next);
+    const event = buildRepoAnnouncement(
+      ctx.repoId,
+      name,
+      description,
+      next,
+      remote.payout
+    );
     const fee = (await standaloneCtx.publisher.getFeeRates()).eventFee.toString();
     const action = `kind:30617 maintainers ${op} ${pubkey.slice(0, 8)}\u2026`;
     if (!flags.json) {
@@ -6885,8 +6896,285 @@ async function runName(args, deps) {
   }
 }
 
-// src/cli/site.ts
+// src/cli/payout.ts
 import { parseArgs as parseArgs16 } from "util";
+import { getAddress } from "viem";
+var PAYOUT_USAGE = `Usage: rig payout <set|clear|show> [<address>] [options]
+
+Manage a repo's declared payout pointer (rig#92, part of the payout epic
+toon-protocol/toon-meta#391). No pointer on the kind:30617 announcement means
+a serving node keeps 100% of repo-scoped write fees; a pointer opts the repo
+into that node's declared ownerFeeShare split.
+
+Subcommands:
+  show             show the declared payout pointer \u2014 FREE (relay read)
+  set <address>    declare the payout pointer (EVM address, EIP-55
+                   checksummed or all-lowercase) \u2014 PAID: republishes the
+                   kind:30617 (permanent, non-refundable). v1 accepts evm
+                   addresses only.
+  clear            remove the payout pointer \u2014 PAID: republishes the
+                   kind:30617
+
+set/clear must run under the repo OWNER's identity (only the owner's
+announcement is authoritative).
+
+Options:
+  --repo-id <id>       repository id / NIP-34 d-tag (default: git config)
+  --owner <pubkey>     repository owner (npub or hex; default: git config)
+  --remote <name>      publish/read via this configured git remote (default: origin)
+  --relay <url>        ad-hoc relay override (exactly one for set/clear)
+  --yes                skip the fee confirmation (required when not a TTY)
+  --json               machine-readable envelope
+  -h, --help           show this help`;
+async function runPayout(args, deps) {
+  const { io: io2 } = deps;
+  const [sub, ...rest] = args;
+  switch (sub) {
+    case "show":
+      return runShow2(rest, deps);
+    case "set":
+      return runMutate2("set", rest, deps);
+    case "clear":
+      return runMutate2("clear", rest, deps);
+    case "--help":
+    case "-h":
+    case "help":
+      io2.out(PAYOUT_USAGE);
+      return 0;
+    default:
+      io2.err(
+        sub === void 0 ? "missing subcommand: rig payout <set|clear|show>" : `unknown rig payout subcommand: ${sub}`
+      );
+      io2.err(PAYOUT_USAGE);
+      return 2;
+  }
+}
+async function runShow2(args, deps) {
+  const { io: io2 } = deps;
+  let flags;
+  try {
+    const { values, positionals } = parseArgs16({
+      args,
+      options: REPO_COMMAND_OPTIONS,
+      allowPositionals: true
+    });
+    if (positionals.length > 0) {
+      throw new Error("rig payout show takes no positional arguments");
+    }
+    flags = pickRepoCommandFlags(values);
+  } catch (err) {
+    io2.err(err instanceof Error ? err.message : String(err));
+    io2.err(PAYOUT_USAGE);
+    return 2;
+  }
+  if (flags.help) {
+    io2.out(PAYOUT_USAGE);
+    return 0;
+  }
+  try {
+    const ctx = await resolveRepoContext(flags, deps);
+    const wsRelays = ctx.relays.filter((url) => WS_URL_RE4.test(url));
+    if (wsRelays.length === 0) {
+      throw new InvalidRelayUrlError(
+        ctx.relays[0] ?? "",
+        "reads need a ws:// or wss:// relay"
+      );
+    }
+    const remote = await fetchRemoteState({
+      relayUrls: wsRelays,
+      ownerPubkey: ctx.owner,
+      repoId: ctx.repoId,
+      ...deps.webSocketFactory ? { webSocketFactory: deps.webSocketFactory } : {}
+    });
+    const payout = remote.payout;
+    if (flags.json) {
+      io2.emitJson({
+        command: "payout show",
+        repoAddr: { ownerPubkey: ctx.owner, repoId: ctx.repoId },
+        announced: remote.announced,
+        payout
+      });
+      return 0;
+    }
+    io2.out(`Repo:   30617:${ctx.owner}:${ctx.repoId}`);
+    if (!remote.announced) {
+      io2.out("No kind:30617 announcement found \u2014 no payout pointer.");
+      return 0;
+    }
+    io2.out(
+      payout === null ? "Payout: none (the serving node keeps 100% of repo-scoped write fees)" : `Payout: ${payout.chain} ${payout.address}`
+    );
+    return 0;
+  } catch (err) {
+    return emitCliError(io2, flags.json, "payout show", err);
+  }
+}
+async function runMutate2(op, args, deps) {
+  const { io: io2 } = deps;
+  const command = `payout ${op}`;
+  let flags;
+  let nextPayout = null;
+  try {
+    const { values, positionals } = parseArgs16({
+      args,
+      options: REPO_COMMAND_OPTIONS,
+      allowPositionals: true
+    });
+    flags = pickRepoCommandFlags(values);
+    if (flags.help) {
+      io2.out(PAYOUT_USAGE);
+      return 0;
+    }
+    if (op === "set") {
+      if (positionals.length !== 1) {
+        throw new Error("expected exactly one <address> to set");
+      }
+      const raw = positionals[0];
+      if (!isValidEvmPayoutAddress(raw)) {
+        throw new Error(
+          `<address> must be a valid EVM address (0x + 40 hex chars, correctly EIP-55 checksummed if mixed-case) \u2014 got ${JSON.stringify(raw)}. See toon-meta#391 (payout epic): v1 accepts evm addresses only.`
+        );
+      }
+      nextPayout = { chain: "evm", address: getAddress(raw) };
+    } else if (positionals.length !== 0) {
+      throw new Error("rig payout clear takes no positional arguments");
+    }
+  } catch (err) {
+    io2.err(err instanceof Error ? err.message : String(err));
+    io2.err(PAYOUT_USAGE);
+    return 2;
+  }
+  let standaloneCtx;
+  try {
+    const ctx = await resolveRepoContext(flags, deps);
+    if (ctx.relays.length > 1) {
+      io2.err(singleRelayRefusal(ctx.resolved, "Nothing was published or paid."));
+      return 1;
+    }
+    const relayUrl = ctx.relays[0];
+    if (relayUrl === void 0 || !WS_URL_RE4.test(relayUrl)) {
+      throw new InvalidRelayUrlError(
+        relayUrl ?? "",
+        "a paid publish needs a ws:// or wss:// relay"
+      );
+    }
+    const load = deps.loadStandalone ?? defaultLoadStandalone;
+    standaloneCtx = await load({
+      env: deps.env,
+      cwd: deps.cwd,
+      warn: (line) => io2.err(line),
+      relayUrl
+    });
+    const identity = identityReport(standaloneCtx);
+    if (identity.pubkey.toLowerCase() !== ctx.owner.toLowerCase()) {
+      io2.err(
+        `rig: only the repo owner (${ctx.owner.slice(0, 8)}\u2026) can change the payout pointer \u2014 the active identity is ${identity.pubkey.slice(0, 8)}\u2026. A non-owner republish would write your own (ignored) announcement. Nothing was published or paid.`
+      );
+      return 1;
+    }
+    const remote = await fetchRemoteState({
+      relayUrls: [relayUrl],
+      ownerPubkey: ctx.owner,
+      repoId: ctx.repoId,
+      ...deps.webSocketFactory ? { webSocketFactory: deps.webSocketFactory } : {}
+    });
+    if (!remote.announced) {
+      io2.err(
+        `rig: 30617:${ctx.owner.slice(0, 8)}\u2026:${ctx.repoId} has no announcement yet \u2014 run \`rig push\` to publish the repo (with its real name/description) before managing the payout pointer. Nothing was published or paid.`
+      );
+      return 1;
+    }
+    const current = remote.payout;
+    if (nextPayout !== null && current !== null && current.chain === nextPayout.chain && current.address === nextPayout.address) {
+      io2.err(
+        `rig: payout is already set to ${current.chain} ${current.address} \u2014 nothing to do (not published).`
+      );
+      return 0;
+    }
+    if (op === "clear" && current === null) {
+      io2.err("rig: no payout pointer is set \u2014 nothing to do (not published).");
+      return 0;
+    }
+    const name = remote.name ?? ctx.repoId;
+    const description = remote.description ?? "";
+    const event = buildRepoAnnouncement(
+      ctx.repoId,
+      name,
+      description,
+      remote.maintainers,
+      nextPayout
+    );
+    const fee = (await standaloneCtx.publisher.getFeeRates()).eventFee.toString();
+    const action = nextPayout ? `kind:30617 payout set ${nextPayout.chain} ${nextPayout.address}` : "kind:30617 payout clear";
+    if (!flags.json) {
+      io2.out(`Republish ${action}`);
+      io2.out(`Repo: 30617:${ctx.owner}:${ctx.repoId}`);
+      io2.out(
+        `Payout after: ${nextPayout ? `${nextPayout.chain} ${nextPayout.address}` : "(none)"}`
+      );
+      io2.out(`Fee: ${feeLabel(fee)}. Writes are permanent and non-refundable.`);
+    }
+    if (!flags.yes) {
+      if (flags.json) {
+        io2.emitJson({
+          command,
+          repoAddr: { ownerPubkey: ctx.owner, repoId: ctx.repoId },
+          identity,
+          executed: false,
+          feeEstimate: fee,
+          payout: nextPayout,
+          hint: "estimate only \u2014 re-run with --yes to publish (permanent, non-refundable)"
+        });
+        return 0;
+      }
+      if (!io2.isInteractive) {
+        io2.err(
+          "refusing to spend channel funds without confirmation in a non-interactive session \u2014 re-run with --yes (or use --json for an estimate)"
+        );
+        return 1;
+      }
+      const proceed = await io2.confirm(
+        `Proceed with paid republish (${feeLabel(fee)})? [y/N] `
+      );
+      if (!proceed) {
+        io2.err("aborted \u2014 nothing was published.");
+        return 1;
+      }
+    }
+    const receipt = await standaloneCtx.publisher.publishEvent(event, [
+      relayUrl
+    ]);
+    const result = serializeEventReceipt(event.kind, receipt);
+    if (flags.json) {
+      io2.emitJson({
+        command,
+        repoAddr: { ownerPubkey: ctx.owner, repoId: ctx.repoId },
+        identity,
+        executed: true,
+        feeEstimate: fee,
+        payout: nextPayout,
+        result
+      });
+    } else {
+      io2.out(
+        `Published ${action}: ${result.eventId}  paid ${result.feePaid} base units`
+      );
+    }
+    return 0;
+  } catch (err) {
+    return emitCliError(io2, flags.json, command, err);
+  } finally {
+    if (standaloneCtx) {
+      try {
+        await standaloneCtx.stop();
+      } catch {
+      }
+    }
+  }
+}
+
+// src/cli/site.ts
+import { parseArgs as parseArgs17 } from "util";
 
 // src/arweave-manifest.ts
 var DEFAULT_INDEX = "index.html";
@@ -6977,7 +7265,7 @@ Options (publish):
                        estimate (nothing uploaded)
   -h, --help           show this help`;
 function parseSiteArgs(args) {
-  const { values, positionals } = parseArgs16({
+  const { values, positionals } = parseArgs17({
     args,
     options: {
       index: { type: "string" },
@@ -7389,6 +7677,10 @@ Commands rig owns:
   maintainers add <pubkey>   remove republish the kind:30617 to change who may
   maintainers remove <pubkey>  author authoritative issue/PR status (owner is
                              always an implicit maintainer)
+  payout show                show the repo's declared payout pointer (free);
+  payout set <address>       set/clear republish the kind:30617 \u2014 no pointer
+  payout clear               means the serving node keeps 100% of
+                             repo-scoped write fees (v1: evm addresses only)
   fund                       drip devnet faucet funds to this identity's
                              wallet (free); on other networks prints the
                              address(es) to fund externally
@@ -7396,10 +7688,11 @@ Commands rig owns:
                              (free \u2014 chain reads and local state only)
   chain [set <c>|unset]      choose which chain/USDC settles paid writes
                              (evm|sol|mina); free \u2014 reads/writes local config
-  entry [apex|sandbox|url]   choose the network entry node (payment ingress +
-                             relay): apex settles evm|sol|mina, sandbox is the
-                             Mina-only multihop demo path; free \u2014 writes local
-                             config and clears the cached topology
+  entry <url> | entry clear  choose the connector that prices and settles paid
+                             writes \u2014 one URL is the whole configuration, since
+                             its GET /ilp describes it; --relay <wss-url>
+                             records the free-read relay beside it; free \u2014
+                             writes local config
   name buy <name>            ArNS naming (#367): buy points a human name at an
   name set <name> <txId>     Arweave txId, owned + paid by this identity's
   name status <name>         Solana key. buy spends mARIO on Solana via the
@@ -7482,6 +7775,8 @@ async function dispatch(argv2, deps) {
       return runPr(rest, deps);
     case "maintainers":
       return runMaintainers(rest, deps);
+    case "payout":
+      return runPayout(rest, deps);
     case "channel":
       return runChannel(rest, deps);
     case "channels":
@@ -7573,6 +7868,7 @@ var RIG_OWNED_VERBS = /* @__PURE__ */ new Set([
   "comment",
   "pr",
   "maintainers",
+  "payout",
   "channel",
   "channels",
   "fund",