@agenzo/merchant-cli 0.5.0 → 0.5.1

package/dist/index.js

@@ -41,15 +41,6 @@ var CODE_NUM = {
   QUOTE_EXPIRED: 4202,
   BOOKING_FAILED: 4203,
   CANCELLATION_NOT_ALLOWED: 4204,
-  PRICE_MISMATCH: 4205,
-  VEHICLE_CLASS_MISMATCH: 4206,
-  PAYMENT_METHOD_REQUIRED: 4207,
-  QUOTE_CACHE_UNAVAILABLE: 4208,
-  ARREARS_OUTSTANDING: 4209,
-  CONTACT_REQUIRED: 4210,
-  INVALID_PHONE: 4211,
-  SEAT_LIMIT_EXCEEDED: 4213,
-  RIDE_NOT_FOUND: 4212,
   NO_AVAILABILITY: 4301,
   PRICE_CHANGED: 4302,
   NAME_FORMAT_INVALID: 4303,
@@ -219,15 +210,6 @@ var STABLE_MESSAGE = {
   VEHICLE_UNAVAILABLE: "No vehicle is available for the requested trip. Please try a different time or class.",
   QUOTE_EXPIRED: "The quote has expired. Please request a new quote and retry.",
   BOOKING_FAILED: "The booking could not be completed. Please retry.",
-  PRICE_MISMATCH: "The price does not match the quote. Re-quote and use the exact amount from the quote response.",
-  VEHICLE_CLASS_MISMATCH: "The vehicle class does not match the quote. Use the vehicle class from the quote response.",
-  PAYMENT_METHOD_REQUIRED: "Pay-per-call billing requires an active payment method. Please add a card first.",
-  QUOTE_CACHE_UNAVAILABLE: "Quote cache is temporarily unavailable. Please request a new quote and retry.",
-  ARREARS_OUTSTANDING: "You have outstanding arrears. Please settle your balance before booking a new ride.",
-  CONTACT_REQUIRED: "Passenger contact information is required. Please provide a passenger name and phone number.",
-  INVALID_PHONE: "The passenger phone number is not valid. Please provide a valid international number.",
-  SEAT_LIMIT_EXCEEDED: "The number of child/infant/toddler seats exceeds the vehicle capacity. Reduce seats or choose a larger vehicle.",
-  RIDE_NOT_FOUND: "The ride order was not found or does not belong to you.",
   CANCELLATION_NOT_ALLOWED: "This order cannot be cancelled in its current state.",
   NO_AVAILABILITY: "No rooms available for the selected hotel and dates.",
   PRICE_CHANGED: "The price changed since the quote. Re-quote and confirm.",
@@ -1259,7 +1241,7 @@ var hotelCreateOrderSchema = {
   cli: CLI_NAME,
   noun: HOTEL_NOUN,
   verb: "create-order",
-  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",
+  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",
   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" },
@@ -1278,74 +1260,69 @@ 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 same order creation",
+      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",
       constraints: "1-128 chars [A-Za-z0-9_-]"
     }
   },
   response: {
-    order_id: { type: "string", description: "Our order reference (coOrderCode). Use as --order-id in pay-order / get / cancel." },
+    order_id: { type: "string", description: "Our order reference (coOrderCode). Use as --order-id in 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 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." }
+    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." }
   },
   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 AWAITING_PAYMENT (no charge). Use order_id as --order-id in pay-order to settle."
+    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."
   },
   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 the SAME 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.",
     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. Retry once after ~2s backoff with the SAME idempotency-key."
+    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."
   }
 };
 var hotelPayOrderSchema = {
   cli: CLI_NAME,
   noun: HOTEL_NOUN,
   verb: "pay-order",
-  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 "active_payment"). On success the order becomes PAID. Supports --watch to poll on PAYMENT_NOT_COMPLETED until PAID',
+  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",
   flags: {
-    "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." },
+    "order-id": { type: "string", required: true, description: "Order to confirm with the supplier (create-order.response.order_id)." },
     "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(order_id + attempt)) and reuse the SAME key when retrying the same payment",
+      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",
       constraints: "1-128 chars [A-Za-z0-9_-]"
     },
-    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: { type: "bool", required: false, default: false, description: "Retained for backward compatibility. 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: "Which billing path was used: 'monthly_settlement' or 'active_payment'." },
-    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." }
+    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." }
   },
   example: {
     command: "agenzo-merchant-cli hotel-redaug pay-order --order-id hho_01KWC63Z5CD6CKBM33Q7SC2ZDT --idempotency-key pay-h1n2",
-    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:"active_payment").'
+    output_summary: 'Triggers supplier payOrder (confirmation/ticket issuance). Returns {order_id, settlement_path, status:"PAID", amount, currency}. Then poll get until CONFIRMED.'
   },
   error_recovery: {
-    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.",
+    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.",
     ORDER_NOT_FOUND: "No order for this --order-id. Verify it is the order_id returned by create-order. Do NOT retry.",
-    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.",
+    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.",
     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."
   }
@@ -1759,69 +1736,6 @@ 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) {
@@ -2351,7 +2265,10 @@ function registerListOrdersCommand(parent, deps) {
 // src/services/registry.ts
 var SERVICE_REGISTRY = [
   {
-    service_id: "ride-elife",
+    // service_id 是平台级不透明内部引用（svc_ 前缀 + ULID），不进 Agent 日常拼的命令
+    // ——Agent 拼命令用的是 cli_noun="ride-elife"。与后端
+    // services/merchant_service/discovery/catalog.py 的 RIDE_ELIFE_SERVICE_ID 保持一致。
+    service_id: "svc_01KWTPBWDH5YZ52H717BFVWZA8",
     name: "Ride hailing (eLife)",
     description: "On-demand ride ordering: quote a fare, book it, poll status, and cancel.",
     category: "ride",
@@ -2516,30 +2433,78 @@ 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 ?? "")],
-    ["Name", String(s.name ?? "")],
-    ["Description", String(s.description ?? s.summary ?? "")],
+    ["CLI Noun", String(s.cli_noun ?? "")],
     ["Category", String(s.category ?? "")],
-    ["Version", String(s.version ?? "")],
+    ["Name", String(s.name ?? "")],
+    ["Summary", String(s.summary ?? "")],
+    ["Status", String(s.status ?? "")],
     ["Provider", String(s.provider ?? "")],
-    ["CLI Noun", String(s.cli_noun ?? "")],
-    ["Verbs", Array.isArray(s.verbs) ? s.verbs.join(", ") : ""]
+    ["Version", String(s.version ?? "")]
   ];
-  if (Array.isArray(s.workflow) && s.workflow.length > 0) {
-    lines.push(["Workflow", s.workflow.join(" \u2192 ")]);
-  }
   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}
-
-Verb descriptions:
-${detail}`;
+  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)}`);
+    }
   }
-  return block;
+  return sections.length > 0 ? `${block}
+
+${sections.join("\n\n")}` : block;
 }
 function gateCapability(data, localCaps) {
   const noun = String(data.cli_noun ?? "");
@@ -2560,7 +2525,7 @@ function gateCapability(data, localCaps) {
   return out;
 }
 function registerServiceGetCommand(parent, deps) {
-  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)");
+  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)");
   cmd.action(async (serviceId) => {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
@@ -2589,7 +2554,7 @@ function registerServiceGetCommand(parent, deps) {
         `Service '${serviceId}' is not available in this CLI. Run "services list" to see available services.`
       );
     }
-    const resolved = data;
+    const resolved = toServiceLayerView(data);
     const configManager = new ConfigManager();
     const commandResult = {
       data: resolved,
@@ -2599,105 +2564,6 @@ 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) {
@@ -2719,7 +2585,7 @@ function coord(value, flag, min, max) {
   }
   return n;
 }
-function positiveInt3(value, flag) {
+function positiveInt2(value, flag) {
   const n = num3(value, flag);
   if (!Number.isInteger(n) || n <= 0) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a positive integer.`);
@@ -2796,8 +2662,8 @@ function registerHotelSearchCommand(parent, deps) {
     if (!(checkOut > checkIn)) {
       throw new CliError("PARAM_INVALID", "--check-out must be strictly after --check-in.");
     }
-    const page = positiveInt3(opts.page, "page");
-    const pageSize = positiveInt3(opts.pageSize, "page-size");
+    const page = positiveInt2(opts.page, "page");
+    const pageSize = positiveInt2(opts.pageSize, "page-size");
     const body = {};
     if (hasDestination) {
       body.destination_id = need5(opts.destinationId, "destination-id");
@@ -2995,19 +2861,15 @@ 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 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(
+  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(
     "--idempotency-key <key>",
-    "Idempotency key forwarded verbatim as the Idempotency-Key header"
+    "Idempotency key forwarded verbatim as the Idempotency-Key header (covers both order creation AND payment)"
   );
   attachSchemaHelp(cmd, hotelCreateOrderSchema);
   cmd.action(async () => {
@@ -3049,10 +2911,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.hotelName !== void 0) body.hotel_name = opts.hotelName;
+    if (opts.paymentMethodId !== void 0) body.payment_method_id = opts.paymentMethodId;
     if (!isYes) {
       const confirmed = await confirm3({
-        message: `Create this hotel order for ${totalAmount} ${currency} (check-in ${checkIn}, check-out ${checkOut})? This locks the rate but does NOT charge anything yet.`,
+        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.`,
         default: false
       });
       if (!confirmed) {
@@ -3211,23 +3073,20 @@ var DEFAULT_PAY_WATCH_TIMEOUT_SECONDS = 300;
 function formatPayOrder(data) {
   const lines = [
     ["Order ID", String(data.order_id ?? "-")],
-    ["Order status", String(data.order_status ?? "-")]
+    ["Order status", String(data.status ?? "-")]
   ];
   if (data.settlement_path) lines.push(["Settlement path", String(data.settlement_path)]);
-  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.amount != null && data.currency) {
+    lines.push(["Amount", `${data.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.order_status;
+  const status = record.status;
   return status === "PAID";
 }
 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(
+  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(
     "--idempotency-key <key>",
     "Idempotency key forwarded verbatim as the Idempotency-Key header"
   ).option("--watch", "Poll until PAID or timeout (NDJSON output)", false).option(
@@ -3262,11 +3121,11 @@ function registerHotelPayOrderCommand(parent, deps) {
     const body = {};
     if (!isYes) {
       const confirmed = await confirm4({
-        message: `Settle hotel order ${orderId}? This moves money via the order's configured billing mode (monthly_settlement or pay_per_call).`,
-        default: false
+        message: `Confirm hotel order ${orderId} with the supplier? (Payment was already settled in create-order; this triggers supplier confirmation.)`,
+        default: true
       });
       if (!confirmed) {
-        throw new CliError("CLIENT_ABORTED", "Payment aborted by user.");
+        throw new CliError("CLIENT_ABORTED", "Confirmation aborted by user.");
       }
     }
     const path = `/hotel/${encodeURIComponent(orderId)}/pay`;
@@ -3309,19 +3168,7 @@ function registerHotelPayOrderCommand(parent, deps) {
             return;
           }
         } else {
-          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" });
-          }
+          throw CliError.fromApi(result, { auth: "api-key" });
         }
         if (Date.now() + watchInterval * 1e3 >= deadline) {
           const timeoutLine = {
@@ -3362,10 +3209,29 @@ function formatGetOrder2(data) {
   if (data.check_in) lines.push(["Check-in", String(data.check_in)]);
   if (data.check_out) lines.push(["Check-out", String(data.check_out)]);
   if (data.total_amount !== void 0 && data.total_amount !== null) {
-    lines.push(["Total amount", String(data.total_amount)]);
+    const currency = data.currency ? ` ${data.currency}` : "";
+    lines.push(["Total amount", `${String(data.total_amount)}${currency}`]);
+  }
+  if (data.settlement_path) lines.push(["Settlement path", String(data.settlement_path)]);
+  if (data.rooms && data.rooms.length > 0) {
+    lines.push([
+      "Rooms",
+      data.rooms.map((r) => `${r.room_index}:${r.guest_name}`).join(", ")
+    ]);
+  }
+  if (data.room_num !== void 0 && data.room_num !== null) {
+    lines.push(["Rooms booked", String(data.room_num)]);
+  }
+  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}`]);
   }
+  if (data.arrive_time) lines.push(["Arrive time", String(data.arrive_time)]);
+  if (data.special_requests) lines.push(["Special requests", String(data.special_requests)]);
   if (data.channel_state) lines.push(["Channel state", String(data.channel_state)]);
-  if (data.source) lines.push(["Source", String(data.source)]);
+  if (data.created_at) lines.push(["Created at", String(data.created_at)]);
+  if (data.updated_at) lines.push(["Updated at", String(data.updated_at)]);
   return Formatter.keyValue(lines);
 }
 function registerHotelGetCommand(parent, deps) {
@@ -3701,16 +3567,16 @@ function registerHotelGetCheckoutCommand(parent, deps) {
 }
 
 // src/hotel-redaug/list-orders.ts
-var DEFAULT_PAGE3 = "1";
-var DEFAULT_PAGE_SIZE3 = "20";
-function positiveInt4(value, flag) {
+var DEFAULT_PAGE2 = "1";
+var DEFAULT_PAGE_SIZE2 = "20";
+function positiveInt3(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 formatOrders3(data) {
+function formatOrders2(data) {
   const orders = data.orders ?? [];
   if (orders.length === 0) {
     return Formatter.status("info", "No hotel orders found");
@@ -3734,7 +3600,7 @@ function formatOrders3(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_PAGE3).option("--page-size <size>", "Page size", DEFAULT_PAGE_SIZE3);
+  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);
   attachSchemaHelp(cmd, hotelListOrdersSchema);
   cmd.action(async () => {
     const opts = cmd.optsWithGlobals();
@@ -3744,8 +3610,8 @@ function registerHotelListOrdersCommand(parent, deps) {
       type: "password"
     });
     const params = {
-      page: positiveInt4(opts.page ?? DEFAULT_PAGE3, "page"),
-      page_size: positiveInt4(opts.pageSize ?? DEFAULT_PAGE_SIZE3, "page-size")
+      page: positiveInt3(opts.page ?? DEFAULT_PAGE2, "page"),
+      page_size: positiveInt3(opts.pageSize ?? DEFAULT_PAGE_SIZE2, "page-size")
     };
     if (opts.status !== void 0) params.status = opts.status;
     const spinner = format === "json" ? null : createSpinner("Fetching orders...");
@@ -3762,7 +3628,7 @@ function registerHotelListOrdersCommand(parent, deps) {
     const configManager = new ConfigManager();
     const commandResult = {
       data,
-      text: () => formatOrders3(data)
+      text: () => formatOrders2(data)
     };
     await renderWithContext(commandResult, { format }, configManager);
   });
@@ -4134,7 +4000,7 @@ run \`hotel-redaug <verb> --help\`.
 - API key with merchant scope
 - Two billing modes supported (set on the developer, not chosen per-call):
   - **monthly_settlement**: developer has a settlement account with sufficient balance
-  - **pay_per_call**: developer collects payment from their end-user via EVO; the user pays using the create-order \`order_id\` as the EVO merchantTransID, and the platform verifies by querying EVO for that order_id (the pay-order response reports settlement_path "active_payment")
+  - **pay_per_call**: developer collects payment from their end-user via EVO; the user pays using the create-order \`order_id\` as the EVO merchantTransID, and the platform verifies by querying EVO for that order_id (the pay-order response reports settlement_path "pay_per_call")
 - BILLING_MODE_MISMATCH means the order billing_mode is not one of the two modes above
 - Pass --api-key <key> --format json on every call; add --yes on writes
 
@@ -4179,32 +4045,40 @@ run \`hotel-redaug <verb> --help\`.
    - Generate a unique idempotency-key
    - Response \u2192 save order_id + fc_order_code + total_amount + currency
    - Order status: AWAITING_PAYMENT (no money charged yet)
-   - FOR pay_per_call: tell the user to pay total_amount+currency via EVO
-     USING THIS order_id as the EVO merchantTransID. The verification in step 6 works by
-     querying EVO for exactly this order_id, so paying under any other id will not settle.
 
-6. Pay order (settle the locked order) \u2014 MUST confirm with the user before calling this
+6. BRANCH ON BILLING_MODE \u2014 decide THIS before calling pay-order, not inside it
+   - You (the developer/Agent) know your own billing_mode; the order does not expose it.
+   a) monthly_settlement \u2192 skip straight to step 7 (pay-order). Nothing to do here.
+   b) pay_per_call \u2192 STOP. Do NOT call pay-order yet.
+      - Drive YOUR OWN EVO payment integration now, using the order_id from step 5 AS THE
+        EVO merchantTransID (this is the id you pass to your EVO payment call \u2014 not a new
+        or random id).
+      - Wait for the end-user to actually complete that EVO payment for total_amount+currency.
+      - Only once EVO shows the payment as complete, proceed to step 7 \u2014 pay-order is what
+        tells the platform "go verify and settle this", it does NOT itself collect payment.
+
+7. Pay order (settle the locked order) \u2014 MUST confirm with the user before calling this
    - Before calling: show the user total_amount + currency from create-order and which
      billing path applies, and get explicit go-ahead \u2014 pay-order is the step that actually
-     moves money
+     moves money (for pay_per_call, confirm the EVO payment from step 6 was completed first)
    - pay-order --order-id <order_id from create-order>   (that's the only identifier needed)
    - Billing path determined server-side by developer's billing_mode:
      a) monthly_settlement:
         - Platform deducts from settlement account \u2192 calls upstream payOrder
      b) pay_per_call:
-        - The user must have ALREADY paid via EVO using the order_id as the EVO
-          merchantTransID (see create-order step 5). Just call pay-order --order-id <id>;
-          the platform queries EVO for that order_id and verifies exact amount/currency.
+        - Requires step 6 to have already happened (user paid via EVO under this order_id).
+          Calling pay-order now just makes the platform query EVO for that order_id and
+          verify exact amount/currency \u2014 it does NOT initiate the EVO payment itself.
           There is no merchant-transaction-id flag: the EVO key IS the order_id, so a
           foreign already-paid EVO transaction cannot be substituted.
         - If EVO not yet confirmed \u2192 PAYMENT_NOT_COMPLETED; use --watch to poll
    - On success \u2192 order status becomes PAID
 
-7. Confirm (upstream confirmation is async)
+8. Confirm (upstream confirmation is async)
    - Poll get --order-id until CONFIRMED (success) or CANCELLED (failed)
    - Do not report success before CONFIRMED
 
-8. Post-booking (only when the user asks)
+9. Post-booking (only when the user asks)
    - cancel: order_id + fc_order_code + reason
    - checkout: partial leave-early \u2192 then poll get-checkout with task_order_code
    - list-orders: view all orders
@@ -4215,8 +4089,9 @@ run \`hotel-redaug <verb> --help\`.
 - price_items     : quote \u2192 create-order  (JSON array; copy exactly)
 - order_id        : create-order \u2192 pay-order / get / cancel
 - fc_order_code   : create-order \u2192 cancel / checkout
-- order_id (again): for pay_per_call it IS the EVO merchantTransID \u2014 the user pays via
-  EVO under the order_id; pay-order takes no separate merchant-transaction-id
+- order_id (again): for pay_per_call it IS the EVO merchantTransID \u2014 YOU (the developer/Agent)
+  use it to drive your own EVO payment call BEFORE pay-order (see step 6); pay-order itself
+  takes no separate merchant-transaction-id, it only verifies the payment already made
 - task_order_code : checkout \u2192 get-checkout
 
 ## Billing modes (chosen server-side by billing_mode)
@@ -4227,15 +4102,18 @@ routes purely by the order's billing_mode:
 | Developer billing_mode | Behavior |
 |------------------------|----------|
 | monthly_settlement     | Deducts settlement balance \u2192 payOrder |
-| pay_per_call           | Platform queries EVO for the order_id \u2192 verify exact amount/currency \u2192 payOrder (response settlement_path is "active_payment") |
+| pay_per_call           | Platform queries EVO for the order_id \u2192 verify exact amount/currency \u2192 payOrder (response settlement_path is "pay_per_call") |
 | anything else          | ERROR: BILLING_MODE_MISMATCH (only the two modes above are valid) |
 
 ## pay_per_call flow \u2014 the EVO merchantTransID IS the order_id
 
 1. create-order returns order_id + total_amount + currency (no EVO credentials in response)
-2. User pays total_amount+currency via EVO, USING the order_id as the EVO merchantTransID
-   (the shared EVO parameters are onboarded separately, out of band)
-3. Agent calls pay-order --order-id <order_id>   (no other identifier)
+2. YOU drive your own EVO payment integration now, passing the order_id as the EVO
+   merchantTransID, and get the user to pay total_amount+currency
+   (the shared EVO parameters are onboarded separately, out of band \u2014 pay-order does not do
+   this step for you)
+3. ONLY once that EVO payment is complete, call pay-order --order-id <order_id>
+   (no other identifier)
 4. Platform queries EVO for that order_id: paid + exact amount/currency match \u2192 payOrder \u2192 PAID
 5. If not yet paid \u2192 PAYMENT_NOT_COMPLETED; use --watch to auto-poll
 6. Why order_id (not an arbitrary id): it binds the payment to this exact order, so a caller
@@ -4252,7 +4130,7 @@ routes purely by the order's billing_mode:
 - IMPORTANT: --yes only skips this CLI's own interactive TTY prompt (needed because the Agent
   runs non-interactively). It is NOT a substitute for showing the user the hotel/rate/price and
   getting their decision in the chat UI. Passing --yes does not remove the confirmation steps in
-  step 3/4 (choose hotel + rate) or step 6 (confirm before pay-order) above.
+  step 3/4 (choose hotel + rate) or step 7 (confirm before pay-order) above.
 - After a cancel call returns successfully (including the cancel_status='cancel_pending' shape),
   do NOT call cancel again for the same order \u2014 poll get instead. A pending acknowledgement is
   success, not failure.
@@ -4313,11 +4191,6 @@ 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.