@xiashe/cli 0.1.31 → 0.1.32

package/README.md

@@ -26,7 +26,7 @@ xiashe skills publish submit "<submission-id>"
 # 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://<payment-resource-site>/payment/alipay-ai-collect/skills/<skillCatalogId>?orderId=<id>" --intent-summary "使用付费 Skill：<name>" --session-id "<active-agent-session>" --confirm
+xiashe payment pay --resource-url "https://<payment-resource-site>/payment/alipay-ai-collect/skills/<skillCatalogId>?orderId=<id>" --intent-summary "使用付费 Skill：<name>" --confirm
 xiashe payment status --resource-url "https://<payment-resource-site>/payment/alipay-ai-collect/skills/<skillCatalogId>?orderId=<id>"
 # Only for an Alipay support-assisted read-only query. This is not out_trade_no or Payment-Proof.
 xiashe payment status --resource-url "https://<payment-resource-site>/payment/alipay-ai-collect/skills/<skillCatalogId>?orderId=<id>" --business-no "<32-digit outShakeNo with 8282 in positions 11–14>"
@@ -51,10 +51,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 bridge-info` checks that the official buyer CLI can run and exposes the buyer-pay/status command contract required by the bridge. It does not check wallet authorization, merchant activation, or whether a transaction can be created. `payment doctor` remains a manual wallet-status diagnostic only.
-- `xiashe payment pay` requests the resource once, saves its exact 402 request in a private local file, and passes that file plus the current Agent business-session ID to the official buyer CLI. It requires an HTTPS AI-Collect resource URL, a visible purchase-purpose summary, `--session-id`, and `--confirm`; it never generates a replacement session ID.
+- `xiashe payment pay` requests the resource once, saves its exact 402 request in a private local file, and passes that file plus the current Agent business-session ID to the official buyer CLI. It requires an HTTPS AI-Collect resource URL, a visible purchase-purpose summary, and `--confirm`. After confirmation it resolves a valid current host session only from its own local process; `--session-id` remains an optional explicit adapter override. It never generates, prints, or persists a replacement session ID. If no valid host session is available, it returns `host_session_unavailable` and does not invoke the wallet.
 - `xiashe payment status` resumes the same local attempt with its official query credential and returns a normalized status only. If Alipay support provides the documented 32-digit `outShakeNo` (with `8282` in positions 11–14, sometimes called a business order number), use `--out-shake-no` or `--business-no` for one read-only status query; it is validated, never stored, and cannot create a payment or acknowledge fulfillment. No wallet protocol payload or proof is printed. A QR or confirmation image is exposed only as `officialMedia` when the official wallet emitted that image in the same invocation; the bridge never generates one itself.
 - `xiashe payment preflight` requests the seller resource once and validates the public field shape of its 402 bill without opening a wallet or creating a trade. It does not prove that Alipay accepts the seller signature, service binding, or merchant activation. `xiashe payment diagnose` is read-only. It reports the last stored safe diagnosis for that local attempt, including allow-listed official error/sub-codes, message, and request/trace identifiers when present, without contacting Alipay, replaying the resource, or exposing its local query credential.
 
 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.31 payment bridge-info`. No global `xiashe` installation is required for that path. Run the supplied preflight command before requesting payment confirmation, then run the payment and status commands exactly as supplied in the foreground. The Agent must inspect bridge JSON instead of suppressing output or guessing status from shell text. Failed attempts include a redacted `diagnosis` object and `userVisible` next step; do not replace them with a generic payment-failed message.
+For a clean Codex Task, the XiaShe MCP response provides a version-pinned ephemeral command such as `npx -y @xiashe/cli@0.1.32 payment bridge-info`. No global `xiashe` installation is required for that path. Do not run preflight before requesting payment confirmation: it is a read-only diagnostic only. After explicit confirmation, run the supplied payment and status commands exactly as supplied in the foreground. The Agent must inspect bridge JSON instead of suppressing output or guessing status from shell text. Failed attempts include a redacted `diagnosis` object and `userVisible` next step; do not replace them with a generic payment-failed message.

package/bin/xiashe.mjs

@@ -51,6 +51,20 @@ const EXIT_RUNTIME = 5;
 const COMMAND_NAME = process.env.XIASHE_CLI_NAME || 'xiashe';
 const PRODUCT_NAME = process.env.XIASHE_PRODUCT_NAME || (COMMAND_NAME === 'agentpie' ? 'AgentPie' : 'XiaShe');
 const PRODUCT_ENV = COMMAND_NAME === 'agentpie' ? 'global' : 'cn';
+// A payment business session is host-owned.  Keep the allowlist deliberately
+// narrow: this CLI may consume a current Task/session identifier from its own
+// process, but it must never manufacture, print, or persist one.
+const HOST_BUSINESS_SESSION_ENV_NAMES = Object.freeze([
+  'XIASHE_HOST_BUSINESS_SESSION',
+  'AGENT_HOST_BUSINESS_SESSION',
+  'AGENT_SESSION_ID',
+  'CODEX_THREAD_ID',
+  'OPENAI_THREAD_ID',
+  'AGENT_THREAD_ID',
+  'THREAD_ID',
+  'CONVERSATION_ID'
+]);
+const HOST_BUSINESS_SESSION_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._:-]{7,191}$/;
 
 function usage() {
   const c = COMMAND_NAME;
@@ -103,7 +117,7 @@ Usage:
 
   ${c} payment bridge-info|doctor
   ${c} payment preflight --resource-url <https-url>
-  ${c} payment pay --resource-url <https-url> --intent-summary <text> --session-id <active-agent-session> --confirm [--wallet-timeout-ms <ms>]
+  ${c} payment pay --resource-url <https-url> --intent-summary <text> [--session-id <active-agent-session>] --confirm [--wallet-timeout-ms <ms>]
   ${c} payment status --resource-url <https-url> [--out-shake-no <32-digit-8282>|--business-no <32-digit-8282>]
   ${c} payment diagnose --resource-url <https-url>
   ${c} payment support-report --resource-url <https-url>
@@ -251,6 +265,47 @@ function requireArg(value, label) {
   return value;
 }
 
+function resolvePaymentBusinessSession(flags) {
+  const explicitValue = flags['session-id'] ?? flags.sessionId;
+  if (explicitValue !== undefined) {
+    if (explicitValue === true || !String(explicitValue).trim()) {
+      fail('Missing value for --session-id.', EXIT_USAGE);
+    }
+    // Preserve the official SDK's validation and error reporting for an
+    // explicit caller-provided value. This is still useful for compatible
+    // hosts that expose a session through their own runtime adapter.
+    return {
+      sessionId: String(explicitValue).trim(),
+      source: 'explicit_argument'
+    };
+  }
+  for (const environmentName of HOST_BUSINESS_SESSION_ENV_NAMES) {
+    const candidate = String(process.env[environmentName] || '').trim();
+    if (HOST_BUSINESS_SESSION_PATTERN.test(candidate)) {
+      return {
+        sessionId: candidate,
+        source: 'current_host_environment'
+      };
+    }
+  }
+  return null;
+}
+
+function hostBusinessSessionUnavailableResult() {
+  return {
+    ok: false,
+    status: 'host_session_unavailable',
+    failureCode: 'HOST_BUSINESS_SESSION_UNAVAILABLE',
+    walletInvoked: false,
+    diagnosis: {
+      code: 'host_business_session_unavailable',
+      stage: 'host_session_resolution'
+    },
+    userVisible: '当前 Agent 未提供可用的任务会话标识，尚未发起支付宝付款。',
+    nextStep: '请在能向本地付款 CLI 提供当前任务 sessionId、threadId 或 conversationId 的 Agent 环境中重试；不要手工创建或粘贴替代值。'
+  };
+}
+
 function publicError(error) {
   const message = error instanceof Error ? error.message : String(error || '');
   const code = error?.code || message.match(/\b[A-Z][A-Z0-9_]{4,}\b/)?.[0] || '';
@@ -1208,14 +1263,27 @@ async function cmdPayment(sub, args, global) {
   if (sub === 'pay') {
     const resourceUrl = requireArg(flags['resource-url'] || flags.resourceUrl || flags.r, '--resource-url');
     const intentSummary = requireArg(flags['intent-summary'] || flags.intentSummary || flags.i, '--intent-summary');
-    const sessionId = requireArg(flags['session-id'] || flags.sessionId, '--session-id');
+    const businessSession = resolvePaymentBusinessSession(flags);
+    if (!businessSession) {
+      print(hostBusinessSessionUnavailableResult(), global);
+      process.exitCode = EXIT_RUNTIME;
+      return;
+    }
     const result = await payAlipay402Resource({
       resourceUrl,
       intentSummary,
-      sessionId,
+      sessionId: businessSession.sessionId,
       confirm: flags.confirm === true
     }, walletTimeoutMs ? { timeoutMs: walletTimeoutMs } : {});
-    print(result, global);
+    print({
+      ...result,
+      // This confirms resolution occurred without exposing the identifier or
+      // the environment variable that contained it.
+      hostBusinessSession: {
+        resolved: true,
+        source: businessSession.source
+      }
+    }, global);
     return;
   }
   if (sub === 'status') {

package/package.json

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