@itpay/cli 2.1.17 → 2.1.18

package/dist/src/state/account_auth.js

@@ -3,6 +3,8 @@ import { homedir } from 'node:os';
 import { dirname, resolve } from 'node:path';
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync, rmSync } from 'node:fs';
 import { writeLocalPNG } from '../render/qr.js';
+import { TaskJournal } from './task_journal.js';
+import { taskJournalPath } from './config.js';
 export function sellerAuthPath(baseURL, env = process.env, purpose = "seller") {
     return resolve(env.HOME || homedir(), '.itpay-v3', `${purpose}-${createHash('sha256').update(baseURL).digest('hex').slice(0, 16)}.json`);
 }
@@ -32,46 +34,176 @@ export function sellerAuth(action, baseURL, env = process.env, fetcher = fetch)
 export function agentAuth(action, baseURL, backend, env = process.env, fetcher = fetch) {
     return accountAuth(action, baseURL, env, fetcher, backend);
 }
+// AUTH01: dashboard session stages stay distinct — the human must know exactly
+// what the official page still needs instead of a generic "pending".
+const ACTIVE_SESSION_STAGES = ['created', 'waiting_provider', 'email_verification_required', 'merge_confirmation_required'];
+function stageInstruction(stage) {
+    if (stage === 'email_verification_required') {
+        return '钱包授权已完成，官方页还需要完成联系方式验证（邮箱或手机，以页面实际提供的方式为准）。完成后继续原查询，不用重说行程。';
+    }
+    if (stage === 'merge_confirmation_required') {
+        return '官方页需要用户确认账号合并决定后才能完成登录；不要替用户选择，也不要新建授权请求。';
+    }
+    return '用户仍在官方页面完成登录；保留当前 handoff，不要生成新二维码或新请求。';
+}
+// AUTH07: distinct outcomes stay distinct — a technical failure is never
+// reported as a user denial, and a missing session is its own state.
+const TERMINAL_SESSION_STATES = {
+    expired: {
+        status: 'auth_expired',
+        instruction: '授权请求已过期。重新运行 itpay auth login 生成新请求；之前的查询输入在服务端保留，可恢复。',
+    },
+    failed: {
+        status: 'auth_failed',
+        instruction: '官方授权因技术原因未完成（不是用户拒绝）。重新运行 itpay auth login 生成新请求。',
+    },
+    cancelled: {
+        status: 'auth_cancelled',
+        instruction: '用户在官方页取消了授权。如仍需登录，重新运行 itpay auth login。',
+    },
+    denied: {
+        status: 'auth_denied',
+        instruction: '官方授权被拒绝。重新运行 itpay auth login 生成新请求。',
+    },
+};
+class AuthRequestError extends Error {
+    httpStatus;
+    constructor(httpStatus, message) {
+        super(message);
+        this.httpStatus = httpStatus;
+        this.name = 'AuthRequestError';
+    }
+}
+// AUTH03: transport/read uncertainty never maps to "denied" or a new session —
+// the stored session stays on disk and the caller retries the same poll.
+function authStatusUnknown(sessionID) {
+    return {
+        status: 'auth_status_unknown',
+        result: sessionID ? { dashboard_auth_session_id: sessionID } : {},
+        instruction: '读取官方授权状态时遇到网络或服务端临时故障；原授权请求已保留。稍后重读同一状态，不要新建授权、不要清除本地登记。',
+        next: { command: 'itpay auth status --json', reason: '稍后重读同一授权状态', poll_after_ms: 5000 },
+        recovery: [],
+    };
+}
+function sessionGone(env, purpose, baseURL, sessionID) {
+    rmSync(sellerAuthPath(baseURL, env, purpose), { force: true });
+    return {
+        status: 'auth_session_missing',
+        result: sessionID ? { dashboard_auth_session_id: sessionID } : {},
+        instruction: '之前的授权请求在服务端已不存在。重新运行 itpay auth login 生成新请求。',
+        next: { command: 'itpay auth login --json', reason: '重新发起官方授权' },
+        recovery: [],
+    };
+}
+// AUTH04: a successful bind resumes the SAME task that paused for login —
+// from the local task journal, never a placeholder and never a guess at the
+// latest order.
+function authenticatedEnvelope(env, phoneVerified) {
+    const paused = new TaskJournal(taskJournalPath(env)).pausedTasks()
+        .filter((task) => task.stage === 'login_required' || task.stage === 'quota_paused');
+    const resumable = paused.filter((task) => typeof task.resume_command === 'string');
+    const result = { bound: true, phone_verified: phoneVerified };
+    let instruction = '登录与绑定已完成，告知用户可继续之前的查询；已注册账号查询不消耗试用次数，仍受正常限流。';
+    let next = null;
+    if (resumable.length === 1) {
+        next = { command: resumable[0].resume_command, reason: '恢复登录前暂停的同一查询' };
+    }
+    else if (resumable.length > 1) {
+        result.paused_executions = resumable.map((task) => ({
+            service_execution_id: task.service_execution_id,
+            ...(task.service_id ? { service_id: task.service_id } : {}),
+            resume_command: task.resume_command,
+        }));
+        instruction += ' 有多个暂停的查询：只恢复与当前用户目标对应的那一个，不要一次恢复全部。';
+    }
+    else {
+        instruction += ' 当前没有待恢复的暂停查询；不构造恢复命令。';
+    }
+    return { status: 'authenticated', result, instruction, next, recovery: [] };
+}
 async function accountAuth(action, baseURL, env, fetcher, backend) {
     const purpose = backend ? 'agent-login' : 'seller';
     const command = backend ? 'itpay auth status' : 'itpay sell auth status';
     if (backend) {
-        const current = await backend.agentAccountStatus();
-        if (current.status === 'authenticated')
-            return {
-                status: 'authenticated',
-                result: { bound: true, phone_verified: current.phone_verified === true },
-                instruction: '设备已绑定账号，可继续之前的查询或购买；登录不附带任何额外授权。',
-                next: { command: 'itpay services run <service_id> --execution <pending_execution_id> --json', reason: '恢复被额度暂停的原执行' },
-                recovery: [],
-            };
+        try {
+            const current = await backend.agentAccountStatus();
+            if (current.status === 'authenticated')
+                return authenticatedEnvelope(env, current.phone_verified === true);
+        }
+        catch (error) {
+            if (error instanceof AuthRequestError)
+                throw error;
+            // AUTH03: even the binding-status probe can hit transport failure; the
+            // truthful state is "unknown", never an implicit unbound or a fresh login.
+            return authStatusUnknown(undefined);
+        }
     }
     async function request(path, init = {}) {
         const response = await fetcher(baseURL + path, { ...init, redirect: 'error', signal: AbortSignal.timeout(15000) });
         if (!response.ok)
-            throw new Error(`ItPay authorization failed (${response.status}); retry login if expired`);
+            throw new AuthRequestError(response.status, `ItPay authorization failed (${response.status}); retry login if expired`);
         return response;
     }
+    function pollOpenSession(state) {
+        return request(`/v1/dashboard/auth-sessions/${encodeURIComponent(state.sessionID)}?poll_token=${encodeURIComponent(state.pollToken)}`)
+            .then((response) => response.json());
+    }
+    async function bindSavedSession(state) {
+        const bound = await backend.bindAgentAccount({ dashboard_auth_session_id: state.sessionID, start_token: state.startToken });
+        if (bound.status !== 'authenticated')
+            throw new Error('Agent binding did not complete');
+        rmSync(sellerAuthPath(baseURL, env, purpose), { force: true });
+        return authenticatedEnvelope(env, bound.phone_verified === true);
+    }
     if (action === 'login') {
         if (backend) {
             const open = read(baseURL, env, purpose);
             if (open?.sessionID && open.pollToken && open.startToken) {
                 try {
-                    const current = await (await request(`/v1/dashboard/auth-sessions/${encodeURIComponent(open.sessionID)}?poll_token=${encodeURIComponent(open.pollToken)}`)).json();
-                    if (['created', 'waiting_provider', 'email_verification_required', 'merge_confirmation_required'].includes(current.status)) {
+                    const current = await pollOpenSession(open);
+                    // AUTH02: a completed-but-unbound session binds in place; never
+                    // create a second auth session for the same login.
+                    if (current.status === 'completed')
+                        return await bindSavedSession(open);
+                    if (ACTIVE_SESSION_STAGES.includes(current.status)) {
                         const url = open.authURL ?? '';
                         const qr = url ? await writeLocalPNG(url).catch(() => undefined) : undefined;
                         return {
                             status: 'auth_pending',
-                            result: { dashboard_auth_session_id: open.sessionID, expires_at: current.expires_at, methods: ['phone', 'email', 'alipay', 'wechat'] },
-                            handoff: { url, ...(qr ? { qr_local_path: qr.filePath, markdown: `![ItPay 官方授权二维码](${qr.filePath})` } : {}) },
-                            instruction: '已有进行中的官方授权请求，沿用同一链接或二维码；不要生成新请求。用户在页面内选择手机号验证码、邮箱或钱包完成登录。',
+                            result: {
+                                dashboard_auth_session_id: open.sessionID,
+                                stage: current.status,
+                                expires_at: current.expires_at,
+                                methods: ['phone', 'email', 'alipay', 'wechat'],
+                            },
+                            // SEC01: the handoff URL carries one-time credentials — it goes
+                            // to the human only, never into logs, prompts, or PR material.
+                            handoff: {
+                                url,
+                                contains_credentials: true,
+                                ...(qr ? { qr_local_path: qr.filePath, markdown: `![ItPay 官方授权二维码](${qr.filePath})` } : {}),
+                            },
+                            instruction: `${stageInstruction(current.status)} 沿用同一链接或二维码；不要生成新请求。`,
                             next: { command: 'itpay auth status --json', reason: '用户完成页面登录后确认绑定', poll_after_ms: 5000 },
                             recovery: [],
                         };
                     }
+                    const terminal = TERMINAL_SESSION_STATES[current.status];
+                    if (terminal) {
+                        rmSync(sellerAuthPath(baseURL, env, purpose), { force: true });
+                        // Fall through to a fresh session only after a definitive
+                        // terminal state; anything else keeps the stored session.
+                    }
+                    else {
+                        return authStatusUnknown(open.sessionID);
+                    }
+                }
+                catch (error) {
+                    if (error instanceof AuthRequestError && (error.httpStatus === 404 || error.httpStatus === 410)) {
+                        return sessionGone(env, purpose, baseURL, open.sessionID);
+                    }
+                    return authStatusUnknown(open.sessionID);
                 }
-                catch { /* fall through to a fresh request */ }
             }
         }
         const response = await request('/v1/dashboard/auth-sessions', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ return_to: backend ? '/' : '/seller' }) });
@@ -95,14 +227,16 @@ async function accountAuth(action, baseURL, env, fetcher, backend) {
                 status: 'auth_pending',
                 result: {
                     dashboard_auth_session_id: result.dashboard_auth_session_id,
+                    stage: 'created',
                     expires_at: result.expires_at,
                     methods: ['phone', 'email', 'alipay', 'wechat'],
                 },
                 handoff: {
                     url: url.href,
+                    contains_credentials: true,
                     ...(qr ? { qr_local_path: qr.filePath, markdown: `![ItPay 官方授权二维码](${qr.filePath})` } : {}),
                 },
-                instruction: '把官方授权页或二维码交给用户。用户在页面内选择手机号验证码、邮箱或钱包完成登录；不要替用户输入手机号或验证码，start_token 不要写入聊天记录。',
+                instruction: '把官方授权页或二维码交给用户。用户在页面内选择手机号验证码、邮箱或钱包完成登录；不要替用户输入手机号或验证码，start_token 不要写入聊天记录或日志。',
                 next: { command: 'itpay auth status --json', reason: '用户完成页面登录后确认绑定', poll_after_ms: 5000 },
                 recovery: [],
             };
@@ -119,36 +253,50 @@ async function accountAuth(action, baseURL, env, fetcher, backend) {
     }
     if (!backend && sellerSessionToken(baseURL, env))
         return { status: 'authenticated', base_url: baseURL, expires_at: state?.expiresAt };
-    if (!state?.sessionID || !state.pollToken || !state.startToken)
-        return { status: 'login_required' };
-    const path = `/v1/dashboard/auth-sessions/${encodeURIComponent(state.sessionID)}`;
-    const progress = await (await request(`${path}?poll_token=${encodeURIComponent(state.pollToken)}`)).json();
+    if (!state?.sessionID || !state.pollToken || !state.startToken) {
+        // AUTH07: a bare `status` with no session is its own truthful state, not a
+        // failure and not an implicit login.
+        if (!backend)
+            return { status: 'login_required' };
+        return {
+            status: 'login_required',
+            result: {},
+            instruction: '当前设备尚未绑定账号，也没有进行中的授权请求。需要时运行 itpay auth login 发起官方登录。',
+            next: { command: 'itpay auth login --json', reason: '需要账号绑定时发起官方授权' },
+            recovery: [],
+        };
+    }
+    let progress;
+    try {
+        progress = await pollOpenSession(state);
+    }
+    catch (error) {
+        if (error instanceof AuthRequestError && (error.httpStatus === 404 || error.httpStatus === 410)) {
+            return sessionGone(env, purpose, baseURL, state.sessionID);
+        }
+        return authStatusUnknown(state.sessionID);
+    }
     if (progress.status !== 'completed') {
         if (backend) {
-            if (progress.status === 'expired') {
+            const terminal = TERMINAL_SESSION_STATES[progress.status];
+            if (terminal) {
                 rmSync(sellerAuthPath(baseURL, env, purpose), { force: true });
                 return {
-                    status: 'auth_expired',
-                    result: { dashboard_auth_session_id: state.sessionID },
-                    instruction: '授权请求已过期。重新运行 itpay auth login 生成新请求；之前的查询输入在服务端保留，可恢复。',
-                    next: { command: 'itpay auth login --json', reason: '重新发起官方授权' },
-                    recovery: [],
-                };
-            }
-            if (progress.status === 'failed' || progress.status === 'cancelled' || progress.status === 'denied') {
-                rmSync(sellerAuthPath(baseURL, env, purpose), { force: true });
-                return {
-                    status: progress.status === 'failed' ? 'auth_denied' : `auth_${progress.status}`,
-                    result: { dashboard_auth_session_id: state.sessionID },
-                    instruction: '官方授权未通过或被取消。重新运行 itpay auth login 生成新请求。',
+                    status: terminal.status,
+                    result: { dashboard_auth_session_id: state.sessionID, stage: progress.status },
+                    instruction: terminal.instruction,
                     next: { command: 'itpay auth login --json', reason: '重新发起官方授权' },
                     recovery: [],
                 };
             }
             return {
                 status: 'auth_pending',
-                result: { dashboard_auth_session_id: state.sessionID },
-                instruction: '用户仍在官方页面完成登录；保留当前 handoff，不要生成新二维码或新请求。',
+                result: {
+                    dashboard_auth_session_id: state.sessionID,
+                    stage: progress.status,
+                    ...(progress.expires_at ? { expires_at: progress.expires_at } : {}),
+                },
+                instruction: stageInstruction(progress.status),
                 next: { command: 'itpay auth status --json', reason: '轮询同一授权请求', poll_after_ms: 5000 },
                 recovery: [],
             };
@@ -156,19 +304,18 @@ async function accountAuth(action, baseURL, env, fetcher, backend) {
         return { status: progress.status, instruction: 'Finish login and email verification in the browser.' };
     }
     if (backend) {
-        const result = await backend.bindAgentAccount({ dashboard_auth_session_id: state.sessionID, start_token: state.startToken });
-        if (result.status !== 'authenticated')
-            throw new Error('Agent binding did not complete');
-        rmSync(sellerAuthPath(baseURL, env, purpose), { force: true });
-        return {
-            status: 'authenticated',
-            result: { bound: true, phone_verified: result.phone_verified === true },
-            instruction: '登录与绑定已完成，告知用户可继续之前的查询；已注册账号查询不消耗试用次数，仍受正常限流。',
-            next: { command: 'itpay services run <service_id> --execution <pending_execution_id> --json', reason: '恢复被额度暂停的原查询' },
-            recovery: [],
-        };
+        try {
+            return await bindSavedSession(state);
+        }
+        catch (error) {
+            if (error instanceof AuthRequestError)
+                throw error;
+            // Binding outcome unknown: keep the session so a retry can still bind
+            // the same completed login instead of creating a new one.
+            return authStatusUnknown(state.sessionID);
+        }
     }
-    const claimed = await request(`${path}/claim?start_token=${encodeURIComponent(state.startToken)}`, { method: 'POST' });
+    const claimed = await request(`/v1/dashboard/auth-sessions/${encodeURIComponent(state.sessionID)}/claim?start_token=${encodeURIComponent(state.startToken)}`, { method: 'POST' });
     const token = /(?:^|[, ]+)itpay_buyer_session=([^;]+)/.exec(claimed.headers.get('set-cookie') ?? '')?.[1];
     const session = await claimed.json();
     if (!token || !session.expires_at || !(Date.parse(session.expires_at) > Date.now()))

package/dist/src/state/client_context.js

@@ -79,3 +79,73 @@ export function validateContext(host, target) {
     }
     return undefined;
 }
+export function normalizeViewer(raw) {
+    const v = raw?.trim().toLowerCase();
+    if (v === "desktop" || v === "mobile")
+        return v;
+    return "unknown";
+}
+export function normalizeLocality(raw) {
+    const v = raw?.trim().toLowerCase();
+    if (v === "same_device" || v === "remote" || v === "cloud")
+        return v;
+    return "unknown";
+}
+// Conservative declared capability table per host. Terminal/desktop agent
+// hosts run where a human watches a screen and a system browser exists;
+// IM hosts can send links/buttons but cannot be assumed to open pages;
+// plain-chat surfaces get links and copyable entries only.
+export function hostCapabilities(host) {
+    switch (host) {
+        case "terminal":
+        case "codex":
+        case "claude-code":
+            return {
+                user_visible_browser: "unknown",
+                system_browser: "yes",
+                clickable_https: "yes",
+                image_visible: host === "terminal" ? "no" : "unknown",
+                native_url_button: "no",
+                user_visible_terminal: "yes",
+                other_device_scan: "yes",
+                send_message: "yes",
+            };
+        case "telegram":
+        case "feishu":
+        case "lark":
+            return {
+                user_visible_browser: "no",
+                system_browser: "no",
+                clickable_https: "yes",
+                image_visible: "yes",
+                native_url_button: "yes",
+                user_visible_terminal: "no",
+                other_device_scan: "unknown",
+                send_message: "yes",
+            };
+        case "discord":
+        case "whatsapp":
+            return {
+                user_visible_browser: "no",
+                system_browser: "no",
+                clickable_https: "yes",
+                image_visible: "yes",
+                native_url_button: "unknown",
+                user_visible_terminal: "no",
+                other_device_scan: "unknown",
+                send_message: "yes",
+            };
+        case "plain-chat":
+        default:
+            return {
+                user_visible_browser: "no",
+                system_browser: "unknown",
+                clickable_https: "yes",
+                image_visible: "no",
+                native_url_button: "unknown",
+                user_visible_terminal: "no",
+                other_device_scan: "unknown",
+                send_message: "yes",
+            };
+    }
+}

package/dist/src/state/config.js

@@ -15,11 +15,12 @@ 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.17";
-export const API_CONTRACT_REVISION = "sha256:c6125896053540d1b56f9d106df499ac90162fb8fa4cce619c8029e90f771f85";
+export const CLI_VERSION = "2.1.18";
+export const API_CONTRACT_REVISION = "sha256:2f9fbcdc5cd0630910abb52671304cc019e348e9a778017ec92ddc3513b3639f";
 const CART_SESSION_DEFAULT_DIR = ".itpay-v3";
 const CART_SESSION_FILENAME = "cart.json";
 const OPERATION_JOURNAL_FILENAME = "operations.json";
+const TASK_JOURNAL_FILENAME = "tasks.json";
 export function cliDistribution(env = process.env) {
     if (env.ITPAY_DISTRIBUTION === "openclaw-skill-bundle")
         return "openclaw-skill-bundle";
@@ -75,6 +76,16 @@ export function cartSessionPath(env = process.env) {
     mkdirSync(dir, { recursive: true });
     return resolve(dir, stateFilename(CART_SESSION_FILENAME, resolveBackendURL(env)));
 }
+// Task journal (AUTH04): paused Service Executions per backend, so a login
+// completion can resume the SAME task instead of guessing from the latest order.
+export function taskJournalPath(env = process.env) {
+    if (env.ITPAY_TASK_JOURNAL_PATH) {
+        return resolve(env.ITPAY_TASK_JOURNAL_PATH);
+    }
+    const dir = stateDir(env);
+    mkdirSync(dir, { recursive: true });
+    return resolve(dir, stateFilename(TASK_JOURNAL_FILENAME, resolveBackendURL(env)));
+}
 export function loadConfig(env = process.env) {
     const baseURL = resolveBackendURL(env);
     const bearerToken = env.ITPAY_BEARER_TOKEN || undefined;

package/dist/src/state/task_journal.js

@@ -0,0 +1,88 @@
+// Minimal local task journal: which Service Executions are paused at a human
+// gate (login, rate limit) and how to resume the SAME execution. It stores
+// no chat history, PII, credentials or tokens — only ids, stage and the
+// resume command the owner flow already emitted. Business truth stays
+// server-side; this file only makes "continue" point at the right task.
+import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+export const PAUSED_STAGES = new Set([
+    "login_required",
+    "rate_limited",
+    "quota_paused",
+    "auth_pending",
+    "awaiting_input",
+]);
+const TERMINAL_STAGES = new Set([
+    "completed",
+    "delivered",
+    "issued",
+    "failed",
+    "cancelled",
+    "refunded",
+]);
+export class TaskJournal {
+    path;
+    constructor(path) {
+        this.path = path;
+    }
+    record(task) {
+        const file = this.readFile();
+        file.tasks[task.service_execution_id] = {
+            ...task,
+            updated_at: new Date().toISOString(),
+        };
+        this.writeFile(file);
+    }
+    clear(serviceExecutionID) {
+        const file = this.readFile();
+        if (!file.tasks[serviceExecutionID])
+            return;
+        delete file.tasks[serviceExecutionID];
+        this.writeFile(file);
+    }
+    // Observe the latest stage without deleting history; terminal stages stop
+    // the task from counting as resumable.
+    observe(serviceExecutionID, stage, resumeCommand) {
+        const file = this.readFile();
+        const existing = file.tasks[serviceExecutionID];
+        file.tasks[serviceExecutionID] = {
+            service_execution_id: serviceExecutionID,
+            ...(existing?.service_id ? { service_id: existing.service_id } : {}),
+            stage,
+            ...(resumeCommand ?? existing?.resume_command ? { resume_command: resumeCommand ?? existing.resume_command } : {}),
+            updated_at: new Date().toISOString(),
+        };
+        this.writeFile(file);
+    }
+    // Tasks paused behind login/quota gates, newest first. Terminal or
+    // completed tasks never count as "still waiting for login".
+    pausedTasks() {
+        const file = this.readFile();
+        return Object.values(file.tasks)
+            .filter((task) => PAUSED_STAGES.has(task.stage) && !TERMINAL_STAGES.has(task.stage))
+            .sort((left, right) => right.updated_at.localeCompare(left.updated_at));
+    }
+    readFile() {
+        if (!existsSync(this.path))
+            return { schema_version: "itpay.task_journal.v1", tasks: {} };
+        try {
+            const parsed = JSON.parse(readFileSync(this.path, "utf8"));
+            if (parsed.schema_version !== "itpay.task_journal.v1" || !parsed.tasks || typeof parsed.tasks !== "object") {
+                return { schema_version: "itpay.task_journal.v1", tasks: {} };
+            }
+            return parsed;
+        }
+        catch {
+            return { schema_version: "itpay.task_journal.v1", tasks: {} };
+        }
+    }
+    writeFile(file) {
+        // Bound the journal: keep only the 50 most recent task records.
+        const entries = Object.entries(file.tasks).sort((left, right) => right[1].updated_at.localeCompare(left[1].updated_at));
+        file.tasks = Object.fromEntries(entries.slice(0, 50));
+        mkdirSync(dirname(this.path), { recursive: true, mode: 0o700 });
+        const tmp = `${this.path}.${process.pid}.tmp`;
+        writeFileSync(tmp, JSON.stringify(file), { mode: 0o600 });
+        renameSync(tmp, this.path);
+    }
+}

package/docs/agent/buyer/identity-and-sessions.json

@@ -90,5 +90,13 @@
     "lock",
     "window",
     "chat"
-  ]
+  ],
+  "auth_session_states": {
+    "stages": "The CLI now reports the auth session stage exactly as the server returns it: waiting_provider (show the handoff and wait), email_verification_required (the human must verify the emailed code on the auth page), merge_confirmation_required (an existing account matches — the human must confirm the merge on the auth page), provider_pending/pending (generic wait), completed (session done — bind it, do not restart).",
+    "terminal_states": "auth_expired/auth_denied/auth_cancelled/auth_failed mean this session is over; say so plainly and start a NEW session only if the human still wants in — never keep polling a dead one.",
+    "transport_unknown": "auth_session_unknown means a network error while polling — the outcome is unknown. Keep waiting on the SAME session (it may still complete); do NOT restart auth, and do not assume denial.",
+    "missing": "auth_session_not_found means the cached session is gone server-side; start a new login.",
+    "completed_resume": "When login completes, itpay auth login resumes the remembered pending service execution automatically when one exists — you do not need to find it yourself.",
+    "path_b": "A buyer who reaches checkout without a login completes identity inside the protected checkout page; never force a separate itpay auth login first."
+  }
 }

package/docs/agent/buyer/rail-booking.json

@@ -13,7 +13,7 @@
     "A query returned login_required or rate_limited."
   ],
   "service_selection": {
-    "itpay-rail-exact": "Use when the buyer knows BOTH the exact departure and arrival railway station names (e.g. 古镇 → 广州南). Direct train query, fastest path. Do NOT use it with only a city or fuzzy location.",
+    "itpay-rail-exact": "Use when the buyer knows BOTH the exact departure and arrival railway station names (e.g. 古镇 → 广州南). It is one station-pair + one travel_date query: filter the returned list locally for remembered train numbers or time windows — do NOT re-query per train. Do NOT use it with only a city or fuzzy location.",
     "itpay-rail-smart": "Use when the buyer has a city name, an area, an address, or wants transfer planning and recommendations. The platform resolves locations to stations itself; never silently convert a city into its namesake station.",
     "itpay-rail-booking": "Purchase service — use ONLY after the buyer explicitly chose a train and seat from a query result. Starts quote → protected checkout → payment → asynchronous issuance on one execution. Never queried for schedules.",
     "svc_qizhidao_company_lookup": "Not a railway service; do not mix intents."
@@ -67,7 +67,7 @@
       },
       "explicit_legs": {
         "passengers": "Integer 1-5.",
-        "legs": "Array of 1-3 legs, each: from_station_code, to_station_code, travel_date, train_code, departure_time (HH:MM), arrival_time (HH:MM), arrival_days (int 0-7), seat_type. Only use when no booking_offer is available; never guess these values."
+        "legs": "Array with exactly ONE leg: from_station_code, to_station_code, travel_date, train_code, departure_time (HH:MM), arrival_time (HH:MM), arrival_days (int 0-7), seat_type. The public review accepts a single leg; only use when no booking_offer is available, and never guess these values. For v2 separate_legs_only journeys, book one leg at a time via that leg's own booking_offer — never a multi-leg basket."
       },
       "boundary": "Identity fields (names, ID numbers, phones) never belong in this input; they are collected on the protected checkout page."
     }
@@ -92,6 +92,7 @@
     "Submit input with services run <service> --execution <id> --input-json <file> --json on the SAME execution.",
     "itpay-rail-smart may stop at a location confirmation step; show the candidate places to the buyer, then continue the same execution after the human confirms.",
     "After the buyer explicitly picks a train/seat, run itpay-rail-booking with the selection token (preferred) or explicit legs. The execution then pauses at the booking review (workflow:confirm_booking): services next returns booking_review_required with human_action.context.review carrying draft_revision, legs, seat_options and notice_version.",
+    "Whether or not the query was free, the answer is the same shape under compare: one preferred option, at most two meaningful alternatives, the key trade-offs — then stop and wait for the buyer. Do not stack more options or chain into purchase.",
     "Collect the review input and submit it with services action <id> --action workflow:confirm_booking --actor-type human --status approved --input-json <file> --json. Required fields: draft_revision (exact server value), passengers, seat_type, seat_preferences (one entry per passenger_index 0..n-1, values limited to that leg's seat_options), party_preference, fallback=automatic_assignment, notice_version, accept_non_guaranteed=true. Only after an accepted review does the server quote and offer checkout.",
     "The booking execution reaches a protected checkout: passenger identity data is entered by the human on that page, never through the CLI. Account authentication may happen inside checkout — do not force a separate auth login first (Path B).",
     "Payment success does not mean the ticket is issued. Issuance is asynchronous; keep reading the same execution with services next.",
@@ -122,6 +123,7 @@
   },
   "agent_rules": [
     "Pick the service by the buyer's input precision: exact station names → itpay-rail-exact; anything fuzzier → itpay-rail-smart; explicit purchase intent after a selection → itpay-rail-booking.",
+    "Choose the goal first (see goals): compare presents one preferred option plus at most two meaningful alternatives then waits; prepare_checkout selects under the buyer's rules and continues to the official confirmation entry without re-asking.",
     "Never invent input field names. If the guidance block or this doc does not list a field, do not send it.",
     "Never ask the buyer for passenger names, ID numbers, or phone numbers in chat; those are collected only on the protected checkout page.",
     "Never reconstruct provider-shaped legs JSON when a booking_offer.selection_token is available; submit the token plus passengers.",
@@ -187,5 +189,17 @@
     "journey_card": "Cards carry station names, train codes, dated times, transfer/same-run notes, observed_at price time and handles. representative_offer.ticket_offers[] lists one purchasable segment per entry (leg_index, offer_id, service_ref, station codes, travel_date, seat_type, passengers, integer-minor amounts); per-item amounts sum to the total. rides[] (ridden legs) and ticket_offers[] (purchasable segments) are different lists — never infer transfers or fees from array lengths.",
     "selection": "booking_support=single_leg cards carry booking_offer {service_id: itpay-rail-booking, selection_token: rsel_…}; submit it to itpay-rail-booking with passengers as today. separate_legs_only cards expose no whole-journey token — each leg is quoted and confirmed separately via its protected detail; never assemble legs JSON yourself. booking_support=none has no selection action.",
     "honesty": "Coverage is bounded: repeat searched_scope/notices verbatim, never claim national-exhaustive search, and surface missing prices as unknown — never 0."
+  },
+  "goals": {
+    "compare": "Buyer wants to see options and keeps the final choice. Present one preferred option plus at most two meaningful alternatives, then wait. A fully-specified query with no purchase delegation stays compare.",
+    "prepare_checkout": "Buyer named the product, or delegated selection under explicit rules and asked for the purchase entry. Select under those rules, explain the match, and continue to the official confirmation/payment entry without re-asking '要不要买'. Clear delegation missing only the date asks for the date alone.",
+    "boundaries": [
+      "Decide locally from the whole conversation (negations, conditions, references, latest withdrawal); no trigger-word lists, no regex, no field-completeness classifier, no mode flag, never ask the human to name a mode.",
+      "Explicit buyer rules outrank default recommendations; missing facts are unknown, never assumed satisfied.",
+      "compare must not continue into selection; prepare_checkout must not silently downgrade to waiting.",
+      "A pending/login/error state is never new intent; withdrawal updates the goal but never rewrites a completed payment.",
+      "Neither goal authorizes payment or skips confirmation: payment, terms and passenger identity stay behind their own gates."
+    ],
+    "recipe": "For the query→booking→review→checkout continuity after a valid selection, load the rail-fast-checkout topic (itpay docs show rail-fast-checkout --json)."
   }
 }