@heyanon-arp/cli 0.0.19 → 0.0.20

package/dist/cli.js

@@ -734,7 +734,7 @@ var import_simple_update_notifier = __toESM(require("simple-update-notifier"));
 // package.json
 var package_default = {
   name: "@heyanon-arp/cli",
-  version: "0.0.19",
+  version: "0.0.20",
   description: "Command-line client for the Agent Relationship Protocol \u2014 register agents, sign envelopes, run escrowed work cycles on Solana.",
   license: "MIT",
   keywords: ["arp", "agent-relationship-protocol", "did", "solana", "escrow", "ed25519", "agents", "a2a", "cli"],
@@ -1780,6 +1780,9 @@ var UNTIL_PHASES = [
 ];
 var WAIT_DEFAULT_INTERVAL_SEC = 3;
 var WAIT_DEFAULT_TIMEOUT_SEC = 300;
+var WAIT_ABS_MAX_SEC = 86400;
+var WAIT_CONTRACT_LAG_MARGIN_SEC = 300;
+var WAIT_CONTRACT_CAP_FALLBACK_SEC = 3600;
 function registerStatusCommand(root) {
   root.command("status").description("Where am I in the work cycle? FSM state + next-action hint for ONE relationship (signed reads)").argument("<relationship-id>", "Relationship UUID").option("--server <url>", "Override ARP server base URL").option("--from-did <did>", "Signer DID \u2014 required only if multiple agents are registered against this server").option("--from <name>", "Signer agent NAME (handle) \u2014 alternative to --from-did, resolved against your local agents").option("--json", "Machine-readable: single JSON object with the composed summary. Pipe-safe.", false).option(
     "--wait",
@@ -1787,7 +1790,7 @@ function registerStatusCommand(root) {
     false
   ).option(
     "--wait-timeout <seconds>",
-    `Max wall-clock seconds to wait when --wait is set (default ${WAIT_DEFAULT_TIMEOUT_SEC}). Process exits code 124 on timeout, matching the unix \`timeout\` convention.`,
+    `Max wall-clock seconds to wait when --wait is set (default ${WAIT_DEFAULT_TIMEOUT_SEC}; with --until it defaults to the live on-chain budget = work+review+dispute windows + margin, read from the contract). Capped at that same on-chain budget. Process exits code 124 on timeout (unix \`timeout\` convention).`,
     String(WAIT_DEFAULT_TIMEOUT_SEC)
   ).option(
     "--wait-interval <seconds>",
@@ -1823,9 +1826,9 @@ async function runStatus(relationshipId, opts) {
     console.log(formatStatusReport(summary));
     return;
   }
-  const waitTimeout = parseWaitTimeout(opts.waitTimeout);
-  const waitInterval = parseWaitInterval(opts.waitInterval);
   const until = parseUntilPhase(opts.until);
+  const waitInterval = parseWaitInterval(opts.waitInterval);
+  const waitTimeout = await resolveWaitTimeoutSec(api, opts.waitTimeout, { hasUntil: !!until });
   const outcome = await runWaitLoop({
     fetchSummary: () => composeStatus(api, sender.did, relationshipId, signer),
     waitIntervalSec: waitInterval,
@@ -1986,8 +1989,31 @@ function parseWaitTimeout(raw) {
   if (!Number.isFinite(n) || !Number.isInteger(n) || n <= 0) {
     throw new Error(`status: --wait-timeout must be a positive integer number of seconds (got '${raw}')`);
   }
-  if (n > 3600) {
-    throw new Error(`status: --wait-timeout must be <= 3600 seconds (1h). Got ${n}; if you really need to wait longer, script a loop around \`heyarp status\`.`);
+  if (n > WAIT_ABS_MAX_SEC) {
+    throw new Error(`status: --wait-timeout must be <= ${WAIT_ABS_MAX_SEC} seconds (24h, the max envelope TTL). Got ${n}.`);
+  }
+  return n;
+}
+function contractWaitCapSec(cfg) {
+  const w = Number(cfg?.workWindowSecs);
+  const r = Number(cfg?.reviewWindowSecs);
+  const d = Number(cfg?.disputeWindowSecs);
+  if (![w, r, d].every((n) => Number.isFinite(n) && n > 0)) return WAIT_CONTRACT_CAP_FALLBACK_SEC;
+  return Math.min(WAIT_ABS_MAX_SEC, w + r + d + WAIT_CONTRACT_LAG_MARGIN_SEC);
+}
+async function resolveWaitTimeoutSec(api, raw, opts) {
+  let cap;
+  try {
+    cap = contractWaitCapSec(await api.getEscrowConfig());
+  } catch {
+    cap = WAIT_CONTRACT_CAP_FALLBACK_SEC;
+  }
+  if (raw === void 0) return opts.hasUntil ? cap : WAIT_DEFAULT_TIMEOUT_SEC;
+  const n = parseWaitTimeout(raw);
+  if (n > cap) {
+    throw new Error(
+      `status: --wait-timeout ${n}s exceeds the live on-chain budget of ${cap}s (work+review+dispute windows + ${WAIT_CONTRACT_LAG_MARGIN_SEC}s lag, read from the contract). Nothing stays pending longer; lower it or script a loop around \`heyarp status\`.`
+    );
   }
   return n;
 }
@@ -2949,7 +2975,10 @@ function registerOffer(parent) {
   ).option(
     "--wait-until <phase>",
     'Block after delivery until the named FSM phase is reached (e.g. delegation.accepted). One of the UNTIL_PHASES from `heyarp status --help`. Exit code 124 on --wait-timeout. Recovers the "sub-agent exits before counterparty accepts" antipattern.'
-  ).option("--wait-timeout <seconds>", "When --wait-until is set: max wall-clock wait (default 300). Exit code 124 on timeout.").option("--wait-interval <seconds>", "When --wait-until is set: poll cadence (default 3, bound [1, 60]).").option(
+  ).option(
+    "--wait-timeout <seconds>",
+    "When --wait-until is set: max wall-clock wait. Omitted \u2192 auto-sized to the live on-chain budget (work+review+dispute windows + margin, read from the contract); explicit values are capped at that budget. Exit code 124 on timeout."
+  ).option("--wait-interval <seconds>", "When --wait-until is set: poll cadence (default 3, bound [1, 60]).").option(
     "--wait-verbose",
     'When --wait-until is set: emit one dim line per poll tick showing the current FSM state. Useful for "is it alive or stuck?" diagnosis on long blocks.',
     false
@@ -3174,7 +3203,8 @@ After the worker accepts, fund the escrow lock:`));
       relationshipId: result.relationshipId,
       untilPhase,
       waitIntervalSec: parseWaitInterval(opts.waitInterval),
-      waitTimeoutSec: parseWaitTimeout(opts.waitTimeout),
+      // Cap/default the wait against the live on-chain windows (work+review+dispute).
+      waitTimeoutSec: await resolveWaitTimeoutSec(api, opts.waitTimeout, { hasUntil: true }),
       waitVerbose: !!opts.waitVerbose,
       json: false
       // delegation offer is a human-text command (printIngestResult is human-text); JSON mode would be a follow-up.
@@ -3198,7 +3228,10 @@ function registerFund(parent) {
   ).option(
     "--wait-until <phase>",
     "Block after delivery until the named FSM phase is reached (typically delegation.locked \u2014 resolves once the escrow lock confirms on chain). One of the UNTIL_PHASES from `heyarp status --help`. Exit code 124 on --wait-timeout."
-  ).option("--wait-timeout <seconds>", "When --wait-until is set: max wall-clock wait (default 300). Exit code 124 on timeout.").option("--wait-interval <seconds>", "When --wait-until is set: poll cadence (default 3, bound [1, 60]).").option("--wait-verbose", "When --wait-until is set: emit one dim line per poll tick showing the current FSM state.", false).action(async (delegationId, opts) => {
+  ).option(
+    "--wait-timeout <seconds>",
+    "When --wait-until is set: max wall-clock wait. Omitted \u2192 auto-sized to the live on-chain budget (work+review+dispute windows + margin, read from the contract); explicit values are capped at that budget. Exit code 124 on timeout."
+  ).option("--wait-interval <seconds>", "When --wait-until is set: poll cadence (default 3, bound [1, 60]).").option("--wait-verbose", "When --wait-until is set: emit one dim line per poll tick showing the current FSM state.", false).action(async (delegationId, opts) => {
     await runFund(delegationId, opts);
   });
 }
@@ -3296,11 +3329,11 @@ async function runFund(delegationId, opts) {
       relationshipId: result.relationshipId,
       untilPhase,
       waitIntervalSec: parseWaitInterval(opts.waitInterval),
-      // Lock finalization on devnet routinely takes 5–12 min
-      // (submit → confirm → indexer projection), so fund gets a
-      // larger default than the generic 300s — a timeout here is
-      // almost never a failure, just a slow chain.
-      waitTimeoutSec: parseWaitTimeout(opts.waitTimeout ?? "1200"),
+      // Lock finalization (submit → confirm → indexer projection) is
+      // slow, so an omitted timeout auto-sizes to the live on-chain
+      // budget (work+review+dispute + margin) — generous by design;
+      // a timeout here is almost never a failure, just a slow chain.
+      waitTimeoutSec: await resolveWaitTimeoutSec(api, opts.waitTimeout, { hasUntil: true }),
       waitVerbose: !!opts.waitVerbose,
       json: false
     });