@itpay/cli 0.2.1 → 0.2.2

package/README.md

@@ -158,6 +158,19 @@ Before starting a new purchase, agents should inspect recoverable local state:
 itp status --refresh --json
 ```
 
+Humans can use the default account overview:
+
+```bash
+itp status
+```
+
+```text
+Account:  buyer_7xK2mP9vQ4
+Linked:   alipay, wechat
+Orders:   12
+Device:   Codex on MacBook-Pro (active)
+```
+
 If an unfinished run exists, continue it:
 
 ```bash

package/lib/account-status.js

@@ -0,0 +1,157 @@
+import { coreApi } from "./http.js";
+import { noRecoverableContext } from "./buyer.js";
+import { cliCommand, output, readConfig, readCredentials, readSessionToken, safeErrorMessage } from "./env.js";
+
+async function accountOverviewStatus(flags = {}) {
+  const config = readConfig();
+  const credentials = readCredentials();
+  const hasLocalSession = Boolean(readSessionToken(credentials) || flags.access_token);
+  const base = {
+    schema_version: "itp.agent.v1",
+    status: hasLocalSession ? "account_status_unavailable" : "unauthenticated",
+    phase: hasLocalSession ? "account_status_unavailable" : "unauthenticated",
+    authenticated: false,
+    session_verified: !hasLocalSession,
+    auth_source: hasLocalSession ? "local_files_unverified" : "local_files",
+    account_id: config.account_id || null,
+    buyer_account_id: config.account_id || null,
+    device_id: config.device_id || null,
+    agent_device_id: config.device_id || null,
+    linked_providers: [],
+    order_count: 0,
+    created_at: null,
+    device: config.device_id ? { agent_device_id: config.device_id } : null,
+    next: hasLocalSession
+      ? { type: "retry_status", command: cliCommand("status", "--json"), safe_for_agent: true }
+      : { type: "start_auth", command: cliCommand("setup", "--plan", "credit-300", "--method", "alipay", "--json"), safe_for_agent: true },
+    recoverable_context: noRecoverableContext(),
+    agent_next_actions: hasLocalSession
+      ? ["run_status_refresh", "view_orders", "create_refund_if_needed", "list_agent_read_grants"]
+      : ["start_human_auth_if_unauthenticated"],
+    secrets: { raw_key_included: false, session_token_included: false }
+  };
+  if (!hasLocalSession) return base;
+
+  try {
+    const me = await coreApi("/v1/me", { method: "GET" }, flags);
+    const authenticated = Boolean(me.authenticated);
+    const accountID = me.buyer_account_id || config.account_id || null;
+    const deviceID = me.agent_device_id || me.device?.agent_device_id || config.device_id || null;
+    return {
+      ...base,
+      status: authenticated ? "idle" : "unauthenticated",
+      phase: authenticated ? "idle" : "unauthenticated",
+      authenticated,
+      session_verified: true,
+      auth_source: "core",
+      account_id: accountID,
+      buyer_account_id: accountID,
+      device_id: deviceID,
+      agent_device_id: deviceID,
+      linked_providers: Array.isArray(me.linked_providers) ? me.linked_providers : [],
+      order_count: Number.isFinite(Number(me.order_count)) ? Number(me.order_count) : 0,
+      created_at: me.created_at || null,
+      device: me.device || (deviceID ? { agent_device_id: deviceID } : null),
+      next: authenticated
+        ? { type: "buyer_ready", command: cliCommand("buyer", "auth", "status", "--json"), safe_for_agent: true }
+        : base.next,
+      agent_next_actions: authenticated
+        ? ["search_catalog", "view_orders", "create_refund_if_needed", "list_agent_read_grants"]
+        : ["start_human_auth_if_unauthenticated"],
+      backend: {
+        environment: me.environment || null,
+        backend_version: me.backend_version || null
+      }
+    };
+  } catch (error) {
+    return {
+      ...base,
+      error: safeErrorMessage(error)
+    };
+  }
+}
+
+function outputAccountStatus(status, flags = {}) {
+  if (flags.json) {
+    output(status);
+    return;
+  }
+  console.log(formatStatusText(status));
+}
+
+function formatStatusText(status = {}) {
+  if (!status.authenticated) {
+    const lines = [
+      `Account:  ${status.account_id ? `${status.account_id} (unverified)` : "not signed in"}`,
+      "Linked:   -",
+      "Orders:   -",
+      `Device:   ${formatDeviceLine(status.device, status.device_id) || "-"}`
+    ];
+    if (status.error) lines.push(`Error:    ${status.error}`);
+    return lines.join("\n");
+  }
+  const linked = Array.isArray(status.linked_providers) && status.linked_providers.length
+    ? status.linked_providers.join(", ")
+    : "-";
+  return [
+    `Account:  ${status.buyer_account_id || status.account_id || "-"}`,
+    `Linked:   ${linked}`,
+    `Orders:   ${Number.isFinite(Number(status.order_count)) ? Number(status.order_count) : 0}`,
+    `Device:   ${formatDeviceLine(status.device, status.device_id) || "-"}`
+  ].join("\n");
+}
+
+function formatDeviceLine(device, fallbackID = "") {
+  const displayName = String(device?.display_name || "").trim();
+  const deviceID = String(device?.agent_device_id || fallbackID || "").trim();
+  const label = displayName || deviceID;
+  if (!label) return "";
+  const status = String(device?.status || "").trim();
+  return status ? `${label} (${status})` : label;
+}
+
+async function refreshBuyerSessionForStatus(flags = {}) {
+  const config = readConfig();
+  const credentials = readCredentials();
+  if (!readSessionToken(credentials)) {
+    return {
+      authenticated: false,
+      session_verified: true,
+      account_id: config.account_id || null,
+      device_id: config.device_id || null,
+      auth_source: "core_no_session"
+    };
+  }
+  try {
+    const status = await coreApi("/v1/me/auth/status", { method: "GET" }, flags);
+    return {
+      authenticated: true,
+      session_verified: true,
+      account_id: status.buyer_account_id || config.account_id || null,
+      device_id: config.device_id || null,
+      account_status: status.account_status || null,
+      auth_source: "core"
+    };
+  } catch (error) {
+    return {
+      authenticated: false,
+      session_verified: true,
+      account_id: config.account_id || null,
+      device_id: config.device_id || null,
+      auth_source: "core",
+      error: safeErrorMessage(error)
+    };
+  }
+}
+
+function nextActionForAuthStatus(auth = {}, flags = {}) {
+  if (auth.authenticated && auth.session_verified === false) {
+    return { type: "verify_buyer_session", command: cliCommand("status", "--refresh", "--json"), safe_for_agent: true };
+  }
+  if (auth.authenticated) {
+    return { type: "buyer_ready", command: cliCommand("buyer", "auth", "status", "--json"), safe_for_agent: true };
+  }
+  return { type: "start_auth", command: cliCommand("setup", "--plan", "credit-300", "--method", "alipay", "--json"), safe_for_agent: true };
+}
+
+export { accountOverviewStatus, outputAccountStatus, refreshBuyerSessionForStatus, nextActionForAuthStatus };

package/lib/render-human.js

@@ -8,7 +8,7 @@ import { apiTimeoutMs, cliCommand, commandExists, mergeRun, readRun, readState,
 async function renderItPayPaymentAction(intent, flags = {}) {
   const action = intent?.human_action ? { ...intent.human_action } : (intent?.payment_url ? {
     id: intent.payment_intent_id,
-    title: "Scan with Alipay",
+    title: "Scan payment QR",
     url: intent.payment_url,
     expires_at: intent.qr?.expires_at
   } : null);
@@ -23,7 +23,7 @@ async function renderItPayPaymentAction(intent, flags = {}) {
   if (action && (intent?.qr_image_url || intent?.qr?.image_url)) {
     action.qr_image_url = intent.qr_image_url || intent.qr.image_url;
     action.display_mode = intent.qr?.scan_mode || "itpay_entry_qr";
-    action.description = action.description || "Scan the ItPay payment entry QR; ItPay will safely hand off to Alipay.";
+    action.description = action.description || "Scan the ItPay payment entry QR; ItPay will safely hand off to the payment provider.";
   }
   const result = await renderHumanAction(action, flags);
   if (intent && action) {
@@ -39,7 +39,7 @@ function humanActionSummaryLines(action) {
   if (!action?.url) return [];
   const lines = [
     "ITP HUMAN ACTION REQUIRED",
-    `Title: ${action.title || "Scan with Alipay"}`,
+    `Title: ${humanActionTitle(action)}`,
     `URL: ${action.url}`
   ];
   if (action.local_qr_path) {
@@ -55,7 +55,7 @@ function humanActionSummaryLines(action) {
     lines.push(`Mobile wallet link: ${action.mobile_wallet_url}`);
   }
   if (action.oauth_start_url) {
-    lines.push(`Alipay auth fallback: ${action.oauth_start_url}`);
+    lines.push(`${humanActionProviderLabel(action)} auth fallback: ${action.oauth_start_url}`);
   }
   if (action.fallback_text && !action.fallback_text.includes(action.url)) {
     lines.push(`Fallback: ${action.fallback_text}`);
@@ -89,7 +89,7 @@ function writeWaitHeartbeat({ kind, idName, idValue, status, action, lastHeartbe
     action?.qr_png_url ? `QR PNG: ${action.qr_png_url}` : null,
     action?.qr_image_url ? `QR image: ${action.qr_image_url}` : null,
     action?.mobile_wallet_url ? `Mobile wallet link: ${action.mobile_wallet_url}` : null,
-    action?.oauth_start_url ? `Alipay auth fallback: ${action.oauth_start_url}` : null,
+    action?.oauth_start_url ? `${humanActionProviderLabel(action)} auth fallback: ${action.oauth_start_url}` : null,
     command ? `Resume command: ${command}` : null
   ].filter(Boolean);
   process.stderr.write(`\n${lines.join("\n")}\n\n`);
@@ -147,9 +147,29 @@ async function renderHumanAction(action, flags = {}) {
   }
 
   const renderResult = { rendered: false, mode, outputs: [] };
+  const terminalQRAllowed = shouldRenderTerminalQR(host, mode);
+  const providerLabel = humanActionProviderLabel(action);
+  const actionTitle = humanActionTitle(action);
   writeHumanActionSummary(action);
+
+  if ((mode === "auto" || mode === "terminal") && terminalQRAllowed) {
+    const qr = await QRCode.toString(action.url, {
+      type: terminalQRType(flags, host),
+      small: true,
+      errorCorrectionLevel: "M"
+    });
+    process.stderr.write(`\n${actionTitle}\n`);
+    if (action.description) process.stderr.write(`${action.description}\n`);
+    process.stderr.write(`${qr}\n`);
+    process.stderr.write(`${providerLabel} action URL: ${action.url}\n`);
+    if (action.expires_at) process.stderr.write(`Expires at: ${formatActionTime(action.expires_at)}\n`);
+    renderResult.rendered = true;
+    renderResult.outputs.push("terminal");
+    return renderResult;
+  }
+
   if ((mode === "auto" || mode === "browser") && shouldOpenBrowser(flags)) {
-    if (openBrowser(action.mobile_wallet_url || qrImageURL || action.url)) {
+    if (openBrowser(qrImageURL || action.mobile_wallet_url || action.url)) {
       renderResult.rendered = true;
       renderResult.outputs.push("browser");
     }
@@ -162,7 +182,7 @@ async function renderHumanAction(action, flags = {}) {
       await downloadQRImage(qrImageURL, file, flags);
       action.local_qr_path = file;
       action.local_qr_mime = qrMimeType(qrImageURL, action);
-      process.stderr.write(`Alipay QR image: ${file}\n`);
+      process.stderr.write(`${providerLabel} QR image: ${file}\n`);
       renderResult.rendered = true;
       renderResult.outputs.push(file);
       if (mode === "file") return renderResult;
@@ -173,44 +193,42 @@ async function renderHumanAction(action, flags = {}) {
       if (localPath) {
         attachAgentLocalQR(action, localPath);
         annotateHumanActionPresentation(action, "");
-        process.stderr.write(`Alipay action QR image: ${localPath}\n`);
+        process.stderr.write(`${providerLabel} action QR image: ${localPath}\n`);
         renderResult.rendered = true;
         renderResult.outputs.push(localPath);
         if (mode === "file") return renderResult;
       } else {
-        process.stderr.write(`No QR image available. Open action URL: ${action.url}\n`);
+        process.stderr.write(`No branded QR image available. Open action URL: ${action.url}\n`);
       }
     }
   }
 
   if (qrImageURL) {
-    process.stderr.write(`Alipay QR image URL: ${qrImageURL}\n`);
+    process.stderr.write(`${providerLabel} QR image URL: ${qrImageURL}\n`);
     if (action.mobile_wallet_url) process.stderr.write(`Mobile wallet link: ${action.mobile_wallet_url}\n`);
     renderResult.outputs.push("preferred_qr_url");
     return renderResult;
   }
 
-  if ((mode === "auto" || mode === "terminal") && shouldRenderTerminalQR(host)) {
-    const qr = await QRCode.toString(action.url, {
-      type: terminalQRType(flags, host),
-      small: true,
-      errorCorrectionLevel: "M"
-    });
-    process.stderr.write(`\n${action.title || "Scan with Alipay"}\n`);
-    if (action.description) process.stderr.write(`${action.description}\n`);
-    process.stderr.write(`${qr}\n`);
-    process.stderr.write(`Alipay action URL: ${action.url}\n`);
-    if (action.expires_at) process.stderr.write(`Expires at: ${formatActionTime(action.expires_at)}\n`);
-    renderResult.rendered = true;
-    renderResult.outputs.push("terminal");
-    return renderResult;
-  }
-
-  process.stderr.write(`${action.fallback_text || `Open Alipay URL: ${action.url}`}\n`);
+  process.stderr.write(`${action.fallback_text || `Open ${providerLabel} URL: ${action.url}`}\n`);
   renderResult.outputs.push("url");
   return renderResult;
 }
 
+function humanActionTitle(action = {}) {
+  if (action.title) return action.title;
+  if (action.kind === "auth_qr") return `${humanActionProviderLabel(action)} authentication`;
+  return "Scan payment QR";
+}
+
+function humanActionProviderLabel(action = {}) {
+  const raw = String(action.provider || action.channel || action.display_mode || "").toLowerCase();
+  if (raw.includes("alipay")) return "Alipay";
+  if (raw.includes("wechat")) return "WeChat Pay";
+  if (raw.includes("fake") || raw.includes("local")) return "ItPay local";
+  return "Alipay or WeChat Pay";
+}
+
 function preferredHumanActionQRURL(action) {
   return action?.qr_png_url ||
     humanActionPresentationURL(action, "qr_png_url") ||
@@ -416,16 +434,22 @@ function persistHumanAction(action, flags = {}) {
   writeRun(mergeRun(run, { human_action: action }));
 }
 
-function shouldRenderTerminalQR(host) {
+function shouldRenderTerminalQR(host, mode = "auto") {
+  if (["terminal", "tty"].includes(mode)) return true;
+  if (mode && !["auto", ""].includes(mode)) return false;
   if (process.stderr.isTTY) return true;
-  return ["gemini", "gemini-cli"].includes(host);
+  return terminalQRHostAliases().has(String(host || "").toLowerCase());
+}
+
+function terminalQRHostAliases() {
+  return new Set(["terminal", "tty", "bash", "zsh", "sh", "shell", "iterm", "iterm2"]);
 }
 
 function terminalQRType(flags = {}, host = "") {
   const requested = String(flags.qr_format || process.env.ITP_QR_FORMAT || "").toLowerCase();
   if (requested === "unicode" || requested === "utf8") return "utf8";
   if (requested === "ansi" || requested === "terminal") return "terminal";
-  if (["gemini", "gemini-cli"].includes(host)) return "utf8";
+  if (terminalQRHostAliases().has(String(host || "").toLowerCase())) return "utf8";
   return "terminal";
 }
 

package/lib/runtime.js

@@ -7,6 +7,7 @@ import {
   recoverableBuyerContextForStatus, recoverableIntentCheckGuidance
 } from "./buyer.js";
 import { renderHumanAction, shouldReturnAfterAgentTextQR, writeWaitHeartbeat } from "./render-human.js";
+import { accountOverviewStatus, nextActionForAuthStatus, outputAccountStatus, refreshBuyerSessionForStatus } from "./account-status.js";
 import {
   CREDENTIALS_PATH, CONFIG_DIR, RUNS_DIR, VERSION, apiBase, apiTimeoutMs, appendURLQuery, booleanFlag, cliCommand, commandExists,
   cryptoRandom, csvValues, currentExecutable, deleteGrantCredential, deleteSessionCredential, detectNativeCredentialStore,
@@ -131,14 +132,14 @@ async function setup(flags) {
         grant_id: checkout.grant_id || run.grant?.grant_id || null
       },
       human_action: checkout.human_action || null,
-      safe_summary: checkout.grant_id ? "Payment verified and grant is ready." : "Waiting for Alipay payment scan."
+      safe_summary: checkout.grant_id ? "Payment verified and grant is ready." : "Waiting for Alipay or WeChat Pay payment scan."
     });
     writeRun(run);
 
     if (checkout.human_action) {
       await renderHumanAction(checkout.human_action, setupFlags);
     } else if (checkout.payment?.cashier_url) {
-      process.stderr.write(`Open Alipay payment URL: ${checkout.payment.cashier_url}\n`);
+      process.stderr.write(`Open Alipay or WeChat Pay payment URL: ${checkout.payment.cashier_url}\n`);
     }
 
     if (!checkout.grant_id && (setupFlags.no_wait_payment || setupFlags.no_wait)) {
@@ -263,40 +264,7 @@ async function agentStatus(flags) {
   const runId = flags.run_id || readState().current_run_id;
   const run = readRun(runId);
   if (!run) {
-    const config = readConfig();
-    const credentials = readCredentials();
-    const hasLocalSession = Boolean(readSessionToken(credentials));
-    const auth = flags.refresh
-      ? await refreshBuyerSessionForStatus(flags)
-      : {
-          authenticated: hasLocalSession,
-          session_verified: false,
-          account_id: config.account_id || null,
-          device_id: config.device_id || null,
-          auth_source: hasLocalSession ? "local_files_unverified" : "local_files"
-        };
-    output({
-      schema_version: "itp.agent.v1",
-      status: auth.authenticated
-        ? (auth.session_verified === false ? "local_session_unverified" : "idle")
-        : "unauthenticated",
-      phase: auth.authenticated ? "idle" : "unauthenticated",
-      authenticated: Boolean(auth.authenticated),
-      session_verified: auth.session_verified !== false,
-      auth_source: auth.auth_source,
-      account_id: auth.account_id || null,
-      device_id: auth.device_id || null,
-      next: nextActionForAuthStatus(auth, flags),
-      recoverable_context: noRecoverableContext(),
-      agent_next_actions: auth.authenticated && auth.session_verified !== false
-        ? ["search_catalog", "view_orders", "create_refund_if_needed", "list_agent_read_grants"]
-        : ["run_status_refresh", "start_human_auth_if_unauthenticated"],
-      note: auth.authenticated && auth.session_verified === false
-        ? "Local buyer session exists but the server has not verified it. Run the next.command before order/refund/account operations."
-        : undefined,
-      error: auth.error || undefined,
-      secrets: { raw_key_included: false, session_token_included: false }
-    });
+    outputAccountStatus(await accountOverviewStatus(flags), flags);
     return;
   }
   const refreshed = flags.refresh ? await refreshRun(run, flags) : run;
@@ -306,50 +274,6 @@ async function agentStatus(flags) {
   }));
 }
 
-async function refreshBuyerSessionForStatus(flags = {}) {
-  const config = readConfig();
-  const credentials = readCredentials();
-  if (!readSessionToken(credentials)) {
-    return {
-      authenticated: false,
-      session_verified: true,
-      account_id: config.account_id || null,
-      device_id: config.device_id || null,
-      auth_source: "core_no_session"
-    };
-  }
-  try {
-    const status = await coreApi("/v1/me/auth/status", { method: "GET" }, flags);
-    return {
-      authenticated: true,
-      session_verified: true,
-      account_id: status.buyer_account_id || config.account_id || null,
-      device_id: config.device_id || null,
-      account_status: status.account_status || null,
-      auth_source: "core"
-    };
-  } catch (error) {
-    return {
-      authenticated: false,
-      session_verified: true,
-      account_id: config.account_id || null,
-      device_id: config.device_id || null,
-      auth_source: "core",
-      error: safeErrorMessage(error)
-    };
-  }
-}
-
-function nextActionForAuthStatus(auth = {}, flags = {}) {
-  if (auth.authenticated && auth.session_verified === false) {
-    return { type: "verify_buyer_session", command: cliCommand("status", "--refresh", "--json"), safe_for_agent: true };
-  }
-  if (auth.authenticated) {
-    return { type: "buyer_ready", command: cliCommand("buyer", "auth", "status", "--json"), safe_for_agent: true };
-  }
-  return { type: "start_auth", command: cliCommand("setup", "--plan", "credit-300", "--method", "alipay", "--json"), safe_for_agent: true };
-}
-
 async function resume(flags) {
   const runId = flags.run_id || readState().current_run_id;
   const run = readRun(runId);
@@ -761,7 +685,7 @@ async function createCheckoutResult(flags) {
       grant_id: response.grant_id || currentRun?.grant?.grant_id || null
     },
     human_action: response.human_action || null,
-    safe_summary: response.grant_id ? "Payment verified and grant is ready." : "Waiting for Alipay payment scan."
+    safe_summary: response.grant_id ? "Payment verified and grant is ready." : "Waiting for Alipay or WeChat Pay payment scan."
   }, flags);
   return response;
 }
@@ -827,7 +751,7 @@ async function paymentWaitResult(checkoutId, flags) {
       }
     }
     lastHeartbeatAt = writeWaitHeartbeat({
-      kind: "Alipay payment",
+      kind: "Alipay or WeChat Pay payment",
       idName: "checkout_id",
       idValue: checkoutId,
       status: response.status || "waiting",
@@ -1376,7 +1300,7 @@ async function refreshRun(run, flags = {}) {
         payment: { provider: next.payment_method, status: checkout.status },
         grant: { ...(next.grant || {}), grant_id: checkout.grant_id || next.grant?.grant_id || null },
         human_action: checkout.human_action || null,
-        safe_summary: checkout.grant_id ? "Payment verified and grant is ready." : checkout.status === "waiting_user_payment" ? "Waiting for Alipay payment scan." : `Checkout status: ${checkout.status}`
+        safe_summary: checkout.grant_id ? "Payment verified and grant is ready." : checkout.status === "waiting_user_payment" ? "Waiting for Alipay or WeChat Pay payment scan." : `Checkout status: ${checkout.status}`
       });
     } catch (error) {
       next = mergeRun(next, { last_error: safeErrorMessage(error), safe_summary: "Could not refresh checkout status." });
@@ -1498,7 +1422,7 @@ function appendPassthroughFlag(args, flags, key, flagName = key) {
 
 function safeUserMessageForRun(run) {
   if (run.phase === "waiting_human_auth") return "Please scan the Alipay authentication QR. I will continue automatically after approval.";
-  if (run.phase === "waiting_human_payment") return "Please scan the Alipay payment QR. I will continue automatically after payment is verified.";
+  if (run.phase === "waiting_human_payment") return "Please scan the Alipay or WeChat Pay payment QR. I will continue automatically after payment is verified.";
   if (run.grant?.installed) return "Payment verified. The API credential is stored locally.";
   return run.safe_summary || "ITPay setup is in progress.";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itpay/cli",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "ItPay CLI, buyer skill, and agent-readable docs for agent-native commerce.",
   "type": "module",
   "bin": {