@t2000/cli 10.30.0 → 10.30.2

package/dist/index.js

@@ -34368,7 +34368,7 @@ var import_picocolors8 = __toESM(require_picocolors(), 1);
 function registerPay(program3) {
   program3.command("pay <url>").description("Pay an x402 Service (USDC on Sui) \u2014 the seller's own endpoint").option("--key <path>", "Custom wallet path (default ~/.t2000/wallet.key)").option("--method <method>", "HTTP method (GET, POST, PUT)", "GET").option("--data <json>", "Request body for POST/PUT (auto-promotes --method to POST)").option("--header <key=value>", "Additional HTTP header (repeatable)", collectHeaders, {}).option("--max-price <amount>", "Max USDC price to auto-approve", "1.00").option(
     "--estimate",
-    "Preview the price + service info (no signing, no payment). Exits 0 if the service responds with a 402 challenge."
+    'Preview the price + service info (no signing, no payment). Exits 0 ONLY if the service answers a payable 402 x402 challenge; any other response (including 2xx "no payment required") exits 1.'
   ).option("--force", "Override spending limits for this call (see `t2 limit`)").addHelpText(
     "after",
     `
@@ -34439,6 +34439,23 @@ Examples:
     }
   });
 }
+var ESTIMATE_PREVIEW_MAX = 512;
+function truncatePreview(body2, max = ESTIMATE_PREVIEW_MAX) {
+  if (body2.length <= max) {
+    return body2;
+  }
+  return `${body2.slice(0, max)}\u2026 (truncated, ${body2.length} total bytes)`;
+}
+var EstimateFailure = class extends Error {
+  constructor(message, payload) {
+    super(message);
+    this.payload = payload;
+    this.name = "EstimateFailure";
+  }
+  toJSON() {
+    return this.payload;
+  }
+};
 async function runEstimate(url, opts) {
   const method = opts.data && opts.method === "GET" ? "POST" : opts.method;
   const canHaveBody = method !== "GET" && method !== "HEAD";
@@ -34461,28 +34478,33 @@ async function runEstimate(url, opts) {
   });
   if (response.status !== 402) {
     const body2 = await response.text().catch(() => "");
-    if (isJsonMode()) {
-      printJson({
+    const preview = truncatePreview(body2);
+    const open = response.status >= 200 && response.status < 300;
+    const note = open ? `Endpoint responded ${response.status} without a 402 challenge \u2014 no payment required.` : `Endpoint responded ${response.status} (not a 402 payment challenge).`;
+    if (!isJsonMode()) {
+      if (open) {
+        printInfo(`No payment required (status ${response.status}).`);
+      } else {
+        printInfo(`Status ${response.status} \u2014 not a 402 payment challenge.`);
+      }
+      if (preview) {
+        printBlank();
+        console.log(preview);
+        printBlank();
+      }
+    }
+    throw new EstimateFailure(
+      `${note} --estimate exits 0 only for a payable 402 x402 challenge.`,
+      {
         url,
         method,
         status: response.status,
+        ok: false,
         estimate: null,
-        note: response.status >= 200 && response.status < 300 ? "Endpoint responded without a 402 challenge \u2014 no payment required." : `Endpoint responded with ${response.status} (not a 402 payment challenge).`,
-        body: body2
-      });
-      return;
-    }
-    if (response.status >= 200 && response.status < 300) {
-      printSuccess(`No payment required (status ${response.status}).`);
-    } else {
-      printInfo(`Status ${response.status} \u2014 not a 402 payment challenge.`);
-    }
-    if (body2) {
-      printBlank();
-      console.log(body2);
-      printBlank();
-    }
-    return;
+        note,
+        ...preview ? { bodyPreview: preview } : {}
+      }
+    );
   }
   let accepts = [];
   try {
@@ -36387,24 +36409,116 @@ async function fetchSellerJobs(base, seller) {
   return json.jobs ?? [];
 }
 var TERMINAL_STATES = /* @__PURE__ */ new Set(["released", "rejected", "refunded"]);
-function inboxHint(job) {
+function reviewClosesMs(job) {
+  const anchor = job.deliveredAtMs ?? job.updatedAtMs;
+  if (!(typeof anchor === "number" && anchor > 0 && typeof job.reviewWindowMs === "number" && job.reviewWindowMs > 0)) {
+    return null;
+  }
+  return anchor + job.reviewWindowMs;
+}
+function bucketSellerJob(job, nowMs) {
+  if (TERMINAL_STATES.has(job.state)) {
+    return "terminal";
+  }
   if (job.state === "funded") {
-    return `t2 job spec ${job.jobId} \u2192 do the work \u2192 t2 job deliver ${job.jobId} <file>`;
+    return nowMs <= job.deliverByMs ? "needsYou" : "fundedLate";
+  }
+  const closes = reviewClosesMs(job);
+  return closes !== null && nowMs > closes ? "releasable" : "awaitingBuyer";
+}
+function summarizeSellerInbox(jobs, nowMs) {
+  const buckets = {
+    counts: { total: jobs.length, needsYou: 0, fundedLate: 0, awaitingBuyer: 0, releasable: 0, terminal: 0 },
+    needsYou: [],
+    fundedLate: [],
+    awaitingBuyer: [],
+    releasable: [],
+    terminal: []
+  };
+  for (const job of jobs) {
+    const bucket = bucketSellerJob(job, nowMs);
+    buckets[bucket].push(job);
+    buckets.counts[bucket] += 1;
   }
-  if (job.state === "delivered") {
-    return `waiting on the buyer's review \u2014 anyone can \`t2 job release\` once it lapses`;
+  return buckets;
+}
+var HYDRATE_MAX = 25;
+var HYDRATE_CONCURRENCY = 8;
+function mergeIndexedJobFromChain(row, chain) {
+  return {
+    ...row,
+    jobId: chain.id ?? row.jobId,
+    state: chain.state,
+    buyer: chain.buyer ?? row.buyer,
+    seller: chain.seller ?? row.seller,
+    amountUsdc: chain.amountUsdc ?? row.amountUsdc,
+    deliverByMs: chain.deliverByMs ?? row.deliverByMs,
+    reviewWindowMs: chain.reviewWindowMs ?? row.reviewWindowMs,
+    deliveryHash: chain.deliveryHash ?? row.deliveryHash,
+    deliveredAtMs: chain.deliveredAtMs ?? row.deliveredAtMs ?? null,
+    createdAtMs: chain.createdAtMs ?? row.createdAtMs,
+    // Review clock prefers deliveredAtMs (reviewClosesMs anchors there when
+    // set); for delivered rows keep updatedAtMs honest with the chain clock,
+    // otherwise the index value stands — never invent a clock.
+    updatedAtMs: chain.state === "delivered" && chain.deliveredAtMs != null ? chain.deliveredAtMs : row.updatedAtMs
+  };
+}
+async function hydrateSellerJobsFromChain(rows, getJobById, opts) {
+  const max = opts?.maxHydrate ?? HYDRATE_MAX;
+  const out = [...rows];
+  const targets = [];
+  for (let i = 0; i < out.length && targets.length < max; i++) {
+    if (!TERMINAL_STATES.has(out[i].state)) targets.push(i);
+  }
+  for (let at = 0; at < targets.length; at += HYDRATE_CONCURRENCY) {
+    await Promise.all(
+      targets.slice(at, at + HYDRATE_CONCURRENCY).map(async (i) => {
+        try {
+          out[i] = mergeIndexedJobFromChain(out[i], await getJobById(out[i].jobId));
+        } catch {
+        }
+      })
+    );
   }
-  return "";
+  return out;
 }
-function printInboxRow(job) {
+function inboxHint(job, bucket) {
+  switch (bucket) {
+    case "needsYou":
+      return `t2 job spec ${job.jobId} \u2192 do the work \u2192 t2 job deliver ${job.jobId} <file>`;
+    case "releasable":
+      return `releasable now \u2014 t2 job release ${job.jobId}`;
+    case "awaitingBuyer": {
+      const closes = reviewClosesMs(job);
+      return closes !== null ? `waiting on the buyer's review \u2014 release becomes permissionless after ${new Date(closes).toISOString()}` : `waiting on the buyer's review \u2014 anyone can \`t2 job release\` once it lapses`;
+    }
+    case "fundedLate":
+      return `deliver deadline passed \u2014 the chain rejects late delivers; the buyer (or anyone) may t2 job refund ${job.jobId}`;
+    default:
+      return "";
+  }
+}
+function printInboxRow(job, bucket) {
   const deadline = job.state === "funded" ? ` \xB7 deliver by ${new Date(job.deliverByMs).toISOString()}` : "";
   printLine(
     `  ${stateColor(job.state)}  $${job.amountUsdc.toFixed(2)} USDC \xB7 from ${truncateAddress(job.buyer)}${deadline}`
   );
   printLine(`  ${import_picocolors13.default.dim(job.jobId)}`);
-  const hint = inboxHint(job);
+  const hint = inboxHint(job, bucket);
   if (hint) printLine(`  ${import_picocolors13.default.dim("\u2192")} ${hint}`);
 }
+function deliverPreflightError(state, deliverByMs, nowMs) {
+  if (state === "delivered") {
+    return "This job is already delivered. The delivery hash is permanent and cannot be replaced \u2014 wait for the buyer's review, or once the window closes anyone may run `t2 job release <jobId>`. Fixes travel via buyer reject (inside the window) or out-of-band, never a second deliver.";
+  }
+  if (state === "released" || state === "rejected" || state === "refunded") {
+    return `This job is ${state} \u2014 nothing can be delivered.`;
+  }
+  if (state === "funded" && nowMs > deliverByMs) {
+    return `The deliver deadline (${new Date(deliverByMs).toISOString()}) has passed \u2014 the chain rejects late delivers, so nothing was uploaded or signed. The refund path is open: anyone may run \`t2 job refund <jobId>\`.`;
+  }
+  return null;
+}
 async function sponsoredJobVerb(opts) {
   const agent = await withAgent({ keyPath: opts.keyPath });
   const address = agent.address();
@@ -36653,9 +36767,16 @@ no fund step; unclaimed openings refund fee-free):
       handleError(error);
     }
   });
-  group.command("deliver").argument("<jobId>", "The Job object id (0x\u2026)").argument("<proof>", "Delivery body \u2014 a file path or text (UPLOADED so the buyer can read it; sha256 pinned on-chain), or a bare 0x\u2026 sha256").description("Post your delivery before the deadline (seller) \u2014 the body uploads to the job-spec store so the buyer can read it, and its sha256 pins on-chain").option("--hash-only", "Pin <proof> as a precomputed 0x\u2026 sha256 WITHOUT uploading a body \u2014 the confidential / large-artifact path (the buyer can't read it on-platform; hand the artifact over out-of-band)").option("--key <path>", "Custom wallet path (default ~/.t2000/wallet.key)").option("--api <url>", `API base URL (default ${DEFAULT_API_BASE7})`).action(async (jobId, proof, opts) => {
+  group.command("deliver").argument("<jobId>", "The Job object id (0x\u2026)").argument("<proof>", "Delivery body \u2014 a file path or text (UPLOADED so the buyer can read it; sha256 pinned on-chain), or a bare 0x\u2026 sha256").description("Post your delivery before the deadline (seller) \u2014 ONE SHOT: the sha256 pins on-chain permanently and cannot be replaced. Fix mistakes via buyer reject (inside the review window) or out-of-band \u2014 never a second deliver. Decline is only possible BEFORE delivery.").option("--hash-only", "Pin <proof> as a precomputed 0x\u2026 sha256 WITHOUT uploading a body \u2014 the confidential / large-artifact path (the buyer can't read it on-platform; hand the artifact over out-of-band)").option("--key <path>", "Custom wallet path (default ~/.t2000/wallet.key)").option("--api <url>", `API base URL (default ${DEFAULT_API_BASE7})`).action(async (jobId, proof, opts) => {
     try {
       const base = opts.api ?? DEFAULT_API_BASE7;
+      const existing = await getJob(getSuiClient(), jobId).catch(() => null);
+      if (existing) {
+        const preflightError = deliverPreflightError(existing.state, existing.deliverByMs, Date.now());
+        if (preflightError) {
+          throw new Error(preflightError.replaceAll("<jobId>", jobId));
+        }
+      }
       let deliveryHash;
       let uploaded = false;
       if (opts.hashOnly) {
@@ -36667,6 +36788,9 @@ no fund step; unclaimed openings refund fee-free):
       } else {
         ({ hash: deliveryHash, uploaded } = await resolveSpecUpload(base, proof));
       }
+      if (!isJsonMode()) {
+        printInfo("Delivery pins once. The buyer review window starts after this succeeds; you cannot replace the hash.");
+      }
       const { digest } = await sponsoredJobVerb({
         base,
         keyPath: opts.key,
@@ -36674,11 +36798,12 @@ no fund step; unclaimed openings refund fee-free):
         params: { jobId, deliveryHash }
       });
       if (isJsonMode()) {
-        printJson({ jobId, deliveryHash, uploaded, digest });
+        printJson({ jobId, deliveryHash, uploaded, digest, onceOnly: true });
         return;
       }
       printBlank();
       printSuccess("Delivery posted \u2014 the buyer's review window is now open.");
+      printInfo("This delivery cannot be amended \u2014 further `t2 job deliver` calls on this job will fail.");
       printKeyValue("Delivery hash", deliveryHash);
       if (digest) printKeyValue("Tx", digest);
       if (uploaded) {
@@ -36821,44 +36946,72 @@ no fund step; unclaimed openings refund fee-free):
       if (opts.mine) {
         const base = opts.api ?? DEFAULT_API_BASE7;
         const seen = /* @__PURE__ */ new Map();
-        const jobs = await fetchSellerJobs(base, me);
+        const mineClient = getSuiClient();
+        const loadInbox = async () => hydrateSellerJobsFromChain(await fetchSellerJobs(base, me), (id) => getJob(mineClient, id));
+        const jobs = await loadInbox();
+        const inbox = summarizeSellerInbox(jobs, Date.now());
         if (isJsonMode()) {
-          printJson({ seller: me, jobs });
+          printJson({
+            seller: me,
+            counts: inbox.counts,
+            needsYou: inbox.needsYou,
+            fundedLate: inbox.fundedLate,
+            awaitingBuyer: inbox.awaitingBuyer,
+            releasable: inbox.releasable,
+            terminal: inbox.terminal,
+            jobs
+          });
           return;
         }
-        const open = jobs.filter((j) => !TERMINAL_STATES.has(j.state));
         printBlank();
-        printInfo(`Provider inbox for ${truncateAddress(me)} \u2014 ${jobs.length} job(s), ${open.length} open.`);
+        printInfo(
+          `Provider inbox for ${truncateAddress(me)} \u2014 ${jobs.length} job(s) \xB7 ${inbox.counts.needsYou} need you \xB7 ${inbox.counts.awaitingBuyer} awaiting buyer \xB7 ${inbox.counts.releasable} releasable now`
+        );
+        if (inbox.counts.fundedLate > 0) {
+          printLine(import_picocolors13.default.dim(`  ${inbox.counts.fundedLate} past deliver deadline (not deliverable \u2014 refund path is open to others)`));
+        }
         printBlank();
-        for (const job of open) {
-          printInboxRow(job);
-          printBlank();
+        for (const [bucket, rows] of [
+          ["needsYou", inbox.needsYou],
+          ["releasable", inbox.releasable],
+          ["awaitingBuyer", inbox.awaitingBuyer],
+          ["fundedLate", inbox.fundedLate]
+        ]) {
+          for (const job of rows) {
+            printInboxRow(job, bucket);
+            printBlank();
+          }
         }
-        if (open.length === 0) {
+        const openCount = jobs.length - inbox.counts.terminal;
+        if (openCount === 0) {
           printInfo("No open jobs. New hires appear here the moment the escrow funds.");
           printBlank();
         }
-        for (const job of jobs) seen.set(job.jobId, job.state);
+        for (const job of jobs) seen.set(job.jobId, bucketSellerJob(job, Date.now()));
         if (opts.once) return;
         for (; ; ) {
           await new Promise((r) => setTimeout(r, intervalMs));
           let latest;
           try {
-            latest = await fetchSellerJobs(base, me);
+            latest = await loadInbox();
           } catch {
             continue;
           }
+          const nowMs = Date.now();
           for (const job of latest) {
+            const bucket = bucketSellerJob(job, nowMs);
             const prev = seen.get(job.jobId);
-            if (prev === job.state) continue;
-            seen.set(job.jobId, job.state);
+            if (prev === bucket) continue;
+            seen.set(job.jobId, bucket);
             printBlank();
-            if (prev === void 0 && job.state === "funded") {
+            if (prev === void 0 && bucket === "needsYou") {
               printSuccess(`New job \u2014 $${job.amountUsdc.toFixed(2)} USDC escrowed for you.`);
+            } else if (bucket === "releasable") {
+              printSuccess(`Releasable now \u2014 t2 job release ${job.jobId}`);
             } else {
               printInfo(`Job ${truncateAddress(job.jobId)}: ${prev ?? "new"} \u2192 ${job.state}`);
             }
-            printInboxRow(job);
+            printInboxRow(job, bucket);
             printBlank();
           }
         }