@agenzo/merchant-cli 0.5.1 → 0.5.2

package/dist/index.js

@@ -896,7 +896,9 @@ var quoteSchema = {
     "passenger-count": { type: "int", required: false, description: "Number of passengers" },
     "luggage-count": { type: "int", required: false, description: "Number of luggage items" },
     "passenger-email": { type: "string", required: false, description: "Passenger email address" },
-    "children-count": { type: "int", required: false, description: "Number of children" }
+    "children-count": { type: "int", required: false, description: "Number of children" },
+    "infant-count": { type: "int", required: false, description: "Number of infants (passenger breakdown; affects seat pricing)" },
+    "toddler-count": { type: "int", required: false, description: "Number of toddlers (passenger breakdown; affects seat pricing)" }
   },
   response: {
     vehicle_classes: {
@@ -1241,7 +1243,7 @@ var hotelCreateOrderSchema = {
   cli: CLI_NAME,
   noun: HOTEL_NOUN,
   verb: "create-order",
-  description: "Create AND pay for a hotel order in one call, using a product_token and price_items from a recent quote. The backend re-checks availability, authorizes/captures payment via the platform payment gateway (funds path decided server-side by the developer billing_mode \u2014 monthly_settlement or pay_per_call), locks the room with the supplier, and returns the order already PAID. There is no separate settlement step. If any step after funds are taken fails, the funds are automatically released/refunded before the error is returned. check-in/check-out, guest counts, total-amount and price-items must match the quote",
+  description: "Create a hotel order WITHOUT charging any account (re-check availability + createOrder upstream), using a product_token and price_items from a recent quote. The order enters AWAITING_PAYMENT \u2014 no money is moved until pay-order. check-in/check-out, guest counts, total-amount and price-items must match the quote",
   flags: {
     "product-token": { type: "string", required: true, description: "Chosen rate token from quote (quote.response.rates[].product_token). Pass verbatim" },
     "total-amount": { type: "float", required: true, description: "Total price for the stay (quote.response.rates[].total_price.amount)", constraints: "DECIMAL units (NOT cents), 0.01\u2013999999999.99. Must equal the chosen rate total_price.amount" },
@@ -1260,69 +1262,74 @@ var hotelCreateOrderSchema = {
     "contact-email": { type: "string", required: false, description: "Booking contact email" },
     "arrive-time": { type: "string", required: false, description: "Expected arrival time", constraints: "HH:mm, hotel local time" },
     "special-requests": { type: "string", required: false, description: "Free-text special requests (non-binding)" },
-    "payment-method-id": { type: "string", required: false, description: "pay_per_call only: charge this SPECIFIC already-bound card instead of the platform auto-selected default/most-recent one. Ignored for monthly_settlement.", constraints: "Must be an ACTIVE card belonging to this developer, else PAYMENT_METHOD_REQUIRED" },
     "idempotency-key": {
       type: "string",
       required: true,
-      description: "Unique key forwarded verbatim as the Idempotency-Key header; never auto-generated. Derive from business intent (e.g. hash(user_id + product_token + check_in)) and reuse the SAME key when retrying the identical request. This single call covers both order creation AND payment",
+      description: "Unique key forwarded verbatim as the Idempotency-Key header; never auto-generated. Derive from business intent (e.g. hash(user_id + product_token + check_in)) and reuse the SAME key when retrying the same order creation",
       constraints: "1-128 chars [A-Za-z0-9_-]"
     }
   },
   response: {
-    order_id: { type: "string", description: "Our order reference (coOrderCode). Use as --order-id in get / cancel." },
+    order_id: { type: "string", description: "Our order reference (coOrderCode). Use as --order-id in pay-order / get / cancel." },
     fc_order_code: { type: "string", description: "Supplier order reference. Needed as --fc-order-code in cancel and checkout." },
-    total_amount: { type: "float", description: "Amount actually charged (DECIMAL units) \u2014 the order is already PAID by the time this response is returned." },
-    currency: { type: "string", description: "ISO 4217 currency code of the charge." }
+    total_amount: { type: "float", description: "Amount to be paid in pay-order (DECIMAL units). The order is locked in AWAITING_PAYMENT \u2014 no charge has been made." },
+    currency: { type: "string", description: "ISO 4217 currency code for the payment." }
   },
   example: {
     command: `agenzo-merchant-cli hotel-redaug create-order --product-token <tok> --total-amount 10.00 --currency CNY --price-items '[{"sale_date":"2026-08-20","sale_price":10.00,"breakfast_num":0}]' --check-in 2026-08-20 --check-out 2026-08-21 --adults 2 --guest-name "Zhang San" --contact-name "Zhang San" --contact-phone 13800138000 --idempotency-key create-h1n2`,
-    output_summary: "Returns {order_id, fc_order_code, total_amount, currency}. The order is already PAID \u2014 proceed to get to poll for supplier CONFIRMED status."
+    output_summary: "Returns {order_id, fc_order_code, total_amount, currency}. The order is AWAITING_PAYMENT (no charge). Use order_id as --order-id in pay-order to settle."
   },
   error_recovery: {
     NO_AVAILABILITY: "Availability vanished between quote and create-order. Re-quote the same hotel; if still empty, quote another hotel or change dates. Use a NEW idempotency-key for the new product_token.",
     PRICE_CHANGED: "The price/price_items no longer match upstream. Re-quote to get fresh total_price and price_items, confirm the new price with the user, then create-order with the new values and a NEW idempotency-key.",
-    NAME_FORMAT_INVALID: "The supplier requires the guest name in a specific format (commonly Latin first/last name for international properties). Re-collect guest-name in Latin letters and retry with a NEW idempotency-key (the request is no longer identical).",
-    PAYMENT_METHOD_REQUIRED: "pay_per_call developer has no ACTIVE bound card at all, OR the explicitly-passed --payment-method-id is missing/not ACTIVE/does not belong to this developer. Direct the user to bind a card, drop --payment-method-id to auto-select, or pass a valid one.",
-    ACCOUNT_INSUFFICIENT_BALANCE: "monthly_settlement developer settlement credit is insufficient (check via admin-cli accounts get). Direct the user to top up offline; do NOT retry until funded.",
-    ACCOUNT_NOT_FOUND: "monthly_settlement developer has no settlement account. Direct the user to complete contract signing.",
-    ACCOUNT_SUSPENDED: "The settlement account is suspended. Direct the user to contact support; do NOT retry.",
+    NAME_FORMAT_INVALID: "The supplier requires the guest name in a specific format (commonly Latin first/last name for international properties). Re-collect guest-name in Latin letters and retry with the SAME idempotency-key.",
     PARAM_IDEMPOTENCY_KEY_REQUIRED: "Add a unique --idempotency-key derived from business intent and retry.",
     PARAM_IDEMPOTENCY_KEY_CONFLICT: "The same idempotency-key was used with different parameters. Retry with the original parameters, or generate a NEW key for the new parameters.",
-    UPSTREAM_ERROR: "Transient upstream error during checkBooking or createOrder. Any funds already taken are automatically released/refunded before this error is returned. Retry once after ~2s backoff with the SAME idempotency-key."
+    UPSTREAM_ERROR: "Transient upstream error during checkBooking or createOrder. Retry once after ~2s backoff with the SAME idempotency-key."
   }
 };
 var hotelPayOrderSchema = {
   cli: CLI_NAME,
   noun: HOTEL_NOUN,
   verb: "pay-order",
-  description: "Trigger supplier confirmation (upstream payOrder) for an order that was already paid via create-order. Takes only --order-id; no payment parameters needed. On success the supplier begins asynchronous confirmation \u2014 poll get until CONFIRMED (3). Idempotent: calling pay-order on an already-confirmed order replays the existing result",
+  description: 'Settle an existing AWAITING_PAYMENT order created by create-order. Takes only --order-id; the billing path is decided server-side by the order billing_mode. monthly_settlement deducts from the developer credit account then confirms with the supplier; pay_per_call verifies the user EVO payment \u2014 the EVO merchantTransID IS the order_id (the user pays via EVO under the order_id), so the platform queries EVO for that order_id and requires an exact amount/currency match before confirming (the response settlement_path is then "pay_per_call"). On success the order becomes PAID. Supports --watch to poll on PAYMENT_NOT_COMPLETED until PAID',
   flags: {
-    "order-id": { type: "string", required: true, description: "Order to confirm with the supplier (create-order.response.order_id)." },
+    "order-id": { type: "string", required: true, description: "Order to settle (create-order.response.order_id). For pay_per_call this is also the EVO merchantTransID the user paid under." },
     "idempotency-key": {
       type: "string",
       required: true,
-      description: "Unique key forwarded verbatim as the Idempotency-Key header; never auto-generated. Derive from business intent and reuse the SAME key when retrying the same pay-order call",
+      description: "Unique key forwarded verbatim as the Idempotency-Key header; never auto-generated. Derive from business intent (e.g. hash(order_id + attempt)) and reuse the SAME key when retrying the same payment",
       constraints: "1-128 chars [A-Za-z0-9_-]"
     },
-    watch: { type: "bool", required: false, default: false, description: "Retained for backward compatibility. Each iteration emits one NDJSON line" },
+    watch: { type: "bool", required: false, default: false, description: "Poll automatically on PAYMENT_NOT_COMPLETED until PAID or timeout. Each iteration emits one NDJSON line" },
     "watch-interval": { type: "int", required: false, default: 5, description: "Seconds between poll attempts in --watch mode" },
     "watch-timeout": { type: "int", required: false, default: 300, description: "Total seconds before giving up in --watch mode" }
   },
   response: {
     order_id: { type: "string", description: "Order reference." },
-    settlement_path: { type: "string", description: "The order's billing_mode echoed: 'monthly_settlement' or 'pay_per_call'." },
-    status: { type: "string", description: "'PAID' \u2014 supplier confirmation is asynchronous; poll get until CONFIRMED." },
-    amount: { type: "float", description: "Settled amount in DECIMAL units (from create-order)." },
-    currency: { type: "string", description: "ISO 4217 currency code." }
+    settlement_path: { type: "string", description: "Which billing path was used: 'monthly_settlement' or 'pay_per_call' (same tokens as billing_mode)." },
+    amount: { type: "float", description: "Settled amount in DECIMAL units." },
+    currency: { type: "string", description: "ISO 4217 currency code of the settlement." },
+    pay_status: { type: "int", description: "Upstream pay status (1 = paid). The order internal status is now PAID." },
+    settled_at: { type: "string", description: "ISO 8601 settlement timestamp. On idempotent replay, the original first settled_at is returned unchanged." }
   },
   example: {
     command: "agenzo-merchant-cli hotel-redaug pay-order --order-id hho_01KWC63Z5CD6CKBM33Q7SC2ZDT --idempotency-key pay-h1n2",
-    output_summary: 'Triggers supplier payOrder (confirmation/ticket issuance). Returns {order_id, settlement_path, status:"PAID", amount, currency}. Then poll get until CONFIRMED.'
+    output_summary: 'Settlement path is chosen server-side by billing_mode. monthly_settlement: deducts from the credit account, confirms with the supplier. Returns {order_id, settlement_path:"monthly_settlement", amount, currency, pay_status:1, settled_at}. Order becomes PAID. For pay_per_call the user must have already paid via EVO using the order_id as the merchantTransID; the same command settles it (settlement_path:"pay_per_call").'
   },
   error_recovery: {
-    INVALID_ORDER_STATE: "The order is not in a payable state (it may already be confirmed, cancelled, or missing auth). Check status via get; do NOT retry pay-order.",
+    PAYMENT_NOT_COMPLETED: "pay_per_call only: EVO has not yet confirmed the payment for this order_id. Retry with the SAME idempotency-key after a delay, or use --watch to poll automatically until PAID.",
+    PAYMENT_NOT_FOUND: "No EVO transaction found for this order_id. Confirm the user paid via EVO using the order_id as the merchantTransID; do NOT retry blindly.",
+    PAYMENT_AMOUNT_MISMATCH: "The EVO-confirmed amount/currency does not match the order. The user must pay the exact order amount in the exact currency under the order_id. Do NOT retry until corrected.",
+    PAYMENT_QUERY_FAILED: "EVO gateway query failed (transport/timeout). Retry once after ~5s with the SAME idempotency-key.",
+    BILLING_MODE_MISMATCH: "The order billing_mode is not a recognized settlement mode (only monthly_settlement and pay_per_call are valid). Check the developer billing_mode; do NOT retry blindly.",
+    INVALID_ORDER_STATE: "The order is not in AWAITING_PAYMENT (it may already be PAID or CANCELLED). Check status via get; do NOT retry pay-order.",
     ORDER_NOT_FOUND: "No order for this --order-id. Verify it is the order_id returned by create-order. Do NOT retry.",
-    UPSTREAM_ERROR: "Transient upstream error during supplier payOrder. Retry once after ~5s with the SAME idempotency-key, then poll get to check whether the confirmation actually took effect.",
+    ACCOUNT_INSUFFICIENT_BALANCE: "Settlement credit is insufficient (check via admin-cli accounts get). Direct the user to top up offline.",
+    ACCOUNT_NOT_FOUND: "Developer has no settlement account. Direct the user to complete contract signing.",
+    ACCOUNT_SUSPENDED: "The settlement account is suspended. Direct the user to contact support; do NOT retry.",
+    PAYORDER_FAILED: "Upstream payOrder failed after a successful deduction; the deduction was reversed and the order stays AWAITING_PAYMENT. Retry with the SAME idempotency-key after a delay.",
+    PAYORDER_FAILED_AFTER_PAYMENT: "EVO payment confirmed but upstream payOrder failed. The order is recoverable (the EVO payment under the order_id is preserved). Contact support for reconciliation; do NOT retry automatically.",
     PARAM_IDEMPOTENCY_KEY_REQUIRED: "Add a unique --idempotency-key and retry.",
     PARAM_IDEMPOTENCY_KEY_CONFLICT: "Same idempotency-key used with different parameters. Use the original parameters, or generate a NEW key."
   }
@@ -1736,6 +1743,69 @@ var hotelDetailSchema = {
     PARAM_INVALID: "Ensure --hotel-id is a non-empty string, then retry."
   }
 };
+var ORDERS_NOUN = "orders";
+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.',
+  flags: {
+    "order-type": { type: "string", required: false, description: "Filter by provider: ride | hotel" },
+    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" }
+  },
+  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`.",
+      items: {
+        order_id: { type: "string", description: "Order id (rio_... for ride, hho_... for hotel). Pass to `orders get`." },
+        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)" },
+        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" }
+  },
+  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`."
+  },
+  error_recovery: {
+    INVALID_REQUEST: "The --status value is not one of PENDING/CONFIRMED/COMPLETED/CANCELLED/FAILED. Fix and retry.",
+    INTERNAL_ERROR: "Transient backend error. Retry once after a short delay.",
+    PARAM_INVALID: "Ensure --page / --page-size are positive integers, 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.",
+  flags: {
+    "order-id": { type: "string", required: true, description: "Order id from `orders list` (rio_... for ride, hho_... for hotel)" }
+  },
+  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."
+    }
+  },
+  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)."
+  },
+  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.",
+    INTERNAL_ERROR: "The order's provider detail lookup is temporarily unavailable. Retry once after a short delay."
+  }
+};
 
 // src/ride-elife/quote.ts
 function need(value, flag) {
@@ -2285,7 +2355,9 @@ var SERVICE_REGISTRY = [
     },
     workflow: ["quote", "book", "get (poll for status)", "cancel (optional)"],
     since: "2026-06-01",
-    discovery: { help_command: "agenzo-merchant-cli ride-elife --help" }
+    discovery: {
+      help_command: "agenzo-merchant-cli ride-elife --help"
+    }
   },
   {
     service_id: "svc_01J0HT5REDAUG0001",
@@ -2337,7 +2409,9 @@ var SERVICE_REGISTRY = [
       "cancel / checkout (optional)"
     ],
     since: "2026-06-25",
-    discovery: { help_command: "agenzo-merchant-cli hotel-redaug --help" }
+    discovery: {
+      help_command: "agenzo-merchant-cli hotel-redaug --help"
+    }
   }
 ];
 function findService(serviceId) {
@@ -2433,78 +2507,30 @@ function registerServicesListCommand(parent, deps) {
 }
 
 // src/services/get.ts
-function buildVerbsSummary(data) {
-  const verbs = Array.isArray(data.verbs) ? data.verbs : [];
-  const verbDescriptions = data.verb_descriptions ?? {};
-  const schema = data.schema_content;
-  const schemaVerbs = schema?.verbs;
-  return verbs.map((verb) => {
-    const item = {
-      verb,
-      description: verbDescriptions[verb] ?? String(schemaVerbs?.[verb]?.description ?? "")
-    };
-    const annotations = schemaVerbs?.[verb]?.annotations;
-    if (annotations) item.annotations = annotations;
-    return item;
-  });
-}
-function toServiceLayerView(data) {
-  const schema = data.schema_content;
-  const view = {
-    service_id: data.service_id,
-    cli_noun: data.cli_noun,
-    category: data.category,
-    name: data.name,
-    summary: data.description ?? schema?.summary,
-    status: data.status ?? "available",
-    provider: data.provider,
-    version: data.version
-  };
-  if (schema?.selection_hints) view.selection_hints = schema.selection_hints;
-  const discovery = data.discovery;
-  view.schema_ref = schema?.schema_ref ?? {
-    help_command: discovery?.help_command,
-    ...discovery?.schema_url ? { schema_url: discovery.schema_url } : {}
-  };
-  if (schema?.conventions) view.conventions = schema.conventions;
-  if (schema?.workflow) {
-    view.workflow = schema.workflow;
-  } else if (Array.isArray(data.workflow)) {
-    view.workflow = { description: data.workflow.join(" \u2192 ") };
-  }
-  view.verbs_summary = buildVerbsSummary(data);
-  if (schema?.cross_service_recovery) view.cross_service_recovery = schema.cross_service_recovery;
-  return view;
-}
 function formatServiceGet(s) {
   const lines = [
     ["Service ID", String(s.service_id ?? "")],
-    ["CLI Noun", String(s.cli_noun ?? "")],
-    ["Category", String(s.category ?? "")],
     ["Name", String(s.name ?? "")],
-    ["Summary", String(s.summary ?? "")],
-    ["Status", String(s.status ?? "")],
+    ["Description", String(s.description ?? s.summary ?? "")],
+    ["Category", String(s.category ?? "")],
+    ["Version", String(s.version ?? "")],
     ["Provider", String(s.provider ?? "")],
-    ["Version", String(s.version ?? "")]
+    ["CLI Noun", String(s.cli_noun ?? "")],
+    ["Verbs", Array.isArray(s.verbs) ? s.verbs.join(", ") : ""]
   ];
-  const block = Formatter.keyValue(lines);
-  const sections = [];
-  for (const key of [
-    "selection_hints",
-    "schema_ref",
-    "conventions",
-    "workflow",
-    "verbs_summary",
-    "cross_service_recovery"
-  ]) {
-    if (s[key] !== void 0) {
-      sections.push(`${key}:
-${JSON.stringify(s[key], null, 2)}`);
-    }
+  if (Array.isArray(s.workflow) && s.workflow.length > 0) {
+    lines.push(["Workflow", s.workflow.join(" \u2192 ")]);
   }
-  return sections.length > 0 ? `${block}
+  const block = Formatter.keyValue(lines);
+  const verbDescriptions = s.verb_descriptions;
+  if (verbDescriptions && Object.keys(verbDescriptions).length > 0) {
+    const detail = Object.entries(verbDescriptions).map(([verb, desc]) => `  ${verb}: ${desc}`).join("\n");
+    return `${block}
 
-${sections.join("\n\n")}` : block;
+Verb descriptions:
+${detail}`;
+  }
+  return block;
 }
 function gateCapability(data, localCaps) {
   const noun = String(data.cli_noun ?? "");
@@ -2525,7 +2551,7 @@ function gateCapability(data, localCaps) {
   return out;
 }
 function registerServiceGetCommand(parent, deps) {
-  const cmd = parent.command("get <service-id>").description("Retrieve a single merchant service (service-layer view: workflow + conventions + verbs_summary)").option("--api-key <key>", "API Key for authentication (X-Api-Key)");
+  const cmd = parent.command("get <service-id>").description("Retrieve a single merchant service by id (includes full schema)").option("--api-key <key>", "API Key for authentication (X-Api-Key)");
   cmd.action(async (serviceId) => {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
@@ -2554,7 +2580,7 @@ function registerServiceGetCommand(parent, deps) {
         `Service '${serviceId}' is not available in this CLI. Run "services list" to see available services.`
       );
     }
-    const resolved = toServiceLayerView(data);
+    const resolved = data;
     const configManager = new ConfigManager();
     const commandResult = {
       data: resolved,
@@ -2564,6 +2590,105 @@ function registerServiceGetCommand(parent, deps) {
   });
 }
 
+// src/orders/list.ts
+var DEFAULT_PAGE2 = "1";
+var DEFAULT_PAGE_SIZE2 = "20";
+function positiveInt2(value, flag) {
+  const n = Number(value);
+  if (!Number.isFinite(n) || !Number.isInteger(n) || n < 1) {
+    throw new CliError("PARAM_INVALID", `--${flag} must be a positive integer.`);
+  }
+  return String(n);
+}
+function formatOrders2(data) {
+  const orders = data.orders ?? [];
+  if (orders.length === 0) {
+    return Formatter.status("info", "No orders found");
+  }
+  const headers = ["Order ID", "Type", "Status", "Amount", "Currency"];
+  const rows = orders.map((o) => [
+    String(o.order_id ?? "-"),
+    String(o.order_type ?? "-"),
+    String(o.status ?? "-"),
+    String(o.amount ?? "-"),
+    String(o.currency ?? "-")
+  ]);
+  const summary = [
+    ["Total", String(data.total ?? "-")],
+    ["Page", String(data.page ?? "-")],
+    ["Page size", String(data.page_size ?? "-")]
+  ];
+  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);
+  attachSchemaHelp(cmd, unifiedOrdersListSchema);
+  cmd.action(async () => {
+    const opts = cmd.optsWithGlobals();
+    const format = resolveFormat(opts.format);
+    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
+      message: "API Key:",
+      type: "password"
+    });
+    const params = {
+      page: positiveInt2(opts.page ?? DEFAULT_PAGE2, "page"),
+      page_size: positiveInt2(opts.pageSize ?? DEFAULT_PAGE_SIZE2, "page-size")
+    };
+    if (opts.orderType !== void 0) params.order_type = opts.orderType;
+    if (opts.status !== void 0) params.status = opts.status;
+    const spinner = format === "json" ? null : createSpinner("Fetching orders...");
+    const result = await deps.apiClient.get(
+      "/orders",
+      { type: "api-key", key: apiKey },
+      params
+    );
+    spinner?.stop();
+    if (!result.success) {
+      throw CliError.fromApi(result, { auth: "api-key" });
+    }
+    const data = result.data;
+    const configManager = new ConfigManager();
+    const commandResult = {
+      data,
+      text: () => formatOrders2(data)
+    };
+    await renderWithContext(commandResult, { format }, configManager);
+  });
+}
+
+// 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_...)");
+  attachSchemaHelp(cmd, unifiedOrdersGetSchema);
+  cmd.action(async () => {
+    const opts = cmd.optsWithGlobals();
+    const format = resolveFormat(opts.format);
+    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
+      message: "API Key:",
+      type: "password"
+    });
+    const spinner = format === "json" ? null : createSpinner("Fetching order...");
+    const result = await deps.apiClient.get(
+      `/orders/${encodeURIComponent(opts.orderId)}`,
+      { type: "api-key", key: apiKey }
+    );
+    spinner?.stop();
+    if (!result.success) {
+      throw CliError.fromApi(result, { auth: "api-key" });
+    }
+    const data = result.data;
+    const configManager = new ConfigManager();
+    const commandResult = {
+      data,
+      text: () => Formatter.keyValue(
+        Object.entries(data).map(([k, v]) => [k, typeof v === "object" ? JSON.stringify(v) : String(v)])
+      )
+    };
+    await renderWithContext(commandResult, { format }, configManager);
+  });
+}
+
 // src/hotel-redaug/search.ts
 function need5(value, flag) {
   if (value === void 0) {
@@ -2585,7 +2710,7 @@ function coord(value, flag, min, max) {
   }
   return n;
 }
-function positiveInt2(value, flag) {
+function positiveInt3(value, flag) {
   const n = num3(value, flag);
   if (!Number.isInteger(n) || n <= 0) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a positive integer.`);
@@ -2662,8 +2787,8 @@ function registerHotelSearchCommand(parent, deps) {
     if (!(checkOut > checkIn)) {
       throw new CliError("PARAM_INVALID", "--check-out must be strictly after --check-in.");
     }
-    const page = positiveInt2(opts.page, "page");
-    const pageSize = positiveInt2(opts.pageSize, "page-size");
+    const page = positiveInt3(opts.page, "page");
+    const pageSize = positiveInt3(opts.pageSize, "page-size");
     const body = {};
     if (hasDestination) {
       body.destination_id = need5(opts.destinationId, "destination-id");
@@ -2861,15 +2986,19 @@ function formatCreateOrder(data) {
     const rows = rooms.map((r) => [String(r.room_index ?? "-"), String(r.guest_name ?? "-")]);
     out.push("", Formatter.table(headers, rows));
   }
+  out.push(
+    "",
+    Formatter.status(
+      "info",
+      `Order created with status AWAITING_PAYMENT \u2014 proceed with 'hotel-redaug pay-order --order-id ${data.order_id ?? "<order_id>"}' to settle.`
+    )
+  );
   return out.join("\n");
 }
 function registerHotelCreateOrderCommand(parent, deps) {
-  const cmd = parent.command("create-order").description("Create AND pay for a hotel order in one call (billing path decided server-side by billing_mode)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--product-token <token>", "Chosen rate token from quote (rates[].product_token)").option("--total-amount <amount>", "Total stay price in decimal currency units (not cents)").option("--currency <currency>", "ISO 4217 currency code from the chosen rate").option("--price-items <json>", "Per-night price breakdown JSON array (copied verbatim from quote)").option("--check-in <date>", "Check-in date (YYYY-MM-DD, match quote)").option("--check-out <date>", "Check-out date (YYYY-MM-DD, strictly after check-in)").option("--room-num <n>", "Number of rooms (match quote)", "1").option("--adults <n>", "Adults per room (match quote)", "2").option("--children <n>", "Children per room (match quote)", "0").option("--nationality <code>", "Guest nationality (ISO country code)", "CN").option("--guest-name <name>", "Primary guest name").option("--contact-name <name>", "Booking contact name (may equal guest-name)").option("--contact-phone <phone>", "Booking contact phone number (digits)").option("--contact-country-code <code>", "Phone country calling code without '+'", "86").option("--contact-email <email>", "Booking contact email").option("--arrive-time <time>", "Expected arrival time (HH:mm, hotel local time)").option("--special-requests <text>", "Free-text special requests (non-binding)").option(
-    "--payment-method-id <id>",
-    "pay_per_call only: charge this SPECIFIC already-bound card instead of the platform auto-selected one"
-  ).option(
+  const cmd = parent.command("create-order").description("Create a hotel order without charging (lock inventory, await payment)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--product-token <token>", "Chosen rate token from quote (rates[].product_token)").option("--total-amount <amount>", "Total stay price in decimal currency units (not cents)").option("--currency <currency>", "ISO 4217 currency code from the chosen rate").option("--price-items <json>", "Per-night price breakdown JSON array (copied verbatim from quote)").option("--check-in <date>", "Check-in date (YYYY-MM-DD, match quote)").option("--check-out <date>", "Check-out date (YYYY-MM-DD, strictly after check-in)").option("--room-num <n>", "Number of rooms (match quote)", "1").option("--adults <n>", "Adults per room (match quote)", "2").option("--children <n>", "Children per room (match quote)", "0").option("--nationality <code>", "Guest nationality (ISO country code)", "CN").option("--guest-name <name>", "Primary guest name").option("--contact-name <name>", "Booking contact name (may equal guest-name)").option("--contact-phone <phone>", "Booking contact phone number (digits)").option("--contact-country-code <code>", "Phone country calling code without '+'", "86").option("--contact-email <email>", "Booking contact email").option("--arrive-time <time>", "Expected arrival time (HH:mm, hotel local time)").option("--special-requests <text>", "Free-text special requests (non-binding)").option("--hotel-name <name>", "Hotel name (display-only, stored for order summary)").option(
     "--idempotency-key <key>",
-    "Idempotency key forwarded verbatim as the Idempotency-Key header (covers both order creation AND payment)"
+    "Idempotency key forwarded verbatim as the Idempotency-Key header"
   );
   attachSchemaHelp(cmd, hotelCreateOrderSchema);
   cmd.action(async () => {
@@ -2911,10 +3040,10 @@ function registerHotelCreateOrderCommand(parent, deps) {
     if (opts.contactEmail !== void 0) body.contact_email = opts.contactEmail;
     if (opts.arriveTime !== void 0) body.arrive_time = opts.arriveTime;
     if (opts.specialRequests !== void 0) body.special_requests = opts.specialRequests;
-    if (opts.paymentMethodId !== void 0) body.payment_method_id = opts.paymentMethodId;
+    if (opts.hotelName !== void 0) body.hotel_name = opts.hotelName;
     if (!isYes) {
       const confirmed = await confirm3({
-        message: `Create and pay for this hotel order: ${totalAmount} ${currency} (check-in ${checkIn}, check-out ${checkOut})? This locks the rate AND charges the amount immediately.`,
+        message: `Create this hotel order for ${totalAmount} ${currency} (check-in ${checkIn}, check-out ${checkOut})? This locks the rate but does NOT charge anything yet.`,
         default: false
       });
       if (!confirmed) {
@@ -3073,20 +3202,23 @@ var DEFAULT_PAY_WATCH_TIMEOUT_SECONDS = 300;
 function formatPayOrder(data) {
   const lines = [
     ["Order ID", String(data.order_id ?? "-")],
-    ["Order status", String(data.status ?? "-")]
+    ["Order status", String(data.order_status ?? "-")]
   ];
   if (data.settlement_path) lines.push(["Settlement path", String(data.settlement_path)]);
-  if (data.amount != null && data.currency) {
-    lines.push(["Amount", `${data.amount} ${data.currency}`]);
+  if (data.pay_status) lines.push(["Pay status", String(data.pay_status)]);
+  if (data.total_amount != null && data.currency) {
+    lines.push(["Amount", `${data.total_amount} ${data.currency}`]);
   }
+  if (data.billing_entry_id) lines.push(["Billing entry", String(data.billing_entry_id)]);
+  if (data.merchant_trans_id) lines.push(["Merchant trans ID", String(data.merchant_trans_id)]);
   return Formatter.keyValue(lines);
 }
 function isPaymentTerminal(record) {
-  const status = record.status;
+  const status = record.order_status;
   return status === "PAID";
 }
 function registerHotelPayOrderCommand(parent, deps) {
-  const cmd = parent.command("pay-order").description("Trigger supplier confirmation for a paid hotel order (upstream payOrder)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-id <id>", "Order ID to pay (from create-order response)").option(
+  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(
     "--idempotency-key <key>",
     "Idempotency key forwarded verbatim as the Idempotency-Key header"
   ).option("--watch", "Poll until PAID or timeout (NDJSON output)", false).option(
@@ -3121,11 +3253,11 @@ function registerHotelPayOrderCommand(parent, deps) {
     const body = {};
     if (!isYes) {
       const confirmed = await confirm4({
-        message: `Confirm hotel order ${orderId} with the supplier? (Payment was already settled in create-order; this triggers supplier confirmation.)`,
-        default: true
+        message: `Settle hotel order ${orderId}? This moves money via the order's configured billing mode (monthly_settlement or pay_per_call).`,
+        default: false
       });
       if (!confirmed) {
-        throw new CliError("CLIENT_ABORTED", "Confirmation aborted by user.");
+        throw new CliError("CLIENT_ABORTED", "Payment aborted by user.");
       }
     }
     const path = `/hotel/${encodeURIComponent(orderId)}/pay`;
@@ -3168,7 +3300,19 @@ function registerHotelPayOrderCommand(parent, deps) {
             return;
           }
         } else {
-          throw CliError.fromApi(result, { auth: "api-key" });
+          const errorCode = result.code ?? result.errorCode;
+          const errorCodeStr = String(errorCode);
+          if (errorCodeStr === "PAYMENT_NOT_COMPLETED" || errorCodeStr === "1933") {
+            const errorLine = {
+              watch_status: "pending",
+              error_code: errorCodeStr === "1933" ? "PAYMENT_NOT_COMPLETED" : errorCodeStr,
+              message: result.errorMessage ?? "Payment not yet completed"
+            };
+            lastRecord = errorLine;
+            ndjsonWriteLine(errorLine);
+          } else {
+            throw CliError.fromApi(result, { auth: "api-key" });
+          }
         }
         if (Date.now() + watchInterval * 1e3 >= deadline) {
           const timeoutLine = {
@@ -3567,16 +3711,16 @@ function registerHotelGetCheckoutCommand(parent, deps) {
 }
 
 // src/hotel-redaug/list-orders.ts
-var DEFAULT_PAGE2 = "1";
-var DEFAULT_PAGE_SIZE2 = "20";
-function positiveInt3(value, flag) {
+var DEFAULT_PAGE3 = "1";
+var DEFAULT_PAGE_SIZE3 = "20";
+function positiveInt4(value, flag) {
   const n = Number(value);
   if (!Number.isFinite(n) || !Number.isInteger(n) || n < 1) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a positive integer.`);
   }
   return String(n);
 }
-function formatOrders2(data) {
+function formatOrders3(data) {
   const orders = data.orders ?? [];
   if (orders.length === 0) {
     return Formatter.status("info", "No hotel orders found");
@@ -3600,7 +3744,7 @@ function formatOrders2(data) {
 ${Formatter.keyValue(summary)}`;
 }
 function registerHotelListOrdersCommand(parent, deps) {
-  const cmd = parent.command("list-orders").description("List the developer's hotel orders with optional status filtering and pagination").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--status <status>", "Filter by order status (omitted entirely when absent \u2192 all statuses)").option("--page <page>", "Page number", DEFAULT_PAGE2).option("--page-size <size>", "Page size", DEFAULT_PAGE_SIZE2);
+  const cmd = parent.command("list-orders").description("List the developer's hotel orders with optional status filtering and pagination").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--status <status>", "Filter by order status (omitted entirely when absent \u2192 all statuses)").option("--page <page>", "Page number", DEFAULT_PAGE3).option("--page-size <size>", "Page size", DEFAULT_PAGE_SIZE3);
   attachSchemaHelp(cmd, hotelListOrdersSchema);
   cmd.action(async () => {
     const opts = cmd.optsWithGlobals();
@@ -3610,8 +3754,8 @@ function registerHotelListOrdersCommand(parent, deps) {
       type: "password"
     });
     const params = {
-      page: positiveInt3(opts.page ?? DEFAULT_PAGE2, "page"),
-      page_size: positiveInt3(opts.pageSize ?? DEFAULT_PAGE_SIZE2, "page-size")
+      page: positiveInt4(opts.page ?? DEFAULT_PAGE3, "page"),
+      page_size: positiveInt4(opts.pageSize ?? DEFAULT_PAGE_SIZE3, "page-size")
     };
     if (opts.status !== void 0) params.status = opts.status;
     const spinner = format === "json" ? null : createSpinner("Fetching orders...");
@@ -3628,7 +3772,7 @@ function registerHotelListOrdersCommand(parent, deps) {
     const configManager = new ConfigManager();
     const commandResult = {
       data,
-      text: () => formatOrders2(data)
+      text: () => formatOrders3(data)
     };
     await renderWithContext(commandResult, { format }, configManager);
   });
@@ -4182,7 +4326,31 @@ async function main() {
     const flag = thisCommand.opts().format;
     process.env.AGENZO_FORMAT = resolveFormat(flag);
   });
-  const rideCmd = program.command("ride-elife").description("Ride ordering (eLife)");
+  const rideCmd = program.command("ride-elife").description(
+    `Ride ordering (eLife) \u2014 quote a fare, book it, poll status, and cancel.
+
+Workflow (typical order):
+  1. quote        Get fare quotes between two points \u2192 vehicle_classes[] each with a quote_id
+  2. book         Book one vehicle_class using its quote_id \u2192 ride_id (write; needs --idempotency-key)
+  3. get          Poll ride status by --order-id=<ride_id> until terminal (or use --watch for NDJSON)
+  4. cancel       (optional) Cancel a ride by --order-id (write; may incur a fee)
+     list-orders  (standalone) List the developer's previous ride orders
+
+Key notes:
+  \u2022 Coordinates are NOT geocoded by the backend \u2014 supply --pickup-lat/lng and --dropoff-lat/lng.
+    book must repeat the SAME pickup/dropoff coordinates+names and pickup-time used in quote;
+    the quote_id does NOT carry them forward.
+  \u2022 quote_id from quote is opaque and provider-specific \u2014 pass it unchanged to book, never reuse
+    it across services.
+  \u2022 vehicle_class values are case-sensitive literals (Sedan / SUV / MPV-5 / MPV-7 / Van / Luxury /
+    Train) \u2014 pass back to book verbatim.
+  \u2022 --pickup-time is UTC epoch seconds or the literal "now"; convert the user's local time to UTC.
+  \u2022 All amounts are DECIMAL currency units (e.g. 42.50 = $42.50), never minor units (cents).
+  \u2022 Billing mode is decided server-side: pay_per_call needs a PAID --payment-order-id (from
+    payment-cli); monthly_settlement forbids it (settled against the developer's account).
+  \u2022 Write verbs (book / cancel) require --idempotency-key; reuse the SAME key when retrying the
+    same intent.`
+  );
   registerQuoteCommand(rideCmd, deps);
   registerBookCommand(rideCmd, deps);
   registerRideGetCommand(rideCmd, deps);
@@ -4191,6 +4359,11 @@ async function main() {
   const servicesCmd = program.command("services").description("Merchant service discovery");
   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.'
+  );
+  registerOrdersListCommand(ordersCmd, deps);
+  registerOrdersGetCommand(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.