@agenzo/merchant-cli 0.8.15 → 0.8.17

package/dist/index.js

@@ -1050,7 +1050,7 @@ var bookSchema = {
     "payment-token-id": {
       type: "string",
       required: false,
-      description: "UPI Agent Pay: network-token id from an already-completed UnionPay/Visa capture. When set, the platform skips EVO preauth/capture and only books the ride + records this credential (funds already charged)"
+      description: "DEPRECATED \u2014 use `ride-elife create-order` + `pay-order` for network-token direct charge. A single-step book carrying a network token hits Charge_Service strict order\u2194token binding and is rejected server-side with a retriable=false guidance error. Kept only for backward compatibility; monthly_settlement / EVO / no-credential booking still work via book"
     },
     member: MEMBER_FLAG_SCHEMA,
     "passenger-name": { type: "string", required: true, description: "Passenger full name" },
@@ -1106,6 +1106,125 @@ var bookSchema = {
     PARAM_IDEMPOTENCY_KEY_REQUIRED: "Supply --idempotency-key (1-128 chars [A-Za-z0-9_-]); the CLI never generates one under --yes."
   }
 };
+var rideCreateOrderSchema = {
+  cli: CLI_NAME,
+  noun: NOUN,
+  verb: "create-order",
+  description: "Lock a ride fare without charging (status AWAITING_PAYMENT). Returns the authoritative order_ref to bind as the network token external_transaction_id, then settle with pay-order. No payment credentials here \u2014 funding happens in pay-order",
+  flags: {
+    "quote-id": { type: "string", required: true, description: "Quote id from quote response (vehicle_classes[].price.quote_id)" },
+    "vehicle-class": { type: "string", required: true, description: "Vehicle class: Sedan / SUV / MPV-5 / MPV-7 / Van / Luxury / Train" },
+    "price-amount": { type: "float", required: true, description: "Fare in decimal currency units (NOT cents), from the quote" },
+    "price-currency": { type: "string", required: false, default: "USD", description: "ISO 4217 currency code" },
+    member: MEMBER_FLAG_SCHEMA,
+    "passenger-name": { type: "string", required: true, description: "Passenger full name" },
+    "passenger-phone": { type: "string", required: true, description: "Passenger phone in E.164 format (e.g. +14155551234)" },
+    "passenger-email": { type: "string", required: true, description: "Passenger email (persisted at lock; eLife needs it when pay-order creates the ride)" },
+    "luggage-count": { type: "int", required: false, description: "Number of luggage items" },
+    "special-requests": { type: "string", required: false, description: "Free-text special requests or notes" },
+    "pickup-lat": { type: "float", required: false, description: "Pickup latitude (must match the quote)", constraints: "-90 to 90" },
+    "pickup-lng": { type: "float", required: false, description: "Pickup longitude (must match the quote)", constraints: "-180 to 180" },
+    "pickup-name": { type: "string", required: false, description: "Pickup location name (must match the quote)" },
+    "dropoff-lat": { type: "float", required: false, description: "Dropoff latitude (must match the quote)", constraints: "-90 to 90" },
+    "dropoff-lng": { type: "float", required: false, description: "Dropoff longitude (must match the quote)", constraints: "-180 to 180" },
+    "dropoff-name": { type: "string", required: false, description: "Dropoff location name (must match the quote)" },
+    "pickup-time": { type: "int|string", required: false, description: "Epoch seconds or 'now' (must match the quote)" },
+    "meet-and-greet": { type: "bool", required: false, default: false, description: "Enable meet & greet service" },
+    "meet-and-greet-price": { type: "float", required: false, description: "Meet & greet surcharge from the quote (meet_and_greet.price.amount)" },
+    "welcome-sign": { type: "string", required: false, description: "Welcome sign text (meet & greet)" },
+    "child-seat-count": { type: "int", required: false, description: "Number of child seats needed", constraints: "0 to 5" },
+    "infant-seat-count": { type: "int", required: false, description: "Number of infant seats needed", constraints: "0 to 5" },
+    "toddler-seat-count": { type: "int", required: false, description: "Number of toddler seats needed", constraints: "0 to 5" },
+    "arrival-flight-no": { type: "string", required: false, description: "Arrival flight number (airport pickup)" },
+    "arrival-airline": { type: "string", required: false, description: "Arrival airline name" },
+    "departure-flight-no": { type: "string", required: false, description: "Departure flight number (airport dropoff)" },
+    "departure-airline": { type: "string", required: false, description: "Departure airline name" },
+    "idempotency-key": {
+      type: "string",
+      required: true,
+      description: "Unique key (1-128 chars [A-Za-z0-9_-]) forwarded verbatim as the Idempotency-Key header; never auto-generated"
+    }
+  },
+  response: {
+    order_id: { type: "string", description: "Authoritative order_ref (rio_\u2026, = order document _id). Bind it as the network token external_transaction_id and pass it to pay-order" },
+    status: { type: "string", description: "AWAITING_PAYMENT after a successful lock" },
+    payment_status: { type: "string", description: "PENDING after lock (funds untouched)" },
+    is_scheduled: { type: "bool", description: "true = scheduled/airport ride; false = realtime" },
+    order_type: { type: "string", description: "'realtime' or 'airport'" },
+    price: { type: "object", description: "{ amount, currency, quote_id } \u2014 the authoritative amount + currency the token must match" }
+  },
+  example: {
+    command: 'agenzo-merchant-cli ride-elife create-order --quote-id qte_01HZXD --vehicle-class Sedan --price-amount 42.50 --passenger-name "Alice" --passenger-phone +14155551234 --passenger-email alice@example.com --idempotency-key ride-create-123',
+    output_summary: "Returns order_id (the order_ref). Bind it as the token external_transaction_id, mint the token for price.amount, then settle with `ride-elife pay-order --order-id <order_ref>`."
+  },
+  error_recovery: {
+    QUOTE_EXPIRED: "Re-invoke 'quote' for a fresh quote_id, then retry 'create-order' with the SAME --idempotency-key.",
+    VEHICLE_CLASS_MISMATCH: "The vehicle-class does not match the quote. Re-quote and pass the exact vehicle_class back.",
+    PRICE_MISMATCH: "The submitted total does not equal the authoritative fare. Re-quote and pass price-amount from the fresh quote.",
+    IDEMPOTENCY_CONFLICT: "Same --idempotency-key reused with different order params. Use a fresh idempotency-key.",
+    PARAM_IDEMPOTENCY_KEY_REQUIRED: "Supply --idempotency-key (1-128 chars [A-Za-z0-9_-]); the CLI never generates one under --yes."
+  }
+};
+var ridePayOrderSchema = {
+  cli: CLI_NAME,
+  noun: NOUN,
+  verb: "pay-order",
+  description: "Settle a locked ride order created by create-order. Charging happens in this step (create-order only locks the fare and moves no money). Provide EXACTLY ONE of --payment-token-id (network-token direct charge \u2014 the main path; charge(order_id=order_ref) triggers strict order\u2194token binding) or --payment-method-id (EVO bound-card fallback); both missing or both present is rejected as PARAM_INVALID before any request. The amount/currency are NOT accepted here \u2014 the platform settles at the order-locked authoritative amount and the token minted amount. On success the order becomes status=PAID / payment_status=SETTLED",
+  flags: {
+    "order-id": {
+      type: "string",
+      required: true,
+      description: "The authoritative order_ref (rio_\u2026) from create-order.response.order_id to settle"
+    },
+    "payment-token-id": {
+      type: "string",
+      required: "conditional",
+      description: "Network-token id (UnionPay/Visa) for the direct-charge main path. Bind order_ref as its external_transaction_id first. Exactly one of --payment-token-id / --payment-method-id is required (mutually exclusive)"
+    },
+    "payment-method-id": {
+      type: "string",
+      required: "conditional",
+      description: "Bound-card id to charge via EVO preauth+capture (fallback path). Exactly one of --payment-token-id / --payment-method-id is required (mutually exclusive)"
+    },
+    "authorized-merchant-trans-id": {
+      type: "string",
+      required: false,
+      description: "Resume a 3DS challenge: merchant trans id of an already-authorised EVO preauth returned by a prior AUTHENTICATION_REQUIRED response"
+    },
+    "evo-explicit": {
+      type: "bool",
+      required: false,
+      default: false,
+      description: "[\u65B9\u6848 B/R16] Explicit opt-in to settle this pay_per_call ride via the EVO bound-card fallback rail. Set true ONLY when the user explicitly chose EVO; forwarded to the pay body as evo_explicit=true. Without it, a pay_per_call settlement lacking --payment-token-id is hard-gated server-side. Ignored for monthly_settlement and on the payment-token-id direct-charge path."
+    },
+    "idempotency-key": {
+      type: "string",
+      required: true,
+      description: "Unique key (1-128 chars [A-Za-z0-9_-]) forwarded verbatim as the Idempotency-Key header; never auto-generated"
+    }
+  },
+  response: {
+    order_id: { type: "string", description: "Authoritative order_ref (rio_\u2026, = order document _id) that was settled" },
+    ride_id: { type: "string|int", description: "eLife upstream ride id, assigned once create_ride succeeds \u2014 use for `ride-elife get`" },
+    status: { type: "string", description: "PAID after a successful settlement" },
+    payment_status: { type: "string", description: "SETTLED after a successful network-token direct charge" },
+    payment_channel: { type: "string", description: "'upi_agent' for the network-token direct-charge path" },
+    price: { type: "object", description: "{ amount, currency, quote_id } \u2014 the authoritative amount the token matched" }
+  },
+  example: {
+    command: "agenzo-merchant-cli ride-elife pay-order --order-id rio_01HZXD --payment-token-id ntk_01J2ABC --idempotency-key ride-pay-123",
+    output_summary: "Settles the order via network-token direct charge and creates the ride. Returns order_id + ride_id; the order becomes status=PAID / payment_status=SETTLED. Poll `ride-elife get --order-id <ride_id>` for driver dispatch."
+  },
+  error_recovery: {
+    PARAM_INVALID: "Provide EXACTLY ONE of --payment-token-id or --payment-method-id (both missing or both present is invalid), and a non-empty --order-id.",
+    TOKEN_ORDER_MISMATCH: "The token's external_transaction_id is not this order_ref. Mint a token bound to THIS order_ref (external_transaction_id = order_ref) and retry; no funds moved.",
+    RESOURCE_STATE_INVALID: "The order is not in AWAITING_PAYMENT (it may already be PAID or CANCELLED). Check status via get; do NOT retry pay-order.",
+    RIDE_NOT_FOUND: "No order for this --order-id. Verify it is the order_ref returned by create-order. Do NOT retry.",
+    QUOTE_EXPIRED: "The quote expired before settlement. Re-quote; if the authoritative price is unchanged retry pay-order with the SAME order_ref + SAME token and a NEW --idempotency-key, otherwise create a new order.",
+    BOOKING_FAILED: "eLife create_ride failed after a successful charge; the charge was reversed and the order stays AWAITING_PAYMENT. Retry with a NEW --idempotency-key.",
+    PARAM_IDEMPOTENCY_KEY_REQUIRED: "Supply --idempotency-key (1-128 chars [A-Za-z0-9_-]); the CLI never generates one under --yes."
+  }
+};
 var rideGetSchema = {
   cli: CLI_NAME,
   noun: NOUN,
@@ -1537,6 +1656,12 @@ var hotelPayOrderSchema = {
       required: false,
       description: "Resume a 3DS challenge: merchant trans id of an already-authorised preauth returned by a prior AUTHENTICATION_REQUIRED response. Reuses that authorization instead of creating a new one (pay_per_call only)."
     },
+    "evo-explicit": {
+      type: "bool",
+      required: false,
+      default: false,
+      description: "[\u65B9\u6848 B/R16] Explicit opt-in to settle this pay_per_call order via the EVO bound-card fallback rail. Set true ONLY when the user explicitly chose EVO; forwarded to the pay body as evo_explicit=true. Without it, a pay_per_call settlement lacking --payment-token-id is hard-gated server-side. Ignored for monthly_settlement and on the payment-token-id direct-charge path."
+    },
     "idempotency-key": {
       type: "string",
       required: true,
@@ -2037,63 +2162,72 @@ 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."
   }
 };
@@ -2216,6 +2350,7 @@ var flightPayOrderSchema = flightSchema(
     "payment-method-id": { type: "string", required: false, description: "Optional bound-card id to charge (pay_per_call only; omit to use the default card)." },
     "payment-token-id": { type: "string", required: false, description: "Optional network-token id; settles via direct charge instead of EVO preauth." },
     "authorized-merchant-trans-id": { type: "string", required: false, description: "Resume a 3DS challenge with an already-authorised preauth trans id." },
+    "evo-explicit": { type: "bool", required: false, default: false, description: "[\u65B9\u6848 B/R16] Explicit opt-in to settle this pay_per_call order via the EVO bound-card fallback rail. Set true ONLY when the user explicitly chose EVO; forwarded to the pay body as evo_explicit=true. Without it, a pay_per_call settlement lacking --payment-token-id is hard-gated server-side." },
     "idempotency-key": { type: "string", required: true, description: "Forwarded verbatim as the Idempotency-Key header." }
   },
   { order_no: { type: "string", description: "Our order reference." }, status: { type: "string", description: "PAID on success; AUTHENTICATION_REQUIRED when the card needs 3DS." } },
@@ -2561,7 +2696,7 @@ function registerBookCommand(parent, deps) {
     "Bound payment method id to charge (pay_per_call mode only)"
   ).option(
     "--payment-token-id <id>",
-    "UPI Agent Pay: payment token id from an already-completed UnionPay/Visa network-token capture. When set, the platform skips EVO preauth/capture and only books the ride + records this credential (funds already charged)."
+    "DEPRECATED \u2014 use `ride-elife create-order` + `pay-order` for network-token direct charge. A single-step book carrying a network token hits Charge_Service strict order\u2194token binding and is rejected server-side with a retriable=false guidance error. Kept only for backward compatibility; monthly_settlement / EVO / no-credential booking still work via book."
   ).option(
     "--authorized-merchant-trans-id <id>",
     "EVO merchant transaction id of an already-authorised preauth (3DS challenge resume). When set, the server reuses that authorization instead of creating a new one, avoiding a second hold on the card (pay_per_call mode only)."
@@ -2677,13 +2812,292 @@ function registerBookCommand(parent, deps) {
   });
 }
 
-// src/ride-elife/get.ts
+// src/ride-elife/create-order.ts
+import { confirm as confirm2 } from "@inquirer/prompts";
 function need3(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
+function num3(value, flag) {
+  const n = Number(need3(value, flag));
+  if (!Number.isFinite(n)) {
+    throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
+  }
+  return n;
+}
+function phone2(value, flag) {
+  const raw = need3(value, flag);
+  const cleaned = raw.replace(/[\s-]/g, "");
+  if (!/^\+[1-9]\d{7,14}$/.test(cleaned)) {
+    throw new CliError(
+      "PARAM_INVALID",
+      `--${flag} must be a valid international phone number, e.g. +14155552671.`
+    );
+  }
+  return cleaned;
+}
+function seatCount2(value, flag) {
+  const n = num3(value, flag);
+  if (!Number.isInteger(n) || n < 0 || n > 5) {
+    throw new CliError("PARAM_INVALID", `--${flag} must be an integer between 0 and 5.`);
+  }
+  return n;
+}
+function formatCreateOrder(data) {
+  const orderRef = String(data.order_ref ?? data.order_id ?? "-");
+  const lines = [
+    ["Order ref", orderRef],
+    ["Status", String(data.status ?? "-")],
+    ["Payment status", String(data.payment_status ?? "-")]
+  ];
+  if (data.price) {
+    lines.push(["Amount", `${data.price.amount} ${data.price.currency}`]);
+    if (data.price.quote_id) lines.push(["Quote ID", String(data.price.quote_id)]);
+  }
+  if (data.is_scheduled !== void 0) lines.push(["Scheduled", String(data.is_scheduled)]);
+  if (data.order_type) lines.push(["Order type", String(data.order_type)]);
+  return [
+    Formatter.keyValue(lines),
+    Formatter.status(
+      "info",
+      `Fare locked (AWAITING_PAYMENT) \u2014 bind ${orderRef} as the network token external_transaction_id, then settle with 'ride-elife pay-order --order-id ${orderRef}'. No funds moved yet.`
+    )
+  ].join("\n\n");
+}
+function registerRideCreateOrderCommand(parent, deps) {
+  const cmd = parent.command("create-order").description("Lock a ride fare without charging (await payment); returns the order_ref to pay").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--quote-id <id>", "Quote id from `ride-elife quote`").option("--vehicle-class <class>", "Chosen vehicle class").option("--price-amount <amount>", "Fare in decimal currency units (not cents)").option("--price-currency <currency>", "Currency code (default USD)").option("--passenger-name <name>", "Passenger full name").option("--passenger-phone <phone>", "Passenger phone").option("--passenger-email <email>", "Passenger email").option("--luggage-count <n>", "Luggage count").option("--special-requests <text>", "Free-text special requests").option("--pickup-lat <lat>", "Pickup latitude").option("--pickup-lng <lng>", "Pickup longitude").option("--pickup-name <name>", "Pickup location name").option("--dropoff-lat <lat>", "Dropoff latitude").option("--dropoff-lng <lng>", "Dropoff longitude").option("--dropoff-name <name>", "Dropoff location name").option("--pickup-time <time>", 'Pickup time: epoch seconds, or "now"').option("--meet-and-greet", "Enable meet & greet service").option("--meet-and-greet-price <amount>", "Meet & greet surcharge").option("--welcome-sign <text>", "Welcome sign text").option("--child-seat-count <n>", "Number of child seats needed (0-5)").option("--infant-seat-count <n>", "Number of infant seats needed (0-5)").option("--toddler-seat-count <n>", "Number of toddler seats needed (0-5)").option("--arrival-flight-no <no>", "Arrival flight number").option("--arrival-airline <airline>", "Arrival airline").option("--departure-flight-no <no>", "Departure flight number").option("--departure-airline <airline>", "Departure airline").option("--member <id>", MEMBER_OPTION_DESCRIPTION).option(
+    "--idempotency-key <key>",
+    "Idempotency key forwarded verbatim as the Idempotency-Key header"
+  );
+  attachSchemaHelp(cmd, rideCreateOrderSchema);
+  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 quoteId = need3(opts.quoteId, "quote-id");
+    const priceAmount = num3(opts.priceAmount, "price-amount");
+    const priceCurrency = opts.priceCurrency ?? "USD";
+    const body = {
+      quote_id: quoteId,
+      vehicle_class: need3(opts.vehicleClass, "vehicle-class"),
+      price_amount: priceAmount,
+      price_currency: priceCurrency,
+      passenger_name: need3(opts.passengerName, "passenger-name"),
+      passenger_phone: phone2(opts.passengerPhone, "passenger-phone"),
+      passenger_email: need3(opts.passengerEmail, "passenger-email")
+    };
+    const member = memberIdOf(opts);
+    if (member !== void 0) body.member_id = member;
+    if (opts.luggageCount !== void 0) {
+      body.luggage_count = num3(opts.luggageCount, "luggage-count");
+    }
+    if (opts.specialRequests) body.special_requests = opts.specialRequests;
+    if (opts.pickupLat || opts.pickupLng || opts.pickupName) {
+      body.pickup = {
+        lat: num3(opts.pickupLat, "pickup-lat"),
+        lng: num3(opts.pickupLng, "pickup-lng"),
+        name: need3(opts.pickupName, "pickup-name")
+      };
+    }
+    if (opts.dropoffLat || opts.dropoffLng || opts.dropoffName) {
+      body.dropoff = {
+        lat: num3(opts.dropoffLat, "dropoff-lat"),
+        lng: num3(opts.dropoffLng, "dropoff-lng"),
+        name: need3(opts.dropoffName, "dropoff-name")
+      };
+    }
+    if (opts.pickupTime) {
+      body.pickup_time = opts.pickupTime === "now" ? "now" : num3(opts.pickupTime, "pickup-time");
+    }
+    if (opts.meetAndGreet) body.meet_and_greet = true;
+    if (opts.meetAndGreetPrice !== void 0) {
+      body.meet_and_greet_price = num3(opts.meetAndGreetPrice, "meet-and-greet-price");
+    }
+    if (opts.welcomeSign) body.welcome_sign = opts.welcomeSign;
+    if (opts.childSeatCount !== void 0) {
+      body.child_seat_count = seatCount2(opts.childSeatCount, "child-seat-count");
+    }
+    if (opts.infantSeatCount !== void 0) {
+      body.infant_seat_count = seatCount2(opts.infantSeatCount, "infant-seat-count");
+    }
+    if (opts.toddlerSeatCount !== void 0) {
+      body.toddler_seat_count = seatCount2(opts.toddlerSeatCount, "toddler-seat-count");
+    }
+    if (opts.arrivalFlightNo || opts.arrivalAirline) {
+      body.arrival_flight = {
+        flight_no: opts.arrivalFlightNo,
+        airline: opts.arrivalAirline
+      };
+    }
+    if (opts.departureFlightNo || opts.departureAirline) {
+      body.departure_flight = {
+        flight_no: opts.departureFlightNo,
+        airline: opts.departureAirline
+      };
+    }
+    if (!isYes) {
+      const confirmed = await confirm2({
+        message: `Lock this ride fare for ${priceAmount} ${priceCurrency}? This reserves the order (AWAITING_PAYMENT) but does NOT charge yet.`,
+        default: false
+      });
+      if (!confirmed) {
+        throw new CliError("CLIENT_ABORTED", "Order creation aborted by user.");
+      }
+    }
+    const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
+      yes: isYes,
+      commandPath: "ride-elife create-order"
+    });
+    const spinner = format === "json" ? null : createSpinner("Locking ride fare...");
+    const result = await deps.apiClient.post(
+      "/ride/create-order",
+      { type: "api-key", key: apiKey },
+      body,
+      { "Idempotency-Key": idempotencyKey }
+    );
+    spinner?.stop();
+    if (!result.success) {
+      throw CliError.fromApi(result, { auth: "api-key" });
+    }
+    const data = result.data;
+    const configManager = new ConfigManager();
+    const commandResult = {
+      data,
+      text: () => formatCreateOrder(data)
+    };
+    await renderWithContext(commandResult, { format }, configManager);
+  });
+}
+
+// src/ride-elife/pay-order.ts
+import { confirm as confirm3 } from "@inquirer/prompts";
+function need4(value, flag) {
+  if (value === void 0) {
+    throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
+  }
+  return value;
+}
+function assertExactlyOneCredential(paymentTokenId, paymentMethodId) {
+  const hasToken = paymentTokenId !== void 0;
+  const hasMethod = paymentMethodId !== void 0;
+  if (!hasToken && !hasMethod) {
+    throw new CliError(
+      "PARAM_INVALID",
+      "Invalid payment credential options: provide exactly one of --payment-token-id (network-token direct charge) or --payment-method-id (EVO bound card). Neither was given."
+    );
+  }
+  if (hasToken && hasMethod) {
+    throw new CliError(
+      "PARAM_INVALID",
+      "Invalid payment credential options: --payment-token-id and --payment-method-id are mutually exclusive \u2014 provide exactly one, not both."
+    );
+  }
+}
+function formatPayOrder(data) {
+  const orderRef = String(data.order_ref ?? data.order_id ?? "-");
+  const lines = [
+    ["Order ref", orderRef],
+    ["Status", String(data.status ?? "-")],
+    ["Payment status", String(data.payment_status ?? "-")]
+  ];
+  if (data.ride_id !== void 0) lines.push(["Ride ID", String(data.ride_id)]);
+  if (data.payment_channel) lines.push(["Payment channel", String(data.payment_channel)]);
+  if (data.price) {
+    lines.push(["Amount", `${data.price.amount} ${data.price.currency}`]);
+    if (data.price.quote_id) lines.push(["Quote ID", String(data.price.quote_id)]);
+  }
+  return [
+    Formatter.keyValue(lines),
+    Formatter.status(
+      "success",
+      `Order ${orderRef} settled \u2014 ${data.status ?? "PAID"} / ${data.payment_status ?? "SETTLED"}.`
+    )
+  ].join("\n\n");
+}
+function registerRidePayOrderCommand(parent, deps) {
+  const cmd = parent.command("pay-order").description("Settle a locked ride order by --order-id (charges the card, creates the ride)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-id <id>", "The order_ref (rio_\u2026) from create-order to settle").option(
+    "--payment-token-id <id>",
+    "Network-token id (unionpay/visa direct-charge path). Exactly one of --payment-token-id / --payment-method-id is required."
+  ).option(
+    "--payment-method-id <id>",
+    "Bound-card id to charge via EVO preauth+capture (fallback path). Exactly one of --payment-token-id / --payment-method-id is required."
+  ).option(
+    "--authorized-merchant-trans-id <id>",
+    "Resume a 3DS challenge: merchant trans id of an already-authorised preauth"
+  ).option(
+    "--evo-explicit",
+    "[\u65B9\u6848 B/R16] Explicit opt-in to settle this pay_per_call ride via the EVO bound-card fallback rail. Set ONLY when the user explicitly chose EVO; forwarded to the pay body as evo_explicit=true. Without it, a pay_per_call settlement lacking --payment-token-id is hard-gated server-side."
+  ).option(
+    "--idempotency-key <key>",
+    "Idempotency key forwarded verbatim as the Idempotency-Key header"
+  );
+  attachSchemaHelp(cmd, ridePayOrderSchema);
+  cmd.action(async () => {
+    const opts = cmd.optsWithGlobals();
+    const format = resolveFormat(opts.format);
+    const isYes = Boolean(opts.yes);
+    const orderId = need4(opts.orderId, "order-id");
+    const paymentTokenId = opts.paymentTokenId;
+    const paymentMethodId = opts.paymentMethodId;
+    assertExactlyOneCredential(paymentTokenId, paymentMethodId);
+    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
+      message: "API Key:",
+      type: "password"
+    });
+    const body = { order_id: orderId };
+    if (paymentTokenId !== void 0) body.payment_token_id = paymentTokenId;
+    if (paymentMethodId !== void 0) body.payment_method_id = paymentMethodId;
+    if (opts.authorizedMerchantTransId !== void 0) {
+      body.authorized_merchant_trans_id = opts.authorizedMerchantTransId;
+    }
+    if (opts.evoExplicit) body.evo_explicit = true;
+    if (!isYes) {
+      const confirmed = await confirm3({
+        message: `Settle ride order ${orderId}? This charges the card and creates the ride (AWAITING_PAYMENT \u2192 PAID).`,
+        default: false
+      });
+      if (!confirmed) {
+        throw new CliError("CLIENT_ABORTED", "Payment aborted by user.");
+      }
+    }
+    const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
+      yes: isYes,
+      commandPath: "ride-elife pay-order"
+    });
+    const spinner = format === "json" ? null : createSpinner("Settling ride order...");
+    const result = await deps.apiClient.post(
+      "/ride/pay",
+      { type: "api-key", key: apiKey },
+      body,
+      { "Idempotency-Key": idempotencyKey }
+    );
+    spinner?.stop();
+    if (!result.success) {
+      throw CliError.fromApi(result, { auth: "api-key" });
+    }
+    const data = result.data;
+    const configManager = new ConfigManager();
+    const commandResult = {
+      data,
+      text: () => formatPayOrder(data)
+    };
+    await renderWithContext(commandResult, { format }, configManager);
+  });
+}
+
+// src/ride-elife/get.ts
+function need5(value, flag) {
+  if (value === void 0) {
+    throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
+  }
+  return value;
+}
 function formatGetOrder(data) {
   const lines = [
     ["Ride ID", String(data.ride_id ?? "-")],
@@ -2710,8 +3124,8 @@ function formatGetOrder(data) {
   }
   if (data.driver) {
     const driver = data.driver;
-    const phone2 = driver.phone_number ? ` (${driver.phone_number})` : "";
-    lines.push(["Driver", `${driver.name ?? "-"}${phone2}`]);
+    const phone3 = driver.phone_number ? ` (${driver.phone_number})` : "";
+    lines.push(["Driver", `${driver.name ?? "-"}${phone3}`]);
   }
   if (data.vehicle) {
     const v = data.vehicle;
@@ -2738,7 +3152,7 @@ function registerRideGetCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const orderId = need3(opts.orderId, "order-id");
+    const orderId = need5(opts.orderId, "order-id");
     if (opts.watch) {
       await watchRideStatus(deps.apiClient, apiKey, orderId, {
         intervalSeconds: resolveSeconds(
@@ -2772,8 +3186,8 @@ function registerRideGetCommand(parent, deps) {
 }
 
 // src/ride-elife/cancel.ts
-import { confirm as confirm2 } from "@inquirer/prompts";
-function need4(value, flag) {
+import { confirm as confirm4 } from "@inquirer/prompts";
+function need6(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -2808,9 +3222,9 @@ function registerCancelCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const orderId = need4(opts.orderId, "order-id");
+    const orderId = need6(opts.orderId, "order-id");
     if (!isYes) {
-      const confirmed = await confirm2({
+      const confirmed = await confirm4({
         message: `Cancel ride ${orderId}? This may incur a fee.`,
         default: false
       });
@@ -2844,14 +3258,14 @@ function registerCancelCommand(parent, deps) {
 }
 
 // src/ride-elife/update.ts
-import { confirm as confirm3 } from "@inquirer/prompts";
-function need5(value, flag) {
+import { confirm as confirm5 } from "@inquirer/prompts";
+function need7(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
-function num3(value, flag) {
+function num4(value, flag) {
   if (value === void 0) return void 0;
   const parsed = Number(value);
   if (!Number.isFinite(parsed)) {
@@ -2860,7 +3274,7 @@ function num3(value, flag) {
   return parsed;
 }
 function int(value, flag) {
-  const parsed = num3(value, flag);
+  const parsed = num4(value, flag);
   if (parsed === void 0) return void 0;
   if (!Number.isInteger(parsed)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be an integer.`);
@@ -2885,8 +3299,8 @@ function location(lat, lng, name, side) {
     );
   }
   return {
-    lat: num3(lat, `${side}-lat`),
-    lng: num3(lng, `${side}-lng`),
+    lat: num4(lat, `${side}-lat`),
+    lng: num4(lng, `${side}-lng`),
     name
   };
 }
@@ -2912,7 +3326,7 @@ function registerRideUpdateCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const orderId = need5(opts.orderId, "order-id");
+    const orderId = need7(opts.orderId, "order-id");
     const mgTouched = process.argv.some(
       (a) => a === "--meet-and-greet" || a === "--no-meet-and-greet"
     );
@@ -2922,7 +3336,7 @@ function registerRideUpdateCommand(parent, deps) {
     };
     set("quote_id", opts.quoteId);
     set("vehicle_class", opts.vehicleClass);
-    set("price_amount", num3(opts.priceAmount, "price-amount"));
+    set("price_amount", num4(opts.priceAmount, "price-amount"));
     set("price_currency", opts.priceCurrency);
     set(
       "pickup",
@@ -2969,7 +3383,7 @@ function registerRideUpdateCommand(parent, deps) {
       );
     }
     if (!isYes) {
-      const confirmed = await confirm3({
+      const confirmed = await confirm5({
         message: `Apply ${Object.keys(body).length} change(s) to ride ${orderId}? The fare may change.`,
         default: false
       });
@@ -3003,7 +3417,7 @@ function registerRideUpdateCommand(parent, deps) {
 }
 
 // src/ride-elife/trip-status.ts
-function need6(value, flag) {
+function need8(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -3041,7 +3455,7 @@ function registerRideTripStatusCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const orderId = need6(opts.orderId, "order-id");
+    const orderId = need8(opts.orderId, "order-id");
     const leg = tripNo(opts.tripNo);
     const spinner = format === "json" ? null : createSpinner("Fetching trip status...");
     const result = await deps.apiClient.get(
@@ -3478,6 +3892,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) {
@@ -3496,14 +3921,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:",
@@ -3514,7 +3942,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...");
@@ -3539,7 +3972,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();
@@ -3570,28 +4003,28 @@ function registerOrdersGetCommand(parent, deps) {
 }
 
 // src/hotel-redaug/search.ts
-function need7(value, flag) {
+function need9(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
-function num4(value, flag) {
-  const n = Number(need7(value, flag));
+function num5(value, flag) {
+  const n = Number(need9(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
   return n;
 }
 function coord(value, flag, min, max) {
-  const n = num4(value, flag);
+  const n = num5(value, flag);
   if (n < min || n > max) {
     throw new CliError("PARAM_INVALID", `--${flag} must be between ${min} and ${max}.`);
   }
   return n;
 }
 function positiveInt3(value, flag) {
-  const n = num4(value, flag);
+  const n = num5(value, flag);
   if (!Number.isInteger(n) || n <= 0) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a positive integer.`);
   }
@@ -3599,7 +4032,7 @@ function positiveInt3(value, flag) {
 }
 var YMD_RE = /^\d{4}-\d{2}-\d{2}$/;
 function stayDate(value, flag) {
-  const raw = need7(value, flag);
+  const raw = need9(value, flag);
   if (!YMD_RE.test(raw)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a YYYY-MM-DD date.`);
   }
@@ -3671,21 +4104,21 @@ function registerHotelSearchCommand(parent, deps) {
     const pageSize = positiveInt3(opts.pageSize, "page-size");
     const body = {};
     if (hasDestination) {
-      body.destination_id = need7(opts.destinationId, "destination-id");
+      body.destination_id = need9(opts.destinationId, "destination-id");
     } else {
       body.lat = coord(opts.lat, "lat", -90, 90);
       body.lng = coord(opts.lng, "lng", -180, 180);
     }
-    body.distance = num4(opts.distance, "distance");
+    body.distance = num5(opts.distance, "distance");
     body.check_in = checkIn;
     body.check_out = checkOut;
-    body.adults = num4(opts.adults, "adults");
-    body.children = num4(opts.children, "children");
-    body.room_num = num4(opts.roomNum, "room-num");
-    if (opts.star !== void 0) body.star = num4(opts.star, "star");
+    body.adults = num5(opts.adults, "adults");
+    body.children = num5(opts.children, "children");
+    body.room_num = num5(opts.roomNum, "room-num");
+    if (opts.star !== void 0) body.star = num5(opts.star, "star");
     if (opts.keyword !== void 0) body.keyword = opts.keyword;
-    if (opts.priceMin !== void 0) body.price_min = num4(opts.priceMin, "price-min");
-    if (opts.priceMax !== void 0) body.price_max = num4(opts.priceMax, "price-max");
+    if (opts.priceMin !== void 0) body.price_min = num5(opts.priceMin, "price-min");
+    if (opts.priceMax !== void 0) body.price_max = num5(opts.priceMax, "price-max");
     if (opts.sortBy !== void 0) body.sort_by = opts.sortBy;
     body.page = page;
     body.page_size = pageSize;
@@ -3714,14 +4147,14 @@ function registerHotelSearchCommand(parent, deps) {
 }
 
 // src/hotel-redaug/quote.ts
-function need8(value, flag) {
+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(need8(value, flag));
+function num6(value, flag) {
+  const n = Number(need10(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -3729,7 +4162,7 @@ function num5(value, flag) {
 }
 var YMD_RE2 = /^\d{4}-\d{2}-\d{2}$/;
 function stayDate2(value, flag) {
-  const raw = need8(value, flag);
+  const raw = need10(value, flag);
   if (!YMD_RE2.test(raw)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a YYYY-MM-DD date.`);
   }
@@ -3769,7 +4202,7 @@ function registerHotelQuoteCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const hotelId = need8(opts.hotelId, "hotel-id");
+    const hotelId = need10(opts.hotelId, "hotel-id");
     const checkIn = stayDate2(opts.checkIn, "check-in");
     const checkOut = stayDate2(opts.checkOut, "check-out");
     if (!(checkOut > checkIn)) {
@@ -3779,9 +4212,9 @@ function registerHotelQuoteCommand(parent, deps) {
       hotel_id: hotelId,
       check_in: checkIn,
       check_out: checkOut,
-      adults: num5(opts.adults, "adults"),
-      children: num5(opts.children, "children"),
-      room_num: num5(opts.roomNum, "room-num"),
+      adults: num6(opts.adults, "adults"),
+      children: num6(opts.children, "children"),
+      room_num: num6(opts.roomNum, "room-num"),
       nationality: opts.nationality
     };
     const result = await deps.apiClient.post(
@@ -3803,7 +4236,7 @@ function registerHotelQuoteCommand(parent, deps) {
 }
 
 // src/hotel-redaug/create-order.ts
-import { confirm as confirm4 } from "@inquirer/prompts";
+import { confirm as confirm6 } 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;
@@ -3861,14 +4294,14 @@ function parseCancellation(raw) {
   }
   return parsed;
 }
-function need9(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(need9(value, flag));
+function num7(value, flag) {
+  const n = Number(need11(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -3876,7 +4309,7 @@ function num6(value, flag) {
 }
 var YMD_RE3 = /^\d{4}-\d{2}-\d{2}$/;
 function stayDate3(value, flag) {
-  const raw = need9(value, flag);
+  const raw = need11(value, flag);
   if (!YMD_RE3.test(raw)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a YYYY-MM-DD date.`);
   }
@@ -3887,7 +4320,7 @@ function stayDate3(value, flag) {
   }
   return raw;
 }
-function formatCreateOrder(data) {
+function formatCreateOrder2(data) {
   const lines = [
     ["Order ID", String(data.order_id ?? "-")],
     ["FC order code", String(data.fc_order_code ?? "-")],
@@ -3945,18 +4378,18 @@ function registerHotelCreateOrderCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const productToken = need9(opts.productToken, "product-token");
-    const totalAmount = num6(opts.totalAmount, "total-amount");
-    const currency = need9(opts.currency, "currency");
-    const priceItems = parsePriceItems(need9(opts.priceItems, "price-items"));
+    const productToken = need11(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 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 = need9(opts.guestName, "guest-name");
-    const contactName = need9(opts.contactName, "contact-name");
-    const contactPhone = need9(opts.contactPhone, "contact-phone");
+    const guestName = need11(opts.guestName, "guest-name");
+    const contactName = need11(opts.contactName, "contact-name");
+    const contactPhone = need11(opts.contactPhone, "contact-phone");
     const body = {
       product_token: productToken,
       total_amount: totalAmount,
@@ -3964,9 +4397,9 @@ function registerHotelCreateOrderCommand(parent, deps) {
       price_items: priceItems,
       check_in: checkIn,
       check_out: checkOut,
-      room_num: num6(opts.roomNum, "room-num"),
-      adults: num6(opts.adults, "adults"),
-      children: num6(opts.children, "children"),
+      room_num: num7(opts.roomNum, "room-num"),
+      adults: num7(opts.adults, "adults"),
+      children: num7(opts.children, "children"),
       nationality: opts.nationality,
       guest_name: guestName,
       contact_name: contactName,
@@ -3990,7 +4423,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 confirm4({
+      const confirmed = await confirm6({
         message: `Create this hotel order for ${totalAmount} ${currency} (check-in ${checkIn}, check-out ${checkOut})? ${chargeNote}`,
         default: false
       });
@@ -4017,14 +4450,14 @@ function registerHotelCreateOrderCommand(parent, deps) {
     const configManager = new ConfigManager();
     const commandResult = {
       data,
-      text: () => formatCreateOrder(data)
+      text: () => formatCreateOrder2(data)
     };
     await renderWithContext(commandResult, { format }, configManager);
   });
 }
 
 // src/hotel-redaug/pay-order.ts
-import { confirm as confirm5 } from "@inquirer/prompts";
+import { confirm as confirm7 } from "@inquirer/prompts";
 
 // src/hotel-redaug/watch.ts
 var DEFAULT_ORDER_WATCH_INTERVAL_SECONDS = 5;
@@ -4147,7 +4580,7 @@ async function watchCheckoutStatus(apiClient, apiKey, taskOrderCode, opts) {
 // src/hotel-redaug/pay-order.ts
 var DEFAULT_PAY_WATCH_INTERVAL_SECONDS = 5;
 var DEFAULT_PAY_WATCH_TIMEOUT_SECONDS = 300;
-function formatPayOrder(data) {
+function formatPayOrder2(data) {
   const lines = [
     ["Order ID", String(data.order_id ?? "-")],
     ["Order status", String(data.order_status ?? "-")]
@@ -4169,6 +4602,9 @@ function registerHotelPayOrderCommand(parent, deps) {
   const cmd = parent.command("pay-order").description("Settle an existing hotel order (path decided by billing_mode: monthly_settlement or pay_per_call)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-id <id>", "Order ID to pay (from create-order response)").option("--payment-method-id <id>", "Optional bound-card id to charge (pay_per_call / EVO preauth)").option("--payment-token-id <id>", "Optional network-token id (unionpay/visa charge path)").option(
     "--authorized-merchant-trans-id <id>",
     "Resume a 3DS challenge: merchant trans id of an already-authorised preauth"
+  ).option(
+    "--evo-explicit",
+    "[\u65B9\u6848 B/R16] Explicit opt-in to settle this pay_per_call order via the EVO bound-card fallback rail. Set ONLY when the user explicitly chose EVO; forwarded to the pay body as evo_explicit=true. Without it, a pay_per_call settlement lacking --payment-token-id is hard-gated server-side."
   ).option(
     "--idempotency-key <key>",
     "Idempotency key forwarded verbatim as the Idempotency-Key header"
@@ -4207,8 +4643,9 @@ function registerHotelPayOrderCommand(parent, deps) {
     if (opts.authorizedMerchantTransId !== void 0) {
       body.authorized_merchant_trans_id = opts.authorizedMerchantTransId;
     }
+    if (opts.evoExplicit) body.evo_explicit = true;
     if (!isYes) {
-      const confirmed = await confirm5({
+      const confirmed = await confirm7({
         message: `Settle hotel order ${orderId}? This moves money via the order's configured billing mode (monthly_settlement or pay_per_call).`,
         default: false
       });
@@ -4235,7 +4672,7 @@ function registerHotelPayOrderCommand(parent, deps) {
       const configManager = new ConfigManager();
       const commandResult = {
         data,
-        text: () => formatPayOrder(data)
+        text: () => formatPayOrder2(data)
       };
       await renderWithContext(commandResult, { format }, configManager);
     } else {
@@ -4286,7 +4723,7 @@ function registerHotelPayOrderCommand(parent, deps) {
 }
 
 // src/hotel-redaug/get.ts
-function need10(value, flag) {
+function need12(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -4324,8 +4761,8 @@ function formatGetOrder2(data) {
   }
   if (data.guest?.name) lines.push(["Guest", String(data.guest.name)]);
   if (data.contact?.name) {
-    const phone2 = data.contact.phone ? ` (+${data.contact.country_code ?? ""} ${data.contact.phone})` : "";
-    lines.push(["Contact", `${data.contact.name}${phone2}`]);
+    const phone3 = data.contact.phone ? ` (+${data.contact.country_code ?? ""} ${data.contact.phone})` : "";
+    lines.push(["Contact", `${data.contact.name}${phone3}`]);
   }
   if (data.arrive_time) lines.push(["Arrive time", String(data.arrive_time)]);
   if (data.special_requests) lines.push(["Special requests", String(data.special_requests)]);
@@ -4350,7 +4787,7 @@ function registerHotelGetCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const orderId = need10(opts.orderId, "order-id");
+    const orderId = need12(opts.orderId, "order-id");
     if (opts.watch) {
       await watchOrderStatus(deps.apiClient, apiKey, orderId, {
         intervalSeconds: resolveSeconds(
@@ -4384,7 +4821,7 @@ function registerHotelGetCommand(parent, deps) {
 }
 
 // src/hotel-redaug/cancel.ts
-function need11(value, flag) {
+function need13(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -4437,8 +4874,8 @@ function registerHotelCancelCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const orderId = need11(opts.orderId, "order-id");
-    const fcOrderCode = need11(opts.fcOrderCode, "fc-order-code");
+    const orderId = need13(opts.orderId, "order-id");
+    const fcOrderCode = need13(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, {
@@ -4467,15 +4904,15 @@ function registerHotelCancelCommand(parent, deps) {
 }
 
 // src/hotel-redaug/checkout.ts
-import { confirm as confirm6 } from "@inquirer/prompts";
-function need12(value, flag) {
+import { confirm as confirm8 } from "@inquirer/prompts";
+function need14(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
-function num7(value, flag) {
-  const n = Number(need12(value, flag));
+function num8(value, flag) {
+  const n = Number(need14(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -4541,11 +4978,11 @@ function registerHotelCheckoutCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const orderId = need12(opts.orderId, "order-id");
-    const fcOrderCode = need12(opts.fcOrderCode, "fc-order-code");
-    const reason = need12(opts.reason, "reason");
-    const checkoutRooms = parseCheckoutRooms(need12(opts.checkoutRooms, "checkout-rooms"));
-    const refundType = num7(opts.refundType, "refund-type");
+    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 refundType = num8(opts.refundType, "refund-type");
     const body = {
       fc_order_code: fcOrderCode,
       reason,
@@ -4553,7 +4990,7 @@ function registerHotelCheckoutCommand(parent, deps) {
       checkout_rooms: checkoutRooms
     };
     if (!isYes) {
-      const confirmed = await confirm6({
+      const confirmed = await confirm8({
         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
       });
@@ -4587,7 +5024,7 @@ function registerHotelCheckoutCommand(parent, deps) {
 }
 
 // src/hotel-redaug/get-checkout.ts
-function need13(value, flag) {
+function need15(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -4623,7 +5060,7 @@ function registerHotelGetCheckoutCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const taskOrderCode = need13(opts.taskOrderCode, "task-order-code");
+    const taskOrderCode = need15(opts.taskOrderCode, "task-order-code");
     if (opts.watch) {
       await watchCheckoutStatus(deps.apiClient, apiKey, taskOrderCode, {
         intervalSeconds: resolveSeconds(
@@ -4727,7 +5164,7 @@ function registerHotelListOrdersCommand(parent, deps) {
 }
 
 // src/hotel-redaug/find-destination.ts
-function need14(value, flag) {
+function need16(value, flag) {
   if (value === void 0 || value.trim() === "") {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -4761,7 +5198,7 @@ function registerHotelFindDestinationCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const keyword = need14(opts.keyword, "keyword");
+    const keyword = need16(opts.keyword, "keyword");
     const body = { keyword };
     if (opts.dataType !== void 0) {
       body.data_type = opts.dataType;
@@ -4785,21 +5222,21 @@ function registerHotelFindDestinationCommand(parent, deps) {
 }
 
 // src/hotel-redaug/hotel-filters.ts
-function need15(value, flag) {
+function need17(value, flag) {
   if (value === void 0 || value.trim() === "") {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
-function num8(value, flag) {
-  const n = Number(need15(value, flag));
+function num9(value, flag) {
+  const n = Number(need17(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
   return n;
 }
 function coord2(value, flag, min, max) {
-  const n = num8(value, flag);
+  const n = num9(value, flag);
   if (n < min || n > max) {
     throw new CliError("PARAM_INVALID", `--${flag} must be between ${min} and ${max}.`);
   }
@@ -4872,12 +5309,12 @@ function registerHotelFiltersCommand(parent, deps) {
     }
     const body = {};
     if (hasDestination) {
-      body.destination_id = need15(opts.destinationId, "destination-id");
+      body.destination_id = need17(opts.destinationId, "destination-id");
     } else {
       body.lat = coord2(opts.lat, "lat", -90, 90);
       body.lng = coord2(opts.lng, "lng", -180, 180);
     }
-    body.distance = num8(opts.distance, "distance");
+    body.distance = num9(opts.distance, "distance");
     const result = await deps.apiClient.post(
       "/hotel/filters",
       { type: "api-key", key: apiKey },
@@ -4897,7 +5334,7 @@ function registerHotelFiltersCommand(parent, deps) {
 }
 
 // src/hotel-redaug/list-cities.ts
-function need16(value, flag) {
+function need18(value, flag) {
   if (value === void 0 || value.trim() === "") {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -4930,7 +5367,7 @@ function registerHotelListCitiesCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const country = need16(opts.country, "country");
+    const country = need18(opts.country, "country");
     const body = { country_code: country };
     const result = await deps.apiClient.post(
       "/hotel/cities",
@@ -4951,7 +5388,7 @@ function registerHotelListCitiesCommand(parent, deps) {
 }
 
 // src/hotel-redaug/hotel-detail.ts
-function need17(value, flag) {
+function need19(value, flag) {
   if (value === void 0 || value.trim() === "") {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -5098,7 +5535,7 @@ function registerHotelDetailCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const hotelId = need17(opts.hotelId, "hotel-id");
+    const hotelId = need19(opts.hotelId, "hotel-id");
     const rawWithImages = opts.withImages;
     const withImages = rawWithImages !== "false" && rawWithImages !== false;
     const settings = parseSettings(opts.settings);
@@ -5306,14 +5743,14 @@ function registerHotelSkillCommand(parent) {
 }
 
 // src/flight-flink/_helpers.ts
-function need18(value, flag) {
+function need20(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
-function num9(value, flag) {
-  const n = Number(need18(value, flag));
+function num10(value, flag) {
+  const n = Number(need20(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -5348,7 +5785,7 @@ function registerFindAirportCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const keyword = need18(opts.keyword, "keyword");
+    const keyword = need20(opts.keyword, "keyword");
     const spinner = format === "json" ? null : createSpinner("Resolving airports...");
     const result = await deps.apiClient.post(
       "/flight/find-airport",
@@ -5374,8 +5811,8 @@ function registerListAirportsCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
     const body = {
-      page: num9(opts.page, "page"),
-      page_size: num9(opts.pageSize, "page-size")
+      page: num10(opts.page, "page"),
+      page_size: num10(opts.pageSize, "page-size")
     };
     if (opts.keyword !== void 0) body.keyword = opts.keyword;
     const spinner = format === "json" ? null : createSpinner("Fetching airports...");
@@ -5399,8 +5836,8 @@ function registerListAirlinesCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
     const body = {
-      page: num9(opts.page, "page"),
-      page_size: num9(opts.pageSize, "page-size")
+      page: num10(opts.page, "page"),
+      page_size: num10(opts.pageSize, "page-size")
     };
     if (opts.keyword !== void 0) body.keyword = opts.keyword;
     const spinner = format === "json" ? null : createSpinner("Fetching airlines...");
@@ -5444,13 +5881,13 @@ function registerSearchCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
     const body = {
-      trip_type: num9(opts.tripType, "trip-type"),
-      journeys: jsonArray(need18(opts.journeys, "journeys"), "journeys"),
+      trip_type: num10(opts.tripType, "trip-type"),
+      journeys: jsonArray(need20(opts.journeys, "journeys"), "journeys"),
       cabin_class: opts.cabinClass,
-      adult_num: num9(opts.adultNum, "adult-num"),
-      child_num: num9(opts.childNum, "child-num"),
-      infant_num: num9(opts.infantNum, "infant-num"),
-      transfer_number: num9(opts.transferNumber, "transfer-number")
+      adult_num: num10(opts.adultNum, "adult-num"),
+      child_num: num10(opts.childNum, "child-num"),
+      infant_num: num10(opts.infantNum, "infant-num"),
+      transfer_number: num10(opts.transferNumber, "transfer-number")
     };
     if (opts.airline !== void 0) body.airline = opts.airline;
     if (opts.journeyId !== void 0) {
@@ -5476,7 +5913,7 @@ function registerMoreOffersCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const productToken = need18(opts.productToken, "product-token");
+    const productToken = need20(opts.productToken, "product-token");
     const spinner = format === "json" ? null : createSpinner("Fetching offers...");
     const result = await deps.apiClient.post(
       "/flight/more-offers",
@@ -5497,7 +5934,7 @@ function registerVerifyCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const productToken = need18(opts.productToken, "product-token");
+    const productToken = need20(opts.productToken, "product-token");
     const spinner = format === "json" ? null : createSpinner("Verifying price...");
     const result = await deps.apiClient.post(
       "/flight/verify",
@@ -5519,7 +5956,7 @@ function registerVerifyCommand(parent, deps) {
 }
 
 // src/flight-flink/create-order.ts
-import { confirm as confirm7 } from "@inquirer/prompts";
+import { confirm as confirm9 } 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>",
@@ -5531,19 +5968,19 @@ function registerCreateOrderCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const productToken = need18(opts.productToken, "product-token");
-    const totalAmount = num9(opts.totalAmount, "total-amount");
-    const currency = need18(opts.currency, "currency");
+    const productToken = need20(opts.productToken, "product-token");
+    const totalAmount = num10(opts.totalAmount, "total-amount");
+    const currency = need20(opts.currency, "currency");
     const body = {
       product_token: productToken,
       total_amount: totalAmount,
       currency,
-      trip_type: num9(opts.tripType, "trip-type"),
-      contact_name: need18(opts.contactName, "contact-name"),
-      contact_region: need18(opts.contactRegion, "contact-region"),
-      contact_phone: need18(opts.contactPhone, "contact-phone"),
-      contact_email: need18(opts.contactEmail, "contact-email"),
-      passengers: jsonArray(need18(opts.passengers, "passengers"), "passengers")
+      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")
     };
     if (opts.paymentMethodId !== void 0) body.payment_method_id = opts.paymentMethodId;
     if (opts.paymentTokenId !== void 0) body.payment_token_id = opts.paymentTokenId;
@@ -5553,7 +5990,7 @@ function registerCreateOrderCommand(parent, deps) {
     const member = memberIdOf(opts);
     if (member !== void 0) body.member_id = member;
     if (!isYes) {
-      const ok = await confirm7({
+      const ok = await confirm9({
         message: `Create this flight order for ${totalAmount} ${currency}? This locks the fare but does NOT charge yet.`,
         default: false
       });
@@ -5592,11 +6029,14 @@ function registerCreateOrderCommand(parent, deps) {
 }
 
 // src/flight-flink/pay-order.ts
-import { confirm as confirm8 } from "@inquirer/prompts";
+import { confirm as confirm10 } 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>",
     "Resume a 3DS challenge: merchant trans id of an already-authorised preauth"
+  ).option(
+    "--evo-explicit",
+    "[\u65B9\u6848 B/R16] Explicit opt-in to settle this pay_per_call order via the EVO bound-card fallback rail. Set ONLY when the user explicitly chose EVO; forwarded to the pay body as evo_explicit=true. Without it, a pay_per_call settlement lacking --payment-token-id is hard-gated server-side."
   ).option("--idempotency-key <key>", "Forwarded verbatim as the Idempotency-Key header");
   attachSchemaHelp(cmd, flightPayOrderSchema);
   cmd.action(async () => {
@@ -5604,9 +6044,9 @@ function registerPayOrderCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const orderNo = need18(opts.orderNo, "order-no");
+    const orderNo = need20(opts.orderNo, "order-no");
     if (!isYes) {
-      const ok = await confirm8({
+      const ok = await confirm10({
         message: `Pay and ticket order ${orderNo}? This settles the order and issues tickets.`,
         default: false
       });
@@ -5623,6 +6063,7 @@ function registerPayOrderCommand(parent, deps) {
     if (opts.authorizedMerchantTransId !== void 0) {
       body.authorized_merchant_trans_id = opts.authorizedMerchantTransId;
     }
+    if (opts.evoExplicit) body.evo_explicit = true;
     const result = await deps.apiClient.post(
       `/flight/${encodeURIComponent(orderNo)}/pay`,
       { type: "api-key", key: apiKey },
@@ -5655,12 +6096,12 @@ function registerGetOrderCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const orderNo = need18(opts.orderNo, "order-no");
+    const orderNo = need20(opts.orderNo, "order-no");
     const path = `/flight/${encodeURIComponent(orderNo)}/status`;
     const auth = { type: "api-key", key: apiKey };
     if (opts.watch) {
-      const interval = num9(opts.watchInterval, "watch-interval") * 1e3;
-      const timeoutMs = num9(opts.watchTimeout, "watch-timeout") * 1e3;
+      const interval = num10(opts.watchInterval, "watch-interval") * 1e3;
+      const timeoutMs = num10(opts.watchTimeout, "watch-timeout") * 1e3;
       const deadline = Date.now() + timeoutMs;
       for (; ; ) {
         const r = await deps.apiClient.get(path, auth);
@@ -5695,7 +6136,7 @@ function registerGetOrderCommand(parent, deps) {
 }
 
 // src/flight-flink/cancel-order.ts
-import { confirm as confirm9 } from "@inquirer/prompts";
+import { confirm as confirm11 } 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);
@@ -5704,9 +6145,9 @@ function registerCancelOrderCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const orderNo = need18(opts.orderNo, "order-no");
+    const orderNo = need20(opts.orderNo, "order-no");
     if (!isYes) {
-      const ok = await confirm9({
+      const ok = await confirm11({
         message: `Cancel order ${orderNo}? This requests cancellation and a refund.`,
         default: false
       });
@@ -5751,8 +6192,8 @@ function registerListOrdersCommand2(parent, deps) {
     if (opts.status !== void 0) params.set("status", opts.status);
     const member = memberIdOf(opts);
     if (member !== void 0) params.set("member_id", member);
-    params.set("page", String(num9(opts.page, "page")));
-    params.set("page_size", String(num9(opts.pageSize, "page-size")));
+    params.set("page", String(num10(opts.page, "page")));
+    params.set("page_size", String(num10(opts.pageSize, "page-size")));
     const spinner = format === "json" ? null : createSpinner("Fetching flight orders...");
     const result = await deps.apiClient.get(
       `/flight/orders?${params.toString()}`,
@@ -5780,10 +6221,10 @@ function registerChangeSearchCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
     const body = {
-      order_no: need18(opts.orderNo, "order-no"),
-      date: need18(opts.date, "date"),
-      passenger: need18(opts.passenger, "passenger"),
-      segment_id: need18(opts.segmentId, "segment-id"),
+      order_no: need20(opts.orderNo, "order-no"),
+      date: need20(opts.date, "date"),
+      passenger: need20(opts.passenger, "passenger"),
+      segment_id: need20(opts.segmentId, "segment-id"),
       cabin_class: opts.cabinClass
     };
     const spinner = format === "json" ? null : createSpinner("Searching change options...");
@@ -5799,7 +6240,7 @@ function registerChangeSearchCommand(parent, deps) {
 }
 
 // src/flight-flink/change-apply.ts
-import { confirm as confirm10 } from "@inquirer/prompts";
+import { confirm as confirm12 } 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);
@@ -5809,17 +6250,17 @@ function registerChangeApplyCommand(parent, deps) {
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
     const body = {
-      order_no: need18(opts.orderNo, "order-no"),
-      passenger: need18(opts.passenger, "passenger"),
-      segment_id: need18(opts.segmentId, "segment-id"),
-      product_token: need18(opts.productToken, "product-token"),
-      contact_name: need18(opts.contactName, "contact-name"),
-      contact_region: need18(opts.contactRegion, "contact-region"),
-      contact_phone: need18(opts.contactPhone, "contact-phone"),
-      contact_email: need18(opts.contactEmail, "contact-email")
+      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")
     };
     if (!isYes) {
-      const ok = await confirm10({
+      const ok = await confirm12({
         message: `Submit a change request for order ${body.order_no}?`,
         default: false
       });
@@ -5850,7 +6291,7 @@ function registerChangeDetailCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const changeOrderNo = need18(opts.changeOrderNo, "change-order-no");
+    const changeOrderNo = need20(opts.changeOrderNo, "change-order-no");
     const spinner = format === "json" ? null : createSpinner("Fetching change detail...");
     const result = await deps.apiClient.get(
       `/flight/change/${encodeURIComponent(changeOrderNo)}`,
@@ -5863,7 +6304,7 @@ function registerChangeDetailCommand(parent, deps) {
 }
 
 // src/flight-flink/change-cancel.ts
-import { confirm as confirm11 } from "@inquirer/prompts";
+import { confirm as confirm13 } 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);
@@ -5872,9 +6313,9 @@ function registerChangeCancelCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const changeOrderNo = need18(opts.changeOrderNo, "change-order-no");
+    const changeOrderNo = need20(opts.changeOrderNo, "change-order-no");
     if (!isYes) {
-      const ok = await confirm11({ message: `Cancel change request ${changeOrderNo}?`, default: false });
+      const ok = await confirm13({ 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, {
@@ -5895,7 +6336,7 @@ function registerChangeCancelCommand(parent, deps) {
 }
 
 // src/flight-flink/change-pay.ts
-import { confirm as confirm12 } from "@inquirer/prompts";
+import { confirm as confirm14 } 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>",
@@ -5907,10 +6348,10 @@ function registerChangePayCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const changeOrderNo = need18(opts.changeOrderNo, "change-order-no");
-    const orderNo = need18(opts.orderNo, "order-no");
-    const amount = num9(opts.amount, "amount");
-    const currency = need18(opts.currency, "currency");
+    const changeOrderNo = need20(opts.changeOrderNo, "change-order-no");
+    const orderNo = need20(opts.orderNo, "order-no");
+    const amount = num10(opts.amount, "amount");
+    const currency = need20(opts.currency, "currency");
     const body = {
       order_no: orderNo,
       amount,
@@ -5924,7 +6365,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 confirm12({ message, default: false });
+      const ok = await confirm14({ message, default: false });
       if (!ok) throw new CliError("CLIENT_ABORTED", "Change payment aborted by user.");
     }
     const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
@@ -5971,7 +6412,7 @@ function registerChangePayCommand(parent, deps) {
 }
 
 // src/flight-flink/refund-apply.ts
-import { confirm as confirm13 } from "@inquirer/prompts";
+import { confirm as confirm15 } 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);
@@ -5981,18 +6422,18 @@ function registerRefundApplyCommand(parent, deps) {
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
     const body = {
-      order_no: need18(opts.orderNo, "order-no"),
-      passenger: need18(opts.passenger, "passenger"),
-      segment_id: need18(opts.segmentId, "segment-id"),
-      reason_type: num9(opts.reasonType, "reason-type"),
-      contact_name: need18(opts.contactName, "contact-name"),
-      contact_region: need18(opts.contactRegion, "contact-region"),
-      contact_phone: need18(opts.contactPhone, "contact-phone"),
-      contact_email: need18(opts.contactEmail, "contact-email")
+      order_no: need20(opts.orderNo, "order-no"),
+      passenger: need20(opts.passenger, "passenger"),
+      segment_id: need20(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")
     };
     if (opts.reason !== void 0) body.reason = opts.reason;
     if (!isYes) {
-      const ok = await confirm13({
+      const ok = await confirm15({
         message: `Submit a refund request for order ${body.order_no}?`,
         default: false
       });
@@ -6023,7 +6464,7 @@ function registerRefundDetailCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const refundOrderNo = need18(opts.refundOrderNo, "refund-order-no");
+    const refundOrderNo = need20(opts.refundOrderNo, "refund-order-no");
     const spinner = format === "json" ? null : createSpinner("Fetching refund detail...");
     const result = await deps.apiClient.get(
       `/flight/refund/${encodeURIComponent(refundOrderNo)}`,
@@ -6036,7 +6477,7 @@ function registerRefundDetailCommand(parent, deps) {
 }
 
 // src/flight-flink/refund-confirm.ts
-import { confirm as confirm14 } from "@inquirer/prompts";
+import { confirm as confirm16 } 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);
@@ -6045,14 +6486,14 @@ function registerRefundConfirmCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const refundOrderNo = need18(opts.refundOrderNo, "refund-order-no");
-    const confirmFlag = need18(opts.confirm, "confirm");
+    const refundOrderNo = need20(opts.refundOrderNo, "refund-order-no");
+    const confirmFlag = need20(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 confirm14({ message: `${action} refund ${refundOrderNo}?`, default: false });
+      const ok = await confirm16({ message: `${action} refund ${refundOrderNo}?`, default: false });
       if (!ok) throw new CliError("CLIENT_ABORTED", "Refund confirmation aborted by user.");
     }
     const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
@@ -6215,6 +6656,8 @@ Key notes:
   );
   registerQuoteCommand(rideCmd, deps);
   registerBookCommand(rideCmd, deps);
+  registerRideCreateOrderCommand(rideCmd, deps);
+  registerRidePayOrderCommand(rideCmd, deps);
   registerRideGetCommand(rideCmd, deps);
   registerCancelCommand(rideCmd, deps);
   registerRideUpdateCommand(rideCmd, deps);
@@ -6224,7 +6667,7 @@ 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 (ride + hotel + flight). Use for order history, common filters, and stable pagination."
   );
   registerOrdersListCommand(ordersCmd, deps);
   registerOrdersGetCommand(ordersCmd, deps);