@t2000/cli 10.30.1 → 10.30.3

package/dist/index.js

@@ -30670,7 +30670,6 @@ function jobActionsFor(job, caller, nowMs = Date.now()) {
   const actions = [];
   if (job.state === "funded") {
     if (isSeller && nowMs <= job.deliverByMs) actions.push("deliver");
-    if (isBuyer) actions.push("release");
     if (nowMs > job.deliverByMs) actions.push("refund");
   } else if (job.state === "delivered") {
     const windowClosesMs = (job.deliveredAtMs ?? 0) + job.reviewWindowMs;
@@ -36404,6 +36403,10 @@ function printJob(job, me) {
   if (job.deliveryHash) printKeyValue("Delivery hash", job.deliveryHash);
   printKeyValue("Reject split", `${job.rejectSplitBps / 100}% buyer / ${(1e4 - job.rejectSplitBps) / 100}% seller`);
 }
+async function fetchBuyerJobs(base, buyer) {
+  const json = await fetchJson4(`${base}/jobs?buyer=${encodeURIComponent(buyer)}&limit=100`);
+  return json.jobs ?? [];
+}
 async function fetchSellerJobs(base, seller) {
   const json = await fetchJson4(`${base}/jobs?seller=${encodeURIComponent(seller)}&limit=100`);
   return json.jobs ?? [];
@@ -36442,6 +36445,83 @@ function summarizeSellerInbox(jobs, nowMs) {
   }
   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 hydrateJobsFromChain(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 out;
+}
+var hydrateSellerJobsFromChain = hydrateJobsFromChain;
+function bucketBuyerJob(job, nowMs) {
+  if (TERMINAL_STATES.has(job.state)) {
+    return "terminal";
+  }
+  if (job.state === "delivered") {
+    return "needsYou";
+  }
+  return nowMs > job.deliverByMs ? "refundable" : "waiting";
+}
+function summarizeBuyerInbox(jobs, nowMs) {
+  const buckets = {
+    counts: { total: jobs.length, needsYou: 0, refundable: 0, waiting: 0, terminal: 0 },
+    needsYou: [],
+    refundable: [],
+    waiting: [],
+    terminal: []
+  };
+  for (const job of jobs) {
+    const bucket = bucketBuyerJob(job, nowMs);
+    buckets[bucket].push(job);
+    buckets.counts[bucket] += 1;
+  }
+  return buckets;
+}
+function buyerInboxHint(job, bucket) {
+  switch (bucket) {
+    case "needsYou":
+      return `delivered \u2014 grade it: t2 job release ${job.jobId}  \xB7  t2 job reject ${job.jobId}`;
+    case "refundable":
+      return `deadline passed, no delivery \u2014 t2 job refund ${job.jobId} (fee-free, anyone may crank it)`;
+    case "waiting":
+      return `waiting on the seller \u2014 t2 job watch ${job.jobId}`;
+    default:
+      return "";
+  }
+}
 function inboxHint(job, bucket) {
   switch (bucket) {
     case "needsYou":
@@ -36459,12 +36539,17 @@ function inboxHint(job, bucket) {
   }
 }
 function printInboxRow(job, bucket) {
+  printInboxRowWithHint(job, inboxHint(job, bucket), "from", job.buyer);
+}
+function printBuyerInboxRow(job, bucket) {
+  printInboxRowWithHint(job, buyerInboxHint(job, bucket), "seller", job.seller);
+}
+function printInboxRowWithHint(job, hint, partyLabel, party) {
   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}`
+    `  ${stateColor(job.state)}  $${job.amountUsdc.toFixed(2)} USDC \xB7 ${partyLabel} ${truncateAddress(party)}${deadline}`
   );
   printLine(`  ${import_picocolors13.default.dim(job.jobId)}`);
-  const hint = inboxHint(job, bucket);
   if (hint) printLine(`  ${import_picocolors13.default.dim("\u2192")} ${hint}`);
 }
 function deliverPreflightError(state, deliverByMs, nowMs) {
@@ -36509,8 +36594,11 @@ function registerJob(program3) {
 The escrow is a Sui object, not a company: funds lock inside the Job object at
 create; release/refund are pure functions of (state, clock, caller). A ghosting
 buyer can't strand a delivering seller (anyone may release after the review
-window) and a no-show seller can never keep funds (anyone may refund after the
-deadline). v1 caps jobs at ${MAX_JOB_USDC} USDC.
+window), and a no-show seller cannot keep funds AS LONG AS the buyer uses the
+escrow's protections \u2014 wait out the deadline and refund (anyone may crank it),
+or reject a bad delivery in-window. Releasing early without a delivery
+(--pay-without-delivery) voluntarily waives that protection. v1 caps jobs at
+${MAX_JOB_USDC} USDC.
 
 Typical flow:
   buyer   $ t2 job hire 5 0xSELLER --spec brief.md --deadline 24h
@@ -36518,7 +36606,8 @@ Typical flow:
   seller  $ t2 job deliver 0xJOB report.md
   buyer   $ t2 job release 0xJOB          (or: t2 job reject 0xJOB)
   either  $ t2 job watch 0xJOB
-  seller  $ t2 job watch --mine           (the provider inbox \u2014 all your jobs)
+  seller  $ t2 job watch --mine           (the provider inbox \u2014 all your sells)
+  buyer   $ t2 job watch --buying         (the buyer inbox \u2014 every job you funded)
 
 Hiring a LISTING (t2 ACP) \u2014 price + terms come from the listing:
   buyer   $ t2 services "market report"
@@ -36777,12 +36866,45 @@ no fund step; unclaimed openings refund fee-free):
       handleError(error);
     }
   });
+  group.command("release").argument("<jobId>", "The Job object id (0x\u2026)").description("Accept delivery \u2014 funds go to the seller (buyer; or anyone once the review window lapses). On a FUNDED job with no delivery this pays the full escrow to the seller, terminally \u2014 refused unless --pay-without-delivery.").option("--pay-without-delivery", "DELIBERATE goodwill: release the full escrow on a funded job with NO delivery (off-band delivery only \u2014 the seller keeps everything, no refund path)").option("--key <path>", "Custom wallet path (default ~/.t2000/wallet.key)").option("--api <url>", `API base URL (default ${DEFAULT_API_BASE7})`).action(async (jobId, opts) => {
+    try {
+      const existing = await getJob(getSuiClient(), jobId).catch(() => null);
+      const undelivered = existing?.state === "funded" && !existing.deliveryHash;
+      if (undelivered && !opts.payWithoutDelivery) {
+        throw new Error(
+          "This job is FUNDED with no delivery \u2014 releasing now pays the full escrow to the seller with no recovery path. Wait for the delivery, refund after the deadline (t2 job refund), or \u2014 only if the work arrived off-band \u2014 re-run with --pay-without-delivery."
+        );
+      }
+      if (undelivered && opts.payWithoutDelivery) {
+        printWarning(
+          "Paying WITHOUT an on-chain delivery: the full escrow goes to the seller, terminally. No refund path exists after this."
+        );
+      }
+      const { digest } = await sponsoredJobVerb({
+        base: opts.api ?? DEFAULT_API_BASE7,
+        keyPath: opts.key,
+        action: "release",
+        params: {
+          jobId,
+          ...opts.payWithoutDelivery ? { payWithoutDelivery: true } : {}
+        }
+      });
+      if (isJsonMode()) {
+        printJson({ jobId, action: "release", digest, ...undelivered ? { paidWithoutDelivery: true } : {} });
+        return;
+      }
+      printBlank();
+      printSuccess("Funds released to the seller.");
+      if (digest) printKeyValue("Tx", digest);
+      if (existing?.deliveryHash) {
+        printInfo(`Rate the work: t2 job review ${jobId} --stars <1-5>`);
+      }
+      printBlank();
+    } catch (error) {
+      handleError(error);
+    }
+  });
   for (const [verb, description, note] of [
-    [
-      "release",
-      "Accept delivery \u2014 funds go to the seller (buyer; or anyone once the review window lapses)",
-      "Funds released to the seller."
-    ],
     [
       "reject",
       "Reject a delivery within the review window \u2014 funds split per the create terms (buyer)",
@@ -36814,9 +36936,6 @@ no fund step; unclaimed openings refund fee-free):
         printBlank();
         printSuccess(note);
         if (digest) printKeyValue("Tx", digest);
-        if (verb === "release") {
-          printInfo(`Rate the work (builds the seller's on-chain-backed reputation): t2 job review ${jobId} --stars 5`);
-        }
         printBlank();
       } catch (error) {
         handleError(error);
@@ -36829,6 +36948,12 @@ no fund step; unclaimed openings refund fee-free):
       if (!Number.isInteger(stars) || stars < 1 || stars > 5) {
         throw new Error(`--stars must be an integer 1\u20135 (got "${opts.stars}").`);
       }
+      const reviewedJob = await getJob(getSuiClient(), jobId).catch(() => null);
+      if (reviewedJob && !reviewedJob.deliveryHash) {
+        throw new Error(
+          "This job has no on-chain delivery \u2014 there is no work to rate. Reviews attach only to jobs the seller actually delivered."
+        );
+      }
       const base = opts.api ?? DEFAULT_API_BASE7;
       const agent = await withAgent({ keyPath: opts.key });
       const address = agent.address();
@@ -36898,15 +37023,90 @@ no fund step; unclaimed openings refund fee-free):
       handleError(error);
     }
   });
-  group.command("watch").argument("[jobId]", "The Job object id (0x\u2026) \u2014 omit with --mine").description("Poll a job \u2014 or, with --mine, the provider inbox (every job selling to you)").option("--mine", "Watch ALL jobs where this wallet is the seller (the provider inbox)").option("--interval <seconds>", "Poll interval", "15").option("--once", "Print the current state and exit").option("--key <path>", "Custom wallet path (default ~/.t2000/wallet.key)").option("--api <url>", `API base URL (default ${DEFAULT_API_BASE7})`).action(async (jobId, opts) => {
+  group.command("watch").argument("[jobId]", "The Job object id (0x\u2026) \u2014 omit with --mine or --buying").description("Poll a job \u2014 or an inbox: --mine (every job selling to you) / --buying (every job you funded)").option("--mine", "Watch ALL jobs where this wallet is the seller (the provider inbox)").option("--buying", "Watch ALL jobs where this wallet is the BUYER \u2014 recovers job ids the hire line printed once (S.1016)").option("--interval <seconds>", "Poll interval", "15").option("--once", "Print the current state and exit").option("--key <path>", "Custom wallet path (default ~/.t2000/wallet.key)").option("--api <url>", `API base URL (default ${DEFAULT_API_BASE7})`).action(async (jobId, opts) => {
     try {
+      if (opts.mine && opts.buying) {
+        throw new Error("Pick one seat: --mine (selling) or --buying (funding) \u2014 not both.");
+      }
+      if (jobId && (opts.mine || opts.buying)) {
+        throw new Error("Pick one mode: a job id OR an inbox flag (--mine / --buying).");
+      }
       const agent = await withAgent({ keyPath: opts.key });
       const me = agent.address();
       const intervalMs = Math.max(5, Number.parseInt(opts.interval, 10) || 15) * 1e3;
+      if (opts.buying) {
+        const base = opts.api ?? DEFAULT_API_BASE7;
+        const seen = /* @__PURE__ */ new Map();
+        const buyClient = getSuiClient();
+        const loadInbox = async () => hydrateJobsFromChain(await fetchBuyerJobs(base, me), (id) => getJob(buyClient, id));
+        const jobs = await loadInbox();
+        const inbox = summarizeBuyerInbox(jobs, Date.now());
+        if (isJsonMode()) {
+          printJson({
+            buyer: me,
+            counts: inbox.counts,
+            needsYou: inbox.needsYou,
+            refundable: inbox.refundable,
+            waiting: inbox.waiting,
+            terminal: inbox.terminal,
+            jobs
+          });
+          return;
+        }
+        printBlank();
+        printInfo(
+          `Buyer inbox for ${truncateAddress(me)} \u2014 ${jobs.length} job(s) \xB7 ${inbox.counts.needsYou} need you \xB7 ${inbox.counts.refundable} refundable \xB7 ${inbox.counts.waiting} waiting`
+        );
+        printBlank();
+        for (const [bucket, rows] of [
+          ["needsYou", inbox.needsYou],
+          ["refundable", inbox.refundable],
+          ["waiting", inbox.waiting]
+        ]) {
+          for (const job of rows) {
+            printBuyerInboxRow(job, bucket);
+            printBlank();
+          }
+        }
+        if (jobs.length - inbox.counts.terminal === 0) {
+          printInfo("No open buys. Hire a listing or post an Open job and it lands here.");
+          printBlank();
+        }
+        for (const job of jobs) seen.set(job.jobId, bucketBuyerJob(job, Date.now()));
+        if (opts.once) return;
+        for (; ; ) {
+          await new Promise((r) => setTimeout(r, intervalMs));
+          let latest;
+          try {
+            latest = await loadInbox();
+          } catch {
+            continue;
+          }
+          const nowMs = Date.now();
+          for (const job of latest) {
+            const bucket = bucketBuyerJob(job, nowMs);
+            const prev = seen.get(job.jobId);
+            if (prev === bucket) continue;
+            seen.set(job.jobId, bucket);
+            printBlank();
+            if (bucket === "needsYou") {
+              printSuccess(`Delivered \u2014 grade it: t2 job release ${job.jobId} \xB7 t2 job reject ${job.jobId}`);
+            } else if (bucket === "refundable") {
+              printSuccess(`Refundable \u2014 t2 job refund ${job.jobId} (deadline passed, no delivery)`);
+            } else {
+              printInfo(`Job ${truncateAddress(job.jobId)}: ${prev ?? "new"} \u2192 ${job.state}`);
+            }
+            printBuyerInboxRow(job, bucket);
+            printBlank();
+          }
+        }
+      }
       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({
@@ -36951,7 +37151,7 @@ no fund step; unclaimed openings refund fee-free):
           await new Promise((r) => setTimeout(r, intervalMs));
           let latest;
           try {
-            latest = await fetchSellerJobs(base, me);
+            latest = await loadInbox();
           } catch {
             continue;
           }
@@ -36975,7 +37175,7 @@ no fund step; unclaimed openings refund fee-free):
         }
       }
       if (!jobId) {
-        printError("Provide a job id \u2014 or use --mine for the provider inbox.");
+        printError("Provide a job id \u2014 or an inbox: --mine (selling) / --buying (funding).");
         process.exitCode = 1;
         return;
       }
@@ -37085,10 +37285,13 @@ function printService(o) {
     `$${o.priceUsdc.toFixed(2)} USDC ${import_picocolors14.default.dim(`\xB7 seller receives ${settlementSplit(o.priceUsdc).payout}`)}`
   );
   printKeyValue("Delivery", `within ${formatSla(o.slaMinutes)}`);
-  printKeyValue(
-    "Seller",
-    `${o.agentName ?? "unnamed"} ${import_picocolors14.default.dim(truncateAddress(o.agent))}`
-  );
+  {
+    const id = o.agentNumericId != null ? ` #${o.agentNumericId}` : "";
+    printKeyValue(
+      "Seller",
+      `${o.agentName ?? "unnamed"}${import_picocolors14.default.bold(id)} ${import_picocolors14.default.dim(truncateAddress(o.agent))}`
+    );
+  }
   printKeyValue("You get", o.deliverable);
   if (o.requirements != null) {
     printKeyValue(
@@ -37238,15 +37441,55 @@ Examples:
     }
   });
 }
+async function resolveServicesQuery(base, query) {
+  const q = query?.trim();
+  if (!q) {
+    return { url: `${base}/services`, scope: { kind: "all" } };
+  }
+  if (q.startsWith("0x")) {
+    try {
+      const agent = validateAddress(q);
+      return {
+        url: `${base}/services?agent=${encodeURIComponent(agent)}`,
+        scope: { kind: "agent", agent }
+      };
+    } catch {
+    }
+  } else if (looksLikeAgentRefValue(q)) {
+    const ref = await resolveAgentRef(base, q);
+    return {
+      url: `${base}/services?agent=${encodeURIComponent(ref.address)}`,
+      scope: { kind: "agent", agent: ref.address, numericId: ref.numericId }
+    };
+  }
+  return {
+    url: `${base}/services?q=${encodeURIComponent(q)}`,
+    scope: { kind: "search", q }
+  };
+}
+function scopeLabel(scope) {
+  if (scope.kind !== "agent") {
+    return "";
+  }
+  return scope.numericId != null ? `#${scope.numericId} (${truncateAddress(scope.agent)})` : truncateAddress(scope.agent);
+}
 function registerDiscovery(command, opts) {
-  command.argument("[query]", "What you need \u2014 free-text search (empty = everything)").option("--api <url>", `API base URL (default ${DEFAULT_API_BASE8})`).action(async (query, cmdOpts) => {
+  command.argument("[query]", "What you need \u2014 free text, or a SELLER scope: 0x\u2026 address, #id, or @handle (empty = everything)").option("--api <url>", `API base URL (default ${DEFAULT_API_BASE8})`).action(async (query, cmdOpts) => {
     try {
       const base = cmdOpts.api ?? DEFAULT_API_BASE8;
-      const params = query ? `?q=${encodeURIComponent(query)}` : "";
-      const json = await fetchJson4(`${base}/services${params}`);
-      const rows = json.services ?? [];
+      const { url, scope } = await resolveServicesQuery(base, query);
+      const json = await fetchJson4(url);
+      const all = json.services ?? [];
+      const rows = scope.kind === "agent" ? all.filter((o) => !o.retired) : all;
+      const retiredHidden = all.length - rows.length;
       if (isJsonMode()) {
-        printJson({ query: query ?? null, total: json.total ?? rows.length, services: rows });
+        printJson({
+          query: query ?? null,
+          scope,
+          total: scope.kind === "agent" ? rows.length : json.total ?? rows.length,
+          ...retiredHidden > 0 ? { retiredHidden } : {},
+          services: rows
+        });
         return;
       }
       printBlank();
@@ -37255,7 +37498,9 @@ function registerDiscovery(command, opts) {
         printBlank();
       }
       if (rows.length === 0) {
-        printInfo(query ? `No services match "${query}".` : "No services listed yet.");
+        printInfo(
+          scope.kind === "agent" ? `No active services for ${scopeLabel(scope)}.` : scope.kind === "search" ? `No services match "${scope.q}".` : "No services listed yet."
+        );
         printBlank();
         return;
       }
@@ -37263,6 +37508,17 @@ function registerDiscovery(command, opts) {
         printService(o);
         printBlank();
       }
+      if (retiredHidden > 0) {
+        printInfo(import_picocolors14.default.dim(`${retiredHidden} retired omitted \u2014 t2 service list ${scope.kind === "agent" ? scope.agent : ""}`));
+        printBlank();
+      }
+      if (scope.kind === "search") {
+        const sellers = new Set(rows.map((o) => o.agent)).size;
+        if (sellers >= 2) {
+          printInfo(import_picocolors14.default.dim(`Results span ${sellers} sellers \u2014 scope to one with t2 services 0x\u2026 or #id.`));
+          printBlank();
+        }
+      }
     } catch (error) {
       handleError(error);
     }