@xiashe/cli 0.1.10 → 0.1.12

package/README.md

@@ -23,7 +23,8 @@ xiashe chat send --chat "New Chat" --content "帮我处理这个文件" --file .
 xiashe skills publish draft . --source xiashe
 xiashe skills publish doctor "<submission-id>"
 xiashe skills publish submit "<submission-id>"
-xiashe payment doctor
+# This checks only that the bridge CLI is present; it does not query a wallet.
+xiashe payment bridge-info
 # After the Agent shows the Skill and purpose and the user explicitly agrees:
 xiashe payment pay --resource-url "https://<actions-site>/payment/alipay-ai-collect?orderId=<id>" --intent-summary "使用付费 Skill：<name>" --confirm
 xiashe payment status --resource-url "https://<actions-site>/payment/alipay-ai-collect?orderId=<id>"
@@ -47,10 +48,10 @@ Production defaults:
 
 `xiashe payment` is the shell-capable Agent path for Alipay AI Pay. It delegates only to the official local `alipay-bot` supplied by `@alipay/agent-payment`; it does not implement or expose `Payment-Needed` / `Payment-Proof` itself.
 
-- `xiashe payment doctor` checks whether the local wallet is enabled.
-- `xiashe payment pay` requires an HTTPS AI-Collect resource URL, a visible purchase-purpose summary, and `--confirm`. The command then waits for the user to approve in Alipay App.
-- `xiashe payment status` returns a normalized status only. No wallet protocol payload or proof is printed.
+- `xiashe payment bridge-info` checks that the official buyer CLI is available without querying the wallet. `payment doctor` remains a manual diagnostic only.
+- `xiashe payment pay` requests the resource once, saves its exact 402 request in a private local file, and passes that file plus one stable session id to the official buyer CLI. It requires an HTTPS AI-Collect resource URL, a visible purchase-purpose summary, and `--confirm`.
+- `xiashe payment status` resumes the same local attempt with its official query credential and returns a normalized status only. No wallet protocol payload or proof is printed.
 
 An Agent must never add `--confirm` before the user has explicitly agreed to the displayed purpose. If the wallet is unavailable, obtain permission before running the official `@alipay/agent-payment` setup, then run `payment doctor` again.
 
-For a clean Codex Task, the XiaShe MCP response provides a version-pinned ephemeral command such as `npx -y @xiashe/cli@0.1.10 payment doctor`. No global `xiashe` installation is required for that path.
+For a clean Codex Task, the XiaShe MCP response provides a version-pinned ephemeral command such as `npx -y @xiashe/cli@0.1.12 payment bridge-info`. No global `xiashe` installation is required for that path. The Agent must run the subsequent payment command in the foreground and must not expect a QR code: this is an Alipay App-confirmation flow.

package/bin/xiashe.mjs

@@ -36,6 +36,7 @@ const {
   decodeMcpToolResult,
   nowIso,
   checkAlipayWallet,
+  getAlipayWalletBridgeInfo,
   payAlipay402Resource,
   queryAlipay402Resource
 } = sdk;
@@ -95,8 +96,8 @@ Usage:
   ${c} files upload <path>
   ${c} files list
 
-  ${c} payment doctor
-  ${c} payment pay --resource-url <https-url> --intent-summary <text> --confirm
+  ${c} payment bridge-info|doctor
+  ${c} payment pay --resource-url <https-url> --intent-summary <text> --confirm [--wallet-timeout-ms <ms>]
   ${c} payment status --resource-url <https-url>
 
   ${c} ops doctor
@@ -126,7 +127,8 @@ function parseGlobal(argv) {
     actionsUrl: '',
     market: '',
     locale: '',
-    timeoutMs: 20_000
+    timeoutMs: 20_000,
+    timeoutMsExplicit: false
   };
   for (let i = 0; i < argv.length; i += 1) {
     const value = argv[i];
@@ -173,6 +175,7 @@ function parseGlobal(argv) {
       if (!Number.isFinite(global.timeoutMs) || global.timeoutMs < 1000) {
         fail('Invalid --timeout-ms value.', EXIT_USAGE);
       }
+      global.timeoutMsExplicit = true;
       i += 1;
       continue;
     }
@@ -1143,6 +1146,18 @@ async function cmdFiles(sub, args, global) {
 
 async function cmdPayment(sub, args, global) {
   const flags = parseFlags(args);
+  if (sub === 'bridge-info' || sub === 'bridge' || sub === 'prepare') {
+    const result = await getAlipayWalletBridgeInfo({ timeoutMs: global.timeoutMs });
+    print(result, global);
+    return;
+  }
+  const walletTimeoutValue = flags['wallet-timeout-ms'] ?? flags.walletTimeoutMs ?? (global.timeoutMsExplicit ? global.timeoutMs : undefined);
+  const walletTimeoutMs = walletTimeoutValue === undefined
+    ? undefined
+    : numericFlag({ walletTimeoutMs: walletTimeoutValue }, 'walletTimeoutMs', 0);
+  if (walletTimeoutValue !== undefined && !walletTimeoutMs) {
+    fail('Invalid --wallet-timeout-ms value.', EXIT_USAGE);
+  }
   if (sub === 'doctor' || sub === 'wallet' || sub === 'wallet-status') {
     const result = await checkAlipayWallet({ timeoutMs: global.timeoutMs });
     print(result, global);
@@ -1155,7 +1170,7 @@ async function cmdPayment(sub, args, global) {
       resourceUrl,
       intentSummary,
       confirm: flags.confirm === true
-    }, { timeoutMs: global.timeoutMs });
+    }, walletTimeoutMs ? { timeoutMs: walletTimeoutMs } : {});
     print(result, global);
     return;
   }
@@ -1165,7 +1180,7 @@ async function cmdPayment(sub, args, global) {
     print(result, global);
     return;
   }
-  fail(`Usage: ${COMMAND_NAME} payment doctor|pay|status`, EXIT_USAGE);
+  fail(`Usage: ${COMMAND_NAME} payment bridge-info|doctor|pay|status`, EXIT_USAGE);
 }
 
 async function cmdOps(sub, args, global) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiashe/cli",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "type": "module",
   "bin": {
     "xiashe": "bin/xiashe.mjs"
@@ -10,7 +10,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@xiashe/sdk": "0.1.10"
+    "@xiashe/sdk": "0.1.12"
   },
   "engines": {
     "node": ">=20"