@agenzo/merchant-cli 0.8.16 → 0.9.0

package/dist/index.js

@@ -2162,66 +2162,166 @@ var unifiedOrdersListSchema = {
   cli: CLI_NAME,
   noun: ORDERS_NOUN,
   verb: "list",
-  description: 'List orders across ALL providers (ride + hotel) in one call. Use this for generic "my orders" / "order history" requests. Prefer ride-elife/hotel-redaug list-orders when the user names a specific business.',
+  description: "List orders across ALL providers (ride + hotel + flight) with common filters and offset/cursor pagination. Use domain-specific list-orders only for provider-specific fields.",
   flags: {
-    "order-type": { type: "string", required: false, description: "Filter by provider: ride | hotel" },
+    "order-type": { type: "string", required: false, description: "Legacy single order type: ride | hotel | flight" },
+    "order-types": { type: "string", required: false, description: "Comma-separated order types: ride,hotel,flight" },
     member: MEMBER_FLAG_SCHEMA,
-    status: { type: "string", required: false, description: "Filter by NORMALIZED status (NOT the domain-specific status): PENDING | CONFIRMED | COMPLETED | CANCELLED | FAILED" },
-    page: { type: "int", required: false, default: 1, description: "Page number", constraints: ">= 1" },
-    "page-size": { type: "int", required: false, default: 20, description: "Items per page", constraints: ">= 1" }
+    status: { type: "string", required: false, description: "Legacy single normalized status: PENDING | CONFIRMED | COMPLETED | CANCELLED | FAILED" },
+    statuses: { type: "string", required: false, description: "Comma-separated normalized statuses" },
+    "created-from": { type: "string", required: false, description: "ISO 8601 created-at lower bound (inclusive)" },
+    "created-to": { type: "string", required: false, description: "ISO 8601 created-at upper bound (exclusive)" },
+    cursor: { type: "string", required: false, description: "Opaque cursor returned by the previous page" },
+    page: { type: "int", required: false, default: 1, description: "Legacy 1-based page number", constraints: ">= 1" },
+    "page-size": { type: "int", required: false, default: 20, description: "Items per page", constraints: "1-100" }
   },
   response: {
     orders: {
       type: "array",
-      description: "Slim cross-provider order-index items. For business-specific fields (vehicle_class, hotel_name, etc.), call `orders get --order-id <id>` or the domain-specific `get`.",
+      description: "Slim cross-provider index items. Call `orders get` for business-specific detail.",
       items: {
-        order_id: { type: "string", description: "Order id (rio_... for ride, hho_... for hotel). Pass to `orders get`." },
-        member_id: { type: "string|null", description: "End-user this order is attributed to; null when unattributed" },
-        order_type: { type: "string", description: "'ride' or 'hotel'" },
-        status: { type: "string", description: "Normalized status: PENDING | CONFIRMED | COMPLETED | CANCELLED | FAILED" },
-        amount: { type: "float|null", description: "Order amount in DECIMAL currency units (NOT cents)" },
+        order_id: { type: "string", description: "Order id (rio_..., hho_..., or ffo_...). Pass to `orders get`." },
+        member_id: { type: "string|null", description: "Attributed end-user id; null when unattributed" },
+        order_type: { type: "string", description: "ride | hotel | flight" },
+        status: { type: "string", description: "Original provider-domain status for display" },
+        unified_status: { type: "string", description: "PENDING | CONFIRMED | COMPLETED | CANCELLED | FAILED" },
+        amount: { type: "float|null", description: "Order amount in decimal currency units" },
         currency: { type: "string|null", description: "ISO 4217 currency code" },
         created_at: { type: "string|null", description: "ISO 8601 datetime" },
         updated_at: { type: "string|null", description: "ISO 8601 datetime" }
       }
     },
     total: { type: "int", description: "Total matching orders across all providers" },
-    page: { type: "int", description: "Current page" },
-    page_size: { type: "int", description: "Items per page" }
+    page: { type: "int", description: "Legacy current page" },
+    page_size: { type: "int", description: "Items per page" },
+    next_cursor: { type: "string|null", description: "Opaque cursor for the next page; null at the end" },
+    has_more: { type: "bool", description: "Whether another page is available" },
+    applied_filters: { type: "object", description: "Normalized filters applied by the platform" }
   },
   example: {
-    command: "agenzo-merchant-cli orders list --page 1 --page-size 10",
-    output_summary: "Returns a paginated, cross-provider list of orders (both ride and hotel). If the user then asks about one order, use its order_id with `orders get`."
+    command: "agenzo-merchant-cli orders list --order-types flight,hotel --created-from 2026-07-01T00:00:00Z --page-size 20",
+    output_summary: "Returns ride, hotel, and flight orders with stable pagination metadata."
   },
   error_recovery: {
-    INVALID_REQUEST: "The --status value is not one of PENDING/CONFIRMED/COMPLETED/CANCELLED/FAILED. Fix and retry.",
+    INVALID_REQUEST: "Fix invalid type/status/date/cursor filters and retry.",
     INTERNAL_ERROR: "Transient backend error. Retry once after a short delay.",
-    PARAM_INVALID: "Ensure --page / --page-size are positive integers, then retry."
+    PARAM_INVALID: "Fix conflicting or invalid CLI options, then retry."
   }
 };
 var unifiedOrdersGetSchema = {
   cli: CLI_NAME,
   noun: ORDERS_NOUN,
   verb: "get",
-  description: "Get a single order detail by id, regardless of which provider (ride/hotel) it belongs to. The platform resolves order_id -> provider internally and returns that provider's own detail shape.",
+  description: "Get a ride, hotel, or flight order detail by id. The platform resolves order_id to the owning domain and returns that domain detail shape.",
   flags: {
-    "order-id": { type: "string", required: true, description: "Order id from `orders list` (rio_... for ride, hho_... for hotel)" }
+    "order-id": { type: "string", required: true, description: "Order id from `orders list` (rio_..., hho_..., or ffo_...)" }
   },
   response: {
     "(varies by order_type)": {
       type: "object",
-      description: "The response shape is delegated to the owning provider and therefore varies: a ride order returns the same shape as `ride-elife get`; a hotel order returns the same shape as `hotel-redaug get`. Treat the result as an opaque object and surface whatever fields it contains \u2014 do NOT assume a fixed schema."
+      description: "Delegated ride, hotel, or flight detail. Treat the result as an opaque domain object and surface the returned fields."
     }
   },
   example: {
-    command: "agenzo-merchant-cli orders get --order-id hho_01K...",
-    output_summary: "Returns the order's detail, delegated to its owning provider (ride or hotel)."
+    command: "agenzo-merchant-cli orders get --order-id ffo_01K...",
+    output_summary: "Returns the order's provider-domain detail."
   },
   error_recovery: {
-    ORDER_NOT_FOUND: "The order_id does not exist or does not belong to this developer/org. Verify the id from `orders list`. Do NOT retry blindly.",
+    ORDER_NOT_FOUND: "The order_id does not exist or does not belong to this developer/org. Verify the id from `orders list`.",
     INTERNAL_ERROR: "The order's provider detail lookup is temporarily unavailable. Retry once after a short delay."
   }
 };
+var ordersPayBatchSchema = {
+  cli: CLI_NAME,
+  noun: ORDERS_NOUN,
+  verb: "pay-batch",
+  description: "Settle a batch of orders (may mix ride/hotel/flight \u2014 hho_/ffo_/rio_) in ONE aggregate payment via a single payment credential. Physical landing point of the logical write tool orders__aggregate__pay-batch, invoked by the trip-aggregate pay-orders write verb through UniversalGateway (executed only after the single confirmation gate; never exposed to the LLM). Amounts are NOT passed here \u2014 the platform sums each order's locked authoritative price. Provide the aggregate total via one rail: --payment-token-id (\u8F68A: network-token minted for the aggregate total, external_transaction_id bound to this payment_group \u2014 one UnionPay/Visa passkey) OR --payment-method-id (\u8F68B: EVO bound card \u2014 one 3DS challenge); both may be omitted (monthly_settlement / platform default card). On EVO cardholder authentication the response is AUTHENTICATION_REQUIRED with a three_ds_url + merchant_trans_id; finish it out-of-band, then an idempotent replay settles. On success the batch becomes settled / partially_settled (upstream-confirmation-failed orders are refunded). Supports --watch to poll until a terminal batch status.",
+  flags: {
+    "order-ids": {
+      type: "string",
+      required: true,
+      description: `Ordered order ids to settle together \u2014 comma-separated (hho_1,ffo_2,rio_3) or a JSON array (["hho_1","ffo_2"]). May mix hho_/ffo_/rio_ domains. Amounts come from each order's locked authoritative price (NOT passed here).`
+    },
+    "payment-token-id": {
+      type: "string",
+      required: false,
+      description: "[\u8F68A] Network-token id (UnionPay/Visa) minted for the aggregate total with external_transaction_id bound to this payment_group (direct-charge main path). Mutually exclusive with --payment-method-id; both may be omitted for monthly_settlement / platform default."
+    },
+    "payment-method-id": {
+      type: "string",
+      required: false,
+      description: "[\u8F68B] EVO bound-card id to settle the aggregate total via one 3DS challenge (explicit/fallback rail). Mutually exclusive with --payment-token-id."
+    },
+    "evo-explicit": {
+      type: "bool",
+      required: false,
+      default: false,
+      description: "[\u8F68B \u786C\u95E8\u69DB] Explicit opt-in to settle via the EVO bound-card rail. Set true ONLY when the user explicitly chose EVO; forwarded to the body as evo_explicit=true. Omit on the payment-token-id direct-charge path."
+    },
+    "payment-group-id": {
+      type: "string",
+      required: false,
+      description: "Optional caller-pre-generated payment group id; omit to let the platform generate one. The whole batch is associated with this group for cross-provider reconciliation."
+    },
+    member: MEMBER_FLAG_SCHEMA,
+    "idempotency-key": {
+      type: "string",
+      required: true,
+      description: "Unique key forwarded verbatim as the Idempotency-Key header; never auto-generated. The SAME key + the SAME ordered order_ids replays as the same batch (dedup re-check, no double charge); any change to order_ids yields a new batch.",
+      constraints: "1-128 chars [A-Za-z0-9_-]"
+    },
+    watch: {
+      type: "bool",
+      required: false,
+      default: false,
+      description: "Poll until a terminal batch status (settled / partially_settled / failed) or timeout, emitting one NDJSON line per poll. Non-terminal states (authorizing/capturing, AUTHENTICATION_REQUIRED) keep polling \u2014 after the user finishes 3DS out-of-band, the next idempotent replay settles."
+    },
+    // watch 默认值与 pay-batch.ts 的 DEFAULT_PAY_BATCH_WATCH_* 常量一致；此处内联字面量
+    // 以避免 verb-schema.ts ↔ pay-batch.ts 循环依赖（pay-batch.ts 反向依赖本模块的 schema）。
+    "watch-interval": {
+      type: "int",
+      required: false,
+      default: 5,
+      description: "Seconds between polls when --watch is set"
+    },
+    "watch-timeout": {
+      type: "int",
+      required: false,
+      default: 300,
+      description: "Max seconds to poll before giving up"
+    }
+  },
+  response: {
+    payment_group_id: { type: "string", description: "The payment group this batch settled under (echoes --payment-group-id when supplied, else server-generated)." },
+    status: { type: "string", description: "settled | partially_settled | failed | AUTHENTICATION_REQUIRED (3DS challenge body)." },
+    currency: { type: "string", description: "ISO 4217 currency of the aggregate settlement (all orders share one currency)." },
+    total_amount: { type: "float", description: "Aggregate total in DECIMAL units = sum of each order's authoritative price (computed by the platform, NOT sent by the caller)." },
+    orders: {
+      type: "array",
+      description: "Per-order final result after upstream confirmation.",
+      items: {
+        order_id: { type: "string", description: "hho_/ffo_/rio_ order id." },
+        status: { type: "string", description: "confirmed | refunded | failed." },
+        amount: { type: "float", description: "That order's authoritative amount." },
+        refunded_amount: { type: "float", description: "Amount refunded when upstream confirmation failed for this order." }
+      }
+    },
+    three_ds_url: { type: "string", description: "[AUTHENTICATION_REQUIRED only] EVO 3DS challenge URL \u2014 complete out-of-band, then replay to settle." },
+    merchant_trans_id: { type: "string", description: "[AUTHENTICATION_REQUIRED only] merchant trans id of the batch preauth." },
+    amount: { type: "float", description: "[AUTHENTICATION_REQUIRED only] challenge amount = aggregate total." }
+  },
+  example: {
+    command: "agenzo-merchant-cli orders pay-batch --order-ids hho_01K...,ffo_01K...,rio_01K... --payment-token-id ntk_01J2ABC --idempotency-key trip-pay-1",
+    output_summary: "Settles all listed orders in one charge (banks/EVO see one transaction). Returns {payment_group_id, status, total_amount, currency, orders[]}. Use --watch to poll until settled / partially_settled / failed; upstream-confirmation-failed orders are refunded."
+  },
+  error_recovery: {
+    PARAM_INVALID: "Fix --order-ids (a non-empty comma-separated list or JSON array of order ids) and ensure --idempotency-key is present, then retry.",
+    ORDER_NOT_PAYABLE: "One of the order_ids is not in AWAITING_PAYMENT (the error names the specific order_id). Remove/replace it and retry with a NEW idempotency-key.",
+    CURRENCY_MISMATCH: "The batch mixes currencies \u2014 orders in one pay-batch must share a single currency. Split by currency and settle each group separately.",
+    TOKEN_ORDER_MISMATCH: "The token external_transaction_id is not bound to this payment_group. Mint a token for the aggregate total bound to THIS payment_group_id and retry; no funds moved.",
+    AUTHENTICATION_REQUIRED: "EVO requires cardholder 3DS: open three_ds_url, finish authentication, then replay pay-batch with the SAME idempotency-key (or use --watch to poll automatically)."
+  }
+};
 function flightSchema(verb, description, flags, response, example, extra = {}) {
   return { cli: CLI_NAME, noun: FLIGHT_NOUN, verb, description, flags, response, example, ...extra };
 }
@@ -3883,6 +3983,17 @@ function positiveInt2(value, flag) {
   }
   return String(n);
 }
+function assertCompatibleOptions(opts) {
+  if (opts.orderType !== void 0 && opts.orderTypes !== void 0) {
+    throw new CliError("PARAM_INVALID", "--order-type and --order-types cannot be used together.");
+  }
+  if (opts.status !== void 0 && opts.statuses !== void 0) {
+    throw new CliError("PARAM_INVALID", "--status and --statuses cannot be used together.");
+  }
+  if (opts.cursor !== void 0 && Number(opts.page ?? DEFAULT_PAGE2) !== 1) {
+    throw new CliError("PARAM_INVALID", "--cursor cannot be combined with --page greater than 1.");
+  }
+}
 function formatOrders2(data) {
   const orders = data.orders ?? [];
   if (orders.length === 0) {
@@ -3901,14 +4012,17 @@ function formatOrders2(data) {
     ["Page", String(data.page ?? "-")],
     ["Page size", String(data.page_size ?? "-")]
   ];
+  if (data.has_more !== void 0) summary.push(["Has more", String(data.has_more)]);
+  if (data.next_cursor) summary.push(["Next cursor", data.next_cursor]);
   return `${Formatter.table(headers, rows)}
 ${Formatter.keyValue(summary)}`;
 }
 function registerOrdersListCommand(parent, deps) {
-  const cmd = parent.command("list").description("List orders across ALL providers (ride + hotel), with optional type/status filters").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-type <type>", "Filter by order type: ride | hotel").option("--status <status>", "Filter by normalized status: PENDING | CONFIRMED | COMPLETED | CANCELLED | FAILED").option("--page <page>", "Page number", DEFAULT_PAGE2).option("--page-size <size>", "Page size", DEFAULT_PAGE_SIZE2).option("--member <id>", MEMBER_OPTION_DESCRIPTION);
+  const cmd = parent.command("list").description("List orders across ALL providers (ride + hotel + flight), with filters and pagination").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-type <type>", "Legacy single order type filter: ride | hotel | flight").option("--order-types <types>", "Comma-separated order types: ride,hotel,flight").option("--status <status>", "Legacy single normalized status filter").option("--statuses <statuses>", "Comma-separated statuses: PENDING,CONFIRMED,COMPLETED,CANCELLED,FAILED").option("--created-from <datetime>", "Created at or after this ISO 8601 datetime (inclusive)").option("--created-to <datetime>", "Created before this ISO 8601 datetime (exclusive)").option("--cursor <cursor>", "Opaque cursor returned by the previous page").option("--page <page>", "Legacy 1-based page number", DEFAULT_PAGE2).option("--page-size <size>", "Page size", DEFAULT_PAGE_SIZE2).option("--member <id>", MEMBER_OPTION_DESCRIPTION);
   attachSchemaHelp(cmd, unifiedOrdersListSchema);
   cmd.action(async () => {
     const opts = cmd.optsWithGlobals();
+    assertCompatibleOptions(opts);
     const format = resolveFormat(opts.format);
     const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
       message: "API Key:",
@@ -3919,7 +4033,12 @@ function registerOrdersListCommand(parent, deps) {
       page_size: positiveInt2(opts.pageSize ?? DEFAULT_PAGE_SIZE2, "page-size")
     };
     if (opts.orderType !== void 0) params.order_type = opts.orderType;
+    if (opts.orderTypes !== void 0) params.order_types = opts.orderTypes;
     if (opts.status !== void 0) params.status = opts.status;
+    if (opts.statuses !== void 0) params.statuses = opts.statuses;
+    if (opts.createdFrom !== void 0) params.created_from = opts.createdFrom;
+    if (opts.createdTo !== void 0) params.created_to = opts.createdTo;
+    if (opts.cursor !== void 0) params.cursor = opts.cursor;
     const member = memberIdOf(opts);
     if (member !== void 0) params.member_id = member;
     const spinner = format === "json" ? null : createSpinner("Fetching orders...");
@@ -3944,7 +4063,7 @@ function registerOrdersListCommand(parent, deps) {
 
 // src/orders/get.ts
 function registerOrdersGetCommand(parent, deps) {
-  const cmd = parent.command("get").description("Get a single order detail by id, regardless of provider (ride/hotel)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").requiredOption("--order-id <id>", "Order id (e.g. rio_... or hho_...)");
+  const cmd = parent.command("get").description("Get a single order detail by id, regardless of provider (ride/hotel/flight)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").requiredOption("--order-id <id>", "Order id (e.g. rio_..., hho_..., or ffo_...)");
   attachSchemaHelp(cmd, unifiedOrdersGetSchema);
   cmd.action(async () => {
     const opts = cmd.optsWithGlobals();
@@ -3974,15 +4093,201 @@ function registerOrdersGetCommand(parent, deps) {
   });
 }
 
-// src/hotel-redaug/search.ts
+// src/orders/pay-batch.ts
+import { confirm as confirm6 } from "@inquirer/prompts";
+var DEFAULT_PAY_BATCH_WATCH_INTERVAL_SECONDS = 5;
+var DEFAULT_PAY_BATCH_WATCH_TIMEOUT_SECONDS = 300;
+var PAY_BATCH_TERMINAL_STATUSES = /* @__PURE__ */ new Set([
+  "settled",
+  "partially_settled",
+  "failed"
+]);
+function parseOrderIds(raw) {
+  const INVALID = '--order-ids must be a comma-separated list OR a JSON array of order ids (e.g. "hho_1,ffo_2,rio_3" or ["hho_1","ffo_2"]).';
+  const trimmed = raw.trim();
+  let ids;
+  if (trimmed.startsWith("[")) {
+    let parsed;
+    try {
+      parsed = JSON.parse(trimmed);
+    } catch {
+      throw new CliError("PARAM_INVALID", INVALID);
+    }
+    if (!Array.isArray(parsed)) {
+      throw new CliError("PARAM_INVALID", INVALID);
+    }
+    if (!parsed.every((el) => typeof el === "string")) {
+      throw new CliError("PARAM_INVALID", INVALID);
+    }
+    ids = parsed.map((s) => s.trim());
+  } else {
+    ids = trimmed.split(",").map((s) => s.trim());
+  }
+  ids = ids.filter((s) => s.length > 0);
+  if (ids.length === 0) {
+    throw new CliError("PARAM_INVALID", INVALID);
+  }
+  return ids;
+}
+function formatPayBatch(data) {
+  const lines = [
+    ["Payment group", String(data.payment_group_id ?? "-")],
+    ["Status", String(data.status ?? "-")]
+  ];
+  if (data.total_amount != null && data.currency) {
+    lines.push(["Total", `${data.total_amount} ${data.currency}`]);
+  }
+  if (data.status === "AUTHENTICATION_REQUIRED") {
+    if (data.three_ds_url) lines.push(["3DS URL", String(data.three_ds_url)]);
+    if (data.merchant_trans_id) lines.push(["Merchant trans ID", String(data.merchant_trans_id)]);
+    if (data.amount != null && data.currency) {
+      lines.push(["Challenge amount", `${data.amount} ${data.currency}`]);
+    }
+  }
+  const out = [Formatter.keyValue(lines)];
+  const perOrder = data.per_order ?? [];
+  if (perOrder.length > 0) {
+    const headers = ["Order ID", "Domain", "Status", "Amount", "Refunded"];
+    const rows = perOrder.map((o) => [
+      String(o.order_id ?? "-"),
+      String(o.domain ?? "-"),
+      String(o.status ?? "-"),
+      String(o.amount ?? "-"),
+      String(o.refunded_amount ?? "-")
+    ]);
+    out.push("", Formatter.table(headers, rows));
+  }
+  return out.join("\n");
+}
+function isBatchTerminal(record) {
+  const status = record.status;
+  return typeof status === "string" && PAY_BATCH_TERMINAL_STATUSES.has(status);
+}
+function registerOrdersPayBatchCommand(parent, deps) {
+  const cmd = parent.command("pay-batch").description(
+    "Settle a batch of orders (may mix ride/hotel/flight) in one aggregate payment via a single payment credential"
+  ).option("--api-key <key>", "API Key for authentication (X-Api-Key)").option(
+    "--order-ids <ids>",
+    "Ordered order ids to settle together \u2014 comma-separated (hho_1,ffo_2,rio_3) or a JSON array. May mix hho_/ffo_/rio_ domains. Amounts come from each order's locked authoritative price (not passed here)."
+  ).option(
+    "--payment-token-id <id>",
+    "[\u8F68 A] Network-token id minted for the aggregate total and bound to this payment_group (unionpay/visa charge path)"
+  ).option(
+    "--payment-method-id <id>",
+    "[\u8F68 B] EVO bound-card id to settle the aggregate total (one 3DS challenge)"
+  ).option(
+    "--evo-explicit",
+    "[\u8F68 B \u786C\u95E8\u69DB] Explicit opt-in to settle via the EVO bound-card rail. Set ONLY when the user explicitly chose EVO; forwarded to the body as evo_explicit=true."
+  ).option(
+    "--payment-group-id <id>",
+    "Optional caller-pre-generated payment group id; omit to let the platform generate one"
+  ).option("--member <id>", MEMBER_OPTION_DESCRIPTION).option(
+    "--idempotency-key <key>",
+    "Idempotency key forwarded verbatim as the Idempotency-Key header"
+  ).option("--watch", "Poll until a terminal batch status or timeout (NDJSON output)", false).option(
+    "--watch-interval <seconds>",
+    "Seconds between polls when --watch is set",
+    String(DEFAULT_PAY_BATCH_WATCH_INTERVAL_SECONDS)
+  ).option(
+    "--watch-timeout <seconds>",
+    "Max seconds to poll before giving up",
+    String(DEFAULT_PAY_BATCH_WATCH_TIMEOUT_SECONDS)
+  );
+  attachSchemaHelp(cmd, ordersPayBatchSchema);
+  cmd.action(async () => {
+    const opts = cmd.optsWithGlobals();
+    const format = resolveFormat(opts.format);
+    const isYes = Boolean(opts.yes);
+    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
+      message: "API Key:",
+      type: "password"
+    });
+    const orderIds = parseOrderIds(need9(opts.orderIds, "order-ids"));
+    const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
+      yes: isYes,
+      commandPath: "orders pay-batch"
+    });
+    const watchEnabled = Boolean(opts.watch);
+    const watchInterval = resolveSeconds(opts.watchInterval, DEFAULT_PAY_BATCH_WATCH_INTERVAL_SECONDS);
+    const watchTimeout = resolveSeconds(opts.watchTimeout, DEFAULT_PAY_BATCH_WATCH_TIMEOUT_SECONDS);
+    const body = { order_ids: orderIds };
+    if (opts.paymentTokenId !== void 0) body.payment_token_id = opts.paymentTokenId;
+    if (opts.paymentMethodId !== void 0) body.payment_method_id = opts.paymentMethodId;
+    if (opts.evoExplicit) body.evo_explicit = true;
+    if (opts.paymentGroupId !== void 0) body.payment_group_id = opts.paymentGroupId;
+    const member = memberIdOf(opts);
+    if (member !== void 0) body.member_id = member;
+    if (!isYes) {
+      const confirmed = await confirm6({
+        message: `Settle ${orderIds.length} order(s) in one aggregate payment? This moves money \u2014 a single charge covers the authoritative total of all listed orders (banks/EVO see one transaction).`,
+        default: false
+      });
+      if (!confirmed) {
+        throw new CliError("CLIENT_ABORTED", "Aggregate payment aborted by user.");
+      }
+    }
+    const path = "/orders/pay-batch";
+    const headers = { "Idempotency-Key": idempotencyKey };
+    const auth = { type: "api-key", key: apiKey };
+    if (!watchEnabled) {
+      const spinner = format === "json" ? null : createSpinner("Settling order batch...");
+      const result = await deps.apiClient.post(path, auth, body, headers);
+      spinner?.stop();
+      if (!result.success) {
+        throw CliError.fromApi(result, { auth: "api-key" });
+      }
+      const data = result.data;
+      const configManager = new ConfigManager();
+      const commandResult = {
+        data,
+        text: () => formatPayBatch(data)
+      };
+      await renderWithContext(commandResult, { format }, configManager);
+    } else {
+      const deadline = Date.now() + watchTimeout * 1e3;
+      let lastRecord = null;
+      for (; ; ) {
+        const result = await deps.apiClient.post(path, auth, body, headers);
+        if (result.success) {
+          const data = result.data;
+          lastRecord = data;
+          ndjsonWriteLine(data);
+          if (isBatchTerminal(data)) {
+            return;
+          }
+        } else {
+          throw CliError.fromApi(result, { auth: "api-key" });
+        }
+        if (Date.now() + watchInterval * 1e3 >= deadline) {
+          const timeoutLine = {
+            watch_status: "timeout",
+            message: `Polling stopped after ${watchTimeout}s without reaching a terminal batch status.`,
+            last_status: lastRecord
+          };
+          ndjsonWriteLine(timeoutLine);
+          return;
+        }
+        await realSleep(watchInterval * 1e3);
+      }
+    }
+  });
+}
 function need9(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
+
+// src/hotel-redaug/search.ts
+function need10(value, flag) {
+  if (value === void 0) {
+    throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
+  }
+  return value;
+}
 function num5(value, flag) {
-  const n = Number(need9(value, flag));
+  const n = Number(need10(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -4004,7 +4309,7 @@ function positiveInt3(value, flag) {
 }
 var YMD_RE = /^\d{4}-\d{2}-\d{2}$/;
 function stayDate(value, flag) {
-  const raw = need9(value, flag);
+  const raw = need10(value, flag);
   if (!YMD_RE.test(raw)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a YYYY-MM-DD date.`);
   }
@@ -4076,7 +4381,7 @@ function registerHotelSearchCommand(parent, deps) {
     const pageSize = positiveInt3(opts.pageSize, "page-size");
     const body = {};
     if (hasDestination) {
-      body.destination_id = need9(opts.destinationId, "destination-id");
+      body.destination_id = need10(opts.destinationId, "destination-id");
     } else {
       body.lat = coord(opts.lat, "lat", -90, 90);
       body.lng = coord(opts.lng, "lng", -180, 180);
@@ -4119,14 +4424,14 @@ function registerHotelSearchCommand(parent, deps) {
 }
 
 // src/hotel-redaug/quote.ts
-function need10(value, flag) {
+function need11(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
 function num6(value, flag) {
-  const n = Number(need10(value, flag));
+  const n = Number(need11(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -4134,7 +4439,7 @@ function num6(value, flag) {
 }
 var YMD_RE2 = /^\d{4}-\d{2}-\d{2}$/;
 function stayDate2(value, flag) {
-  const raw = need10(value, flag);
+  const raw = need11(value, flag);
   if (!YMD_RE2.test(raw)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a YYYY-MM-DD date.`);
   }
@@ -4174,7 +4479,7 @@ function registerHotelQuoteCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const hotelId = need10(opts.hotelId, "hotel-id");
+    const hotelId = need11(opts.hotelId, "hotel-id");
     const checkIn = stayDate2(opts.checkIn, "check-in");
     const checkOut = stayDate2(opts.checkOut, "check-out");
     if (!(checkOut > checkIn)) {
@@ -4208,7 +4513,7 @@ function registerHotelQuoteCommand(parent, deps) {
 }
 
 // src/hotel-redaug/create-order.ts
-import { confirm as confirm6 } from "@inquirer/prompts";
+import { confirm as confirm7 } from "@inquirer/prompts";
 function parsePriceItems(raw) {
   const INVALID = "--price-items must be a JSON array of {sale_date (string), sale_price (number), breakfast_num (number)}.";
   let parsed;
@@ -4266,14 +4571,14 @@ function parseCancellation(raw) {
   }
   return parsed;
 }
-function need11(value, flag) {
+function need12(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
 function num7(value, flag) {
-  const n = Number(need11(value, flag));
+  const n = Number(need12(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -4281,7 +4586,7 @@ function num7(value, flag) {
 }
 var YMD_RE3 = /^\d{4}-\d{2}-\d{2}$/;
 function stayDate3(value, flag) {
-  const raw = need11(value, flag);
+  const raw = need12(value, flag);
   if (!YMD_RE3.test(raw)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a YYYY-MM-DD date.`);
   }
@@ -4350,18 +4655,18 @@ function registerHotelCreateOrderCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const productToken = need11(opts.productToken, "product-token");
+    const productToken = need12(opts.productToken, "product-token");
     const totalAmount = num7(opts.totalAmount, "total-amount");
-    const currency = need11(opts.currency, "currency");
-    const priceItems = parsePriceItems(need11(opts.priceItems, "price-items"));
+    const currency = need12(opts.currency, "currency");
+    const priceItems = parsePriceItems(need12(opts.priceItems, "price-items"));
     const checkIn = stayDate3(opts.checkIn, "check-in");
     const checkOut = stayDate3(opts.checkOut, "check-out");
     if (!(checkOut > checkIn)) {
       throw new CliError("PARAM_INVALID", "--check-out must be strictly after --check-in.");
     }
-    const guestName = need11(opts.guestName, "guest-name");
-    const contactName = need11(opts.contactName, "contact-name");
-    const contactPhone = need11(opts.contactPhone, "contact-phone");
+    const guestName = need12(opts.guestName, "guest-name");
+    const contactName = need12(opts.contactName, "contact-name");
+    const contactPhone = need12(opts.contactPhone, "contact-phone");
     const body = {
       product_token: productToken,
       total_amount: totalAmount,
@@ -4395,7 +4700,7 @@ function registerHotelCreateOrderCommand(parent, deps) {
     if (member !== void 0) body.member_id = member;
     if (!isYes) {
       const chargeNote = opts.paymentTokenId !== void 0 ? "Payment has already been captured via UPI Agent Pay; this only locks the room." : "This locks the rate but does NOT charge anything yet.";
-      const confirmed = await confirm6({
+      const confirmed = await confirm7({
         message: `Create this hotel order for ${totalAmount} ${currency} (check-in ${checkIn}, check-out ${checkOut})? ${chargeNote}`,
         default: false
       });
@@ -4429,7 +4734,7 @@ function registerHotelCreateOrderCommand(parent, deps) {
 }
 
 // src/hotel-redaug/pay-order.ts
-import { confirm as confirm7 } from "@inquirer/prompts";
+import { confirm as confirm8 } from "@inquirer/prompts";
 
 // src/hotel-redaug/watch.ts
 var DEFAULT_ORDER_WATCH_INTERVAL_SECONDS = 5;
@@ -4617,7 +4922,7 @@ function registerHotelPayOrderCommand(parent, deps) {
     }
     if (opts.evoExplicit) body.evo_explicit = true;
     if (!isYes) {
-      const confirmed = await confirm7({
+      const confirmed = await confirm8({
         message: `Settle hotel order ${orderId}? This moves money via the order's configured billing mode (monthly_settlement or pay_per_call).`,
         default: false
       });
@@ -4695,7 +5000,7 @@ function registerHotelPayOrderCommand(parent, deps) {
 }
 
 // src/hotel-redaug/get.ts
-function need12(value, flag) {
+function need13(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -4759,7 +5064,7 @@ function registerHotelGetCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const orderId = need12(opts.orderId, "order-id");
+    const orderId = need13(opts.orderId, "order-id");
     if (opts.watch) {
       await watchOrderStatus(deps.apiClient, apiKey, orderId, {
         intervalSeconds: resolveSeconds(
@@ -4793,7 +5098,7 @@ function registerHotelGetCommand(parent, deps) {
 }
 
 // src/hotel-redaug/cancel.ts
-function need13(value, flag) {
+function need14(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -4846,8 +5151,8 @@ function registerHotelCancelCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const orderId = need13(opts.orderId, "order-id");
-    const fcOrderCode = need13(opts.fcOrderCode, "fc-order-code");
+    const orderId = need14(opts.orderId, "order-id");
+    const fcOrderCode = need14(opts.fcOrderCode, "fc-order-code");
     const body = { fc_order_code: fcOrderCode };
     if (opts.reason !== void 0) body.reason = opts.reason;
     const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
@@ -4876,15 +5181,15 @@ function registerHotelCancelCommand(parent, deps) {
 }
 
 // src/hotel-redaug/checkout.ts
-import { confirm as confirm8 } from "@inquirer/prompts";
-function need14(value, flag) {
+import { confirm as confirm9 } from "@inquirer/prompts";
+function need15(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
 function num8(value, flag) {
-  const n = Number(need14(value, flag));
+  const n = Number(need15(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -4950,10 +5255,10 @@ function registerHotelCheckoutCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const orderId = need14(opts.orderId, "order-id");
-    const fcOrderCode = need14(opts.fcOrderCode, "fc-order-code");
-    const reason = need14(opts.reason, "reason");
-    const checkoutRooms = parseCheckoutRooms(need14(opts.checkoutRooms, "checkout-rooms"));
+    const orderId = need15(opts.orderId, "order-id");
+    const fcOrderCode = need15(opts.fcOrderCode, "fc-order-code");
+    const reason = need15(opts.reason, "reason");
+    const checkoutRooms = parseCheckoutRooms(need15(opts.checkoutRooms, "checkout-rooms"));
     const refundType = num8(opts.refundType, "refund-type");
     const body = {
       fc_order_code: fcOrderCode,
@@ -4962,7 +5267,7 @@ function registerHotelCheckoutCommand(parent, deps) {
       checkout_rooms: checkoutRooms
     };
     if (!isYes) {
-      const confirmed = await confirm8({
+      const confirmed = await confirm9({
         message: `Request check-out / out-of-policy cancellation for order ${orderId} (${checkoutRooms.length} room(s))? The property must approve and charges may apply.`,
         default: false
       });
@@ -4996,7 +5301,7 @@ function registerHotelCheckoutCommand(parent, deps) {
 }
 
 // src/hotel-redaug/get-checkout.ts
-function need15(value, flag) {
+function need16(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -5032,7 +5337,7 @@ function registerHotelGetCheckoutCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const taskOrderCode = need15(opts.taskOrderCode, "task-order-code");
+    const taskOrderCode = need16(opts.taskOrderCode, "task-order-code");
     if (opts.watch) {
       await watchCheckoutStatus(deps.apiClient, apiKey, taskOrderCode, {
         intervalSeconds: resolveSeconds(
@@ -5136,7 +5441,7 @@ function registerHotelListOrdersCommand(parent, deps) {
 }
 
 // src/hotel-redaug/find-destination.ts
-function need16(value, flag) {
+function need17(value, flag) {
   if (value === void 0 || value.trim() === "") {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -5170,7 +5475,7 @@ function registerHotelFindDestinationCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const keyword = need16(opts.keyword, "keyword");
+    const keyword = need17(opts.keyword, "keyword");
     const body = { keyword };
     if (opts.dataType !== void 0) {
       body.data_type = opts.dataType;
@@ -5194,14 +5499,14 @@ function registerHotelFindDestinationCommand(parent, deps) {
 }
 
 // src/hotel-redaug/hotel-filters.ts
-function need17(value, flag) {
+function need18(value, flag) {
   if (value === void 0 || value.trim() === "") {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
 function num9(value, flag) {
-  const n = Number(need17(value, flag));
+  const n = Number(need18(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -5281,7 +5586,7 @@ function registerHotelFiltersCommand(parent, deps) {
     }
     const body = {};
     if (hasDestination) {
-      body.destination_id = need17(opts.destinationId, "destination-id");
+      body.destination_id = need18(opts.destinationId, "destination-id");
     } else {
       body.lat = coord2(opts.lat, "lat", -90, 90);
       body.lng = coord2(opts.lng, "lng", -180, 180);
@@ -5306,7 +5611,7 @@ function registerHotelFiltersCommand(parent, deps) {
 }
 
 // src/hotel-redaug/list-cities.ts
-function need18(value, flag) {
+function need19(value, flag) {
   if (value === void 0 || value.trim() === "") {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -5339,7 +5644,7 @@ function registerHotelListCitiesCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const country = need18(opts.country, "country");
+    const country = need19(opts.country, "country");
     const body = { country_code: country };
     const result = await deps.apiClient.post(
       "/hotel/cities",
@@ -5360,7 +5665,7 @@ function registerHotelListCitiesCommand(parent, deps) {
 }
 
 // src/hotel-redaug/hotel-detail.ts
-function need19(value, flag) {
+function need20(value, flag) {
   if (value === void 0 || value.trim() === "") {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -5507,7 +5812,7 @@ function registerHotelDetailCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const hotelId = need19(opts.hotelId, "hotel-id");
+    const hotelId = need20(opts.hotelId, "hotel-id");
     const rawWithImages = opts.withImages;
     const withImages = rawWithImages !== "false" && rawWithImages !== false;
     const settings = parseSettings(opts.settings);
@@ -5715,14 +6020,14 @@ function registerHotelSkillCommand(parent) {
 }
 
 // src/flight-flink/_helpers.ts
-function need20(value, flag) {
+function need21(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
 function num10(value, flag) {
-  const n = Number(need20(value, flag));
+  const n = Number(need21(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -5757,7 +6062,7 @@ function registerFindAirportCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const keyword = need20(opts.keyword, "keyword");
+    const keyword = need21(opts.keyword, "keyword");
     const spinner = format === "json" ? null : createSpinner("Resolving airports...");
     const result = await deps.apiClient.post(
       "/flight/find-airport",
@@ -5854,7 +6159,7 @@ function registerSearchCommand(parent, deps) {
     const apiKey = await resolveApiKey(opts.apiKey);
     const body = {
       trip_type: num10(opts.tripType, "trip-type"),
-      journeys: jsonArray(need20(opts.journeys, "journeys"), "journeys"),
+      journeys: jsonArray(need21(opts.journeys, "journeys"), "journeys"),
       cabin_class: opts.cabinClass,
       adult_num: num10(opts.adultNum, "adult-num"),
       child_num: num10(opts.childNum, "child-num"),
@@ -5885,7 +6190,7 @@ function registerMoreOffersCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const productToken = need20(opts.productToken, "product-token");
+    const productToken = need21(opts.productToken, "product-token");
     const spinner = format === "json" ? null : createSpinner("Fetching offers...");
     const result = await deps.apiClient.post(
       "/flight/more-offers",
@@ -5906,7 +6211,7 @@ function registerVerifyCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const productToken = need20(opts.productToken, "product-token");
+    const productToken = need21(opts.productToken, "product-token");
     const spinner = format === "json" ? null : createSpinner("Verifying price...");
     const result = await deps.apiClient.post(
       "/flight/verify",
@@ -5928,7 +6233,7 @@ function registerVerifyCommand(parent, deps) {
 }
 
 // src/flight-flink/create-order.ts
-import { confirm as confirm9 } from "@inquirer/prompts";
+import { confirm as confirm10 } from "@inquirer/prompts";
 function registerCreateOrderCommand(parent, deps) {
   const cmd = parent.command("create-order").description("Create a flight order without charging (locks the fare, await payment)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--product-token <token>", "Authoritative rate token from verify").option("--total-amount <amount>", "Verified total price in decimal units").option("--currency <currency>", "ISO 4217 currency code").option("--trip-type <n>", "1/2/3", "1").option("--contact-name <name>", "Booking contact name").option("--contact-region <code>", "Contact phone country code (no '+')").option("--contact-phone <phone>", "Booking contact phone").option("--contact-email <email>", "Booking contact email").option("--passengers <json>", "JSON array of passengers (gender/id_type are strings)").option("--payment-method-id <id>", "Optional bound-card id (pay_per_call only)").option("--payment-token-id <id>", "Optional UPI network-token id (unionpay charge path)").option(
     "--authorized-merchant-trans-id <id>",
@@ -5940,19 +6245,19 @@ function registerCreateOrderCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const productToken = need20(opts.productToken, "product-token");
+    const productToken = need21(opts.productToken, "product-token");
     const totalAmount = num10(opts.totalAmount, "total-amount");
-    const currency = need20(opts.currency, "currency");
+    const currency = need21(opts.currency, "currency");
     const body = {
       product_token: productToken,
       total_amount: totalAmount,
       currency,
       trip_type: num10(opts.tripType, "trip-type"),
-      contact_name: need20(opts.contactName, "contact-name"),
-      contact_region: need20(opts.contactRegion, "contact-region"),
-      contact_phone: need20(opts.contactPhone, "contact-phone"),
-      contact_email: need20(opts.contactEmail, "contact-email"),
-      passengers: jsonArray(need20(opts.passengers, "passengers"), "passengers")
+      contact_name: need21(opts.contactName, "contact-name"),
+      contact_region: need21(opts.contactRegion, "contact-region"),
+      contact_phone: need21(opts.contactPhone, "contact-phone"),
+      contact_email: need21(opts.contactEmail, "contact-email"),
+      passengers: jsonArray(need21(opts.passengers, "passengers"), "passengers")
     };
     if (opts.paymentMethodId !== void 0) body.payment_method_id = opts.paymentMethodId;
     if (opts.paymentTokenId !== void 0) body.payment_token_id = opts.paymentTokenId;
@@ -5962,7 +6267,7 @@ function registerCreateOrderCommand(parent, deps) {
     const member = memberIdOf(opts);
     if (member !== void 0) body.member_id = member;
     if (!isYes) {
-      const ok = await confirm9({
+      const ok = await confirm10({
         message: `Create this flight order for ${totalAmount} ${currency}? This locks the fare but does NOT charge yet.`,
         default: false
       });
@@ -6001,7 +6306,7 @@ function registerCreateOrderCommand(parent, deps) {
 }
 
 // src/flight-flink/pay-order.ts
-import { confirm as confirm10 } from "@inquirer/prompts";
+import { confirm as confirm11 } from "@inquirer/prompts";
 function registerPayOrderCommand(parent, deps) {
   const cmd = parent.command("pay-order").description("Settle a created order by --order-no (triggers ticketing)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-no <id>", "Our order reference from create-order").option("--payment-method-id <id>", "Optional bound-card id to charge (pay_per_call only)").option("--payment-token-id <id>", "Optional network-token id (unionpay/visa charge path)").option(
     "--authorized-merchant-trans-id <id>",
@@ -6016,9 +6321,9 @@ function registerPayOrderCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const orderNo = need20(opts.orderNo, "order-no");
+    const orderNo = need21(opts.orderNo, "order-no");
     if (!isYes) {
-      const ok = await confirm10({
+      const ok = await confirm11({
         message: `Pay and ticket order ${orderNo}? This settles the order and issues tickets.`,
         default: false
       });
@@ -6068,7 +6373,7 @@ function registerGetOrderCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const orderNo = need20(opts.orderNo, "order-no");
+    const orderNo = need21(opts.orderNo, "order-no");
     const path = `/flight/${encodeURIComponent(orderNo)}/status`;
     const auth = { type: "api-key", key: apiKey };
     if (opts.watch) {
@@ -6108,7 +6413,7 @@ function registerGetOrderCommand(parent, deps) {
 }
 
 // src/flight-flink/cancel-order.ts
-import { confirm as confirm11 } from "@inquirer/prompts";
+import { confirm as confirm12 } from "@inquirer/prompts";
 function registerCancelOrderCommand(parent, deps) {
   const cmd = parent.command("cancel-order").description("Cancel an un-ticketed flight order (with refund)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-no <id>", "Our order reference").option("--reason <text>", "Optional cancellation reason").option("--idempotency-key <key>", "Forwarded verbatim as the Idempotency-Key header");
   attachSchemaHelp(cmd, flightCancelOrderSchema);
@@ -6117,9 +6422,9 @@ function registerCancelOrderCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const orderNo = need20(opts.orderNo, "order-no");
+    const orderNo = need21(opts.orderNo, "order-no");
     if (!isYes) {
-      const ok = await confirm11({
+      const ok = await confirm12({
         message: `Cancel order ${orderNo}? This requests cancellation and a refund.`,
         default: false
       });
@@ -6193,10 +6498,10 @@ function registerChangeSearchCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
     const body = {
-      order_no: need20(opts.orderNo, "order-no"),
-      date: need20(opts.date, "date"),
-      passenger: need20(opts.passenger, "passenger"),
-      segment_id: need20(opts.segmentId, "segment-id"),
+      order_no: need21(opts.orderNo, "order-no"),
+      date: need21(opts.date, "date"),
+      passenger: need21(opts.passenger, "passenger"),
+      segment_id: need21(opts.segmentId, "segment-id"),
       cabin_class: opts.cabinClass
     };
     const spinner = format === "json" ? null : createSpinner("Searching change options...");
@@ -6212,7 +6517,7 @@ function registerChangeSearchCommand(parent, deps) {
 }
 
 // src/flight-flink/change-apply.ts
-import { confirm as confirm12 } from "@inquirer/prompts";
+import { confirm as confirm13 } from "@inquirer/prompts";
 function registerChangeApplyCommand(parent, deps) {
   const cmd = parent.command("change-apply").description("Submit a change request (returns change_order_no, pending review)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-no <id>", "Our order reference").option("--passenger <code>", "passengerCode").option("--segment-id <ids>", "Comma-separated segment ids").option("--product-token <token>", "Change priceKey token").option("--contact-name <name>", "Contact name").option("--contact-region <code>", "Contact region").option("--contact-phone <phone>", "Contact phone").option("--contact-email <email>", "Contact email").option("--idempotency-key <key>", "Forwarded verbatim as the Idempotency-Key header");
   attachSchemaHelp(cmd, flightChangeApplySchema);
@@ -6222,17 +6527,17 @@ function registerChangeApplyCommand(parent, deps) {
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
     const body = {
-      order_no: need20(opts.orderNo, "order-no"),
-      passenger: need20(opts.passenger, "passenger"),
-      segment_id: need20(opts.segmentId, "segment-id"),
-      product_token: need20(opts.productToken, "product-token"),
-      contact_name: need20(opts.contactName, "contact-name"),
-      contact_region: need20(opts.contactRegion, "contact-region"),
-      contact_phone: need20(opts.contactPhone, "contact-phone"),
-      contact_email: need20(opts.contactEmail, "contact-email")
+      order_no: need21(opts.orderNo, "order-no"),
+      passenger: need21(opts.passenger, "passenger"),
+      segment_id: need21(opts.segmentId, "segment-id"),
+      product_token: need21(opts.productToken, "product-token"),
+      contact_name: need21(opts.contactName, "contact-name"),
+      contact_region: need21(opts.contactRegion, "contact-region"),
+      contact_phone: need21(opts.contactPhone, "contact-phone"),
+      contact_email: need21(opts.contactEmail, "contact-email")
     };
     if (!isYes) {
-      const ok = await confirm12({
+      const ok = await confirm13({
         message: `Submit a change request for order ${body.order_no}?`,
         default: false
       });
@@ -6263,7 +6568,7 @@ function registerChangeDetailCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const changeOrderNo = need20(opts.changeOrderNo, "change-order-no");
+    const changeOrderNo = need21(opts.changeOrderNo, "change-order-no");
     const spinner = format === "json" ? null : createSpinner("Fetching change detail...");
     const result = await deps.apiClient.get(
       `/flight/change/${encodeURIComponent(changeOrderNo)}`,
@@ -6276,7 +6581,7 @@ function registerChangeDetailCommand(parent, deps) {
 }
 
 // src/flight-flink/change-cancel.ts
-import { confirm as confirm13 } from "@inquirer/prompts";
+import { confirm as confirm14 } from "@inquirer/prompts";
 function registerChangeCancelCommand(parent, deps) {
   const cmd = parent.command("change-cancel").description("Cancel a change request (immediate terminal)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--change-order-no <id>", "Change order number").option("--idempotency-key <key>", "Forwarded verbatim as the Idempotency-Key header");
   attachSchemaHelp(cmd, flightChangeCancelSchema);
@@ -6285,9 +6590,9 @@ function registerChangeCancelCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const changeOrderNo = need20(opts.changeOrderNo, "change-order-no");
+    const changeOrderNo = need21(opts.changeOrderNo, "change-order-no");
     if (!isYes) {
-      const ok = await confirm13({ message: `Cancel change request ${changeOrderNo}?`, default: false });
+      const ok = await confirm14({ message: `Cancel change request ${changeOrderNo}?`, default: false });
       if (!ok) throw new CliError("CLIENT_ABORTED", "Change cancellation aborted by user.");
     }
     const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
@@ -6308,7 +6613,7 @@ function registerChangeCancelCommand(parent, deps) {
 }
 
 // src/flight-flink/change-pay.ts
-import { confirm as confirm14 } from "@inquirer/prompts";
+import { confirm as confirm15 } from "@inquirer/prompts";
 function registerChangePayCommand(parent, deps) {
   const cmd = parent.command("change-pay").description("Pay a change request fee (like a normal order) and trigger change ticketing").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--change-order-no <id>", "Change order number").option("--order-no <id>", "Original order reference (ownership check)").option("--amount <amount>", "Change fee total in decimal units (change-detail price_total)").option("--currency <currency>", "ISO 4217 currency code", "USD").option("--payment-method-id <id>", "Optional bound-card id (EVO path)").option("--payment-token-id <id>", "Optional UPI network-token id (unionpay charge path)").option(
     "--authorized-merchant-trans-id <id>",
@@ -6320,10 +6625,10 @@ function registerChangePayCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const changeOrderNo = need20(opts.changeOrderNo, "change-order-no");
-    const orderNo = need20(opts.orderNo, "order-no");
+    const changeOrderNo = need21(opts.changeOrderNo, "change-order-no");
+    const orderNo = need21(opts.orderNo, "order-no");
     const amount = num10(opts.amount, "amount");
-    const currency = need20(opts.currency, "currency");
+    const currency = need21(opts.currency, "currency");
     const body = {
       order_no: orderNo,
       amount,
@@ -6337,7 +6642,7 @@ function registerChangePayCommand(parent, deps) {
     if (!isYes) {
       const isResume = opts.authorizedMerchantTransId !== void 0;
       const message = isResume ? `Resume change fee ${amount} ${currency} for change order ${changeOrderNo}? The card is already authorised; this captures it and triggers change ticketing.` : `Pay change fee ${amount} ${currency} for change order ${changeOrderNo}? This charges the customer and triggers change ticketing.`;
-      const ok = await confirm14({ message, default: false });
+      const ok = await confirm15({ message, default: false });
       if (!ok) throw new CliError("CLIENT_ABORTED", "Change payment aborted by user.");
     }
     const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
@@ -6384,7 +6689,7 @@ function registerChangePayCommand(parent, deps) {
 }
 
 // src/flight-flink/refund-apply.ts
-import { confirm as confirm15 } from "@inquirer/prompts";
+import { confirm as confirm16 } from "@inquirer/prompts";
 function registerRefundApplyCommand(parent, deps) {
   const cmd = parent.command("refund-apply").description("Submit a refund request (returns refund_order_no, pending review)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-no <id>", "Our order reference").option("--passenger <code>", "passengerCode").option("--segment-id <ids>", "Comma-separated segment ids").option("--reason-type <n>", "Refund reason type code").option("--reason <text>", "Free-text reason").option("--contact-name <name>", "Contact name").option("--contact-region <code>", "Contact region").option("--contact-phone <phone>", "Contact phone").option("--contact-email <email>", "Contact email").option("--idempotency-key <key>", "Forwarded verbatim as the Idempotency-Key header");
   attachSchemaHelp(cmd, flightRefundApplySchema);
@@ -6394,18 +6699,18 @@ function registerRefundApplyCommand(parent, deps) {
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
     const body = {
-      order_no: need20(opts.orderNo, "order-no"),
-      passenger: need20(opts.passenger, "passenger"),
-      segment_id: need20(opts.segmentId, "segment-id"),
+      order_no: need21(opts.orderNo, "order-no"),
+      passenger: need21(opts.passenger, "passenger"),
+      segment_id: need21(opts.segmentId, "segment-id"),
       reason_type: num10(opts.reasonType, "reason-type"),
-      contact_name: need20(opts.contactName, "contact-name"),
-      contact_region: need20(opts.contactRegion, "contact-region"),
-      contact_phone: need20(opts.contactPhone, "contact-phone"),
-      contact_email: need20(opts.contactEmail, "contact-email")
+      contact_name: need21(opts.contactName, "contact-name"),
+      contact_region: need21(opts.contactRegion, "contact-region"),
+      contact_phone: need21(opts.contactPhone, "contact-phone"),
+      contact_email: need21(opts.contactEmail, "contact-email")
     };
     if (opts.reason !== void 0) body.reason = opts.reason;
     if (!isYes) {
-      const ok = await confirm15({
+      const ok = await confirm16({
         message: `Submit a refund request for order ${body.order_no}?`,
         default: false
       });
@@ -6436,7 +6741,7 @@ function registerRefundDetailCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const refundOrderNo = need20(opts.refundOrderNo, "refund-order-no");
+    const refundOrderNo = need21(opts.refundOrderNo, "refund-order-no");
     const spinner = format === "json" ? null : createSpinner("Fetching refund detail...");
     const result = await deps.apiClient.get(
       `/flight/refund/${encodeURIComponent(refundOrderNo)}`,
@@ -6449,7 +6754,7 @@ function registerRefundDetailCommand(parent, deps) {
 }
 
 // src/flight-flink/refund-confirm.ts
-import { confirm as confirm16 } from "@inquirer/prompts";
+import { confirm as confirm17 } from "@inquirer/prompts";
 function registerRefundConfirmCommand(parent, deps) {
   const cmd = parent.command("refund-confirm").description('Confirm ("1") or cancel ("2") a refund').option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--refund-order-no <id>", "Refund order number").option("--confirm <flag>", '"1" confirm / "2" cancel').option("--idempotency-key <key>", "Forwarded verbatim as the Idempotency-Key header");
   attachSchemaHelp(cmd, flightRefundConfirmSchema);
@@ -6458,14 +6763,14 @@ function registerRefundConfirmCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const refundOrderNo = need20(opts.refundOrderNo, "refund-order-no");
-    const confirmFlag = need20(opts.confirm, "confirm");
+    const refundOrderNo = need21(opts.refundOrderNo, "refund-order-no");
+    const confirmFlag = need21(opts.confirm, "confirm");
     if (confirmFlag !== "1" && confirmFlag !== "2") {
       throw new CliError("PARAM_INVALID", '--confirm must be "1" (confirm) or "2" (cancel).');
     }
     if (!isYes) {
       const action = confirmFlag === "1" ? "confirm" : "cancel";
-      const ok = await confirm16({ message: `${action} refund ${refundOrderNo}?`, default: false });
+      const ok = await confirm17({ message: `${action} refund ${refundOrderNo}?`, default: false });
       if (!ok) throw new CliError("CLIENT_ABORTED", "Refund confirmation aborted by user.");
     }
     const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
@@ -6639,10 +6944,11 @@ Key notes:
   registerServicesListCommand(servicesCmd, { discoveryClient, program });
   registerServiceGetCommand(servicesCmd, { discoveryClient, program });
   const ordersCmd = program.command("orders").description(
-    'Unified cross-provider order index (spans ride + hotel). Use for generic "my orders" requests; use ride-elife/hotel-redaug commands once the business is known.'
+    'Unified cross-provider order index (spans ride + hotel + flight). Use list/get for generic "my orders" requests (use ride-elife/hotel-redaug/flight-flink commands once the business is known); pay-batch settles a batch of AWAITING_PAYMENT orders in one aggregate payment (trip checkout).'
   );
   registerOrdersListCommand(ordersCmd, deps);
   registerOrdersGetCommand(ordersCmd, deps);
+  registerOrdersPayBatchCommand(ordersCmd, deps);
   const hotelCmd = program.command("hotel-redaug").description(
     `Hotel booking (Redaug) \u2014 international hotel search, quote, create-order, pay-order, cancel, and check-out.