@itpay/cli 2.1.40 → 2.1.41

package/dist/src/commands/skill.js

@@ -1,7 +1,6 @@
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { CODEX_WAIT_GUIDANCE } from "./install.js";
 import { declaredAgentType } from "../state/agent_type.js";
 import { CommandContractError, writeCommandEnvelope } from "./guidance.js";
 const commandDir = dirname(fileURLToPath(import.meta.url));
@@ -20,14 +19,12 @@ export function runSkillShow(name, options = {}) {
     }
     validateSkill(content);
     const agentType = options.agentType ?? declaredAgentType();
-    if (agentType?.startsWith("codex-"))
-        content += `\n## Codex command continuation\n\n${CODEX_WAIT_GUIDANCE}\n`;
     const envelope = {
         status: "shown",
         result: { skill: ITPAY_SKILL, content },
         instruction: agentType
             ? agentType === "workbuddy"
-                ? "完整读取并遵守 Skill；按用户意图选择第一条命令。保持 workbuddy 和同一 CLI launcher，并为 ~/.itpay-v3 申请宿主允许的持久化权限；权限被拒时报告受阻操作，不删除 identity。"
+                ? "完整读取并遵守 Skill；把自己视为服务用户的代理，先理解用户要购买新服务、查看已购内容、查询订单还是处理退款，并先解释用户权益，再选择对应的第一条命令。保持 workbuddy 和同一 Node/CLI launcher。运行会持久化 ~/.itpay-v3 的 ItPay Bash 命令前，把 Shell 工具参数 dangerouslyDisableSandbox 设为 true；用户拒绝权限时停止，不要切换 Node、删除 identity 或处理 lock。"
                 : `完整读取并遵守 Skill；把自己视为服务用户的代理，先理解用户意图和解释用户权益，再选择购买、已购内容、订单或退款对应的第一条命令。当前 Agent Type 是 ${agentType}，后续命令保持不变。`
             : "完整读取并遵守 Skill；先如实选择当前运行环境对应的 Agent Type。",
         next: agentType
@@ -49,10 +46,10 @@ function findSkillPath() {
             return directPath;
         return resolve(configuredRoot, ITPAY_SKILL, "SKILL.md");
     }
-    const packagePath = resolve(commandDir, "..", "..", "..", "skills", ITPAY_SKILL, "SKILL.md");
-    if (existsSync(packagePath))
-        return packagePath;
-    return resolve(commandDir, "..", "..", "skills", ITPAY_SKILL, "SKILL.md");
+    const sourcePath = resolve(commandDir, "..", "..", "skills", ITPAY_SKILL, "SKILL.md");
+    if (existsSync(sourcePath))
+        return sourcePath;
+    return resolve(commandDir, "..", "..", "..", "skills", ITPAY_SKILL, "SKILL.md");
 }
 function validateSkill(content) {
     const frontmatter = content.match(/^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/)?.[1];

package/dist/src/commands/vault.js

@@ -1,7 +1,7 @@
 import { HttpError } from "../client/http.js";
-import { requiresTarget, validateContext } from "../state/client_context.js";
+import { requiresTarget } from "../state/client_context.js";
 import { formatMoney } from "../render/output.js";
-import { CommandContractError, shellArgument, writeCommandEnvelope } from "./guidance.js";
+import { CommandContractError, writeCommandEnvelope } from "./guidance.js";
 import { buildVaultHandoff } from "./vault_handoff.js";
 function outputOptions(options, plainResult) {
     return {
@@ -19,21 +19,21 @@ export async function runVaultList(backend, input) {
         const value = await backend.listBuyerVaultArtifacts(input);
         writeCommandEnvelope({
             status: value.items.length ? "vault_listed" : "no_vault_artifacts",
-            result: { items: value.items.map(item => ({ ...item, amount: formatMoney(item.amount_minor, item.currency), reader: { command: vaultReadCommand(item.artifact_ref, [], input), reason: "读取这一已购内容" } })), next_cursor: value.next_cursor || null },
+            result: { items: value.items, next_cursor: value.next_cursor || null },
             instruction: value.items.length
-                ? "用编号、服务名称、内容主体、购买时间、金额和订单号说明匹配结果，不要向用户显示内部内容标识。一个精确匹配可按用户原始查看意图继续读取；已有任务可明确匹配时读取对应行；只有真实歧义才让用户选择。"
+                ? "用编号、服务名称、内容主体、购买时间、金额和订单号说明匹配结果，不要向用户显示内部内容标识。一个精确匹配可按用户原始查看意图继续读取；多个匹配必须让用户选择。"
                 : "当前账号没有匹配的已购内容。向用户说明没有找到，不要猜测内容标识、自动购买或发起新的服务查询。",
-            next: value.next_cursor ? { command: `itpay vault list --limit ${input.limit}${input.query ? ` --query ${shellArgument(input.query)}` : ""} --cursor ${shellArgument(value.next_cursor)}${contextFlags(input)} --json`, reason: "读取同一筛选的下一页" } : null,
+            next: null,
             recovery: [],
-        }, outputOptions(input));
+        }, outputOptions(input, value.items.map((item, index) => `${index + 1}. ${item.service_title}${item.subject_label ? ` · ${item.subject_label}` : ""} · ${formatMoney(item.amount_minor, item.currency)} · ${item.purchased_at} · ${item.order_code} · ${item.order_status}`)));
     }
     catch (error) {
         if (error instanceof HttpError && error.code === "vault_authorization_required") {
             writeCommandEnvelope({
                 status: "human_authorization_required",
                 result: { intent: "list_purchased_content", query: input.query ?? "" },
-                instruction: `需要用户确认一次身份和只读权限。按当前动作或待填模板生成官方入口，不要声称链接已经创建；用户完成后重新运行原始 vault list 命令。${accessContextInstruction(input)}`,
-                ...vaultAccessGuidance(undefined, input), recovery: [],
+                instruction: `需要用户确认一次身份和只读权限。执行 next.command 生成官方入口，不要声称链接已经创建；用户完成后重新运行原始 vault list 命令。${accessContextInstruction(input)}`,
+                next: { command: vaultAccessCommand(undefined, input), reason: "创建一次账号读取授权" }, recovery: [],
             }, outputOptions(input));
             return;
         }
@@ -41,9 +41,6 @@ export async function runVaultList(backend, input) {
     }
 }
 export async function runVaultAccess(backend, artifactRef, options) {
-    const issue = validateContext(options.host, options.target);
-    if (issue)
-        throw new CommandContractError(issue.code, issue.message, "先补齐当前可信会话的真实宿主和目标；尚未创建授权请求。", [], { schema_version: "itpay.interaction.v1", stage: "input_required", input_template: { command: vaultAccessCommand(artifactRef, options), required_input: issue.code === "target_required" ? ["target"] : ["host"], executable: false } });
     const value = await backend.createVaultAccessRequest(artifactRef
         ? { purpose: "artifact_reveal", artifact_ref: artifactRef }
         : { purpose: "account_window" });
@@ -93,23 +90,23 @@ export async function runVaultRead(backend, artifactRef, sections, options) {
                 : value.status === "result_preparing"
                     ? "这份已购内容仍在准备。稍后只重试同一 read，不要重新授权、购买或调用 Provider。"
                     : "这份已购内容当前不可用。停止，不要重试、重新购买或绕过退款锁。",
-            next: value.status === "result_preparing" ? { command: vaultReadCommand(artifactRef, normalized, options), reason: "稍后读取同一内容及原sections；不重新授权或购买" } : null, recovery: [],
+            next: null, recovery: [],
         }, outputOptions(options));
     }
     catch (error) {
         if (error instanceof HttpError && error.code === "artifact_authorization_required") {
             writeCommandEnvelope({
                 status: "human_authorization_required", result: { artifact_ref: artifactRef },
-                instruction: `这份内容需要用户单独确认读取权限。按当前动作或待填模板生成一次官方入口；用户完成后重新运行原始 read，不要重复创建授权请求。${accessContextInstruction(options)}`,
-                ...vaultAccessGuidance(artifactRef, options), recovery: [],
+                instruction: `这份内容需要用户单独确认读取权限。执行 next.command 生成一次官方入口；用户完成后重新运行原始 read，不要重复创建授权请求。${accessContextInstruction(options)}`,
+                next: { command: vaultAccessCommand(artifactRef, options), reason: "创建一次内容读取授权" }, recovery: [],
             }, outputOptions(options));
             return;
         }
         if (error instanceof HttpError && error.code === "vault_authorization_required") {
             writeCommandEnvelope({
                 status: "human_authorization_required", result: { artifact_ref: artifactRef },
-                instruction: `账号读取授权已缺失或过期。按当前动作或待填模板生成一次官方入口；用户完成后重新运行原始 read。${accessContextInstruction(options)}`,
-                ...vaultAccessGuidance(undefined, options), recovery: [],
+                instruction: `账号读取授权已缺失或过期。执行 next.command 生成一次官方入口；用户完成后重新运行原始 read。${accessContextInstruction(options)}`,
+                next: { command: vaultAccessCommand(undefined, options), reason: "创建一次账号读取授权" }, recovery: [],
             }, outputOptions(options));
             return;
         }
@@ -124,7 +121,7 @@ export function vaultAccessCommand(artifactRef, options) {
     const host = options.host ?? (openClaw ? "<host>" : undefined);
     if (host)
         parts.push("--host", host);
-    const target = options.target ?? (((openClaw && !options.host) || (options.host && requiresTarget(options.host))) ? "<target>" : undefined);
+    const target = options.target ?? (openClaw && (!options.host || requiresTarget(options.host)) ? "<target>" : undefined);
     if (target)
         parts.push("--target", shellArgument(target));
     parts.push("--json");
@@ -135,14 +132,10 @@ export function accessContextInstruction(options) {
         ? " 将 <host> 和 <target> 替换为当前可信 OpenClaw 会话的真实值，不要照抄占位符或猜测目标。"
         : "";
 }
-function contextFlags(options) {
-    return `${options.host ? ` --host ${options.host}` : ""}${options.target ? ` --target ${shellArgument(options.target)}` : ""}`;
-}
-function vaultReadCommand(artifact, sections, options) {
-    return `itpay vault read --artifact ${shellArgument(artifact)}${sections.map(section => ` --section ${shellArgument(section)}`).join("")}${contextFlags(options)} --json`;
-}
-export function vaultAccessGuidance(artifact, options) {
-    const command = vaultAccessCommand(artifact, options);
-    const missing = [...(options.agentType === "openclaw" && !options.host ? ["host"] : []), ...(options.host && requiresTarget(options.host) && !options.target || options.agentType === "openclaw" && !options.host && !options.target ? ["target"] : [])];
-    return missing.length ? { next: null, interaction: { schema_version: "itpay.interaction.v1", stage: "input_required", input_template: { command, required_input: missing, executable: false } } } : { next: { command, reason: "创建一次官方只读授权入口；用户完成后恢复原reader" } };
+function shellArgument(value) {
+    if (value.startsWith("<") && value.endsWith(">"))
+        return value;
+    if (/^[\p{L}\p{N}._:=/-]+$/u.test(value))
+        return value;
+    return `'${value.replaceAll("'", `'"'"'`)}'`;
 }

package/dist/src/commands/vault_handoff.js

@@ -20,13 +20,6 @@ export async function buildVaultHandoff(input) {
             instruction: "向用户说明这是查看已购内容的只读授权，然后立即用 ZCode 内置浏览器打开 handoff.url。确认已发起打开后停止等待；不要只粘贴文字链接，也不要下载或重建二维码。只有内置浏览器明确不可用时，才展示同一个可点击 handoff.url。用户完成后重新运行最初的读取命令，不要再次创建授权请求。",
         };
     }
-    if (input.agentType?.trim().toLowerCase() === "doubao-work" && platform === "plain_chat") {
-        handoff.qr_image_url = input.qrPNGURL ?? vaultQRURL(input.authorizationURL, input.requestID);
-        return {
-            handoff,
-            instruction: "向用户说明这是查看已购内容的只读授权。在当前豆包工作对话中将 handoff.url 标为“直接打开授权页”，将 handoff.qr_image_url 标为“授权二维码图片（保存或用另一台设备扫码）”，然后停止等待。不要解析 URL credential、下载或重建二维码，也不要重复创建授权请求；用户完成后重新运行最初的读取命令。",
-        };
-    }
     if (platform === "markdown") {
         const downloaded = input.imageAttachEnabled && input.qrPNGURL
             ? await downloadBrandQRToTmp(input.qrPNGURL, "auth", input.requestID, {
@@ -60,17 +53,6 @@ export async function buildVaultHandoff(input) {
         ...(platform === "terminal" ? { terminalQR: await renderTerminalQR(input.authorizationURL, input.qrFormat ?? "unicode") } : {}),
     };
 }
-function vaultQRURL(authorizationURL, requestID) {
-    const url = new URL(authorizationURL);
-    const startToken = url.searchParams.get("start_token");
-    if (!startToken)
-        throw new Error("Backend did not return a usable Vault authorization QR URL");
-    url.pathname = `/v1/vault/access-requests/${encodeURIComponent(requestID)}/qr.png`;
-    url.search = "";
-    url.searchParams.set("start_token", startToken);
-    url.hash = "";
-    return url.toString();
-}
 function authorizationMarkdown(url, localPath) {
     const lines = ["### ItPay 已购内容授权"];
     if (localPath)