mycomesh-consumer 0.9.12 → 0.9.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mycomesh-consumer",
-  "version": "0.9.12",
+  "version": "0.9.13",
   "description": "MycoMesh V11 Consumer: a custodied deposit, relay-blind encrypted requests to any Provider, and a local OpenAI-compatible endpoint.",
   "repository": {
     "type": "git",

package/src/account.mjs

@@ -46,9 +46,12 @@ export async function setup(network, { ownerPrivate, key, deposit, limit, forceF
     await faucet(network, owner);
   }
   const send = (to, data) => sendTransaction(network.rpc_urls, ownerPrivate, { to, data });
+  log("approving the deposit (transaction 1 of 3)...");
   await send(network.stablecoin, encodeCall("approve(address,uint256)", [["address", network.settlement], ["uint", deposit]]));
+  log("depositing (transaction 2 of 3)...");
   await send(network.settlement, encodeCall("deposit(uint256)", [["uint", deposit]]));
   if (!status.grant?.active || BigInt(status.grant.max_per_request) !== limit) {
+    log("authorizing this machine's payment key (transaction 3 of 3)...");
     await send(network.settlement, encodeCall("registerKey(address,uint256,uint64)", [["address", key], ["uint", limit], ["uint", 0]]));
   }
   return { owner, key, deposit: deposit.toString(), max_per_request: limit.toString() };

package/src/chain.mjs

@@ -10,7 +10,9 @@ export async function rpcCall(urls, method, params, { timeoutMs = 15000 } = {})
         body: JSON.stringify({ jsonrpc: "2.0", id: 1, method, params }), signal: AbortSignal.timeout(timeoutMs),
       });
       const body = await response.json();
-      if (body.error) throw Object.assign(new Error(`${method}: ${JSON.stringify(body.error).slice(0, 300)}`), { answered: true });
+      // An endpoint without the history asked for (pruned logs) is not an answer: try the next one.
+      const endpointOnly = /pruned|history unavailable|missing trie node|rate limit|too many requests/i.test(JSON.stringify(body.error ?? ""));
+      if (body.error) throw Object.assign(new Error(`${method}: ${JSON.stringify(body.error).slice(0, 300)}`), { answered: !endpointOnly });
       return body.result;
     } catch (error) {
       if (error.answered) throw error;

package/src/cli.mjs

@@ -24,15 +24,15 @@ const USAGE = `Usage: mycomesh-consumer <command> [options]
   address                  print the payment key address
   wallet                   print the owner wallet address (a V3 keystore; MetaMask can import it)
   faucet                   testnet: get gas ETH and tUSDC for the owner wallet
-  setup --deposit UNITS [--max-per-request UNITS]
+  setup [--deposit 20tUSDC] [--max-per-request 1tUSDC]
                            deposit into the settlement contract and authorize the payment key
-                           (on testnets, tops the wallet up from the faucet first)
+                           (on testnets, tops the wallet up from the faucet first; default 20 tUSDC)
   balance [--owner ADDR]   show the custodied deposit
   rewards [claim]          MYCO earned by the owner wallet (80% of each hour's emission goes to the
                            Consumers who paid that hour's fees); \`claim\` mints it to the wallet
   withdraw [UNITS]         request a withdrawal of the deposit; run again after the delay to receive it
-  request "prompt" [--stream]
-                           send one request and print the verified answer
+  request "prompt" [--stream] [--json]
+                           send one request and print the verified answer (JSON when piped or with --json)
   serve [--port 8110]      run the local web console and OpenAI-compatible endpoint (default)
   tenant add NAME [--budget UNITS] [--max-per-request UNITS]
                            multi-tenant accounts: a payment key and API key per tenant, capped on-chain
@@ -41,10 +41,23 @@ const USAGE = `Usage: mycomesh-consumer <command> [options]
                            reveal a recorded request and response to a Provider-AI jury
                            (within 24 hours; the reporter bond is returned if fraud is confirmed)
 
+Amounts: a bare integer is base units (1 tUSDC = 1000000); 20tUSDC or 20.5 means tUSDC.
 Common: --network FILE (default: the bundled MycoMesh V11 Sepolia manifest), --data-dir DIR, --model ID,
   --max-fee UNITS, --provider SIGNER, --owner-key-file F (raw key or keystore instead of the local wallet).
 The wallet password comes from MYCOMESH_WALLET_PASSWORD or a terminal prompt.`;
 
+// Amounts: a bare integer is base units (1e-6 tUSDC), as before; "20tUSDC", "20 usdc" or "20.5" are tUSDC.
+export function parseAmount(value, name) {
+  const text = String(value).trim();
+  const match = /^([0-9]+(?:\.[0-9]{1,6})?)\s*(t?usdc)?$/i.exec(text);
+  if (!match) throw new Error(`${name}: write base units (20000000) or tUSDC (20tUSDC, 20.5)`);
+  if (!match[2] && !match[1].includes(".")) return BigInt(match[1]);
+  const [whole, fraction = ""] = match[1].split(".");
+  return BigInt(whole) * 1_000_000n + BigInt(fraction.padEnd(6, "0"));
+}
+export const tusdc = (units) => `${(Number(units) / 1e6).toLocaleString("en-US", { maximumFractionDigits: 6 })} tUSDC`;
+const human = () => Boolean(process.stdout.isTTY) && !process.env.MYCOMESH_JSON;
+
 function dataDir(value) {
   const dir = value || process.env.MYCOMESH_CONSUMER_DATA_DIR || join(homedir(), ".mycomesh", "v11");
   mkdirSync(dir, { recursive: true, mode: 0o700 });
@@ -77,7 +90,7 @@ export async function main(argv = process.argv.slice(2), { stdout = process.stdo
       port: { type: "string", default: "8110" }, host: { type: "string", default: "127.0.0.1" },
       "max-output-tokens": { type: "string", default: "4096" }, help: { type: "boolean" },
       reason: { type: "string", default: "unrelated_response" }, faucet: { type: "boolean" }, provider: { type: "string" },
-      statement: { type: "string", default: "" }, stream: { type: "boolean" }, budget: { type: "string" },
+      statement: { type: "string", default: "" }, stream: { type: "boolean" }, json: { type: "boolean" }, budget: { type: "string" },
       "no-browser": { type: "boolean" },
     },
   });
@@ -93,6 +106,11 @@ export async function main(argv = process.argv.slice(2), { stdout = process.stdo
     if (!values["owner-key-file"]) {
       stdout.write(`owner wallet ${walletAddress(await createWallet(dir))} (${join(dir, "owner-wallet.json")})\n`);
     }
+    if (human()) {
+      stdout.write("\nThe first address is this machine's payment key: it signs each request, holds no money, needs no password.\n"
+        + "The owner wallet holds your tUSDC and deposit; it is password-protected and signs deposits, withdrawals and claims.\n"
+        + "Next: mycomesh-consumer setup   (gets testnet funds and deposits 20 tUSDC; about a minute)\n");
+    }
     return 0;
   }
   if (command === "wallet") {
@@ -107,14 +125,15 @@ export async function main(argv = process.argv.slice(2), { stdout = process.stdo
   }
   if (command === "setup") {
     const keyPrivate = paymentKey(dir);
-    if (!values.deposit) throw new Error("--deposit UNITS is required");
     if (!values["owner-key-file"]) await createWallet(dir);
     const result = await setup(network, {
-      ownerPrivate: await ownerKey(values["owner-key-file"], dir), key: addressOf(keyPrivate), deposit: BigInt(values.deposit),
-      limit: BigInt(values["max-per-request"] || values["max-fee"]), forceFaucet: values.faucet,
+      ownerPrivate: await ownerKey(values["owner-key-file"], dir), key: addressOf(keyPrivate),
+      deposit: parseAmount(values.deposit ?? "20tUSDC", "--deposit"),
+      limit: parseAmount(values["max-per-request"] || values["max-fee"], "--max-per-request"), forceFaucet: values.faucet,
       log: (line) => stdout.write(`${line}\n`),
     });
     stdout.write(`deposited ${result.deposit} and authorized ${result.key} up to ${result.max_per_request} per request\n`);
+    if (human()) stdout.write(`Ready: ${tusdc(result.deposit)} deposited. Try: mycomesh-consumer request "hello", or mycomesh-consumer serve\n`);
     return 0;
   }
   if (command === "withdraw") {
@@ -128,7 +147,7 @@ export async function main(argv = process.argv.slice(2), { stdout = process.stdo
       stdout.write(`withdrew ${status.withdrawal.amount}\n`);
       return 0;
     }
-    const amount = BigInt(rest[0] || status.deposit);
+    const amount = rest[0] ? parseAmount(rest[0], "amount") : BigInt(status.deposit);
     await requestWithdrawal(network, owner, amount);
     stdout.write(`requested a withdrawal of ${amount}; run \`withdraw\` again after the delay\n`);
     return 0;
@@ -136,7 +155,8 @@ export async function main(argv = process.argv.slice(2), { stdout = process.stdo
   if (command === "balance") {
     const owner = values.owner || ownerAddress(values["owner-key-file"], dir);
     if (!owner) throw new Error("--owner, --owner-key-file or a local wallet (`init`) is required");
-    stdout.write(`${await availableBalance(network, owner)}\n`);
+    const balance = await availableBalance(network, owner);
+    stdout.write(human() ? `${tusdc(balance)} deposited (${balance} base units)\n` : `${balance}\n`);
     return 0;
   }
   if (command === "rewards") {
@@ -164,18 +184,19 @@ export async function main(argv = process.argv.slice(2), { stdout = process.stdo
     const owner = await ownerKey(values["owner-key-file"], dir);
     if (action === "add") {
       const created = await addTenant(network, dir, owner, name, {
-        maxPerRequest: BigInt(values["max-per-request"] || values["max-fee"]), budget: BigInt(values.budget || 0) });
+        maxPerRequest: parseAmount(values["max-per-request"] || values["max-fee"], "--max-per-request"),
+        budget: parseAmount(values.budget || 0, "--budget") });
       stdout.write(`${JSON.stringify(created)}\nThe API key is shown once; give it to the tenant (Authorization: Bearer ...).\n`);
       return 0;
     }
     const tenant = loadTenants(dir)[name];
     if (!tenant) throw new Error(`no tenant ${name}`);
-    if (action === "budget") { await setBudget(network, owner, tenant.key, BigInt(amount)); stdout.write(`budget of ${name} set to ${amount}\n`); return 0; }
+    if (action === "budget") { await setBudget(network, owner, tenant.key, parseAmount(amount, "budget")); stdout.write(`budget of ${name} set to ${amount}\n`); return 0; }
     if (action === "revoke") { await revokeTenant(network, dir, owner, name); stdout.write(`revoked ${name}\n`); return 0; }
     throw new Error("tenant add | list | budget | revoke");
   }
   const keyPrivate = paymentKey(dir, command === "serve");
-  const consumer = new Consumer({ network, keyPrivate, maxFee: Number(values["max-fee"]), journalDir: dir });
+  const consumer = new Consumer({ network, keyPrivate, maxFee: Number(parseAmount(values["max-fee"], "--max-fee")), journalDir: dir });
   if (command === "request") {
     const { response, receipt } = await consumer.request({
       endpoint: "responses", model: values.model, content: rest.join(" "), maxOutputTokens: Number(values["max-output-tokens"]),
@@ -183,6 +204,12 @@ export async function main(argv = process.argv.slice(2), { stdout = process.stdo
     });
     if (values.stream) process.stderr.write("\n");
     const output = response.output;
+    if (human() && !values.json) {
+      if (!values.stream) stdout.write(`${output.output_text ?? JSON.stringify(output)}\n`);
+      stdout.write(`\n— ${tusdc(receipt.receipt.actual_fee)} · Provider ${receipt.authorization.provider_signer.slice(0, 10)}… · `
+        + "verified against the Provider's signed receipt (--json for details)\n");
+      return 0;
+    }
     stdout.write(`${JSON.stringify({ output_text: output.output_text ?? output, fee: receipt.receipt.actual_fee,
       provider: receipt.authorization.provider_signer, request_id: receipt.authorization.request_id,
       settlement_key: settlementKey(receipt.authorization.key, receipt.authorization.request_id) })}\n`);

package/src/console.mjs

@@ -11,6 +11,9 @@ import { networkPrices } from "./pricing.mjs";
 import { claimRewards, rewardsSummary } from "./rewards.mjs";
 
 const PAGE = new URL("./web/console.html", import.meta.url);
+// Only actions that sign with the owner wallet ask for its password; after one, the wallet stays unlocked in
+// this process for a while so the next signature is a confirmation, not another password.
+export const UNLOCK_MS = 15 * 60_000;
 
 /**
  * Only this machine's own pages may call the local node: reject other Host
@@ -26,7 +29,18 @@ export function localRequestAllowed(req, port) {
 export function consoleRoutes({ consumer, dataDir }) {
   const network = consumer.network;
   const owner = () => ownerAddress(undefined, dataDir);
-  const withWallet = (body) => unlockWallet(dataDir, body.password);
+  let unlocked = null; // { key, until }
+  const isUnlocked = () => Boolean(unlocked && Date.now() < unlocked.until);
+  const withWallet = (body) => {
+    if (body.password) {
+      unlocked = { key: unlockWallet(dataDir, body.password), until: Date.now() + UNLOCK_MS };
+    } else if (!isUnlocked()) {
+      unlocked = null;
+      throw Object.assign(new Error("wallet is locked"), { status: 401, code: "locked" });
+    }
+    unlocked.until = Date.now() + UNLOCK_MS; // each signature keeps it open a little longer
+    return unlocked.key;
+  };
   const units = (value, name) => {
     if (!/^[0-9]+$/.test(String(value ?? ""))) throw Object.assign(new Error(`${name} must be a whole number of base units`), { status: 400 });
     return BigInt(value);
@@ -37,7 +51,7 @@ export function consoleRoutes({ consumer, dataDir }) {
       const address = owner();
       return {
         network: { id: network.network_id, chain_id: network.chain_id, settlement: network.settlement, faucet: Boolean(network.faucet_url) },
-        payment_key: consumer.key, max_fee: String(consumer.maxFee),
+        payment_key: consumer.key, max_fee: String(consumer.maxFee), unlocked_until: isUnlocked() ? unlocked.until : null,
         wallet: address ? await walletStatus(network, address, consumer.key) : null,
       };
     },
@@ -71,6 +85,8 @@ export function consoleRoutes({ consumer, dataDir }) {
       return { claimed: await claimRewards(network, ownerPrivate, addressOf(ownerPrivate)) };
     },
     "POST /api/wallet": async (body) => ({ owner: walletAddress(await createWallet(dataDir, body.password)) }),
+    "POST /api/unlock": async (body) => { withWallet({ password: body.password }); return { unlocked_until: unlocked.until }; },
+    "POST /api/lock": async () => { unlocked = null; return { locked: true }; },
     "POST /api/faucet": async () => {
       const address = owner();
       if (!address) throw Object.assign(new Error("create the wallet first"), { status: 400 });

package/src/consumer.mjs

@@ -597,7 +597,7 @@ export function serveConsumer(consumer, { host = "127.0.0.1", port = 8110, apiKe
       if (res.headersSent) { writer?.fail(error.message); return res.end(); }
       if (error.message === "wrong wallet password") return send(401, { error: error.message });
       if (error.status && error.status < 500 && !error.dispatched && routes[`${req.method} ${new URL(req.url, "http://x").pathname}`]) {
-        return send(error.status, { error: error.message });
+        return send(error.status, { error: error.message, ...(error.code ? { code: error.code } : {}) });
       }
       const status = error.code === "outcome_unknown" ? 504 : (error.status && error.status < 500 ? error.status : 502);
       if (dialect === "anthropic") return send(status, anthropicError(error.message, status));

package/src/web/console.html

@@ -50,6 +50,7 @@
   <span class="badge" id="net">连接中…</span>
   <span class="badge" id="relays">Relay —</span>
   <span class="muted mono" id="paykey" style="margin-left:auto"></span>
+  <button class="ghost" id="lock" style="display:none;padding:4px 10px" title="钱包已解锁：15 分钟内签名不用再输密码">🔓 锁定钱包</button>
 </header>
 <nav>
   <button data-tab="chat" class="active">对话</button>
@@ -142,7 +143,9 @@
 
 <dialog id="dialog"><form method="dialog" id="dialog-form">
   <h3 id="dialog-title" style="margin-top:0"></h3><div id="dialog-body"></div>
-  <label>钱包密码</label><input type="password" id="dialog-pw" required>
+  <div id="dialog-pw-box"><label>钱包密码</label><input type="password" id="dialog-pw" required>
+    <p class="muted" style="margin:6px 0 0">输入一次后，15 分钟内再签名不用重复输入。</p></div>
+  <p class="muted" id="dialog-unlocked" style="display:none">钱包已解锁，确认后用它签名。</p>
   <div class="row" style="justify-content:flex-end"><button class="ghost" value="cancel" formnovalidate>取消</button><button class="primary" value="ok">确认</button></div>
 </form></dialog>
 <div id="toast"></div>
@@ -163,16 +166,41 @@ function toast(text, bad = false) {
 async function api(path, body) {
   const response = await fetch(path, body === undefined ? {} : { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify(body) });
   const data = await response.json().catch(() => ({}));
-  if (!response.ok) throw new Error(typeof data.error === "string" ? data.error : data.error?.message || `HTTP ${response.status}`);
+  if (!response.ok) {
+    const message = typeof data.error === "string" ? data.error : data.error?.message || `HTTP ${response.status}`;
+    throw Object.assign(new Error(message === "wrong wallet password" ? "钱包密码不对" : message), { code: data.code });
+  }
   return data;
 }
-function ask(title, bodyHtml = "") {
+// Only actions signed by the owner wallet come here. While the wallet is unlocked (15 minutes after the last
+// signature) this is a plain confirmation; otherwise it asks for the password once.
+const unlocked = () => Boolean(status?.unlocked_until && status.unlocked_until > Date.now());
+function ask(title, bodyHtml = "", { password = !unlocked() } = {}) {
   return new Promise((resolve) => {
     $("dialog-title").textContent = title; $("dialog-body").innerHTML = bodyHtml; $("dialog-pw").value = "";
-    $("dialog").onclose = () => resolve($("dialog").returnValue === "ok" ? { password: $("dialog-pw").value, form: $("dialog-body") } : null);
+    $("dialog-pw-box").style.display = password ? "" : "none"; $("dialog-pw").required = password;
+    $("dialog-unlocked").style.display = password ? "none" : "";
+    $("dialog").onclose = () => resolve($("dialog").returnValue === "ok"
+      ? { password: password ? $("dialog-pw").value : undefined, form: $("dialog-body") } : null);
     $("dialog").showModal();
   });
 }
+/** Ask, sign, and when the unlock ran out meanwhile, ask once more with the password. */
+async function signed(button, title, bodyHtml, call) {
+  let answer = await ask(title, bodyHtml); if (!answer) return;
+  await busy(button, async () => {
+    try { await call(answer); } catch (error) {
+      if (error.code !== "locked") throw error;
+      status.unlocked_until = null;
+      answer = await ask(title, bodyHtml, { password: true }); if (!answer) return;
+      await call(answer);
+    }
+    status = { ...status, unlocked_until: Date.now() + 15 * 60_000 }; showLock();
+  });
+}
+function showLock() {
+  $("lock").style.display = unlocked() ? "" : "none";
+}
 async function busy(button, work) {
   button.disabled = true; const label = button.textContent; button.textContent = "处理中…";
   try { await work(); } catch (error) { toast(error.message, true); } finally { button.disabled = false; button.textContent = label; }
@@ -190,7 +218,7 @@ let status = null;
 async function refreshWallet() {
   status = await api("/api/status");
   $("net").textContent = `${status.network.id} · 链 ${status.network.chain_id}`; $("net").className = "badge ok";
-  $("paykey").textContent = `付款 key ${short(status.payment_key)}`;
+  $("paykey").textContent = `付款 key ${short(status.payment_key)}`; showLock();
   $("no-wallet").style.display = status.wallet ? "none" : "block"; $("has-wallet").style.display = status.wallet ? "block" : "none";
   $("faucet-btn").style.display = status.network.faucet ? "" : "none";
   const w = status.wallet; if (!w) return;
@@ -241,60 +269,46 @@ async function refreshTenants() {
       const cell = row.lastElementChild;
       for (const [label, action] of [["调整预算", "budget"], ["撤销", "revoke"]]) {
         const button = document.createElement("button"); button.className = "ghost"; button.textContent = label; button.style.marginRight = "6px";
-        button.onclick = async () => {
-          const answer = await ask(`${label}：${t.name}`, action === "budget" ? `<label>新的总预算（tUSDC）</label><input id="new-budget" value="${fmt(t.budget)}">` : "");
-          if (!answer) return;
-          await busy(button, async () => {
+        button.onclick = () => signed(button, `${label}：${t.name}`,
+          action === "budget" ? `<label>新的总预算（tUSDC）</label><input id="new-budget" value="${fmt(t.budget)}">` : "", async (answer) => {
             await api(`/api/tenants/${action}`, { password: answer.password, name: t.name,
               ...(action === "budget" ? { budget: toUnits(answer.form.querySelector("#new-budget").value) } : {}) });
             toast("已更新"); await refreshTenants();
           });
-        };
         cell.append(button);
       }
     }
     $("tenants").append(row);
   }
 }
-$("t-add").onclick = async () => {
-  const answer = await ask(`添加租户 ${$("t-name").value}`); if (!answer) return;
-  await busy($("t-add"), async () => {
-    const created = await api("/api/tenants", { password: answer.password, name: $("t-name").value.trim(),
-      budget: toUnits($("t-budget").value), max_per_request: toUnits($("t-limit").value) });
-    $("t-created").style.display = "block";
-    $("t-created").textContent = `租户 ${created.name} 的 API key（只显示这一次）：${created.api_key}`;
-    await refreshTenants();
-  });
-};
+$("t-add").onclick = () => signed($("t-add"), `添加租户 ${$("t-name").value}`, "", async (answer) => {
+  const created = await api("/api/tenants", { password: answer.password, name: $("t-name").value.trim(),
+    budget: toUnits($("t-budget").value), max_per_request: toUnits($("t-limit").value) });
+  $("t-created").style.display = "block";
+  $("t-created").textContent = `租户 ${created.name} 的 API key（只显示这一次）：${created.api_key}`;
+  await refreshTenants();
+});
 $("create-wallet").onclick = () => busy($("create-wallet"), async () => {
   if ($("new-pw").value !== $("new-pw2").value) throw new Error("两次输入的密码不一致");
   await api("/api/wallet", { password: $("new-pw").value }); toast("钱包已创建"); await refreshWallet();
 });
+$("lock").onclick = async () => { await api("/api/lock", {}); status.unlocked_until = null; showLock(); toast("钱包已锁定"); };
 $("faucet-btn").onclick = () => busy($("faucet-btn"), async () => { await api("/api/faucet", {}); toast("已领取测试 ETH 和 tUSDC"); await refreshWallet(); });
-$("deposit-btn").onclick = async () => {
-  const answer = await ask(`存入 ${$("dep-amount").value} tUSDC`, `<p class="muted">单次请求上限 ${$("dep-limit").value} tUSDC。需要几笔链上交易，约 1 分钟。</p>`);
-  if (!answer) return;
-  await busy($("deposit-btn"), async () => {
+$("deposit-btn").onclick = () => signed($("deposit-btn"), `存入 ${$("dep-amount").value} tUSDC`,
+  `<p class="muted">单次请求上限 ${$("dep-limit").value} tUSDC。需要几笔链上交易，约 1 分钟。</p>`, async (answer) => {
     await api("/api/setup", { password: answer.password, deposit: toUnits($("dep-amount").value), max_per_request: toUnits($("dep-limit").value) });
     toast("押金已存入"); await refreshWallet();
   });
-};
-$("myco-claim").onclick = async () => {
-  const answer = await ask("领取 MYCO"); if (!answer) return;
-  await busy($("myco-claim"), async () => {
-    const { claimed } = await api("/api/rewards/claim", { password: answer.password });
-    const hours = Object.values(claimed).reduce((a, b) => a + b, 0);
-    toast(hours ? `已领取 ${hours} 个小时的 MYCO` : "暂时没有可领取的 MYCO"); await refreshRewards();
-  });
-};
-$("withdraw-btn").onclick = async () => {
-  const answer = await ask("取回押金"); if (!answer) return;
-  await busy($("withdraw-btn"), async () => {
-    const amount = $("wd-amount").value.trim();
-    const result = await api("/api/withdraw", { password: answer.password, ...(amount ? { amount: toUnits(amount) } : {}) });
-    toast(result.withdrawn ? `已取回 ${fmt(result.withdrawn)} tUSDC` : `已申请取回 ${fmt(result.requested)} tUSDC`); await refreshWallet();
-  });
-};
+$("myco-claim").onclick = () => signed($("myco-claim"), "领取 MYCO", "", async (answer) => {
+  const { claimed } = await api("/api/rewards/claim", { password: answer.password });
+  const hours = Object.values(claimed).reduce((a, b) => a + b, 0);
+  toast(hours ? `已领取 ${hours} 个小时的 MYCO` : "暂时没有可领取的 MYCO"); await refreshRewards();
+});
+$("withdraw-btn").onclick = () => signed($("withdraw-btn"), "取回押金", "", async (answer) => {
+  const amount = $("wd-amount").value.trim();
+  const result = await api("/api/withdraw", { password: answer.password, ...(amount ? { amount: toUnits(amount) } : {}) });
+  toast(result.withdrawn ? `已取回 ${fmt(result.withdrawn)} tUSDC` : `已申请取回 ${fmt(result.requested)} tUSDC`); await refreshWallet();
+});
 
 // ---------------- chat ----------------
 let conversation = [];
@@ -349,15 +363,11 @@ async function refreshHistory() {
     const action = document.createElement("td");
     if (entry.status === "pending" && entry.release_at > now) {
       const button = document.createElement("button"); button.className = "ghost"; button.textContent = "争议";
-      button.onclick = async () => {
-        const answer = await ask("发起争议", `<p class="muted">会公开这次的问题和回答给随机抽选的 Provider-AI 陪审团，并锁定 1 tUSDC 保证金；确认欺诈后退款并返还保证金。</p>
-          <label>说明</label><textarea id="statement" placeholder="例如：回答与问题完全无关"></textarea>`);
-        if (!answer) return;
-        await busy(button, async () => {
+      button.onclick = () => signed(button, "发起争议", `<p class="muted">会公开这次的问题和回答给随机抽选的 Provider-AI 陪审团，并锁定 1 tUSDC 保证金；确认欺诈后退款并返还保证金。</p>
+          <label>说明</label><textarea id="statement" placeholder="例如：回答与问题完全无关"></textarea>`, async (answer) => {
           const result = await api("/api/dispute", { password: answer.password, settlement_key: entry.settlement_key, statement: answer.form.querySelector("#statement").value });
           toast(`争议已提交，${result.relays_accepted.length} 个 Relay 接收了证据`); await refreshHistory();
         });
-      };
       action.append(button);
     }
     row.append(action); $("history").append(row);