@toon-protocol/rig 2.13.2 → 3.0.0

package/dist/cli/rig.js

@@ -18,7 +18,7 @@ import {
   setHeadSymref,
   updateRef,
   writeGitObjects
-} from "../chunk-EEUHZNWS.js";
+} from "../chunk-FBIHO3RS.js";
 import {
   DEFAULT_KEYSTORE_PASSWORD,
   MinaZkAppStore,
@@ -33,15 +33,16 @@ import {
 } from "../chunk-FFQXFV4W.js";
 import {
   ChannelMapStore,
+  RIG_STANDALONE_ENV,
   channelStatus,
   defaultDaemonPort,
   resolveChannelPaths,
-  resolveConflictingPath
-} from "../chunk-FQXNLPUR.js";
+  resolveConflictingPath,
+  standaloneForced
+} from "../chunk-LCYCKWAT.js";
 import {
-  MAX_OBJECT_SIZE,
-  flooredUploadFee
-} from "../chunk-35ALWUDJ.js";
+  MAX_OBJECT_SIZE
+} from "../chunk-B5ISARMU.js";
 import {
   minaPresetForChain
 } from "../chunk-ACTH6ISJ.js";
@@ -199,6 +200,18 @@ var DaemonGitClient = class {
 };
 async function resolvePaidSession(options) {
   const fetchImpl = options.fetchImpl ?? fetch;
+  if (standaloneForced(options.env)) {
+    options.warn(
+      "rig: paid path: standalone (RIG_STANDALONE set \u2014 toon-clientd bypassed)"
+    );
+    const ctx2 = await options.loadStandalone({
+      env: options.env,
+      cwd: options.cwd,
+      warn: options.warn,
+      ...options.relayUrl !== void 0 ? { relayUrl: options.relayUrl } : {}
+    });
+    return { path: "standalone", ctx: ctx2 };
+  }
   const probe = await (options.probeDaemon ?? probeDaemon)(
     options.env,
     fetchImpl
@@ -1070,6 +1083,9 @@ async function runRemote(args, deps) {
 }
 
 // src/cli/push.ts
+function withForcedStandalone(deps) {
+  return { ...deps, env: { ...deps.env, [RIG_STANDALONE_ENV]: "1" } };
+}
 function loadPaidSession(deps, relayUrl) {
   return resolvePaidSession({
     env: deps.env,
@@ -1082,7 +1098,7 @@ function loadPaidSession(deps, relayUrl) {
   });
 }
 var defaultLoadStandalone = async (options) => {
-  const mod = await import("../standalone-mode-RG4PGALC.js");
+  const mod = await import("../standalone-mode-X6W2RLTE.js");
   return mod.createStandaloneContext(options);
 };
 function identityReport(ctx) {
@@ -1130,6 +1146,9 @@ Options:
                      as a fallback, with a migration nudge
   --repo-id <id>     repository id / NIP-34 d-tag (default: git config
                      toon.repoid \u2014 run \`rig init\` to set it)
+  --standalone       always run embedded, bypassing a running toon-clientd
+                     (alias: --no-daemon). Same as RIG_STANDALONE=1 \u2014 set that
+                     env var to make it the durable default
   -h, --help         show this help`;
 function noSuchRefMessage(spec, head, refs, remoteName) {
   const branches = refs.filter((r) => r.refname.startsWith("refs/heads/")).map((r) => r.refname.slice("refs/heads/".length));
@@ -1198,6 +1217,8 @@ function parsePushArgs(args) {
       json: { type: "boolean", default: false },
       relay: { type: "string", multiple: true },
       "repo-id": { type: "string" },
+      standalone: { type: "boolean", default: false },
+      "no-daemon": { type: "boolean", default: false },
       help: { type: "boolean", short: "h", default: false }
     },
     allowPositionals: true
@@ -1210,6 +1231,7 @@ function parsePushArgs(args) {
     yes: values.yes ?? false,
     json: values.json ?? false,
     relay: values.relay ?? [],
+    standalone: (values.standalone ?? false) || (values["no-daemon"] ?? false),
     help: values.help ?? false,
     positionals
   };
@@ -1233,7 +1255,10 @@ function planRigPointer(args) {
       entryJs: args.env[RIG_WEB_ENTRY_JS_ENV] ?? DEFAULT_RIG_WEB_BUNDLE.entryJs,
       entryCss: args.env[RIG_WEB_ENTRY_CSS_ENV] ?? DEFAULT_RIG_WEB_BUNDLE.entryCss
     },
-    gateway: (args.env[RIG_WEB_GATEWAY_ENV] ?? DEFAULT_RIG_WEB_GATEWAY).replace(/\/+$/, ""),
+    gateway: (args.env[RIG_WEB_GATEWAY_ENV] ?? DEFAULT_RIG_WEB_GATEWAY).replace(
+      /\/+$/,
+      ""
+    ),
     rigWebUrl: args.env[RIG_WEB_URL_ENV] ?? DEFAULT_RIG_WEB_URL,
     relay: args.relay,
     ownerNpub: hexToNpub(args.ownerPubkey),
@@ -1257,7 +1282,7 @@ function planRigPointer(args) {
     html,
     contentHash,
     bytes,
-    fee: flooredUploadFee(bytes, args.uploadFeePerByte, args.minUploadFee)
+    fee: args.uploadFee
   };
 }
 async function runPush(args, deps) {
@@ -1274,6 +1299,7 @@ async function runPush(args, deps) {
     io2.out(PUSH_USAGE);
     return 0;
   }
+  if (flags.standalone) deps = withForcedStandalone(deps);
   let standaloneCtx;
   try {
     const repoRoot = await resolveRepoRoot(deps.cwd);
@@ -1377,8 +1403,7 @@ async function runPush(args, deps) {
           ownerPubkey: ctx.ownerPubkey,
           repoId,
           relay: relaysUsed[0],
-          uploadFeePerByte: feeRates.uploadFeePerByte,
-          ...feeRates.minUploadFee !== void 0 ? { minUploadFee: feeRates.minUploadFee } : {}
+          uploadFee: feeRates.uploadFee
         });
       }
     } else {
@@ -1556,7 +1581,10 @@ async function runPush(args, deps) {
     const result = await execute();
     let rigPage;
     if (!pointerPlan) {
-      rigPage = { status: "skipped", ...rigPageSkipDetail ? { detail: rigPageSkipDetail } : {} };
+      rigPage = {
+        status: "skipped",
+        ...rigPageSkipDetail ? { detail: rigPageSkipDetail } : {}
+      };
     } else if (pointerPlan.action === "unchanged") {
       rigPage = {
         status: "unchanged",
@@ -3425,6 +3453,8 @@ var COMMON_FLAGS_USAGE = `  --repo-id <id>       repository id / NIP-34 d-tag (d
   --yes                skip the fee confirmation (required when not a TTY)
   --json               machine-readable receipt; without --yes it is a pure
                        estimate (nothing published, exit 0)
+  --standalone         always run embedded, bypassing a running toon-clientd
+                       (alias: --no-daemon; same as RIG_STANDALONE=1)
   -h, --help           show this help`;
 var ISSUE_USAGE = `Usage: rig issue create --title <title> [options]
 
@@ -3513,6 +3543,8 @@ var COMMON_OPTIONS = {
   remote: { type: "string" },
   "repo-id": { type: "string" },
   owner: { type: "string" },
+  standalone: { type: "boolean", default: false },
+  "no-daemon": { type: "boolean", default: false },
   help: { type: "boolean", short: "h", default: false }
 };
 function pickCommon(values) {
@@ -3520,6 +3552,7 @@ function pickCommon(values) {
     yes: values["yes"] === true,
     json: values["json"] === true,
     relay: Array.isArray(values["relay"]) ? values["relay"] : [],
+    standalone: values["standalone"] === true || values["no-daemon"] === true,
     help: values["help"] === true
   };
   const remote = values["remote"];
@@ -3534,7 +3567,8 @@ function pickCommon(values) {
   return flags;
 }
 async function runEvent(opts) {
-  const { command, flags, deps, actionLabel } = opts;
+  const { command, flags, actionLabel } = opts;
+  const deps = flags.standalone ? withForcedStandalone(opts.deps) : opts.deps;
   const { io: io2 } = deps;
   let standaloneCtx;
   try {
@@ -7209,7 +7243,12 @@ async function runSitePublish(args, deps) {
     const repoId = flags.repoId ?? toonConfig.repoId;
     if (!repoId) throw new UnconfiguredRepoAddressError("repository id");
     const reader = new GitRepoReader(repoRoot);
-    const selected = await selectRefspecs(reader, flags.positionals, false, false);
+    const selected = await selectRefspecs(
+      reader,
+      flags.positionals,
+      false,
+      false
+    );
     if (selected.length !== 1) {
       throw new Error(
         `rig site publish builds ONE ref into a site \u2014 got ${selected.length} (${selected.join(", ")}); pass a single branch or tag`
@@ -7284,7 +7323,7 @@ async function runSitePublish(args, deps) {
       }
     }
     const feeRates = await ctx.publisher.getFeeRates();
-    const { uploadFeePerByte, minUploadFee } = feeRates;
+    const { uploadFee } = feeRates;
     const previewEntries = blobs.map((b) => ({
       path: b.path,
       txId: known.get(b.sha) ?? PLACEHOLDER_TX
@@ -7300,16 +7339,9 @@ async function runSitePublish(args, deps) {
     if (flags.forceReupload) {
       const { objects } = await reader.statObjects(uniqueShas);
       reuploadBytes = objects.reduce((sum, o) => sum + o.size, 0);
-      reuploadFee = objects.reduce(
-        (sum, o) => sum + flooredUploadFee(o.size, uploadFeePerByte, minUploadFee),
-        0n
-      );
+      reuploadFee = BigInt(objects.length) * uploadFee;
     }
-    const manifestFee = flooredUploadFee(
-      manifestBytes,
-      uploadFeePerByte,
-      minUploadFee
-    );
+    const manifestFee = uploadFee;
     const totalFee = manifestFee + reuploadFee;
     const gateway = flags.gateway ?? deps.env["RIG_ARWEAVE_GATEWAY"] ?? DEFAULT_GATEWAY;
     const baseJson = () => ({
@@ -7330,10 +7362,14 @@ async function runSitePublish(args, deps) {
     if (!flags.json) {
       io2.out(`Site publish plan for ${ref} (repo ${repoId}):`);
       io2.out(`  files:    ${blobs.length}`);
-      io2.out(`  index:    ${flags.index}${pathSet.has(flags.index) ? "" : " (missing!)"}`);
+      io2.out(
+        `  index:    ${flags.index}${pathSet.has(flags.index) ? "" : " (missing!)"}`
+      );
       if (fallbackPath) io2.out(`  fallback: ${fallbackPath}`);
       if (flags.forceReupload) {
-        io2.out(`  re-upload ${uniqueShas.length} blob(s), ${reuploadBytes} bytes (paid)`);
+        io2.out(
+          `  re-upload ${uniqueShas.length} blob(s), ${reuploadBytes} bytes (paid)`
+        );
       }
       io2.out(`  manifest: ${manifestBytes} bytes`);
       io2.out(`  total fee: ${totalFee} base units`);
@@ -7452,7 +7488,12 @@ async function runSiteUrl(args, deps) {
     const repoId = flags.repoId ?? toonConfig.repoId;
     if (!repoId) throw new UnconfiguredRepoAddressError("repository id");
     const reader = new GitRepoReader(repoRoot);
-    const selected = await selectRefspecs(reader, flags.positionals, false, false);
+    const selected = await selectRefspecs(
+      reader,
+      flags.positionals,
+      false,
+      false
+    );
     if (selected.length !== 1) {
       throw new Error(
         `rig site url takes ONE ref \u2014 got ${selected.length} (${selected.join(", ")})`
@@ -7585,7 +7626,16 @@ goes to stderr), so \`rig <command> --json | jq\` always parses. --json is a
 per-subcommand flag on the commands rig owns, NOT a global rig flag: it does
 not apply to the git passthrough (\`rig status --json\` runs
 \`git status --json\`), and flags placed before the subcommand
-(\`rig --json status\`) pass through to git untouched.`;
+(\`rig --json status\`) pass through to git untouched.
+
+STANDALONE MODE: by default rig delegates paid commands to a running
+toon-clientd that holds the same identity (it owns the payment channel and its
+bootstrap is warm). To bypass the daemon and always sign for yourself, set
+RIG_STANDALONE=1 in your environment (the durable, applies-to-everything
+switch) or pass --standalone / --no-daemon to a paid command. rig then runs
+fully embedded; a per-identity lockfile still stops two rig processes from
+racing the channel. If a daemon is ALSO actively writing on this identity,
+stop it (its pid is in ~/.toon-client/daemon.pid) to avoid a claim race.`;
 function rigVersion() {
   const require2 = createRequire(import.meta.url);
   for (const rel of ["../package.json", "../../package.json", "../../../package.json"]) {