@tempoxyz/patron 0.0.29 → 0.0.30

package/dist/bin.js

@@ -1,17 +1,25 @@
 #!/usr/bin/env node
 import { createRequire as __patronCreateRequire } from 'node:module'
 const require = __patronCreateRequire(import.meta.url)
+import {
+  inferHome
+} from "./chunks/chunk-NDBTADXZ.js";
+import "./chunks/chunk-GTMLTZRN.js";
 
 // src/bin.ts
+if (!process.env.PATRON_HOME) {
+  const home = inferHome(process.argv[1]);
+  if (home) process.env.PATRON_HOME = home;
+}
 if (process.argv[2] === "hook") {
-  const { runHookProcess } = await import("./chunks/hook-process-6WSLYXC7.js");
+  const { runHookProcess } = await import("./chunks/hook-process-ETJ3UZZT.js");
   await runHookProcess().catch(() => void 0);
   process.exit(0);
 } else if (process.argv[2] === "pay") {
-  const { runPayProcess } = await import("./chunks/hook-process-6WSLYXC7.js");
+  const { runPayProcess } = await import("./chunks/hook-process-ETJ3UZZT.js");
   await runPayProcess().catch(() => void 0);
   process.exit(0);
 } else {
-  const { run } = await import("./chunks/-OLVAZG3H.js");
+  const { run } = await import("./chunks/-WRUP4P4C.js");
   process.exitCode = await run(process.argv.slice(2));
 }

package/dist/chunks/{-OLVAZG3H.js → -WRUP4P4C.js}

@@ -21,7 +21,9 @@ import {
   purchasableTokens,
   readJsonObject,
   redeem,
+  refillSize,
   removeCodex,
+  storedIssuer,
   tipTokens,
   upgradeCodex,
   withHooksKey,
@@ -29,41 +31,44 @@ import {
   withPatronStatus,
   withoutPatronHandlers,
   writeJsonObject
-} from "./chunk-SAEZ54SS.js";
+} from "./chunk-4SXIRXUL.js";
 import {
+  awaitRedemptions,
+  gatewayTurn,
   startRefill
-} from "./chunk-3CYJJJR3.js";
+} from "./chunk-TC2WEQ25.js";
 import {
+  inferHome,
   resolveSettings,
   settingsFor
-} from "./chunk-OQXACACU.js";
+} from "./chunk-NDBTADXZ.js";
 import {
-  AGENT_IDS,
   LeaderboardResponse,
   PatronInfo,
-  ensureHome,
-  profileMessage,
-  readConfig,
-  readJson,
-  readUsage,
-  statePaths,
-  updateUsage,
-  writeConfig,
-  writePrivateFile
-} from "./chunk-ZOQJ4CZE.js";
+  profileMessage
+} from "./chunk-ROVOCDKE.js";
 import {
+  AGENT_IDS,
   DEFAULT_MONTHLY_BUDGET_USD,
   MAX_TOKENS_PER_PAGE,
   MIN_TOKENS_PER_PAGE,
   PACK_SIZE,
   TOKEN_PRICE_UNITS,
   clampTokensPerPage,
+  ensureHome,
   formatUsd,
   normalizePayee,
+  readConfig,
+  readJson,
+  readUsage,
+  statePaths,
   tokensToUnits,
   tryLock,
-  withLock
-} from "./chunk-EISHX7Q3.js";
+  updateUsage,
+  withLock,
+  writeConfig,
+  writePrivateFile
+} from "./chunk-AKOXBXV3.js";
 import "./chunk-GTMLTZRN.js";
 
 // src/index.ts
@@ -362,9 +367,9 @@ import { basename, dirname as dirname3, join as join4 } from "node:path";
 function stableBin(home) {
   return join4(home, "cli", "current", "dist", "bin.js");
 }
-async function installStableCli(home, script = process.argv[1]) {
+async function installStableCli(home, script = process.argv[1], anySource = process.platform === "win32" && Boolean(process.env.PATRON_HOME)) {
   const resolved = script ? await realpath(script).catch(() => void 0) : void 0;
-  if (!resolved || !/[/\\]_npx[/\\]/.test(resolved) || basename(resolved) !== "bin.js")
+  if (!resolved || !anySource && !/[/\\]_npx[/\\]/.test(resolved) || basename(resolved) !== "bin.js")
     return void 0;
   const packageDir = dirname3(dirname3(resolved));
   const { version } = JSON.parse(await readFile3(join4(packageDir, "package.json"), "utf8"));
@@ -549,23 +554,45 @@ function failure(agent, error) {
     state: "failed"
   };
 }
-async function hookCommand(env = process.env, script = process.argv[1], node = process.execPath, patronHome = env.PATRON_HOME || join5(homedir(), ".patron")) {
+async function hookCommand(env = process.env, script = process.argv[1], node = process.execPath, patronHome = env.PATRON_HOME || join5(homedir(), ".patron"), platform = process.platform) {
   if (env.PATRON_HOOK_COMMAND) return env.PATRON_HOOK_COMMAND;
-  return withPatronHome(await runCommand(script, node, patronHome), env.PATRON_HOME);
-}
-async function runCommand(script, node, patronHome) {
+  const windows = platform === "win32";
+  const run2 = await runCommand(
+    script,
+    node,
+    patronHome,
+    windows && Boolean(env.PATRON_HOME),
+    platform
+  );
+  if (!env.PATRON_HOME || windows || await runsFromHome(run2.bin, patronHome))
+    return run2.command;
+  return withPatronHome(run2.command, env.PATRON_HOME);
+}
+async function runCommand(script, node, patronHome, preferCopy, platform) {
+  const run2 = (bin) => ({
+    bin,
+    command: `${quote(node, platform)} ${quote(bin, platform)} hook`
+  });
+  const stable = stableBin(patronHome);
+  if (preferCopy && await exists(stable)) return run2(stable);
   const resolved = script ? await realpath2(script).catch(() => void 0) : void 0;
   if (resolved && /[/\\]bin\.js$/.test(resolved) && !/[/\\]_npx[/\\]/.test(resolved))
-    return `${quote(node)} ${quote(resolved)} hook`;
-  if (await exists(stableBin(patronHome)))
-    return `${quote(node)} ${quote(stableBin(patronHome))} hook`;
-  return "npx -y @tempoxyz/patron hook";
+    return run2(resolved);
+  if (await exists(stable)) return run2(stable);
+  return { command: "npx -y @tempoxyz/patron hook" };
+}
+async function runsFromHome(bin, patronHome) {
+  const inferred = inferHome(bin);
+  if (!inferred) return false;
+  const real = (path) => realpath2(path).catch(() => resolve(path));
+  return await real(inferred) === await real(patronHome);
 }
 function withPatronHome(command, patronHome) {
   return patronHome ? `PATRON_HOME=${quote(resolve(patronHome))} ${command}` : command;
 }
-function quote(value) {
-  return /^[\w./:@-]+$/.test(value) ? value : `'${value.replaceAll("'", "'\\''")}'`;
+function quote(value, platform = process.platform) {
+  if (/^[\w./:@-]+$/.test(value)) return value;
+  return platform === "win32" ? `"${value}"` : `'${value.replaceAll("'", "'\\''")}'`;
 }
 async function exists(path) {
   return access2(path).then(
@@ -751,10 +778,10 @@ async function linkRefillFailedAt(home) {
 }
 var defaultOpenWallet = async (settings, config, issuer, maxUnits) => {
   if (config.wallet === "link") {
-    const { openLinkWallet } = await import("./wallet-LOLL66ID.js");
+    const { openLinkWallet } = await import("./wallet-OTFEEKIG.js");
     return openLinkWallet(config, maxUnits);
   }
-  const { openWallet } = await import("./wallet-LOLL66ID.js");
+  const { openWallet } = await import("./wallet-OTFEEKIG.js");
   return openWallet(settings, config.wallet, issuer, maxUnits);
 };
 var REFILL_LOCK_STALE_MS = 5 * 60 * 1e3;
@@ -794,23 +821,41 @@ async function delayedRefill(base, openWallet = defaultOpenWallet, sleep = (ms)
   if (!await readConfig(base.home)) return 0;
   const release = await tryLock(
     statePaths(base.home).refillWait,
-    REFILL_DELAY_MS.max + REFILL_LOCK_STALE_MS
+    REFILL_DELAY_MS.max + REFILL_GATEWAY_WAIT_MS + REFILL_LOCK_STALE_MS
   );
   if (!release) return 0;
   try {
     await sleep(
       REFILL_DELAY_MS.min + random() * (REFILL_DELAY_MS.max - REFILL_DELAY_MS.min)
     );
+    return await refill(base, openWallet, Date.now, sleep);
   } finally {
     await release();
   }
-  return refill(base, openWallet);
 }
-async function refill(base, openWallet = defaultOpenWallet, now = Date.now) {
+var REFILL_GATEWAY_WAIT_MS = 15 * 60 * 1e3;
+async function refill(base, openWallet = defaultOpenWallet, now = Date.now, sleep) {
   const config = await readConfig(base.home);
   if (!config || config.paused) return 0;
   const settings = settingsFor(base, config);
-  await loadIssuer(settings.home, settings.gatewayUrl).catch(() => void 0);
+  const stale = (await storedIssuer(settings.home, settings.gatewayUrl))?.stale ?? true;
+  const low = needsRefill(await new FileTokenStore(settings.home).count()) && await linkBackedOff(settings.home, config, now()) === false && await readUsage(settings.home).then(
+    (usage) => refillSize(config, usage) > 0,
+    () => true
+  );
+  if (!stale && !low) return 0;
+  const bought = await gatewayTurn(
+    settings.home,
+    async () => {
+      if (stale)
+        await loadIssuer(settings.home, settings.gatewayUrl).catch(() => void 0);
+      return low ? refillLocked(settings, config, openWallet, now) : 0;
+    },
+    { maxWaitMs: REFILL_GATEWAY_WAIT_MS, ...sleep ? { sleep } : {} }
+  );
+  return bought ?? 0;
+}
+async function refillLocked(settings, config, openWallet, now) {
   const release = await tryLock(
     statePaths(settings.home).refillLock,
     REFILL_LOCK_STALE_MS
@@ -820,8 +865,7 @@ async function refill(base, openWallet = defaultOpenWallet, now = Date.now) {
     if (!needsRefill(await new FileTokenStore(settings.home).count())) return 0;
     if (config.wallet !== "link")
       return await buyWithinBudget(settings, config, PACK_SIZE, openWallet);
-    const failedAt = await linkRefillFailedAt(settings.home);
-    if (failedAt !== void 0 && now() - failedAt < LINK_REFILL_BACKOFF_MS) return 0;
+    if (await linkBackedOff(settings.home, config, now())) return 0;
     const path = statePaths(settings.home).linkRefill;
     try {
       const bought = await buyWithinBudget(settings, config, PACK_SIZE, openWallet);
@@ -835,6 +879,11 @@ async function refill(base, openWallet = defaultOpenWallet, now = Date.now) {
     await release();
   }
 }
+async function linkBackedOff(home, config, now) {
+  if (config.wallet !== "link") return false;
+  const failedAt = await linkRefillFailedAt(home);
+  return failedAt !== void 0 && now - failedAt < LINK_REFILL_BACKOFF_MS;
+}
 
 // src/render.ts
 function tokensUsd(tokens) {
@@ -925,6 +974,33 @@ PATRON_WALLET=link (pay with Link through link-cli), PATRON_LINK_CLI (its path).
 var UsageError = class extends Error {
 };
 var TIP_BATCH = 8;
+var TIP_REDEEM_TIMEOUT_MS = 3e4;
+var TIP_BATCH_LEASE_MS = 6e4;
+async function inGatewayTurn(deps, fn) {
+  const result = await gatewayTurn(
+    deps.settings.home,
+    async () => ({ value: await fn() }),
+    {
+      ...waiting(deps),
+      onWait: (ms) => say(
+        deps,
+        styleText(
+          `  Waiting ${minutes(ms)} after your agents' last payment, so Patron can't link the two.`,
+          "dim",
+          deps.color
+        )
+      )
+    }
+  );
+  return result.value;
+}
+function waiting(deps) {
+  return deps.sleep ? { sleep: deps.sleep } : {};
+}
+function minutes(ms) {
+  const count = Math.max(1, Math.ceil(ms / 6e4));
+  return count === 1 ? "about a minute" : `about ${count} minutes`;
+}
 function defaults() {
   const interactive = Boolean(process.stdin.isTTY && process.stdout.isTTY);
   const color = supportsColor(process.stdout);
@@ -1086,10 +1162,13 @@ async function setup(deps) {
   const settings = deps.settings;
   say(deps, scrollBanner(VERSION, deps.color));
   say(deps);
-  const issuer = await loadIssuer(settings.home, settings.gatewayUrl, {
-    fetch: deps.fetch,
-    fresh: true
-  }).catch((error) => {
+  const issuer = await inGatewayTurn(
+    deps,
+    () => loadIssuer(settings.home, settings.gatewayUrl, {
+      fetch: deps.fetch,
+      fresh: true
+    })
+  ).catch((error) => {
     throw new Error(`Cannot reach Patron at ${settings.gatewayUrl}: ${error.message}`);
   });
   const budget = await askBudget(deps, DEFAULT_MONTHLY_BUDGET_USD);
@@ -1114,7 +1193,10 @@ async function setup(deps) {
   const starter = config.wallet === "link" ? PACK_SIZE : STARTER_TOKENS;
   const first = purchasableTokens(config, await readUsage(settings.home), starter);
   step(deps, `Adding ${tokensUsd(first)} to your balance`);
-  const bought = await buyWithinBudget(settings, config, starter, deps.openWallet);
+  const bought = await inGatewayTurn(
+    deps,
+    () => buyWithinBudget(settings, config, starter, deps.openWallet)
+  );
   done(deps, `${tokensUsd(bought)} ready to pay sites`);
   deps.startRefill();
   await installStableCli(settings.home).catch(() => void 0);
@@ -1163,7 +1245,7 @@ async function tempoSignIn(deps, budgetUnits, issuer) {
     deps,
     deps.settings.privateKey ? "Using PATRON_PRIVATE_KEY" : "Signing in with Tempo Wallet"
   );
-  const { signIn } = await import("./wallet-LOLL66ID.js");
+  const { signIn } = await import("./wallet-OTFEEKIG.js");
   const account = await signIn(deps.settings, {
     budgetUnits,
     issuer,
@@ -1277,7 +1359,7 @@ async function changeBudget(deps, input) {
   } else budget = await askBudget(deps, config.monthlyBudgetUsd);
   if (config.wallet === "tempo" && budget >= config.monthlyBudgetUsd) {
     step(deps, "Approve the new spending limit in Tempo Wallet");
-    const { authorizeBudget } = await import("./wallet-LOLL66ID.js");
+    const { authorizeBudget } = await import("./wallet-OTFEEKIG.js");
     const issuer = await loadIssuer(settings.home, settings.gatewayUrl, {
       fetch: deps.fetch
     });
@@ -1333,11 +1415,34 @@ async function tip(deps, url, amount = "0.10") {
       );
     const amount2 = Math.max(missing, purchasableTokens(config, usage, PACK_SIZE));
     step(deps, `Adding ${tokensUsd(amount2)} to your balance`);
-    await buyWithinBudget(settings, config, amount2, deps.openWallet);
+    await inGatewayTurn(
+      deps,
+      () => buyWithinBudget(settings, config, amount2, deps.openWallet)
+    );
   }
-  const issuer = await loadIssuer(settings.home, settings.gatewayUrl, {
-    fetch: deps.fetch
+  const issuer = (await storedIssuer(settings.home, settings.gatewayUrl))?.issuer ?? await inGatewayTurn(
+    deps,
+    () => loadIssuer(settings.home, settings.gatewayUrl, { fetch: deps.fetch, fresh: true })
+  );
+  const redeemFetch = (input, init) => deps.fetch(input, { ...init, signal: AbortSignal.timeout(TIP_REDEEM_TIMEOUT_MS) });
+  let told = false;
+  const claimBatch = (cancelled) => awaitRedemptions(settings.home, TIP_BATCH_LEASE_MS, {
+    ...waiting(deps),
+    ...cancelled ? { cancelled } : {},
+    onWait: (ms) => {
+      if (told) return;
+      told = true;
+      say(
+        deps,
+        styleText(
+          `  Waiting ${minutes(ms)} after a recent purchase, so Patron can't link it to this tip. Ctrl-C keeps your balance.`,
+          "dim",
+          deps.color
+        )
+      );
+    }
   });
+  await claimBatch();
   let stopped = false;
   const stop = () => {
     stopped = true;
@@ -1351,6 +1456,7 @@ async function tip(deps, url, amount = "0.10") {
   let rejection;
   try {
     while (sent < count && !stopped) {
+      if (sent > 0 && !await claimBatch(() => stopped)) break;
       const batch = await store.takeMany(Math.min(TIP_BATCH, count - sent));
       if (batch.length === 0) break;
       sent += batch.length;
@@ -1360,7 +1466,7 @@ async function tip(deps, url, amount = "0.10") {
         batch.map(
           (token) => redeem({
             domain,
-            fetch: deps.fetch,
+            fetch: redeemFetch,
             issuer,
             relayUrl: settings.relayUrl,
             token
@@ -1429,7 +1535,7 @@ async function setName(deps, name) {
   const issuer = await loadIssuer(settings.home, settings.gatewayUrl, {
     fetch: deps.fetch
   });
-  const open = deps.openWallet ?? (async (s, c, i, max) => (await import("./wallet-LOLL66ID.js")).openWallet(s, c.wallet, i, max));
+  const open = deps.openWallet ?? (async (s, c, i, max) => (await import("./wallet-OTFEEKIG.js")).openWallet(s, c.wallet, i, max));
   const wallet = await open(settings, config, issuer, 0n);
   await setProfile(settings.gatewayUrl, wallet, name, deps.fetch);
   await writeConfig(settings.home, { ...config, name });

package/dist/chunks/{chunk-HQ2ZLUTT.js → chunk-23MZSDN6.js}

@@ -3,7 +3,7 @@ const require = __patronCreateRequire(import.meta.url)
 import {
   isExcludedByDefault,
   normalizePayee
-} from "./chunk-EISHX7Q3.js";
+} from "./chunk-AKOXBXV3.js";
 
 // src/hook-input.ts
 var HOOK_TIMEOUT_MS = 2e3;

package/dist/chunks/{chunk-SAEZ54SS.js → chunk-4SXIRXUL.js}

@@ -3,22 +3,22 @@ const require = __patronCreateRequire(import.meta.url)
 import {
   IssueResponse,
   IssuerInfo,
-  RedeemResponse,
-  ensureHome,
-  readJson,
-  statePaths,
-  writePrivateFile
-} from "./chunk-ZOQJ4CZE.js";
+  RedeemResponse
+} from "./chunk-ROVOCDKE.js";
 import {
   ISSUER_NAME,
   MAX_TOKENS_PER_PURCHASE,
   PACK_SIZE,
   TOKEN_PRICE_UNITS,
   TOKEN_TYPE,
+  ensureHome,
   fromBase64Url,
+  readJson,
+  statePaths,
   toBase64Url,
-  withLock
-} from "./chunk-EISHX7Q3.js";
+  withLock,
+  writePrivateFile
+} from "./chunk-AKOXBXV3.js";
 import {
   __commonJS,
   __export,