@agenzo/merchant-cli 0.9.3 → 0.9.5

package/dist/index.js

@@ -62,6 +62,7 @@ var CODE_NUM = {
   BOOKING_RESTRICTED: 4310,
   PAYORDER_FAILED: 4311,
   PAYORDER_FAILED_AFTER_PAYMENT: 4312,
+  OFFER_UNAVAILABLE: 4401,
   RATE_LIMITED: 5001,
   UPSTREAM_ERROR: 5101,
   INTERNAL_ERROR: 5201,
@@ -249,6 +250,7 @@ var STABLE_MESSAGE = {
   BOOKING_RESTRICTED: "This room has a booking condition that your request doesn't meet. Please check the room's booking rules and adjust your request.",
   PAYORDER_FAILED: "The hotel order was created, but payment failed. Retry payment for the existing order.",
   PAYORDER_FAILED_AFTER_PAYMENT: "Payment was received, but hotel confirmation failed. Contact support for reconciliation.",
+  OFFER_UNAVAILABLE: "The selected flight is no longer available. Please search again and pick another flight.",
   NOT_IMPLEMENTED: "This operation is not implemented yet."
 };
 function errorDetailLines(envelope) {
@@ -848,6 +850,12 @@ function render(result, opts) {
   process.stdout.write(`${result.text()}
 `);
 }
+function notify(format, type, message) {
+  if (format === "json") {
+    return;
+  }
+  console.error(Formatter.status(type, message));
+}
 async function renderWithContext(result, opts, configManager) {
   if (opts.format !== "json") {
     render(result, opts);
@@ -1432,6 +1440,123 @@ var rideTripStatusSchema = {
     BOOKING_FAILED: "Transient upstream error. Retry once after 5s, or fall back to `ride-elife get` for whole-ride status."
   }
 };
+var RIDE_ORDER_ID_FLAG = {
+  type: "string",
+  required: true,
+  description: "The numeric ride_id returned by book (NOT the rio_... order_id)"
+};
+var CALLBACK_IDEMPOTENCY_FLAG = {
+  type: "string",
+  required: true,
+  description: "Unique key (1-128 chars [A-Za-z0-9_-]) forwarded verbatim as the Idempotency-Key header; never auto-generated"
+};
+var CALLBACK_SUBSCRIPTION_FLAGS = {
+  "callback-url": { type: "string", required: true, description: "https URL that receives status events; internal addresses are rejected by the platform" },
+  adapter: { type: "string", required: false, default: "techtanium_v1", description: "Outbound event shape" },
+  "signature-mode": { type: "string", required: false, default: "off", description: "off / optional / required" },
+  "callback-api-key": { type: "string", required: false, description: "API key sent to your endpoint; omit to keep the stored one (never echoed back)" },
+  "rotate-secret": { type: "bool", required: false, default: false, description: "Issue a new signing secret; the old one stops verifying" },
+  "idempotency-key": CALLBACK_IDEMPOTENCY_FLAG
+};
+var CALLBACK_SUBSCRIPTION_RESPONSE = {
+  callback_url: { type: "string", description: "Registered destination" },
+  adapter: { type: "string", description: "Outbound event shape" },
+  signature_mode: { type: "string", description: "off / optional / required" },
+  status: { type: "string", description: "Registration status" },
+  callback_secret: { type: "string", description: "Signing secret \u2014 present ONLY in the set response that issued it; store it, it cannot be read back" }
+};
+var CALLBACK_ERRORS = {
+  RIDE_NOT_FOUND: "The ride is not yours or does not exist; check the ride_id from book/list-orders.",
+  PARAM_INVALID: "Fix the flag named in the message (https URL, signature-mode, ranges) and retry.",
+  PARAM_IDEMPOTENCY_KEY_REQUIRED: "Supply --idempotency-key (1-128 chars [A-Za-z0-9_-]); the CLI never generates one under --yes."
+};
+var rideCallbackSetSchema = {
+  cli: CLI_NAME,
+  noun: NOUN,
+  verb: "callback-set",
+  description: "Register (or update) where one ride's status events are forwarded; takes priority over the default",
+  flags: { "order-id": RIDE_ORDER_ID_FLAG, ...CALLBACK_SUBSCRIPTION_FLAGS },
+  response: { ride_id: { type: "string|int", description: "Ride id" }, order_id: { type: "string", description: "rio_... order id" }, ...CALLBACK_SUBSCRIPTION_RESPONSE },
+  example: {
+    command: "agenzo-merchant-cli ride-elife callback-set --order-id 4112961 --callback-url https://example.com/ride-events --idempotency-key cb-1",
+    output_summary: "Returns the registration; the first registration also returns callback_secret once."
+  },
+  error_recovery: CALLBACK_ERRORS
+};
+var rideCallbackGetSchema = {
+  cli: CLI_NAME,
+  noun: NOUN,
+  verb: "callback-get",
+  description: "Show one ride's callback registration (the signing secret is never returned)",
+  flags: { "order-id": RIDE_ORDER_ID_FLAG },
+  response: { ride_id: { type: "string|int", description: "Ride id" }, order_id: { type: "string", description: "rio_... order id" }, ...CALLBACK_SUBSCRIPTION_RESPONSE },
+  example: { command: "agenzo-merchant-cli ride-elife callback-get --order-id 4112961", output_summary: "Returns the registration without the secret." },
+  error_recovery: { RIDE_NOT_FOUND: CALLBACK_ERRORS.RIDE_NOT_FOUND }
+};
+var rideCallbackDefaultSetSchema = {
+  cli: CLI_NAME,
+  noun: NOUN,
+  verb: "callback-default-set",
+  description: "Register (or update) the developer-wide fallback used by rides that have no callback of their own",
+  flags: CALLBACK_SUBSCRIPTION_FLAGS,
+  response: { developer_id: { type: "string", description: "Owner of the default" }, ...CALLBACK_SUBSCRIPTION_RESPONSE },
+  example: {
+    command: "agenzo-merchant-cli ride-elife callback-default-set --callback-url https://example.com/ride-events --idempotency-key cbd-1",
+    output_summary: "Configure once so events for rides booked later are never dropped."
+  },
+  error_recovery: { PARAM_INVALID: CALLBACK_ERRORS.PARAM_INVALID, PARAM_IDEMPOTENCY_KEY_REQUIRED: CALLBACK_ERRORS.PARAM_IDEMPOTENCY_KEY_REQUIRED }
+};
+var rideCallbackDefaultGetSchema = {
+  cli: CLI_NAME,
+  noun: NOUN,
+  verb: "callback-default-get",
+  description: "Show the developer-wide fallback callback (the signing secret is never returned)",
+  flags: {},
+  response: { developer_id: { type: "string", description: "Owner of the default" }, ...CALLBACK_SUBSCRIPTION_RESPONSE },
+  example: { command: "agenzo-merchant-cli ride-elife callback-default-get", output_summary: "Returns the default without the secret." }
+};
+var rideCallbackDeliveriesSchema = {
+  cli: CLI_NAME,
+  noun: NOUN,
+  verb: "callback-deliveries",
+  description: "List one ride's callback forwarding records (pending / delivered / dead)",
+  flags: {
+    "order-id": RIDE_ORDER_ID_FLAG,
+    limit: { type: "int", required: false, default: 50, description: "Page size 1-100" },
+    offset: { type: "int", required: false, default: 0, description: "Records to skip" }
+  },
+  response: {
+    ride_id: { type: "string|int", description: "Ride id" },
+    limit: { type: "int", description: "Page size used" },
+    offset: { type: "int", description: "Offset used" },
+    count: { type: "int", description: "Records in this page" },
+    deliveries: { type: "array", description: "Forwarding records: event_id, status, attempts, last_error, timestamps" }
+  },
+  example: { command: "agenzo-merchant-cli ride-elife callback-deliveries --order-id 4112961", output_summary: "Shows what was forwarded and where it stalled." },
+  error_recovery: { RIDE_NOT_FOUND: CALLBACK_ERRORS.RIDE_NOT_FOUND, PARAM_INVALID: CALLBACK_ERRORS.PARAM_INVALID }
+};
+var rideCallbackReplaySchema = {
+  cli: CLI_NAME,
+  noun: NOUN,
+  verb: "callback-replay",
+  description: "Requeue one ride's dead (or failed) callback records; delivered records are never re-sent",
+  flags: {
+    "order-id": RIDE_ORDER_ID_FLAG,
+    "event-id": { type: "string", required: false, description: "Requeue only this record (default: all dead records)" },
+    "include-failed": { type: "bool", required: false, default: false, description: "Also requeue pending records that already failed" },
+    "reset-attempts": { type: "bool", required: false, default: false, description: "Reset the retry counter of requeued records" },
+    "idempotency-key": CALLBACK_IDEMPOTENCY_FLAG
+  },
+  response: {
+    ride_id: { type: "string", description: "Ride id" },
+    requeued: { type: "int", description: "Number of records set back to pending" }
+  },
+  example: {
+    command: "agenzo-merchant-cli ride-elife callback-replay --order-id 4112961 --idempotency-key rp-1",
+    output_summary: "Requeues dead records; the delivery worker re-sends them on its next pass."
+  },
+  error_recovery: CALLBACK_ERRORS
+};
 var listOrdersSchema = {
   cli: CLI_NAME,
   noun: NOUN,
@@ -2380,6 +2505,39 @@ var ordersPayBatchSchema = {
     AUTHENTICATION_REQUIRED: "EVO requires cardholder 3DS: open three_ds_url, finish authentication, then replay pay-batch with the SAME idempotency-key (or use --watch to poll automatically)."
   }
 };
+var ordersGetPaymentGroupSchema = {
+  cli: CLI_NAME,
+  noun: ORDERS_NOUN,
+  verb: "get-payment-group",
+  description: "Get the status of an aggregate settlement created by `orders pay-batch` (read-only; never re-sends the payment)",
+  flags: {
+    "payment-group-id": { type: "string", required: true, description: "payment_group_id returned by `orders pay-batch` (1-64 chars)" }
+  },
+  response: {
+    payment_group_id: { type: "string", description: "The payment group" },
+    status: { type: "string", description: "settled | partially_settled | failed | uncertain" },
+    currency: { type: "string", description: "ISO 4217 currency of the aggregate settlement" },
+    total_amount: { type: "float", description: "Aggregate total in DECIMAL units" },
+    per_order: {
+      type: "array",
+      description: "Per-order outcome, same shape as pay-batch",
+      items: {
+        order_id: { type: "string", description: "Order id" },
+        domain: { type: "string", description: "hotel | flight | ride" },
+        status: { type: "string", description: "confirmed | refunded | failed" },
+        amount: { type: "float", description: "Authoritative order amount (decimal)" },
+        refunded_amount: { type: "float", description: "Amount refunded when upstream confirmation failed" }
+      }
+    }
+  },
+  example: {
+    command: "agenzo-merchant-cli orders get-payment-group --payment-group-id pg_...",
+    output_summary: "Returns the batch status and per-order results; use it instead of replaying pay-batch to check progress."
+  },
+  error_recovery: {
+    PARAM_INVALID: "Pass the payment_group_id exactly as pay-batch returned it (1-64 chars)."
+  }
+};
 function flightSchema(verb, description, flags, response, example, extra = {}) {
   return { cli: CLI_NAME, noun: FLIGHT_NOUN, verb, description, flags, response, example, ...extra };
 }
@@ -2457,13 +2615,21 @@ var flightMoreOffersSchema = flightSchema(
 );
 var flightVerifySchema = flightSchema(
   "verify",
-  "Pre-booking price verification. Returns the authoritative product_token and a price_changed flag; pass the returned token to create-order.",
-  { "product-token": { type: "string", required: true, description: "Opaque token from search." } },
+  "Pre-booking price verification. Returns the authoritative product_token and a price_changed flag; pass the returned token to create-order. With --previous-total-price set, supplier 1002/1950 no longer dead-ends: the platform re-searches the SAME flight from the token and returns the refreshed fare; if that flight can no longer be found it fails with OFFER_UNAVAILABLE (pick another flight).",
+  {
+    "product-token": { type: "string", required: true, description: "Opaque token from search." },
+    "previous-total-price": { type: "int", required: false, description: "Total price of the selected offer; enables the one-shot re-search refresh on supplier 1002/1950. Omit to keep the legacy behavior (error surfaces as-is)." },
+    "cabin-class": { type: "string", required: false, description: "Cabin class to re-search with when refreshing (economy | premium_economy | business | first). Omitted falls back to economy." },
+    "adult-num": { type: "int", required: false, description: "Adults to re-search with when refreshing (1-9)." },
+    "child-num": { type: "int", required: false, description: "Children to re-search with when refreshing (0-9)." },
+    "infant-num": { type: "int", required: false, description: "Infants to re-search with when refreshing (0-9)." }
+  },
   {
     product_token: { type: "string", description: "Authoritative token to pass to create-order." },
     total_price: { type: "int", description: "Verified total price (integer)." },
     currency: { type: "string", description: "Currency code." },
     price_changed: { type: "bool", description: "True if the price changed since search; re-confirm with the user." },
+    previous_total_price: { type: "int", description: "The selected offer\u2019s price at pick time; present when the request carried previous-total-price. If it differs from total_price the fare was refreshed by a re-search (show the user the old \u2192 new price)." },
     journeys: { type: "array", description: "The COMPLETE itinerary being priced \u2014 every leg, not just the last one relayed. Use it to show the full trip on a confirmation screen." }
   },
   { command: "agenzo-merchant-cli flight-flink verify --product-token pt_...", output_summary: "Returns the authoritative product_token + price_changed." }
@@ -2480,7 +2646,8 @@ var flightCreateOrderSchema = flightSchema(
     "contact-region": { type: "string", required: true, description: "Contact phone country code (no +)." },
     "contact-phone": { type: "string", required: true, description: "Contact phone." },
     "contact-email": { type: "string", required: true, description: "Contact email." },
-    passengers: { type: "json", required: true, description: 'JSON array of passengers. gender/id_type are STRINGS ("1"/"2"). child/infant require adult_passenger_name.' },
+    passengers: { type: "json", required: true, description: 'JSON array of passengers. gender/id_type are STRINGS ("1"/"2"). child/infant require adult_passenger_name. A saved traveller can be passed as just {"traveller_token":"tvp_...","type":"adult"} (from token-cli travellers list); the server fills in the ID details.' },
+    "save-travellers": { type: "bool", required: false, description: "Save the fully filled passengers of this order as frequent travellers. Set only when the user explicitly asked to save them." },
     member: MEMBER_FLAG_SCHEMA,
     "idempotency-key": { type: "string", required: true, description: "Forwarded verbatim as the Idempotency-Key header." }
   },
@@ -3734,6 +3901,185 @@ function registerListOrdersCommand(parent, deps) {
   });
 }
 
+// src/ride-elife/callback.ts
+var SIGNATURE_MODES = ["off", "optional", "required"];
+var DELIVERIES_LIMIT_MAX = 100;
+function need9(value, flag) {
+  if (value === void 0 || String(value).trim() === "") {
+    throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
+  }
+  return String(value);
+}
+function intFlag(value, flag, min, max) {
+  if (value === void 0) return void 0;
+  const parsed = Number(value);
+  if (!Number.isInteger(parsed) || parsed < min || max !== void 0 && parsed > max) {
+    const range = max === void 0 ? `>= ${min}` : `${min}-${max}`;
+    throw new CliError("PARAM_INVALID", `--${flag} must be an integer ${range}.`);
+  }
+  return parsed;
+}
+async function apiKeyOf(opts) {
+  return PromptEngine.resolveInput(opts.apiKey, {
+    message: "API Key:",
+    type: "password"
+  });
+}
+function subscriptionBody(opts) {
+  const body = { callback_url: need9(opts.callbackUrl, "callback-url") };
+  if (opts.adapter !== void 0) body.adapter = need9(opts.adapter, "adapter");
+  if (opts.signatureMode !== void 0) {
+    const mode = String(opts.signatureMode);
+    if (!SIGNATURE_MODES.includes(mode)) {
+      throw new CliError("PARAM_INVALID", `--signature-mode must be one of ${SIGNATURE_MODES.join(" / ")}.`);
+    }
+    body.signature_mode = mode;
+  }
+  if (opts.callbackApiKey !== void 0) body.callback_api_key = String(opts.callbackApiKey);
+  if (opts.rotateSecret) body.rotate_secret = true;
+  return body;
+}
+function formatSubscription(data) {
+  const lines = [];
+  for (const key of ["ride_id", "order_id", "developer_id", "callback_url", "adapter", "signature_mode", "status"]) {
+    if (data[key] !== void 0 && data[key] !== null) lines.push([key, String(data[key])]);
+  }
+  const out = [Formatter.keyValue(lines)];
+  if (typeof data.callback_secret === "string" && data.callback_secret) {
+    out.push("", Formatter.keyValue([["callback_secret", data.callback_secret]]));
+    out.push("Save this signing secret now \u2014 it is shown only once and cannot be read back.");
+  }
+  return out.join("\n");
+}
+async function render2(data, text, format) {
+  const commandResult = { data, text };
+  await renderWithContext(commandResult, { format }, new ConfigManager());
+}
+function withSubscriptionFlags(cmd) {
+  return cmd.option("--callback-url <url>", "https URL that receives ride status events (must not be an internal address)").option("--adapter <name>", "Outbound event shape (default techtanium_v1)").option("--signature-mode <mode>", "off / optional / required (default off)").option("--callback-api-key <key>", "API key the platform sends to your endpoint; omit to keep the stored one").option("--rotate-secret", "Issue a new HMAC signing secret (breaks verification with the old one)").option("--idempotency-key <key>", "Idempotency key forwarded verbatim as the Idempotency-Key header");
+}
+async function postSubscription(deps, cmd, path, commandPath, doneMessage) {
+  const opts = cmd.optsWithGlobals();
+  const format = resolveFormat(opts.format);
+  const target = path(opts);
+  const body = subscriptionBody(opts);
+  const apiKey = await apiKeyOf(opts);
+  const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
+    yes: Boolean(opts.yes),
+    commandPath
+  });
+  const result = await deps.apiClient.post(
+    target,
+    { type: "api-key", key: apiKey },
+    body,
+    { "Idempotency-Key": idempotencyKey }
+  );
+  if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
+  notify(format, "success", doneMessage);
+  await render2(result.data, () => formatSubscription(result.data), format);
+}
+async function getJson(deps, cmd, path, text, params) {
+  const opts = cmd.optsWithGlobals();
+  const format = resolveFormat(opts.format);
+  const target = path(opts);
+  const query = params?.(opts);
+  const apiKey = await apiKeyOf(opts);
+  const result = await deps.apiClient.get(target, { type: "api-key", key: apiKey }, query);
+  if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
+  await render2(result.data, () => text(result.data), format);
+}
+var ridePath = (opts, suffix) => `/ride/${encodeURIComponent(need9(opts.orderId, "order-id"))}/callback${suffix}`;
+function registerRideCallbackCommands(parent, deps) {
+  const set = withSubscriptionFlags(
+    parent.command("callback-set").description("Register (or update) where one ride's status events are forwarded").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-id <id>", "The numeric ride_id returned by book")
+  );
+  attachSchemaHelp(set, rideCallbackSetSchema);
+  set.action(
+    () => postSubscription(deps, set, (o) => ridePath(o, ""), "ride-elife callback-set", "Ride callback registered")
+  );
+  const get = parent.command("callback-get").description("Show one ride's callback registration (the signing secret is never returned)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-id <id>", "The numeric ride_id returned by book");
+  attachSchemaHelp(get, rideCallbackGetSchema);
+  get.action(() => getJson(deps, get, (o) => ridePath(o, ""), formatSubscription));
+  const defSet = withSubscriptionFlags(
+    parent.command("callback-default-set").description("Register (or update) the developer-wide fallback for rides without their own callback").option("--api-key <key>", "API Key for authentication (X-Api-Key)")
+  );
+  attachSchemaHelp(defSet, rideCallbackDefaultSetSchema);
+  defSet.action(
+    () => postSubscription(
+      deps,
+      defSet,
+      () => "/ride/callback/default",
+      "ride-elife callback-default-set",
+      "Default ride callback registered"
+    )
+  );
+  const defGet = parent.command("callback-default-get").description("Show the developer-wide fallback callback (the signing secret is never returned)").option("--api-key <key>", "API Key for authentication (X-Api-Key)");
+  attachSchemaHelp(defGet, rideCallbackDefaultGetSchema);
+  defGet.action(() => getJson(deps, defGet, () => "/ride/callback/default", formatSubscription));
+  const deliveries = parent.command("callback-deliveries").description("List one ride's callback forwarding records (pending / delivered / dead)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-id <id>", "The numeric ride_id returned by book").option("--limit <n>", `Page size 1-${DELIVERIES_LIMIT_MAX} (default 50)`).option("--offset <n>", "Records to skip (default 0)");
+  attachSchemaHelp(deliveries, rideCallbackDeliveriesSchema);
+  deliveries.action(
+    () => getJson(
+      deps,
+      deliveries,
+      (o) => ridePath(o, "/deliveries"),
+      (data) => {
+        const rows = data.deliveries ?? [];
+        if (rows.length === 0) return Formatter.status("info", "No callback deliveries");
+        return Formatter.table(
+          ["Event", "Status", "Attempts", "Last error"],
+          rows.map((r) => [
+            String(r.event_id ?? "-"),
+            String(r.status ?? "-"),
+            String(r.attempts ?? "-"),
+            String(r.last_error ?? "-")
+          ])
+        );
+      },
+      (o) => {
+        const limit = intFlag(o.limit, "limit", 1, DELIVERIES_LIMIT_MAX);
+        const offset = intFlag(o.offset, "offset", 0);
+        const params = {};
+        if (limit !== void 0) params.limit = String(limit);
+        if (offset !== void 0) params.offset = String(offset);
+        return Object.keys(params).length > 0 ? params : void 0;
+      }
+    )
+  );
+  const replay = parent.command("callback-replay").description("Requeue one ride's dead (or failed) callback records; delivered records are never re-sent").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-id <id>", "The numeric ride_id returned by book").option("--event-id <id>", "Requeue only this record (default: all dead records of the ride)").option("--include-failed", "Also requeue pending records that already failed at least once").option("--reset-attempts", "Reset the retry counter of requeued records").option("--idempotency-key <key>", "Idempotency key forwarded verbatim as the Idempotency-Key header");
+  attachSchemaHelp(replay, rideCallbackReplaySchema);
+  replay.action(async () => {
+    const opts = replay.optsWithGlobals();
+    const format = resolveFormat(opts.format);
+    const target = ridePath(opts, "/replay");
+    const body = {};
+    if (opts.eventId !== void 0) body.event_id = need9(opts.eventId, "event-id");
+    if (opts.includeFailed) body.include_failed = true;
+    if (opts.resetAttempts) body.reset_attempts = true;
+    const apiKey = await apiKeyOf(opts);
+    const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
+      yes: Boolean(opts.yes),
+      commandPath: "ride-elife callback-replay"
+    });
+    const result = await deps.apiClient.post(
+      target,
+      { type: "api-key", key: apiKey },
+      body,
+      { "Idempotency-Key": idempotencyKey }
+    );
+    if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
+    notify(format, "success", `Requeued ${String(result.data.requeued ?? 0)} callback record(s)`);
+    await render2(
+      result.data,
+      () => Formatter.keyValue([
+        ["Ride ID", String(result.data.ride_id ?? "-")],
+        ["Requeued", String(result.data.requeued ?? 0)]
+      ]),
+      format
+    );
+  });
+}
+
 // src/services/registry.ts
 var SERVICE_REGISTRY = [
   {
@@ -4298,7 +4644,7 @@ function registerOrdersPayBatchCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const orderIds = parseOrderIds(need9(opts.orderIds, "order-ids"));
+    const orderIds = parseOrderIds(need10(opts.orderIds, "order-ids"));
     const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
       yes: isYes,
       commandPath: "orders pay-batch"
@@ -4368,22 +4714,59 @@ function registerOrdersPayBatchCommand(parent, deps) {
     }
   });
 }
-function need9(value, flag) {
+function need10(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
 
+// src/orders/get-payment-group.ts
+var PAYMENT_GROUP_ID_MAX = 64;
+function registerOrdersGetPaymentGroupCommand(parent, deps) {
+  const cmd = parent.command("get-payment-group").description("Get the status of an aggregate settlement created by `orders pay-batch` (read-only)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").requiredOption("--payment-group-id <id>", "payment_group_id returned by `orders pay-batch`");
+  attachSchemaHelp(cmd, ordersGetPaymentGroupSchema);
+  cmd.action(async () => {
+    const opts = cmd.optsWithGlobals();
+    const format = resolveFormat(opts.format);
+    const groupId = String(opts.paymentGroupId ?? "").trim();
+    if (!groupId || groupId.length > PAYMENT_GROUP_ID_MAX) {
+      throw new CliError(
+        "PARAM_INVALID",
+        `--payment-group-id must be 1-${PAYMENT_GROUP_ID_MAX} characters.`
+      );
+    }
+    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
+      message: "API Key:",
+      type: "password"
+    });
+    const spinner = format === "json" ? null : createSpinner("Fetching payment group...");
+    const result = await deps.apiClient.get(
+      `/orders/payment-groups/${encodeURIComponent(groupId)}`,
+      { type: "api-key", key: apiKey }
+    );
+    spinner?.stop();
+    if (!result.success) {
+      throw CliError.fromApi(result, { auth: "api-key" });
+    }
+    const data = result.data;
+    const commandResult = {
+      data,
+      text: () => formatPayBatch(data)
+    };
+    await renderWithContext(commandResult, { format }, new ConfigManager());
+  });
+}
+
 // src/hotel-redaug/search.ts
-function need10(value, flag) {
+function need11(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
 function num5(value, flag) {
-  const n = Number(need10(value, flag));
+  const n = Number(need11(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -4405,7 +4788,7 @@ function positiveInt3(value, flag) {
 }
 var YMD_RE = /^\d{4}-\d{2}-\d{2}$/;
 function stayDate(value, flag) {
-  const raw = need10(value, flag);
+  const raw = need11(value, flag);
   if (!YMD_RE.test(raw)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a YYYY-MM-DD date.`);
   }
@@ -4477,7 +4860,7 @@ function registerHotelSearchCommand(parent, deps) {
     const pageSize = positiveInt3(opts.pageSize, "page-size");
     const body = {};
     if (hasDestination) {
-      body.destination_id = need10(opts.destinationId, "destination-id");
+      body.destination_id = need11(opts.destinationId, "destination-id");
     } else {
       body.lat = coord(opts.lat, "lat", -90, 90);
       body.lng = coord(opts.lng, "lng", -180, 180);
@@ -4520,14 +4903,14 @@ function registerHotelSearchCommand(parent, deps) {
 }
 
 // src/hotel-redaug/quote.ts
-function need11(value, flag) {
+function need12(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
 function num6(value, flag) {
-  const n = Number(need11(value, flag));
+  const n = Number(need12(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -4535,7 +4918,7 @@ function num6(value, flag) {
 }
 var YMD_RE2 = /^\d{4}-\d{2}-\d{2}$/;
 function stayDate2(value, flag) {
-  const raw = need11(value, flag);
+  const raw = need12(value, flag);
   if (!YMD_RE2.test(raw)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a YYYY-MM-DD date.`);
   }
@@ -4575,7 +4958,7 @@ function registerHotelQuoteCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const hotelId = need11(opts.hotelId, "hotel-id");
+    const hotelId = need12(opts.hotelId, "hotel-id");
     const checkIn = stayDate2(opts.checkIn, "check-in");
     const checkOut = stayDate2(opts.checkOut, "check-out");
     if (!(checkOut > checkIn)) {
@@ -4695,14 +5078,14 @@ function parseCancellation(raw) {
   }
   return parsed;
 }
-function need12(value, flag) {
+function need13(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
 function num7(value, flag) {
-  const n = Number(need12(value, flag));
+  const n = Number(need13(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -4710,7 +5093,7 @@ function num7(value, flag) {
 }
 var YMD_RE3 = /^\d{4}-\d{2}-\d{2}$/;
 function stayDate3(value, flag) {
-  const raw = need12(value, flag);
+  const raw = need13(value, flag);
   if (!YMD_RE3.test(raw)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a YYYY-MM-DD date.`);
   }
@@ -4782,18 +5165,18 @@ function registerHotelCreateOrderCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const productToken = need12(opts.productToken, "product-token");
+    const productToken = need13(opts.productToken, "product-token");
     const totalAmount = num7(opts.totalAmount, "total-amount");
-    const currency = need12(opts.currency, "currency");
-    const priceItems = parsePriceItems(need12(opts.priceItems, "price-items"));
+    const currency = need13(opts.currency, "currency");
+    const priceItems = parsePriceItems(need13(opts.priceItems, "price-items"));
     const checkIn = stayDate3(opts.checkIn, "check-in");
     const checkOut = stayDate3(opts.checkOut, "check-out");
     if (!(checkOut > checkIn)) {
       throw new CliError("PARAM_INVALID", "--check-out must be strictly after --check-in.");
     }
-    const guestName = need12(opts.guestName, "guest-name");
-    const contactName = need12(opts.contactName, "contact-name");
-    const contactPhone = need12(opts.contactPhone, "contact-phone");
+    const guestName = need13(opts.guestName, "guest-name");
+    const contactName = need13(opts.contactName, "contact-name");
+    const contactPhone = need13(opts.contactPhone, "contact-phone");
     const body = {
       product_token: productToken,
       total_amount: totalAmount,
@@ -5145,7 +5528,7 @@ function registerHotelPayOrderCommand(parent, deps) {
 }
 
 // src/hotel-redaug/get.ts
-function need13(value, flag) {
+function need14(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -5209,7 +5592,7 @@ function registerHotelGetCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const orderId = need13(opts.orderId, "order-id");
+    const orderId = need14(opts.orderId, "order-id");
     if (opts.watch) {
       await watchOrderStatus(deps.apiClient, apiKey, orderId, {
         intervalSeconds: resolveSeconds(
@@ -5243,7 +5626,7 @@ function registerHotelGetCommand(parent, deps) {
 }
 
 // src/hotel-redaug/cancel.ts
-function need14(value, flag) {
+function need15(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -5296,8 +5679,8 @@ function registerHotelCancelCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const orderId = need14(opts.orderId, "order-id");
-    const fcOrderCode = need14(opts.fcOrderCode, "fc-order-code");
+    const orderId = need15(opts.orderId, "order-id");
+    const fcOrderCode = need15(opts.fcOrderCode, "fc-order-code");
     const body = { fc_order_code: fcOrderCode };
     if (opts.reason !== void 0) body.reason = opts.reason;
     const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
@@ -5327,14 +5710,14 @@ function registerHotelCancelCommand(parent, deps) {
 
 // src/hotel-redaug/checkout.ts
 import { confirm as confirm9 } from "@inquirer/prompts";
-function need15(value, flag) {
+function need16(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
 function num8(value, flag) {
-  const n = Number(need15(value, flag));
+  const n = Number(need16(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -5400,10 +5783,10 @@ function registerHotelCheckoutCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const orderId = need15(opts.orderId, "order-id");
-    const fcOrderCode = need15(opts.fcOrderCode, "fc-order-code");
-    const reason = need15(opts.reason, "reason");
-    const checkoutRooms = parseCheckoutRooms(need15(opts.checkoutRooms, "checkout-rooms"));
+    const orderId = need16(opts.orderId, "order-id");
+    const fcOrderCode = need16(opts.fcOrderCode, "fc-order-code");
+    const reason = need16(opts.reason, "reason");
+    const checkoutRooms = parseCheckoutRooms(need16(opts.checkoutRooms, "checkout-rooms"));
     const refundType = num8(opts.refundType, "refund-type");
     const body = {
       fc_order_code: fcOrderCode,
@@ -5446,7 +5829,7 @@ function registerHotelCheckoutCommand(parent, deps) {
 }
 
 // src/hotel-redaug/get-checkout.ts
-function need16(value, flag) {
+function need17(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -5482,7 +5865,7 @@ function registerHotelGetCheckoutCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const taskOrderCode = need16(opts.taskOrderCode, "task-order-code");
+    const taskOrderCode = need17(opts.taskOrderCode, "task-order-code");
     if (opts.watch) {
       await watchCheckoutStatus(deps.apiClient, apiKey, taskOrderCode, {
         intervalSeconds: resolveSeconds(
@@ -5586,7 +5969,7 @@ function registerHotelListOrdersCommand(parent, deps) {
 }
 
 // src/hotel-redaug/find-destination.ts
-function need17(value, flag) {
+function need18(value, flag) {
   if (value === void 0 || value.trim() === "") {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -5620,7 +6003,7 @@ function registerHotelFindDestinationCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const keyword = need17(opts.keyword, "keyword");
+    const keyword = need18(opts.keyword, "keyword");
     const body = { keyword };
     if (opts.dataType !== void 0) {
       body.data_type = opts.dataType;
@@ -5644,14 +6027,14 @@ function registerHotelFindDestinationCommand(parent, deps) {
 }
 
 // src/hotel-redaug/hotel-filters.ts
-function need18(value, flag) {
+function need19(value, flag) {
   if (value === void 0 || value.trim() === "") {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
 function num9(value, flag) {
-  const n = Number(need18(value, flag));
+  const n = Number(need19(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -5731,7 +6114,7 @@ function registerHotelFiltersCommand(parent, deps) {
     }
     const body = {};
     if (hasDestination) {
-      body.destination_id = need18(opts.destinationId, "destination-id");
+      body.destination_id = need19(opts.destinationId, "destination-id");
     } else {
       body.lat = coord2(opts.lat, "lat", -90, 90);
       body.lng = coord2(opts.lng, "lng", -180, 180);
@@ -5756,7 +6139,7 @@ function registerHotelFiltersCommand(parent, deps) {
 }
 
 // src/hotel-redaug/list-cities.ts
-function need19(value, flag) {
+function need20(value, flag) {
   if (value === void 0 || value.trim() === "") {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -5789,7 +6172,7 @@ function registerHotelListCitiesCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const country = need19(opts.country, "country");
+    const country = need20(opts.country, "country");
     const body = { country_code: country };
     const result = await deps.apiClient.post(
       "/hotel/cities",
@@ -5810,7 +6193,7 @@ function registerHotelListCitiesCommand(parent, deps) {
 }
 
 // src/hotel-redaug/hotel-detail.ts
-function need20(value, flag) {
+function need21(value, flag) {
   if (value === void 0 || value.trim() === "") {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
@@ -5957,7 +6340,7 @@ function registerHotelDetailCommand(parent, deps) {
       message: "API Key:",
       type: "password"
     });
-    const hotelId = need20(opts.hotelId, "hotel-id");
+    const hotelId = need21(opts.hotelId, "hotel-id");
     const rawWithImages = opts.withImages;
     const withImages = rawWithImages !== "false" && rawWithImages !== false;
     const settings = parseSettings(opts.settings);
@@ -6165,14 +6548,14 @@ function registerHotelSkillCommand(parent) {
 }
 
 // src/flight-flink/_helpers.ts
-function need21(value, flag) {
+function need22(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
 function num10(value, flag) {
-  const n = Number(need21(value, flag));
+  const n = Number(need22(value, flag));
   if (!Number.isFinite(n)) {
     throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
@@ -6193,7 +6576,7 @@ function jsonArray(raw, flag) {
 function resolveApiKey(flag) {
   return PromptEngine.resolveInput(flag, { message: "API Key:", type: "password" });
 }
-async function render2(data, format, text) {
+async function render3(data, format, text) {
   const resolved = resolveFormat(format);
   const result = { data, text: () => text(data) };
   await renderWithContext(result, { format: resolved }, new ConfigManager());
@@ -6207,7 +6590,7 @@ function registerFindAirportCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const keyword = need21(opts.keyword, "keyword");
+    const keyword = need22(opts.keyword, "keyword");
     const spinner = format === "json" ? null : createSpinner("Resolving airports...");
     const result = await deps.apiClient.post(
       "/flight/find-airport",
@@ -6216,7 +6599,7 @@ function registerFindAirportCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(
+    await render3(
       result.data,
       opts.format,
       (d) => JSON.stringify(d.airports ?? d, null, 2)
@@ -6245,7 +6628,7 @@ function registerListAirportsCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
+    await render3(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
   });
 }
 
@@ -6270,7 +6653,7 @@ function registerListAirlinesCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
+    await render3(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
   });
 }
 
@@ -6290,7 +6673,7 @@ function registerListNationalitiesCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
+    await render3(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
   });
 }
 
@@ -6304,7 +6687,7 @@ function registerSearchCommand(parent, deps) {
     const apiKey = await resolveApiKey(opts.apiKey);
     const body = {
       trip_type: num10(opts.tripType, "trip-type"),
-      journeys: jsonArray(need21(opts.journeys, "journeys"), "journeys"),
+      journeys: jsonArray(need22(opts.journeys, "journeys"), "journeys"),
       cabin_class: opts.cabinClass,
       adult_num: num10(opts.adultNum, "adult-num"),
       child_num: num10(opts.childNum, "child-num"),
@@ -6323,7 +6706,7 @@ function registerSearchCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
+    await render3(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
   });
 }
 
@@ -6335,7 +6718,7 @@ function registerMoreOffersCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const productToken = need21(opts.productToken, "product-token");
+    const productToken = need22(opts.productToken, "product-token");
     const spinner = format === "json" ? null : createSpinner("Fetching offers...");
     const result = await deps.apiClient.post(
       "/flight/more-offers",
@@ -6344,34 +6727,44 @@ function registerMoreOffersCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
+    await render3(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
   });
 }
 
 // src/flight-flink/verify.ts
 function registerVerifyCommand(parent, deps) {
-  const cmd = parent.command("verify").description("Verify the latest price before booking; returns the authoritative product_token").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--product-token <token>", "Opaque token from search");
+  const cmd = parent.command("verify").description("Verify the latest price before booking; returns the authoritative product_token").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--product-token <token>", "Opaque token from search").option("--previous-total-price <n>", "Total price of the selected offer; enables the one-shot re-search refresh on supplier 1002/1950").option("--cabin-class <c>", "Cabin class to re-search with (economy | premium_economy | business | first)").option("--adult-num <n>", "Adults to re-search with (1-9)").option("--child-num <n>", "Children to re-search with (0-9)").option("--infant-num <n>", "Infants to re-search with (0-9)");
   attachSchemaHelp(cmd, flightVerifySchema);
   cmd.action(async () => {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const productToken = need21(opts.productToken, "product-token");
+    const productToken = need22(opts.productToken, "product-token");
+    const body = { product_token: productToken };
+    if (opts.previousTotalPrice !== void 0) {
+      body.previous_total_price = num10(opts.previousTotalPrice, "previous-total-price");
+    }
+    if (opts.cabinClass !== void 0) body.cabin_class = opts.cabinClass;
+    if (opts.adultNum !== void 0) body.adult_num = num10(opts.adultNum, "adult-num");
+    if (opts.childNum !== void 0) body.child_num = num10(opts.childNum, "child-num");
+    if (opts.infantNum !== void 0) body.infant_num = num10(opts.infantNum, "infant-num");
     const spinner = format === "json" ? null : createSpinner("Verifying price...");
     const result = await deps.apiClient.post(
       "/flight/verify",
       { type: "api-key", key: apiKey },
-      { product_token: productToken }
+      body
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(
+    await render3(
       result.data,
       opts.format,
       (d) => Formatter.keyValue([
         ["Product token", String(d.product_token ?? "-")],
         ["Total price", `${d.total_price ?? "-"} ${d.currency ?? ""}`.trim()],
-        ["Price changed", String(d.price_changed)]
+        ["Price changed", String(d.price_changed)],
+        // 刷新路径：平台带回选中时的原价，人读 output 里直接看出 原价 → 新价。
+        ...d.previous_total_price != null ? [["Previous total price", String(d.previous_total_price)]] : []
       ])
     );
   });
@@ -6380,7 +6773,10 @@ function registerVerifyCommand(parent, deps) {
 // src/flight-flink/create-order.ts
 import { confirm as confirm10 } from "@inquirer/prompts";
 function registerCreateOrderCommand(parent, deps) {
-  const cmd = parent.command("create-order").description("Create a flight order without charging (locks the fare, await payment)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--product-token <token>", "Authoritative rate token from verify").option("--total-amount <amount>", "Verified total price in decimal units").option("--currency <currency>", "ISO 4217 currency code").option("--trip-type <n>", "1/2/3", "1").option("--contact-name <name>", "Booking contact name").option("--contact-region <code>", "Contact phone country code (no '+')").option("--contact-phone <phone>", "Booking contact phone").option("--contact-email <email>", "Booking contact email").option("--passengers <json>", "JSON array of passengers (gender/id_type are strings)").option("--payment-method-id <id>", "Optional bound-card id (pay_per_call only)").option("--payment-token-id <id>", "Optional UPI network-token id (unionpay charge path)").option(
+  const cmd = parent.command("create-order").description("Create a flight order without charging (locks the fare, await payment)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--product-token <token>", "Authoritative rate token from verify").option("--total-amount <amount>", "Verified total price in decimal units").option("--currency <currency>", "ISO 4217 currency code").option("--trip-type <n>", "1/2/3", "1").option("--contact-name <name>", "Booking contact name").option("--contact-region <code>", "Contact phone country code (no '+')").option("--contact-phone <phone>", "Booking contact phone").option("--contact-email <email>", "Booking contact email").option(
+    "--passengers <json>",
+    'JSON array of passengers (gender/id_type are strings). A passenger may be just {"traveller_token":"tvp_...","type":"adult"} from token-cli travellers list.'
+  ).option("--save-travellers", "Save the fully filled passengers as frequent travellers (only when the user asked)").option("--payment-method-id <id>", "Optional bound-card id (pay_per_call only)").option("--payment-token-id <id>", "Optional UPI network-token id (unionpay charge path)").option(
     "--authorized-merchant-trans-id <id>",
     "EVO merchant transaction id of an already-authorised preauth (3DS challenge resume). When set, the server reuses that authorization instead of creating a new one, avoiding a second hold on the card (pay_per_call mode only)."
   ).option("--member <id>", MEMBER_OPTION_DESCRIPTION).option("--idempotency-key <key>", "Forwarded verbatim as the Idempotency-Key header");
@@ -6390,20 +6786,21 @@ function registerCreateOrderCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const productToken = need21(opts.productToken, "product-token");
+    const productToken = need22(opts.productToken, "product-token");
     const totalAmount = num10(opts.totalAmount, "total-amount");
-    const currency = need21(opts.currency, "currency");
+    const currency = need22(opts.currency, "currency");
     const body = {
       product_token: productToken,
       total_amount: totalAmount,
       currency,
       trip_type: num10(opts.tripType, "trip-type"),
-      contact_name: need21(opts.contactName, "contact-name"),
-      contact_region: need21(opts.contactRegion, "contact-region"),
-      contact_phone: need21(opts.contactPhone, "contact-phone"),
-      contact_email: need21(opts.contactEmail, "contact-email"),
-      passengers: jsonArray(need21(opts.passengers, "passengers"), "passengers")
+      contact_name: need22(opts.contactName, "contact-name"),
+      contact_region: need22(opts.contactRegion, "contact-region"),
+      contact_phone: need22(opts.contactPhone, "contact-phone"),
+      contact_email: need22(opts.contactEmail, "contact-email"),
+      passengers: jsonArray(need22(opts.passengers, "passengers"), "passengers")
     };
+    if (opts.saveTravellers) body.save_travellers = true;
     if (opts.paymentMethodId !== void 0) body.payment_method_id = opts.paymentMethodId;
     if (opts.paymentTokenId !== void 0) body.payment_token_id = opts.paymentTokenId;
     if (opts.authorizedMerchantTransId) {
@@ -6431,7 +6828,7 @@ function registerCreateOrderCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(
+    await render3(
       result.data,
       opts.format,
       (d) => [
@@ -6475,7 +6872,7 @@ function registerPayOrderCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const orderNo = need21(opts.orderNo, "order-no");
+    const orderNo = need22(opts.orderNo, "order-no");
     if (!isYes) {
       const ok = await confirm11({
         message: `Pay and ticket order ${orderNo}? This settles the order and issues tickets.`,
@@ -6508,7 +6905,7 @@ function registerPayOrderCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => {
+    await render3(result.data, opts.format, (d) => {
       const rows = [
         ["Order no", String(d.order_no ?? "-")],
         ["Status", String(d.status ?? "-")],
@@ -6533,7 +6930,7 @@ function registerGetOrderCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const orderNo = need21(opts.orderNo, "order-no");
+    const orderNo = need22(opts.orderNo, "order-no");
     const path = `/flight/${encodeURIComponent(orderNo)}/status`;
     const auth = { type: "api-key", key: apiKey };
     if (opts.watch) {
@@ -6558,7 +6955,7 @@ function registerGetOrderCommand(parent, deps) {
     const result = await deps.apiClient.get(path, auth);
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(
+    await render3(
       result.data,
       opts.format,
       (d) => Formatter.keyValue([
@@ -6582,7 +6979,7 @@ function registerCancelOrderCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const orderNo = need21(opts.orderNo, "order-no");
+    const orderNo = need22(opts.orderNo, "order-no");
     if (!isYes) {
       const ok = await confirm12({
         message: `Cancel order ${orderNo}? This requests cancellation and a refund.`,
@@ -6605,7 +7002,7 @@ function registerCancelOrderCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(
+    await render3(
       result.data,
       opts.format,
       (d) => Formatter.keyValue([
@@ -6638,7 +7035,7 @@ function registerListOrdersCommand2(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => {
+    await render3(result.data, opts.format, (d) => {
       const rows = (d.orders ?? []).map((o) => [
         String(o.order_no ?? "-"),
         String(o.status ?? "-"),
@@ -6658,10 +7055,10 @@ function registerChangeSearchCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
     const body = {
-      order_no: need21(opts.orderNo, "order-no"),
-      date: need21(opts.date, "date"),
-      passenger: need21(opts.passenger, "passenger"),
-      segment_id: need21(opts.segmentId, "segment-id"),
+      order_no: need22(opts.orderNo, "order-no"),
+      date: need22(opts.date, "date"),
+      passenger: need22(opts.passenger, "passenger"),
+      segment_id: need22(opts.segmentId, "segment-id"),
       cabin_class: opts.cabinClass
     };
     const spinner = format === "json" ? null : createSpinner("Searching change options...");
@@ -6672,7 +7069,7 @@ function registerChangeSearchCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
+    await render3(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
   });
 }
 
@@ -6687,14 +7084,14 @@ function registerChangeApplyCommand(parent, deps) {
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
     const body = {
-      order_no: need21(opts.orderNo, "order-no"),
-      passenger: need21(opts.passenger, "passenger"),
-      segment_id: need21(opts.segmentId, "segment-id"),
-      product_token: need21(opts.productToken, "product-token"),
-      contact_name: need21(opts.contactName, "contact-name"),
-      contact_region: need21(opts.contactRegion, "contact-region"),
-      contact_phone: need21(opts.contactPhone, "contact-phone"),
-      contact_email: need21(opts.contactEmail, "contact-email")
+      order_no: need22(opts.orderNo, "order-no"),
+      passenger: need22(opts.passenger, "passenger"),
+      segment_id: need22(opts.segmentId, "segment-id"),
+      product_token: need22(opts.productToken, "product-token"),
+      contact_name: need22(opts.contactName, "contact-name"),
+      contact_region: need22(opts.contactRegion, "contact-region"),
+      contact_phone: need22(opts.contactPhone, "contact-phone"),
+      contact_email: need22(opts.contactEmail, "contact-email")
     };
     if (!isYes) {
       const ok = await confirm13({
@@ -6716,7 +7113,7 @@ function registerChangeApplyCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
+    await render3(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
   });
 }
 
@@ -6728,7 +7125,7 @@ function registerChangeDetailCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const changeOrderNo = need21(opts.changeOrderNo, "change-order-no");
+    const changeOrderNo = need22(opts.changeOrderNo, "change-order-no");
     const spinner = format === "json" ? null : createSpinner("Fetching change detail...");
     const result = await deps.apiClient.get(
       `/flight/change/${encodeURIComponent(changeOrderNo)}`,
@@ -6736,7 +7133,7 @@ function registerChangeDetailCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
+    await render3(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
   });
 }
 
@@ -6750,7 +7147,7 @@ function registerChangeCancelCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const changeOrderNo = need21(opts.changeOrderNo, "change-order-no");
+    const changeOrderNo = need22(opts.changeOrderNo, "change-order-no");
     if (!isYes) {
       const ok = await confirm14({ message: `Cancel change request ${changeOrderNo}?`, default: false });
       if (!ok) throw new CliError("CLIENT_ABORTED", "Change cancellation aborted by user.");
@@ -6768,7 +7165,7 @@ function registerChangeCancelCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
+    await render3(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
   });
 }
 
@@ -6785,10 +7182,10 @@ function registerChangePayCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const changeOrderNo = need21(opts.changeOrderNo, "change-order-no");
-    const orderNo = need21(opts.orderNo, "order-no");
+    const changeOrderNo = need22(opts.changeOrderNo, "change-order-no");
+    const orderNo = need22(opts.orderNo, "order-no");
     const amount = num10(opts.amount, "amount");
-    const currency = need21(opts.currency, "currency");
+    const currency = need22(opts.currency, "currency");
     const body = {
       order_no: orderNo,
       amount,
@@ -6818,7 +7215,7 @@ function registerChangePayCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => {
+    await render3(result.data, opts.format, (d) => {
       const challenge = d.challenge ?? null;
       if (challenge) {
         return [
@@ -6859,14 +7256,14 @@ function registerRefundApplyCommand(parent, deps) {
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
     const body = {
-      order_no: need21(opts.orderNo, "order-no"),
-      passenger: need21(opts.passenger, "passenger"),
-      segment_id: need21(opts.segmentId, "segment-id"),
+      order_no: need22(opts.orderNo, "order-no"),
+      passenger: need22(opts.passenger, "passenger"),
+      segment_id: need22(opts.segmentId, "segment-id"),
       reason_type: num10(opts.reasonType, "reason-type"),
-      contact_name: need21(opts.contactName, "contact-name"),
-      contact_region: need21(opts.contactRegion, "contact-region"),
-      contact_phone: need21(opts.contactPhone, "contact-phone"),
-      contact_email: need21(opts.contactEmail, "contact-email")
+      contact_name: need22(opts.contactName, "contact-name"),
+      contact_region: need22(opts.contactRegion, "contact-region"),
+      contact_phone: need22(opts.contactPhone, "contact-phone"),
+      contact_email: need22(opts.contactEmail, "contact-email")
     };
     if (opts.reason !== void 0) body.reason = opts.reason;
     if (!isYes) {
@@ -6889,7 +7286,7 @@ function registerRefundApplyCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
+    await render3(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
   });
 }
 
@@ -6901,7 +7298,7 @@ function registerRefundDetailCommand(parent, deps) {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const refundOrderNo = need21(opts.refundOrderNo, "refund-order-no");
+    const refundOrderNo = need22(opts.refundOrderNo, "refund-order-no");
     const spinner = format === "json" ? null : createSpinner("Fetching refund detail...");
     const result = await deps.apiClient.get(
       `/flight/refund/${encodeURIComponent(refundOrderNo)}`,
@@ -6909,7 +7306,7 @@ function registerRefundDetailCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
+    await render3(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
   });
 }
 
@@ -6923,8 +7320,8 @@ function registerRefundConfirmCommand(parent, deps) {
     const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
     const apiKey = await resolveApiKey(opts.apiKey);
-    const refundOrderNo = need21(opts.refundOrderNo, "refund-order-no");
-    const confirmFlag = need21(opts.confirm, "confirm");
+    const refundOrderNo = need22(opts.refundOrderNo, "refund-order-no");
+    const confirmFlag = need22(opts.confirm, "confirm");
     if (confirmFlag !== "1" && confirmFlag !== "2") {
       throw new CliError("PARAM_INVALID", '--confirm must be "1" (confirm) or "2" (cancel).');
     }
@@ -6946,7 +7343,7 @@ function registerRefundConfirmCommand(parent, deps) {
     );
     spinner?.stop();
     if (!result.success) throw CliError.fromApi(result, { auth: "api-key" });
-    await render2(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
+    await render3(result.data, opts.format, (d) => JSON.stringify(d, null, 2));
   });
 }
 
@@ -7079,6 +7476,9 @@ Workflow (typical order):
                   (write; needs --idempotency-key; the fare may change)
      trip-status  (optional) Status + driver location points of ONE leg of a multi-leg ride
      list-orders  (standalone) List the developer's previous ride orders
+     callback-*   (standalone) Status-event forwarding to your own https endpoint:
+                  callback-set/-get (one ride), callback-default-set/-get (fallback for all
+                  rides), callback-deliveries / callback-replay (inspect and re-send)
 
 Key notes:
   \u2022 Coordinates are NOT geocoded by the backend \u2014 supply --pickup-lat/lng and --dropoff-lat/lng.
@@ -7108,6 +7508,7 @@ Key notes:
   registerRideUpdateCommand(rideCmd, deps);
   registerRideTripStatusCommand(rideCmd, deps);
   registerListOrdersCommand(rideCmd, deps);
+  registerRideCallbackCommands(rideCmd, deps);
   const servicesCmd = program.command("services").description("Merchant service discovery");
   registerServicesListCommand(servicesCmd, { discoveryClient, program });
   registerServiceGetCommand(servicesCmd, { discoveryClient, program });
@@ -7117,6 +7518,7 @@ Key notes:
   registerOrdersListCommand(ordersCmd, deps);
   registerOrdersGetCommand(ordersCmd, deps);
   registerOrdersPayBatchCommand(ordersCmd, deps);
+  registerOrdersGetPaymentGroupCommand(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.