@itpay/cli 2.0.2 → 2.0.5

package/dist/src/main.js

@@ -2,9 +2,9 @@
 // services/backend/internal/httpapi/handlers/*.go. Commands only
 // orchestrate; HTTP and rendering live in src/client and src/render.
 import { Command } from "commander";
-import { loadConfig, cartSessionPath, newBackendClient } from "./state/config.js";
+import { CLI_VERSION, loadConfig, cartSessionPath, newBackendClient } from "./state/config.js";
 import { CartSession } from "./state/cart_session.js";
-import { defaultHostForAgentType, normalizeHost } from "./state/client_context.js";
+import { defaultHostForAgentType, normalizeHost, validateContext } from "./state/client_context.js";
 import { HttpError } from "./client/http.js";
 import { runReadyz } from "./commands/readyz.js";
 import { runBuy } from "./commands/buy.js";
@@ -13,18 +13,19 @@ import { runCheckoutPresentation } from "./commands/checkout.js";
 import { runPay } from "./commands/pay.js";
 import { runOrder } from "./commands/order.js";
 import { runListOrders } from "./commands/orders.js";
-import { runRefund } from "./commands/refund.js";
-import { runCartAdd, runCartAddServer, runCartAbandonServer, runCartClear, runCartNext, runCartRemove, runCartRemoveServer, runCartShowServer, } from "./commands/cart.js";
-import { printErrorRecovery } from "./commands/guidance.js";
+import { runCancelRefund, runGetRefund, runListRefunds, runRefund, runWatchRefund } from "./commands/refund.js";
+import { runCartAdd, runCartAddQuoteServer, runCartAddServer, runCartAbandonServer, runCartClear, runCartNext, runCartRemove, runCartRemoveServer, runCartShow, runCartShowServer, } from "./commands/cart.js";
+import { CommandContractError, printErrorRecovery, writeCommandEnvelope } from "./commands/guidance.js";
 import { runDocsList, runDocsShow, runDocsSearch } from "./commands/docs.js";
 import { runInstall } from "./commands/install.js";
-import { collectOption, parseKeyValueList, runServicesAction, runServicesCheckout, runServicesEvents, runServicesGet, runServicesInvoke, runServicesList, runServicesNext, runServicesReadResult, runServicesStart, } from "./commands/services.js";
+import { runNext } from "./commands/next.js";
+import { collectOption, parseKeyValueList, runServicesAction, runServicesCheckout, runServicesEvents, runServicesGet, runServicesInvoke, runServicesList, runServicesNext, runServicesReadResult, runServicesQuote, runServicesStart, } from "./commands/services.js";
 const program = new Command();
 program
     .name("itpay")
     .description("V3 ItPay CLI — checkout, payment, order, and refund commands")
     .option("--agent-type <type>", "agent runtime type used for device enrollment and client-specific guidance")
-    .version("2.0.2");
+    .version("2.0.5");
 function withHost(value) {
     const host = normalizeHost(value);
     if (!host) {
@@ -36,12 +37,24 @@ function parseRequiredContactFields(value) {
     if (!value) {
         return undefined;
     }
-    const parsed = value
+    const values = value
         .split(",")
         .map((item) => item.trim().toLowerCase())
-        .filter((item) => item === "email" || item === "phone");
+        .filter(Boolean);
+    const invalid = values.filter((item) => item !== "email" && item !== "phone");
+    if (invalid.length > 0) {
+        throw new CommandContractError("contact_field_invalid", `unsupported required contact fields: ${invalid.join(", ")}`, "--require-contact 只接受 email、phone 或二者组合。", [{ command: "itpay buy --help", reason: "查看 contact 参数" }]);
+    }
+    const parsed = values.filter((item) => item === "email" || item === "phone");
     return parsed.length > 0 ? parsed : undefined;
 }
+function positiveInteger(value, name) {
+    const text = String(value ?? "");
+    if (!/^[1-9]\d*$/.test(text)) {
+        throw new CommandContractError("buy_parameter_invalid", `${name} must be a positive integer`, `${name} 必须是正整数；本次未创建或修改 Cart/Checkout。`, [{ command: "itpay buy --help", reason: "查看参数格式" }]);
+    }
+    return Number(text);
+}
 function resolveCheckoutPresentationArgs(input) {
     if (input.requestedCheckoutID && input.requestedDisplayToken) {
         return { checkoutID: input.requestedCheckoutID, displayToken: input.requestedDisplayToken };
@@ -65,7 +78,25 @@ function resolveCheckoutPresentationArgs(input) {
     }
     throw new Error("checkout id and display token are required; pass --id/--token or create a checkout first");
 }
-function reportCLIError(error) {
+function reportCLIError(error, contract) {
+    const commandError = error instanceof CommandContractError ? error : undefined;
+    if (contract || commandError) {
+        writeCommandEnvelope({
+            status: "error",
+            error: {
+                code: commandError?.code ?? (error instanceof HttpError ? error.code : contract?.code ?? "command_failed"),
+                message: error instanceof Error ? error.message : String(error),
+            },
+            instruction: commandError?.instruction ?? contract?.instruction ?? "检查命令参数后重试。",
+            next: null,
+            recovery: commandError?.recovery ?? contract?.recovery ?? [],
+        }, {
+            ...(contract?.jsonOutput !== undefined ? { jsonOutput: contract.jsonOutput } : {}),
+            output: (text) => { process.stderr.write(text); },
+        });
+        process.exitCode = 1;
+        return;
+    }
     if (error instanceof HttpError) {
         process.stderr.write(`[${error.status}] ${error.code}: ${error.message}\n`);
         printErrorRecovery(error, (text) => process.stderr.write(text));
@@ -79,11 +110,34 @@ function reportCLIError(error) {
     }
     throw error;
 }
+function docsErrorFallback(jsonOutput) {
+    return {
+        jsonOutput,
+        code: "docs_unavailable",
+        instruction: "内置文档缺失或损坏；重新安装同版本 CLI 后重试。",
+        recovery: [{ command: `npm install -g @itpay/cli@${CLI_VERSION}`, reason: "恢复随包发布的文档" }],
+    };
+}
 program
     .command("readyz")
     .description("Probe the V3 backend readiness endpoint")
-    .action(async () => {
-    await withBackend(async (backend) => runReadyz(backend));
+    .option("--json", "output JSON instead of terminal text")
+    .action(async (options) => {
+    const backend = newBackendClient(loadConfig());
+    try {
+        await runReadyz(backend, { jsonOutput: Boolean(options.json) });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "backend_unavailable",
+            instruction: "检查 ITPAY_BACKEND_URL 后重试；后端恢复前不要继续下单。",
+            recovery: [
+                { command: "echo $ITPAY_BACKEND_URL", reason: "确认当前 Backend URL" },
+                { command: "itpay readyz", reason: "重试可用性检查" },
+            ],
+        });
+    }
 });
 program
     .command("next")
@@ -91,14 +145,8 @@ program
     .option("--json", "output JSON instead of terminal text")
     .action(async (options) => {
     const config = loadConfig();
-    const backend = newBackendClient(config);
     const session = CartSession.loadFromFile(cartSessionPath(), config.checkoutCurrency);
-    try {
-        await runCartNext(backend, session, { jsonOutput: Boolean(options.json) });
-    }
-    catch (error) {
-        reportCLIError(error);
-    }
+    runNext(session, { jsonOutput: Boolean(options.json) });
 });
 // --- catalog --------------------------------------------------------------
 const catalogCmd = program.command("catalog").description("Browse V3 service catalog");
@@ -107,49 +155,93 @@ catalogCmd
     .description("List all available services from the published catalog manifest")
     .option("--json", "output JSON instead of terminal text")
     .action(async (options) => {
-    await withBackend(async (backend) => runCatalogList(backend, { jsonOutput: Boolean(options.json) }));
+    const backend = newBackendClient(loadConfig());
+    try {
+        await runCatalogList(backend, { jsonOutput: Boolean(options.json) });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "catalog_unavailable",
+            instruction: "确认 ItPay 可用后重试目录读取；不要猜测 service_id。",
+            recovery: [
+                { command: "itpay readyz", reason: "确认 Backend 可用" },
+                { command: "itpay catalog list", reason: "重新读取已发布目录" },
+            ],
+        });
+    }
 });
 // --- install --------------------------------------------------------------
 const installCmd = program.command("install").description("Show setup instructions for each agent host");
 installCmd
-    .argument("[target]", "install target: claude-code, codex, terminal, telegram, feishu")
+    .argument("[target]", "Agent Type, or list")
+    .option("--json", "output JSON instead of terminal text")
     .description("Show agent-specific installation and configuration instructions")
-    .action((target) => {
-    runInstall(target);
+    .action((target, options) => {
+    try {
+        runInstall(target, { jsonOutput: Boolean(options.json) });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "install_failed",
+            instruction: "选择受支持的真实 Agent Type；本命令不会修改宿主配置。",
+            recovery: [{ command: "itpay install --json", reason: "列出支持类型" }],
+        });
+    }
 });
 // --- docs -----------------------------------------------------------------
 const docsCmd = program.command("docs").description("Browse agent documentation");
 docsCmd
     .command("list")
     .description("List all available agent doc topics")
-    .action(() => {
-    runDocsList();
+    .option("--json", "output JSON instead of terminal text")
+    .action((options) => {
+    try {
+        runDocsList({ jsonOutput: Boolean(options.json) });
+    }
+    catch (error) {
+        reportCLIError(error, docsErrorFallback(Boolean(options.json)));
+    }
 });
 docsCmd
     .command("show")
     .description("Show a specific doc topic")
     .argument("<topic>", "doc topic name")
-    .action((topic) => {
-    runDocsShow(topic);
+    .option("--json", "output JSON instead of terminal text")
+    .action((topic, options) => {
+    try {
+        runDocsShow(topic, { jsonOutput: Boolean(options.json) });
+    }
+    catch (error) {
+        reportCLIError(error, docsErrorFallback(Boolean(options.json)));
+    }
 });
 docsCmd
     .command("search")
     .description("Search doc topics by keyword")
     .argument("<query>", "search query")
-    .action((query) => {
-    runDocsSearch(query);
+    .option("--json", "output JSON instead of terminal text")
+    .action((query, options) => {
+    try {
+        runDocsSearch(query, { jsonOutput: Boolean(options.json) });
+    }
+    catch (error) {
+        reportCLIError(error, docsErrorFallback(Boolean(options.json)));
+    }
 });
 // --- cart ----------------------------------------------------------------
 const cart = program.command("cart").description("V3 canonical server cart");
 cart
     .command("add")
     .description("Add a variant/offer/quantity to the canonical server cart")
-    .requiredOption("--item <catalog_item_id>")
-    .requiredOption("--variant <catalog_variant_id>")
-    .requiredOption("--offer <offer_id>")
-    .option("--quantity <n>", "quantity", (value) => Number.parseInt(value, 10), 1)
+    .option("--item <catalog_item_id>")
+    .option("--variant <catalog_variant_id>")
+    .option("--offer <offer_id>")
+    .option("--quote <service_quote_lock_id>", "add a prepared service quote")
+    .option("--quantity <n>", "quantity", Number, 1)
     .option("--input <json>")
-    .option("--host <host>", "client host (terminal, codex, telegram, feishu, lark, ...)", "terminal")
+    .option("--host <host>", "client host (terminal, codex, telegram, feishu, lark, ...)")
     .option("--target <target>", "chat id / channel id / open id for IM hosts")
     .option("--json", "output JSON instead of terminal text")
     .option("--local", "only add to the local draft cache; not valid for service-backed flows")
@@ -157,32 +249,82 @@ cart
     const config = loadConfig();
     const sessionPath = cartSessionPath();
     const session = CartSession.loadFromFile(sessionPath, config.checkoutCurrency);
-    const addOptions = {
-        catalogItemID: options.item,
-        catalogVariantID: options.variant,
-        offerID: options.offer,
-        quantity: options.quantity,
-        ...(options.input ? { input: JSON.parse(options.input) } : {}),
-    };
+    const jsonOutput = Boolean(options.json);
     try {
+        const quoteMode = Boolean(options.quote);
+        if (quoteMode && (options.item || options.variant || options.offer || options.input || options.local)) {
+            throw new CommandContractError("cart_item_scope_invalid", "--quote cannot be combined with catalog fields, input, or --local", "服务报价只使用 services quote 返回的 quote ID；不要混入 Catalog 或 input 参数。", [{ command: "itpay cart add --help", reason: "查看两种添加方式" }]);
+        }
+        if (!quoteMode && (!options.item || !options.variant || !options.offer)) {
+            throw new CommandContractError("cart_item_required", "--item, --variant and --offer are required", "使用同一条 Catalog 记录返回的 item、variant 和 offer ID；不要猜测或混用。", [{ command: "itpay catalog list --json", reason: "读取已发布目录 ID" }]);
+        }
+        if (!quoteMode && (!Number.isInteger(options.quantity) || options.quantity < 1)) {
+            throw new CommandContractError("quantity_invalid", "--quantity must be a positive integer", "使用大于 0 的整数 quantity；本次未修改 Cart。", [{ command: "itpay cart show", reason: "确认当前 Cart 未变化" }]);
+        }
+        let input;
+        if (options.input) {
+            const parsed = JSON.parse(options.input);
+            if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+                throw new CommandContractError("cart_input_invalid", "--input must be a JSON object", "按照服务合同传入 JSON object；本次未修改 Cart。", [{ command: "itpay catalog list --json", reason: "重新确认服务入口" }]);
+            }
+            input = parsed;
+        }
+        const addOptions = {
+            catalogItemID: options.item,
+            catalogVariantID: options.variant,
+            offerID: options.offer,
+            quantity: options.quantity,
+            ...(input ? { input } : {}),
+        };
         if (options.local) {
-            runCartAdd(session, addOptions);
+            runCartAdd(session, { ...addOptions, jsonOutput });
         }
         else {
+            const host = withHost(options.host ?? defaultHostForAgentType(config.agentType));
+            const contextError = validateContext(host, options.target);
+            if (contextError) {
+                throw new CommandContractError(contextError.code, contextError.message, "补齐当前客户端所需的 Host/target；本次未创建或修改 Cart。", [{ command: "itpay cart add --help", reason: "查看客户端参数" }]);
+            }
             const backend = newBackendClient(config);
-            await runCartAddServer({
-                ...addOptions,
-                backend,
-                config,
-                session,
-                host: withHost(options.host),
-                ...(options.target ? { target: options.target } : {}),
-                jsonOutput: Boolean(options.json),
-            });
+            if (quoteMode) {
+                await runCartAddQuoteServer({
+                    serviceQuoteLockID: options.quote,
+                    backend, config, session, host,
+                    ...(options.target ? { target: options.target } : {}),
+                    jsonOutput,
+                });
+            }
+            else {
+                await runCartAddServer({
+                    ...addOptions,
+                    backend,
+                    config,
+                    session,
+                    host,
+                    ...(options.target ? { target: options.target } : {}),
+                    jsonOutput,
+                });
+            }
         }
     }
     catch (error) {
-        reportCLIError(error);
+        const quoteMode = Boolean(options.quote);
+        reportCLIError(error, {
+            jsonOutput,
+            code: "cart_add_failed",
+            instruction: quoteMode
+                ? "Quote 是否已加入 Cart 尚未确认；先恢复当前 Cart 或来源 Execution，不要重复准备报价或直接创建 Checkout。"
+                : "核对 Catalog ID、输入和 Cart 状态；不要在失败后直接创建 Checkout。",
+            recovery: quoteMode
+                ? [
+                    { command: "itpay cart show --json", reason: "检查当前 canonical Cart" },
+                    { command: "itpay services list --json", reason: "恢复 Quote 所属的 Service Execution" },
+                ]
+                : [
+                    { command: "itpay catalog list --json", reason: "核对已发布项目" },
+                    { command: "itpay cart show", reason: "确认 canonical Cart 当前状态" },
+                ],
+        });
     }
     finally {
         session.saveToFile(sessionPath);
@@ -200,7 +342,15 @@ cart
         await runCartNext(backend, session, { jsonOutput: Boolean(options.json) });
     }
     catch (error) {
-        reportCLIError(error);
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "cart_next_failed",
+            instruction: "canonical Cart 无法读取；不要猜测 Cart 内容或创建重复订单。",
+            recovery: [
+                { command: "itpay services list --json", reason: "恢复当前设备可见的 Service Execution" },
+                { command: "itpay catalog list --json", reason: "在没有可恢复执行时重新选择服务" },
+            ],
+        });
     }
 });
 cart
@@ -210,27 +360,51 @@ cart
     .option("--variant <catalog_variant_id>", "local draft variant id, only with --local")
     .option("--offer <offer_id>", "local draft offer id, only with --local")
     .option("--local", "only remove from the explicit local draft cache")
+    .option("--json", "output JSON instead of terminal text")
     .action(async (options) => {
     const config = loadConfig();
     const sessionPath = cartSessionPath();
     const session = CartSession.loadFromFile(sessionPath, config.checkoutCurrency);
+    const jsonOutput = Boolean(options.json);
     try {
         if (options.local) {
             if (!options.variant || !options.offer) {
-                throw new Error("--local remove requires --variant and --offer");
+                throw new CommandContractError("local_cart_item_required", "--local remove requires --variant and --offer", "从 `cart show --local --json` 使用同一条草稿 line 的 variant 和 offer；不要猜测。", [{ command: "itpay cart show --local --json", reason: "读取本地草稿" }]);
+            }
+            if (options.line) {
+                throw new CommandContractError("cart_remove_scope_invalid", "--line cannot be combined with --local", "canonical line 使用 --line；本地草稿使用 --local --variant --offer，不要混用。", [{ command: "itpay cart remove --help", reason: "查看两种删除范围" }]);
             }
             runCartRemove(session, {
                 catalogVariantID: options.variant,
                 offerID: options.offer,
+                jsonOutput,
             });
         }
         else {
+            if (options.variant || options.offer) {
+                throw new CommandContractError("cart_remove_scope_invalid", "--variant and --offer require --local", "canonical Cart 使用 cart_item_id；先从 `cart show --json` 读取 line。", [{ command: "itpay cart show --json", reason: "读取 canonical line 句柄" }]);
+            }
+            if (!session.lastCartID) {
+                throw new CommandContractError("cart_handle_missing", "no canonical server cart is remembered", "本地没有 canonical Cart 句柄；不要用 local draft 代替服务端删除。", [{ command: "itpay next --json", reason: "检查其他可恢复句柄" }]);
+            }
+            const lineID = options.line ?? session.lastCartItemID;
+            if (!lineID) {
+                throw new CommandContractError("cart_item_required", "cart item id is required", "从 `cart show --json` 选择 cart_item_id；不要使用 variant、offer 或 quote lock ID。", [{ command: "itpay cart show --json", reason: "读取 canonical line 句柄" }]);
+            }
             const backend = newBackendClient(config);
-            await runCartRemoveServer(backend, session, options.line);
+            await runCartRemoveServer(backend, session, lineID, { jsonOutput });
         }
     }
     catch (error) {
-        reportCLIError(error);
+        const locked = error instanceof HttpError && error.code === "cart_item_locked";
+        reportCLIError(error, {
+            jsonOutput,
+            code: "cart_remove_failed",
+            instruction: locked
+                ? "该 line 已绑定 quote/Checkout，不能再删除；继续同一 Cart 的现有流程，不要清本地状态伪装成功。"
+                : "删除失败；重新读取同一 Cart，不要假设 line 或 Service Execution 已取消。",
+            recovery: [{ command: "itpay cart next --json", reason: "读取同一 Cart 的服务端首选动作" }],
+        });
     }
     finally {
         session.saveToFile(sessionPath);
@@ -239,37 +413,60 @@ cart
 cart
     .command("show")
     .description("Print the canonical server cart or local draft fallback")
-    .action(async () => {
+    .option("--json", "output JSON instead of terminal text")
+    .option("--local", "show only the explicit local compatibility draft")
+    .action(async (options) => {
     const config = loadConfig();
-    const backend = newBackendClient(config);
     const sessionPath = cartSessionPath();
     const session = CartSession.loadFromFile(sessionPath, config.checkoutCurrency);
     try {
-        await runCartShowServer(backend, session);
+        if (options.local) {
+            runCartShow(session, { jsonOutput: Boolean(options.json) });
+        }
+        else {
+            await runCartShowServer(newBackendClient(config), session, { jsonOutput: Boolean(options.json) });
+        }
     }
     catch (error) {
-        reportCLIError(error);
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "cart_show_failed",
+            instruction: "canonical Cart 无法读取；不要根据本地旧句柄猜测服务端状态。",
+            recovery: [
+                { command: "itpay services list --json", reason: "恢复当前设备可见的 Service Execution" },
+                { command: "itpay catalog list --json", reason: "在没有可恢复资源时重新选择" },
+            ],
+        });
     }
 });
 cart
     .command("clear")
-    .description("Abandon the canonical server cart or clear local draft fallback")
+    .description("Abandon the canonical server cart or explicitly clear local state")
     .option("--local", "only clear local handles and explicit local draft")
+    .option("--json", "output JSON instead of terminal text")
     .action(async (options) => {
     const config = loadConfig();
     const sessionPath = cartSessionPath();
     const session = CartSession.loadFromFile(sessionPath, config.checkoutCurrency);
     try {
         if (options.local) {
-            runCartClear(session);
+            runCartClear(session, { jsonOutput: Boolean(options.json) });
         }
         else {
             const backend = newBackendClient(config);
-            await runCartAbandonServer(backend, session);
+            await runCartAbandonServer(backend, session, { jsonOutput: Boolean(options.json) });
         }
     }
     catch (error) {
-        reportCLIError(error);
+        const locked = error instanceof HttpError && (error.code === "cart_item_locked" || error.status === 409);
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "cart_clear_failed",
+            instruction: locked
+                ? "该 Cart 已绑定 quote/Checkout，不能放弃；保留本地句柄并继续同一流程。"
+                : "放弃失败；不要清本地句柄或假设 Backend Cart 已改变。",
+            recovery: [{ command: "itpay cart next --json", reason: "恢复同一 canonical Cart" }],
+        });
     }
     finally {
         session.saveToFile(sessionPath);
@@ -279,13 +476,13 @@ cart
 program
     .command("buy")
     .description("Create a V3 cart and checkout, then render the checkout QR for the host")
-    .option("--host <host>", "client host (terminal, telegram, feishu, lark, ...)", "terminal")
+    .option("--host <host>", "client host (terminal, telegram, feishu, lark, ...)")
     .option("--target <target>", "chat id / channel id / open id for IM hosts")
     .option("--item <catalog_item_id>")
     .option("--variant <catalog_variant_id>")
     .option("--offer <offer_id>")
     .option("--cart <cart_id>", "existing canonical server cart id")
-    .option("--quantity <n>", "quantity", (value) => Number.parseInt(value, 10), 1)
+    .option("--quantity <n>", "quantity", "1")
     .option("--ref <client_reference_id>")
     .option("--contact-email <email>")
     .option("--contact-phone <phone>")
@@ -295,48 +492,78 @@ program
     .option("--pay", "also create a payment intent and optionally wait for verification")
     .option("--method <alipay|wechatpay>", "payment method for --pay", "alipay")
     .option("--no-wait", "do not wait for payment verification after --pay")
-    .option("--timeout <seconds>", "max seconds to wait for payment", (value) => Number.parseInt(value, 10), 120)
+    .option("--timeout <seconds>", "max seconds to wait for payment", "120")
     .option("--json", "output JSON instead of terminal text")
     .action(async (options) => {
     const config = loadConfig();
     const backend = newBackendClient(config);
     const sessionPath = cartSessionPath();
     const session = CartSession.loadFromFile(sessionPath, config.checkoutCurrency);
-    const host = withHost(options.host);
-    if (options.item && options.variant && options.offer) {
-        runCartAdd(session, {
-            catalogItemID: options.item,
-            catalogVariantID: options.variant,
-            offerID: options.offer,
-            quantity: options.quantity,
-        });
-        session.saveToFile(sessionPath);
-    }
-    const contact = {};
-    if (options.contactEmail)
-        contact.email = options.contactEmail;
-    if (options.contactPhone)
-        contact.phone = options.contactPhone;
-    const requiredContactFields = parseRequiredContactFields(options.requireContact);
-    const method = options.method === "wechatpay" ? "wechatpay" : "alipay";
-    const buyOptions = {
-        cartSession: session,
-        host,
-        ...(options.cart ? { cartID: options.cart } : {}),
-        ...(options.target ? { target: options.target } : {}),
-        ...(options.ref ? { clientReferenceID: options.ref } : {}),
-        ...(Object.keys(contact).length > 0 ? { contact } : {}),
-        ...(requiredContactFields ? { requiredContactFields } : {}),
-        ...(options.qrFormat ? { qrFormat: options.qrFormat } : {}),
-        ...(options.qrFile ? { qrFilePath: options.qrFile } : {}),
-        ...(options.pay ? { pay: true, payMethod: method, noWait: options.wait === false, payTimeoutSec: options.timeout } : {}),
-        ...(options.json ? { jsonOutput: true } : {}),
-    };
+    const jsonOutput = Boolean(options.json);
     try {
+        const inline = [options.item, options.variant, options.offer].filter(Boolean).length;
+        if (inline !== 0 && inline !== 3) {
+            throw new CommandContractError("buy_source_invalid", "--item, --variant and --offer must be provided together", "inline 购买必须同时使用 Catalog 返回的 item、variant 和 offer；不要猜测或部分提交。", [{ command: "itpay catalog list --json", reason: "读取已发布项目" }]);
+        }
+        if (options.cart && inline > 0) {
+            throw new CommandContractError("buy_source_invalid", "--cart cannot be combined with --item/--variant/--offer", "已有 canonical Cart 与 inline item 二选一；本次未修改任何资源。", [{ command: "itpay cart show --json", reason: "检查已有 Cart" }]);
+        }
+        if (options.method !== "alipay" && options.method !== "wechatpay") {
+            throw new CommandContractError("payment_method_invalid", `unsupported payment method: ${options.method}`, "--method 只接受 alipay 或 wechatpay。", [{ command: "itpay buy --help", reason: "查看付款参数" }]);
+        }
+        if (options.wait === false && !options.pay) {
+            throw new CommandContractError("buy_parameter_invalid", "--no-wait requires --pay", "普通 buy 不创建 Payment Intent；移除 --no-wait，或使用明确的付款运维流程。", [{ command: "itpay buy --help", reason: "查看参数关系" }]);
+        }
+        const quantity = positiveInteger(options.quantity, "--quantity");
+        const timeout = positiveInteger(options.timeout, "--timeout");
+        const host = withHost(options.host ?? defaultHostForAgentType(config.agentType));
+        const contact = {};
+        if (options.contactEmail)
+            contact.email = options.contactEmail;
+        if (options.contactPhone)
+            contact.phone = options.contactPhone;
+        const requiredContactFields = parseRequiredContactFields(options.requireContact);
+        const missingContactFields = (requiredContactFields ?? []).filter((field) => {
+            const value = contact[field];
+            return typeof value !== "string" || value.trim().length === 0;
+        });
+        if (missingContactFields.length > 0) {
+            throw new CommandContractError("missing_contact", `missing required contact fields: ${missingContactFields.join(", ")}`, `向用户询问 ${missingContactFields.join(" 和 ")}，再补充对应 contact 参数重跑同一命令；禁止编造。`, [{ command: "itpay buy --help", reason: "查看 contact 参数" }]);
+        }
+        if (inline === 3) {
+            runCartAdd(session, {
+                catalogItemID: options.item,
+                catalogVariantID: options.variant,
+                offerID: options.offer,
+                quantity,
+                output: () => undefined,
+            });
+        }
+        const buyOptions = {
+            cartSession: session,
+            host,
+            ...(options.cart ? { cartID: options.cart } : {}),
+            ...(options.target ? { target: options.target } : {}),
+            ...(options.ref ? { clientReferenceID: options.ref } : {}),
+            ...(Object.keys(contact).length > 0 ? { contact } : {}),
+            ...(requiredContactFields ? { requiredContactFields } : {}),
+            ...(options.qrFormat ? { qrFormat: options.qrFormat } : {}),
+            ...(options.qrFile ? { qrFilePath: options.qrFile } : {}),
+            ...(options.pay ? { pay: true, payMethod: options.method, noWait: options.wait === false, payTimeoutSec: timeout } : {}),
+            ...(jsonOutput ? { jsonOutput: true } : {}),
+        };
         await runBuy(backend, config, buyOptions);
     }
     catch (error) {
-        reportCLIError(error);
+        reportCLIError(error, {
+            jsonOutput,
+            code: "buy_failed",
+            instruction: "Checkout 创建失败；保留当前 Cart/Checkout 句柄并按恢复命令继续，不要重复创建资源。",
+            recovery: [
+                { command: "itpay next --json", reason: "恢复最近资源" },
+                { command: "itpay cart next --json", reason: "检查 canonical Cart" },
+            ],
+        });
     }
     finally {
         session.saveToFile(sessionPath);
@@ -349,36 +576,44 @@ program
     .option("--target <target>")
     .option("--id <checkout_id>")
     .option("--token <display_token>")
+    .option("--json", "output compact JSON")
     .action(async (options) => {
     const config = loadConfig();
     const host = withHost(options.host ?? defaultHostForAgentType(config.agentType));
     const session = CartSession.loadFromFile(cartSessionPath(), config.checkoutCurrency);
     const snap = session.show();
-    const { checkoutID, displayToken } = resolveCheckoutPresentationArgs({
-        ...(options.id ? { requestedCheckoutID: options.id } : {}),
-        ...(options.token ? { requestedDisplayToken: options.token } : {}),
-        ...(snap.lastCheckoutID ? { savedCheckoutID: snap.lastCheckoutID } : {}),
-        ...(snap.lastDisplayToken ? { savedDisplayToken: snap.lastDisplayToken } : {}),
-    });
     const backend = newBackendClient(config);
     try {
+        const { checkoutID, displayToken } = resolveCheckoutPresentationArgs({
+            ...(options.id ? { requestedCheckoutID: options.id } : {}),
+            ...(options.token ? { requestedDisplayToken: options.token } : {}),
+            ...(snap.lastCheckoutID ? { savedCheckoutID: snap.lastCheckoutID } : {}),
+            ...(snap.lastDisplayToken ? { savedDisplayToken: snap.lastDisplayToken } : {}),
+        });
         await runCheckoutPresentation(backend, {
             checkoutID,
             displayToken,
             host,
             baseURL: config.baseURL,
+            jsonOutput: Boolean(options.json),
         });
     }
     catch (error) {
-        if (error instanceof HttpError && error.status === 404 && snap.lastServiceExecutionID) {
-            process.stderr.write(`[${error.status}] ${error.code}: ${error.message}\n`);
-            process.stderr.write("recovery:\n");
-            process.stderr.write("  - Reissue the existing Service Execution checkout handoff\n");
-            process.stderr.write(`    itpay services checkout ${snap.lastServiceExecutionID} --resume --json\n`);
-            process.exitCode = 1;
-            return;
-        }
-        reportCLIError(error);
+        const canResumeSavedService = Boolean(snap.lastServiceExecutionID && (!options.id || options.id === snap.lastCheckoutID));
+        const recovery = canResumeSavedService
+            ? [{
+                    command: `itpay services checkout ${snap.lastServiceExecutionID} --resume --json`,
+                    reason: "为同一个 Service Execution 轮换 Checkout handoff",
+                }]
+            : [{ command: "itpay services list --json", reason: "查找当前设备可恢复的 Service Execution" }];
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "checkout_unavailable",
+            instruction: error instanceof HttpError && error.status === 404
+                ? "当前 Checkout 句柄已失效或不匹配；恢复原 Service Execution，不要创建无关购物车。"
+                : "使用同一笔 Checkout 的完整 checkout_id 与 display token；不要拼接不同 Checkout 的句柄。",
+            recovery,
+        });
     }
 });
 program
@@ -386,66 +621,216 @@ program
     .description("Create a V3 payment intent (CLI escape hatch — usually done by the checkout page)")
     .requiredOption("--checkout <checkout_id>")
     .requiredOption("--method <alipay|wechatpay>")
-    .option("--provider <name>")
-    .option("--buyer <buyer_id>")
+    .option("--token <display_token>", "checkout display token; defaults only from the same saved checkout")
     .option("--refresh", "request a fresh provider payment action for the existing intent")
+    .option("--host <host>", "client host")
+    .option("--target <target>")
+    .option("--json", "output compact JSON")
     .action(async (options) => {
     const config = loadConfig();
     const backend = newBackendClient(config);
-    const method = options.method === "wechatpay" ? "wechatpay" : "alipay";
-    const payOptions = {
-        checkoutID: options.checkout,
-        method,
-        ...(options.provider ? { preferredProvider: options.provider } : {}),
-        ...(options.buyer ? { buyerID: options.buyer } : {}),
-        ...(options.refresh ? { refreshAction: true } : {}),
-    };
-    await runPay(backend, config, payOptions);
+    const session = CartSession.loadFromFile(cartSessionPath(), config.checkoutCurrency);
+    const jsonOutput = Boolean(options.json);
+    try {
+        if (options.method !== "alipay" && options.method !== "wechatpay") {
+            throw new CommandContractError("payment_method_invalid", `unsupported payment method: ${options.method}`, "--method 只接受 alipay 或 wechatpay；本次未创建 Payment Intent。", [{ command: "itpay pay --help", reason: "查看受支持参数" }]);
+        }
+        const displayToken = options.token ?? (session.lastCheckoutID === options.checkout ? session.lastDisplayToken : undefined);
+        if (!displayToken) {
+            throw new CommandContractError("checkout_token_required", "display token is required for this checkout", "提供同一 Checkout 的 display token；不要拼接其他 Checkout 的 token。", [{ command: "itpay next --json", reason: "恢复本机保存的同一 Checkout" }]);
+        }
+        const host = withHost(options.host ?? defaultHostForAgentType(config.agentType));
+        const contextError = validateContext(host, options.target);
+        if (contextError) {
+            throw new CommandContractError(contextError.code, contextError.message, "为当前 Host 提供有效 target；本次未创建 Payment Intent。", [
+                { command: "itpay pay --help", reason: "查看 Host 参数" },
+            ]);
+        }
+        await runPay(backend, {
+            checkoutID: options.checkout,
+            displayToken,
+            method: options.method,
+            host,
+            ...(options.refresh ? { refreshAction: true } : {}),
+            ...(jsonOutput ? { jsonOutput: true } : {}),
+        });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput,
+            code: "payment_intent_failed",
+            instruction: "不要创建替代 Checkout；恢复同一 Checkout 并由用户在 ItPay 页面继续付款。",
+            recovery: [{ command: "itpay next --json", reason: "恢复当前 Checkout" }],
+        });
+    }
 });
 program
     .command("order")
     .description("Read a V3 order by id")
     .argument("<order_id>")
     .option("--host <host>", "client host")
+    .option("--json", "output JSON instead of terminal text")
     .action(async (orderID, options) => {
-    const host = withHost(options.host ?? "terminal");
-    await withBackend(async (backend) => runOrder(backend, orderID, { host }));
+    if (options.host)
+        withHost(options.host);
+    const config = loadConfig();
+    const backend = newBackendClient(config);
+    try {
+        await runOrder(backend, orderID, { ...(options.host ? { host: options.host } : {}), jsonOutput: Boolean(options.json) });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "order_read_failed",
+            instruction: "确认订单属于当前账号或已绑定 Agent；不要通过错误差异探测其他账号的订单。",
+            recovery: [{ command: "itpay services list --json", reason: "恢复当前身份可见的 Service Execution" }],
+        });
+    }
 });
 program
     .command("orders")
     .description("List V3 orders for the account-scoped bearer session")
     .option("--limit <n>", "max orders", (value) => Number.parseInt(value, 10), 20)
     .option("--status <status>")
+    .option("--json", "output JSON instead of terminal text")
     .action(async (options) => {
     const config = loadConfig();
     const backend = newBackendClient(config);
-    await runListOrders(backend, config, {
-        limit: options.limit,
-        status: options.status,
-    });
+    try {
+        await runListOrders(backend, config, {
+            limit: options.limit,
+            status: options.status,
+            jsonOutput: Boolean(options.json),
+        });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "orders_list_failed",
+            instruction: "订单历史只对 account-scoped Buyer session 开放；不要通过错误差异探测其他账号。",
+            recovery: [{ command: "itpay services list --json", reason: "恢复当前 Agent 设备可见的执行" }],
+        });
+    }
 });
-program
+const refund = program
     .command("refund")
+    .enablePositionalOptions()
     .description("Create a V3 refund request for an order")
-    .requiredOption("--order <order_id>")
-    .requiredOption("--payment-intent <payment_intent_id>")
-    .requiredOption("--amount-minor <n>", "amount in minor units", (value) => Number.parseInt(value, 10))
-    .requiredOption("--currency <currency>")
+    .option("--order <order_id>")
     .option("--reason <reason>")
-    .option("--created-by <created_by>")
+    .option("--json", "output JSON instead of terminal text")
     .action(async (options) => {
+    if (!options.order) {
+        process.stdout.write(refund.helpInformation());
+        process.stdout.write("\ninstruction: 使用 `itpay refund create --order <order_id>` 提交退款；本次未发送请求。\n");
+        return;
+    }
+    await executeRefundCreate(options.order, options.reason, Boolean(options.json));
+});
+refund.command("create").option("--order <order_id>").option("--reason <reason>").option("--json", "output JSON instead of terminal text").action(async (options) => {
+    const inherited = refund.opts();
+    const orderID = options.order ?? inherited.order;
+    if (!orderID) {
+        reportCLIError(new Error("--order is required"), {
+            jsonOutput: Boolean(options.json ?? inherited.json),
+            code: "order_required",
+            instruction: "使用用户订单的 order_id；不要猜测或代填。",
+            recovery: [{ command: "itpay services list --json", reason: "恢复当前身份可见的 Service Execution" }],
+        });
+        return;
+    }
+    const reason = options.reason ?? inherited.reason;
+    await executeRefundCreate(orderID, reason, Boolean(options.json ?? inherited.json));
+});
+refund.command("list").option("--order <order_id>").option("--json", "output JSON instead of terminal text").action(async (options) => {
+    const inherited = refund.opts();
+    const orderID = options.order ?? inherited.order;
+    const jsonOutput = Boolean(options.json ?? inherited.json);
+    if (!orderID) {
+        reportCLIError(new Error("--order is required"), {
+            jsonOutput,
+            code: "order_required",
+            instruction: "使用用户订单的 order_id；不要猜测或代填。",
+            recovery: [{ command: "itpay services list --json", reason: "恢复当前身份可见的 Service Execution" }],
+        });
+        return;
+    }
     const config = loadConfig();
-    const backend = newBackendClient(config);
-    const refundOptions = {
-        orderID: options.order,
-        paymentIntentID: options.paymentIntent,
-        amountMinor: options.amountMinor,
-        currency: options.currency,
-        ...(options.reason ? { reason: options.reason } : {}),
-        ...(options.createdBy ? { createdBy: options.createdBy } : {}),
-    };
-    await runRefund(backend, config, refundOptions);
+    try {
+        await runListRefunds(newBackendClient(config), { orderID, jsonOutput });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput,
+            code: "refund_list_failed",
+            instruction: "确认订单属于当前账号或已绑定 Agent；不要探测其他账号的退款。",
+            recovery: [{ command: "itpay services list --json", reason: "恢复当前身份可见的 Service Execution" }],
+        });
+    }
 });
+refund.command("get").argument("<refund_request_id>").option("--json", "output JSON instead of terminal text").action(async (id, options) => {
+    const config = loadConfig();
+    try {
+        await runGetRefund(newBackendClient(config), id, { jsonOutput: Boolean(options.json ?? refund.opts().json) });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json ?? refund.opts().json),
+            code: "refund_read_failed",
+            instruction: "确认退款属于当前账号或已绑定 Agent；不要探测其他账号的退款。",
+            recovery: [{ command: "itpay services list --json", reason: "恢复当前身份可见的 Service Execution" }],
+        });
+    }
+});
+refund.command("watch").argument("<refund_request_id>").option("--interval <seconds>", "poll interval", Number, 2).option("--timeout <seconds>", "timeout", Number, 120).option("--json", "output JSON instead of terminal text").action(async (id, options) => {
+    const config = loadConfig();
+    try {
+        await runWatchRefund(newBackendClient(config), id, {
+            intervalSeconds: options.interval,
+            timeoutSeconds: options.timeout,
+            jsonOutput: Boolean(options.json ?? refund.opts().json),
+        });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json ?? refund.opts().json),
+            code: "refund_watch_failed",
+            instruction: "检查退款 ID 和轮询参数后恢复同一退款；不要重复申请。",
+            recovery: [{ command: `itpay refund get ${id} --json`, reason: "读取当前权威状态" }],
+        });
+    }
+});
+refund.command("cancel").argument("<refund_request_id>").option("--reason <reason>").option("--json", "output JSON instead of terminal text").action(async (id, options) => {
+    const config = loadConfig();
+    try {
+        await runCancelRefund(newBackendClient(config), id, options.reason, { jsonOutput: Boolean(options.json ?? refund.opts().json) });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json ?? refund.opts().json),
+            code: "refund_cancel_failed",
+            instruction: "取消未生效；以 Refund Owner 当前状态为准，不要重复退款或自行解除交付锁。",
+            recovery: [{ command: `itpay refund get ${id} --json`, reason: "读取当前权威状态" }],
+        });
+    }
+});
+async function executeRefundCreate(orderID, reason, jsonOutput) {
+    const config = loadConfig();
+    try {
+        await runRefund(newBackendClient(config), config, { orderID, ...(reason ? { reason } : {}), jsonOutput });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput,
+            code: "refund_create_failed",
+            instruction: "确认订单属于当前账号且可退款；不要修改金额、支付或消费事实。",
+            recovery: [
+                { command: `itpay order ${orderID} --json`, reason: "检查订单和交付锁" },
+                { command: `itpay refund list --order ${orderID} --json`, reason: "检查已有退款" },
+            ],
+        });
+    }
+}
 // --- service execution ----------------------------------------------------
 const services = program.command("services").description("Generic V3 Service Execution commands");
 services
@@ -454,15 +839,28 @@ services
     .argument("<service_id>")
     .option("--host <host>", "client host")
     .option("--target <target>")
-    .option("--buyer <buyer_id>")
+    .option("--json", "output JSON instead of terminal text")
     .action(async (serviceID, options) => {
     const config = loadConfig();
     const backend = newBackendClient(config);
-    await runServicesStart(backend, config, serviceID, {
-        host: withHost(options.host ?? defaultHostForAgentType(config.agentType)),
-        ...(options.target ? { target: options.target } : {}),
-        ...(options.buyer ? { buyerID: options.buyer } : {}),
-    });
+    try {
+        await runServicesStart(backend, serviceID, {
+            host: withHost(options.host ?? defaultHostForAgentType(config.agentType)),
+            ...(options.target ? { target: options.target } : {}),
+            jsonOutput: Boolean(options.json),
+        });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "service_start_failed",
+            instruction: "只使用已发布 Catalog 返回的 service_id；设备身份问题应由 CLI 自动恢复。",
+            recovery: [
+                { command: "itpay catalog list", reason: "重新取得有效 service_id" },
+                { command: "itpay readyz", reason: "确认 Backend 可用" },
+            ],
+        });
+    }
 });
 services
     .command("invoke")
@@ -474,7 +872,20 @@ services
     .action(async (serviceExecutionID, options) => {
     const config = loadConfig();
     const backend = newBackendClient(config);
-    await runServicesInvoke(backend, config, serviceExecutionID, options.capability, parseKeyValueList(options.input), { jsonOutput: Boolean(options.json) });
+    try {
+        await runServicesInvoke(backend, config, serviceExecutionID, options.capability, parseKeyValueList(options.input), { jsonOutput: Boolean(options.json) });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "service_invoke_failed",
+            instruction: "读取当前 Service Execution 的合法下一步后重试；不要复用已结束的 execution。",
+            recovery: [
+                { command: `itpay services next ${serviceExecutionID} --json`, reason: "读取当前合法动作" },
+                { command: `itpay services get ${serviceExecutionID} --json`, reason: "检查执行状态" },
+            ],
+        });
+    }
 });
 services
     .command("action")
@@ -486,27 +897,63 @@ services
     .option("--status <status>", "pending, approved, rejected, expired, or cancelled")
     .option("--candidate <rank>", "select a displayed candidate by its rank", Number)
     .option("--result-item <service_capability_result_item_id>")
-    .option("--selected-candidate-hash <hash>")
     .option("--required-before <step>")
     .option("--input <key=value>", "action input snapshot", collectOption, [])
+    .option("--json", "output JSON instead of terminal text")
     .action(async (serviceExecutionID, options) => {
     const config = loadConfig();
     const backend = newBackendClient(config);
-    await runServicesAction(backend, serviceExecutionID, options.action, parseKeyValueList(options.input), {
-        ...(options.actorType ? { actorType: options.actorType } : {}),
-        ...(options.actorId ? { actorID: options.actorId } : {}),
-        ...(options.status ? { status: options.status } : {}),
-        ...(options.candidate !== undefined ? { candidateRank: options.candidate } : {}),
-        ...(options.resultItem ? { resultItemID: options.resultItem } : {}),
-        ...(options.selectedCandidateHash ? { selectedCandidateHash: options.selectedCandidateHash } : {}),
-        ...(options.requiredBefore ? { requiredBefore: options.requiredBefore } : {}),
-    });
+    try {
+        await runServicesAction(backend, serviceExecutionID, options.action, parseKeyValueList(options.input), {
+            ...(options.actorType ? { actorType: options.actorType } : {}),
+            ...(options.actorId ? { actorID: options.actorId } : {}),
+            ...(options.status ? { status: options.status } : {}),
+            ...(options.candidate !== undefined ? { candidateRank: options.candidate } : {}),
+            ...(options.resultItem ? { resultItemID: options.resultItem } : {}),
+            ...(options.requiredBefore ? { requiredBefore: options.requiredBefore } : {}),
+            jsonOutput: Boolean(options.json),
+        });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "service_action_failed",
+            instruction: "读取当前 Service Execution 的合法 action 后重试；不要猜测状态或候选 ID。",
+            recovery: [
+                { command: `itpay services next ${serviceExecutionID} --json`, reason: "读取当前可选动作" },
+                { command: `itpay services get ${serviceExecutionID} --json`, reason: "检查执行状态" },
+            ],
+        });
+    }
+});
+services
+    .command("quote")
+    .description("Prepare a paid service quote without creating a Cart or Checkout")
+    .argument("<service_execution_id>")
+    .requiredOption("--capability <capability_id>")
+    .option("--input <key=value>", "input to lock into the paid service quote", collectOption, [])
+    .option("--email <delivery_email>")
+    .option("--json", "output compact JSON")
+    .action(async (serviceExecutionID, options) => {
+    const config = loadConfig();
+    try {
+        await runServicesQuote(newBackendClient(config), serviceExecutionID, options.capability, parseKeyValueList(options.input), { ...(options.email ? { email: options.email } : {}), jsonOutput: Boolean(options.json) });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "service_quote_failed",
+            instruction: "按当前 Execution 的合法付费 capability 和可信输入重试；本次不要自行创建 Cart 或 Checkout。",
+            recovery: [{ command: `itpay services next ${serviceExecutionID} --json`, reason: "读取当前合法动作" }],
+        });
+    }
 });
 services
     .command("checkout")
     .description("Create checkout from a service execution and render the ItPay checkout handoff")
     .argument("<service_execution_id>")
     .option("--capability <capability_id>")
+    .option("--input <key=value>", "input to lock into the paid service quote", collectOption, [])
     .option("--email <delivery_email>")
     .option("--resume", "reissue the existing checkout handoff without creating another checkout")
     .option("--host <host>", "client host (terminal, codex, telegram, feishu, lark, ...)")
@@ -519,35 +966,61 @@ services
     const backend = newBackendClient(config);
     const sessionPath = cartSessionPath();
     const session = CartSession.loadFromFile(sessionPath, config.checkoutCurrency);
-    await runServicesCheckout(backend, config, serviceExecutionID, options.capability, {
-        ...(options.email ? { email: options.email } : {}),
-        resume: Boolean(options.resume),
-        host: withHost(options.host ?? defaultHostForAgentType(config.agentType)),
-        ...(options.target ? { target: options.target } : {}),
-        ...(options.qrFormat ? { qrFormat: options.qrFormat } : {}),
-        ...(options.qrFile ? { qrFilePath: options.qrFile } : {}),
-        jsonOutput: Boolean(options.json),
-        persistHandoff: (handoff) => {
-            session.rememberCheckout({
-                cartID: handoff.cartID,
-                checkoutID: handoff.checkoutID,
-                displayToken: handoff.displayToken,
-                checkoutURL: handoff.checkoutURL,
-                serviceExecutionID: handoff.serviceExecutionID,
-            });
-            session.saveToFile(sessionPath);
-        },
-    });
+    try {
+        await runServicesCheckout(backend, config, serviceExecutionID, options.capability, {
+            ...(options.email ? { email: options.email } : {}),
+            lockedInput: parseKeyValueList(options.input),
+            resume: Boolean(options.resume),
+            host: withHost(options.host ?? defaultHostForAgentType(config.agentType)),
+            ...(options.target ? { target: options.target } : {}),
+            ...(options.qrFormat ? { qrFormat: options.qrFormat } : {}),
+            ...(options.qrFile ? { qrFilePath: options.qrFile } : {}),
+            jsonOutput: Boolean(options.json),
+            persistHandoff: (handoff) => {
+                session.rememberCheckout({
+                    checkoutID: handoff.checkoutID,
+                    displayToken: handoff.displayToken,
+                    checkoutURL: handoff.checkoutURL,
+                    serviceExecutionID: handoff.serviceExecutionID,
+                });
+                session.saveToFile(sessionPath);
+            },
+        });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "service_checkout_failed",
+            instruction: "读取当前 Service Execution 后按服务端允许的 capability、输入和交付要求重试；不要创建替代 Checkout。",
+            recovery: [
+                { command: `itpay services next ${serviceExecutionID} --json`, reason: "读取当前合法下一步" },
+                { command: `itpay services get ${serviceExecutionID} --json`, reason: "检查 Checkout 与执行状态" },
+            ],
+        });
+    }
 });
 services
     .command("list")
     .description("Recover service executions visible to this enrolled device or account")
-    .option("--limit <number>", "maximum executions", "50")
+    .option("--limit <number>", "maximum executions", "10")
     .option("--json", "output compact JSON")
     .action(async (options) => {
     const config = loadConfig();
     const backend = newBackendClient(config);
-    await runServicesList(backend, { limit: Number.parseInt(options.limit, 10), jsonOutput: Boolean(options.json) });
+    try {
+        await runServicesList(backend, { limit: Number.parseInt(options.limit, 10), jsonOutput: Boolean(options.json) });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "services_list_failed",
+            instruction: "确认当前设备身份和 Backend 后重试；不要猜测 Service Execution ID。",
+            recovery: [
+                { command: "itpay readyz --json", reason: "确认 Backend 可用" },
+                { command: "itpay services list --limit 10 --json", reason: "重新读取最近执行" },
+            ],
+        });
+    }
 });
 services
     .command("get")
@@ -557,7 +1030,17 @@ services
     .action(async (serviceExecutionID, options) => {
     const config = loadConfig();
     const backend = newBackendClient(config);
-    await runServicesGet(backend, serviceExecutionID, { jsonOutput: Boolean(options.json) });
+    try {
+        await runServicesGet(backend, serviceExecutionID, { jsonOutput: Boolean(options.json) });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "service_get_failed",
+            instruction: "确认 execution 属于当前设备或账号；不要通过错误差异探测其他账号。",
+            recovery: [{ command: "itpay services list --json", reason: "读取当前身份可见的执行" }],
+        });
+    }
 });
 services
     .command("next")
@@ -567,40 +1050,67 @@ services
     .action(async (serviceExecutionID, options) => {
     const config = loadConfig();
     const backend = newBackendClient(config);
-    await runServicesNext(backend, serviceExecutionID, { jsonOutput: Boolean(options.json) });
+    try {
+        await runServicesNext(backend, serviceExecutionID, { jsonOutput: Boolean(options.json) });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "service_next_failed",
+            instruction: "检查 Service Execution 是否属于当前设备或账号，然后读取完整时间线。",
+            recovery: [{ command: `itpay services get ${serviceExecutionID} --json`, reason: "检查执行状态与归属" }],
+        });
+    }
 });
 services
     .command("read-result")
     .description("Read a human-granted service result for this agent")
     .argument("<service_execution_id>")
-    .action(async (serviceExecutionID) => {
+    .option("--json", "output JSON instead of terminal text")
+    .action(async (serviceExecutionID, options) => {
     const config = loadConfig();
     const backend = newBackendClient(config);
-    await runServicesReadResult(backend, serviceExecutionID);
+    try {
+        await runServicesReadResult(backend, serviceExecutionID, { jsonOutput: Boolean(options.json) });
+    }
+    catch (error) {
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "agent_access_denied",
+            instruction: "请用户在订单页面重新授权；不要使用开发者权限绕过授权或退款锁。",
+            recovery: [{ command: `itpay services next ${serviceExecutionID} --json`, reason: "检查交付模式和 grant 状态" }],
+        });
+    }
 });
 services
     .command("events")
     .description("List redacted service execution events")
     .argument("<service_execution_id>")
-    .action(async (serviceExecutionID) => {
-    const config = loadConfig();
-    const backend = newBackendClient(config);
-    await runServicesEvents(backend, serviceExecutionID);
-});
-async function withBackend(action) {
+    .option("--after-sequence <number>", "return events after this sequence", "0")
+    .option("--limit <number>", "maximum events (1-100)", "50")
+    .option("--json", "output compact JSON")
+    .action(async (serviceExecutionID, options) => {
     const config = loadConfig();
     const backend = newBackendClient(config);
     try {
-        await action(backend);
+        await runServicesEvents(backend, serviceExecutionID, {
+            afterSequence: Number(options.afterSequence),
+            limit: Number(options.limit),
+            jsonOutput: Boolean(options.json),
+        });
     }
     catch (error) {
-        if (error instanceof HttpError) {
-            reportCLIError(error);
-            return;
-        }
-        throw error;
+        reportCLIError(error, {
+            jsonOutput: Boolean(options.json),
+            code: "service_events_failed",
+            instruction: "确认 execution 属于当前身份；事件只用于诊断，不要据此重放业务步骤。",
+            recovery: [
+                { command: `itpay services next ${serviceExecutionID} --json`, reason: "读取当前业务动作" },
+                { command: "itpay services list --json", reason: "列出当前身份可见执行" },
+            ],
+        });
     }
-}
+});
 program.parseAsync(process.argv).catch((error) => {
     reportCLIError(error);
 });