@itpay/cli 2.1.6 → 2.1.7

package/dist/src/commands/services.js

@@ -57,18 +57,28 @@ const WORKFLOW_STEP_GUIDANCE = {
     input: { meaning: "输入校验", hint: "对照服务声明的输入契约补齐字段后重新发起" },
     quota: { meaning: "额度检查", hint: "免费额度或限流未通过；登录或稍后重试" },
     geo: { meaning: "位置解析", hint: "检查 origin/destination 是否为真实地名；可附 origin_city 或坐标对象提示" },
+    geo_confirm: { meaning: "确认后位置解析", hint: "用户确认的地点仍未解析成功；重新执行并让用户从候选项中按名称+坐标选择" },
+    resolved: { meaning: "位置解析复核", hint: "位置解析未满足继续条件；检查 origin/destination 后新建执行重试" },
+    resolved_after_confirm: { meaning: "位置确认复核", hint: "确认后的位置仍未通过复核；重新执行并核对用户所选候选项" },
     search: { meaning: "供应商车次检索", hint: "最常见是字段名错误（必须是 travel_date）或站名不存在；按 itpay docs show rail-booking 核对输入" },
     catalog: { meaning: "可行车次计算", hint: "位置已解析但无可行车次；换日期或换站点重试" },
     recommend: { meaning: "方案推荐", hint: "候选集无法产出推荐；放宽条件或换日期重试" },
     delivery: { meaning: "交付", hint: "结果组装失败；稍后重试或联系运营" },
 };
-function failedWorkflowStep(steps) {
+function failedWorkflowStep(steps, errorCode) {
     if (!steps)
         return undefined;
     for (const [step, status] of Object.entries(steps)) {
         if (status === "failure" && step !== "failure")
             return step;
     }
+    // Only a backend-recorded condition_unmet proves a false branch routed to failure.
+    if (errorCode === "condition_unmet") {
+        for (const [step, status] of Object.entries(steps)) {
+            if (status === "false" && step !== "failure")
+                return step;
+        }
+    }
     return undefined;
 }
 export async function runServicesStart(backend, serviceID, options = {}) {
@@ -996,11 +1006,44 @@ function servicesNextEnvelope(model) {
             };
         }
         if (state === "human_action" && model.workflow?.human_action) {
+            const action = model.workflow.human_action;
+            const requiredFields = requiredInputFields(action.input_schema);
+            const rawPlaces = action.context?.places;
+            // Only the location-confirmation action carries origin/destination places;
+            // every other human action keeps the generic envelope.
+            const isLocationConfirmation = !!rawPlaces && typeof rawPlaces === "object" &&
+                ("origin" in rawPlaces || "destination" in rawPlaces);
+            if (isLocationConfirmation) {
+                const places = rawPlaces;
+                const sides = ["origin", "destination"].map((side) => {
+                    const place = places[side];
+                    const candidates = Array.isArray(place?.resolution_candidates) ? place.resolution_candidates : [];
+                    const name = (item) => item.poi_name ?? item.query ?? item.formatted_address;
+                    return {
+                        side,
+                        status: place?.resolution_status,
+                        ...(place?.resolution_status === "resolved"
+                            ? { resolved_place: { name: name(place), location: place.location } }
+                            : {}),
+                        ...(candidates.length
+                            ? { candidates: candidates.slice(0, 5).map((item) => ({ name: name(item), location: item.location })) }
+                            : {}),
+                    };
+                });
+                return {
+                    status: "confirmation_required",
+                    result: { service_execution_id: id, service_id: execution.service_id, human_action: action,
+                        required_fields: requiredFields, sides },
+                    instruction: "向用户展示 sides 中 status=needs_confirmation 一端的候选（名称+坐标），请用户选定后按 required_fields 逐项各传一个 --input：名称取候选 name，坐标取候选 location 的 [lng,lat]；已 resolved 的一端把其 resolved_place 原样填入。继续同一执行，不重新查询；这一步不是购买确认。",
+                    next: { command: `itpay services action ${id} --action ${action.action_type} --actor-type human --status approved${requiredFields.map((field) => ` --input ${field}=<值>`).join("")} --json`, reason: "用户确认后继续当前查询" },
+                    recovery: [],
+                };
+            }
             return {
                 status: "confirmation_required",
-                result: { service_execution_id: id, service_id: execution.service_id, human_action: model.workflow.human_action },
-                instruction: "请展示待确认的位置，请用户明确确认后，按 input_schema 填写 --input 字段。继续同一执行，不重新查询；这一步不是购买确认。",
-                next: { command: `itpay services action ${id} --action ${model.workflow.human_action.action_type} --actor-type human --status approved --input <key=value> --json`, reason: "用户确认后继续当前查询" },
+                result: { service_execution_id: id, service_id: execution.service_id, human_action: action },
+                instruction: "请展示待确认的内容，请用户明确确认后，按 input_schema 填写 --input 字段。继续同一执行，不重新查询；这一步不是购买确认。",
+                next: { command: `itpay services action ${id} --action ${action.action_type} --actor-type human --status approved${requiredFields.map((field) => ` --input ${field}=<值>`).join("")} --json`, reason: "用户确认后继续当前查询" },
                 recovery: [],
             };
         }
@@ -1011,7 +1054,7 @@ function servicesNextEnvelope(model) {
         if (state === "input_required")
             command = `itpay services run ${execution.service_id} --execution ${id} --input-json <file> --json`;
         const guidance = railServiceGuidance(execution.service_id);
-        const failedStep = recovery ? failedWorkflowStep(model.workflow?.steps) : undefined;
+        const failedStep = recovery ? failedWorkflowStep(model.workflow?.steps, model.workflow?.error_code) : undefined;
         const failedStepGuidance = failedStep ? WORKFLOW_STEP_GUIDANCE[failedStep] : undefined;
         const failedInvocation = recovery
             ? [...model.provider_invocations].reverse().find((item) => typeof item.status === "string" && item.status.startsWith("failed"))

package/dist/src/state/config.js

@@ -15,7 +15,7 @@ import { OperationJournal } from "./operation_journal.js";
 export const DEFAULT_BASE_URL = "https://app.itpay.ai";
 export const DEV_BASE_URL = "https://dev.itpay.ai";
 export const SANDBOX_BASE_URL = "https://sandbox.itpay.ai";
-export const CLI_VERSION = "2.1.6";
+export const CLI_VERSION = "2.1.7";
 export const API_CONTRACT_REVISION = "sha256:42659989d533d5a43c4ab92eb2455bcbbc6456e799fa4c2b6587de77f06b95f7";
 const CART_SESSION_DEFAULT_DIR = ".itpay-v3";
 const CART_SESSION_FILENAME = "cart.json";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itpay/cli",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "description": "The ItPay CLI for services, orders, and human-authorized purchased content.",
   "type": "module",
   "bin": {