@agenzo/merchant-cli 0.9.4 → 0.9.6

package/dist/index.js

@@ -850,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);
@@ -904,6 +910,42 @@ function memberIdOf(opts) {
   return trimmed.length > 0 ? trimmed : void 0;
 }
 
+// src/price-annotation.ts
+var ORIGINAL_DESCRIPTION = "Original (pre-discount) price in integer cents. Optional, RECORD-ONLY: stored on our own order / charge record and echoed back in the order detail, never sent to the acquiring gateway and never used to derive or validate the amount charged (that always comes from the order's locked authoritative price).";
+var DISCOUNT_DESCRIPTION = "Discount amount in integer cents. Optional, RECORD-ONLY: same semantics as --original-amount-cents.";
+var PRICE_ANNOTATION_FLAGS = {
+  "original-amount-cents": {
+    type: "int",
+    required: false,
+    description: ORIGINAL_DESCRIPTION,
+    constraints: "non-negative integer cents"
+  },
+  "discount-amount-cents": {
+    type: "int",
+    required: false,
+    description: DISCOUNT_DESCRIPTION,
+    constraints: "non-negative integer cents"
+  }
+};
+function applyPriceAnnotation(body, opts) {
+  const mappings = [
+    ["--original-amount-cents", "originalAmountCents", "original_amount_cents"],
+    ["--discount-amount-cents", "discountAmountCents", "discount_amount_cents"]
+  ];
+  for (const [flag, optKey, bodyKey] of mappings) {
+    const raw = opts[optKey];
+    if (raw === void 0) continue;
+    const cents = Number(raw);
+    if (!Number.isInteger(cents) || cents < 0) {
+      throw new CliError(
+        "PARAM_INVALID",
+        `Invalid ${flag} "${raw}". Expected a non-negative integer number of cents (e.g. 10000 for 100.00).`
+      );
+    }
+    body[bodyKey] = cents;
+  }
+}
+
 // src/ride-elife/watch.ts
 var TERMINAL_STATUSES = /* @__PURE__ */ new Set([
   "At destination",
@@ -1244,7 +1286,8 @@ var ridePayOrderSchema = {
       type: "string",
       required: true,
       description: "Unique key (1-128 chars [A-Za-z0-9_-]) forwarded verbatim as the Idempotency-Key header; never auto-generated"
-    }
+    },
+    ...PRICE_ANNOTATION_FLAGS
   },
   response: {
     order_id: { type: "string", description: "Authoritative order_ref (rio_\u2026, = order document _id) that was settled" },
@@ -1434,6 +1477,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,
@@ -1728,6 +1888,7 @@ var hotelPayOrderSchema = {
       description: "Unique key forwarded verbatim as the Idempotency-Key header; never auto-generated. Derive from business intent (e.g. hash(order_id + attempt)) and reuse the SAME key when retrying the same payment",
       constraints: "1-128 chars [A-Za-z0-9_-]"
     },
+    ...PRICE_ANNOTATION_FLAGS,
     watch: { type: "bool", required: false, default: false, description: "Poll automatically on PAYMENT_NOT_COMPLETED until PAID or timeout. Each iteration emits one NDJSON line" },
     "watch-interval": { type: "int", required: false, default: 5, description: "Seconds between poll attempts in --watch mode" },
     "watch-timeout": { type: "int", required: false, default: 300, description: "Total seconds before giving up in --watch mode" }
@@ -2382,6 +2543,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 };
 }
@@ -2490,7 +2684,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." }
   },
@@ -2522,7 +2717,8 @@ var flightPayOrderSchema = flightSchema(
     "return-url": { type: "string", required: false, description: "Optional 3DS/passkey return URL for the network-token authenticate path; falls back to the platform EVO_3DS_RETURN_URL." },
     "authorized-charge-no": { type: "string", required: false, description: "Resume a network-token 3DS challenge: charge_no from a prior AUTHENTICATION_REQUIRED response (settled via resume_token), then triggers ticketing on success." },
     "evo-explicit": { type: "bool", required: false, default: false, description: "[\u65B9\u6848 B/R16] Explicit opt-in to settle this pay_per_call order via the EVO bound-card fallback rail. Set true ONLY when the user explicitly chose EVO; forwarded to the pay body as evo_explicit=true. Without it, a pay_per_call settlement lacking --payment-token-id is hard-gated server-side." },
-    "idempotency-key": { type: "string", required: true, description: "Forwarded verbatim as the Idempotency-Key header." }
+    "idempotency-key": { type: "string", required: true, description: "Forwarded verbatim as the Idempotency-Key header." },
+    ...PRICE_ANNOTATION_FLAGS
   },
   { order_no: { type: "string", description: "Our order reference." }, status: { type: "string", description: "PAID on success; AUTHENTICATION_REQUIRED when the card needs 3DS." } },
   { command: "agenzo-merchant-cli flight-flink pay-order --order-no ffo_... --idempotency-key k2", output_summary: "Order becomes PAID; poll get-order until TICKETED." }
@@ -2631,7 +2827,8 @@ var flightChangePaySchema = flightSchema(
     "payment-method-id": { type: "string", required: false, description: "Optional bound-card id (EVO path)." },
     "payment-token-id": { type: "string", required: false, description: "Optional UPI network-token id (unionpay charge path)." },
     "authorized-merchant-trans-id": { type: "string", required: false, description: "Resume a 3DS challenge with the merchant trans id of the already-authorised preauth; the platform reuses and captures it instead of authorizing again." },
-    "idempotency-key": { type: "string", required: true, description: "Idempotency-Key header." }
+    "idempotency-key": { type: "string", required: true, description: "Idempotency-Key header." },
+    ...PRICE_ANNOTATION_FLAGS
   },
   {
     change_order_no: { type: "string", description: "Change order number." },
@@ -3227,6 +3424,12 @@ function registerRidePayOrderCommand(parent, deps) {
   ).option(
     "--idempotency-key <key>",
     "Idempotency key forwarded verbatim as the Idempotency-Key header"
+  ).option(
+    "--original-amount-cents <cents>",
+    PRICE_ANNOTATION_FLAGS["original-amount-cents"].description
+  ).option(
+    "--discount-amount-cents <cents>",
+    PRICE_ANNOTATION_FLAGS["discount-amount-cents"].description
   );
   attachSchemaHelp(cmd, ridePayOrderSchema);
   cmd.action(async () => {
@@ -3254,6 +3457,7 @@ function registerRidePayOrderCommand(parent, deps) {
     if (opts.returnUrl !== void 0) body.return_url = opts.returnUrl;
     if (authorizedChargeNo !== void 0) body.authorized_charge_no = authorizedChargeNo;
     if (opts.evoExplicit) body.evo_explicit = true;
+    applyPriceAnnotation(body, opts);
     if (!isYes) {
       const confirmed = await confirm3({
         message: `Settle ride order ${orderId}? This charges the card and creates the ride (AWAITING_PAYMENT \u2192 PAID).`,
@@ -3744,6 +3948,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 = [
   {
@@ -4308,7 +4691,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"
@@ -4378,22 +4761,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.`);
   }
@@ -4415,7 +4835,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.`);
   }
@@ -4487,7 +4907,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);
@@ -4530,14 +4950,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.`);
   }
@@ -4545,7 +4965,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.`);
   }
@@ -4585,7 +5005,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)) {
@@ -4705,14 +5125,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.`);
   }
@@ -4720,7 +5140,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.`);
   }
@@ -4792,18 +5212,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,
@@ -5035,7 +5455,7 @@ function registerHotelPayOrderCommand(parent, deps) {
   ).option(
     "--idempotency-key <key>",
     "Idempotency key forwarded verbatim as the Idempotency-Key header"
-  ).option("--watch", "Poll until PAID or timeout (NDJSON output)", false).option(
+  ).option("--original-amount-cents <cents>", PRICE_ANNOTATION_FLAGS["original-amount-cents"].description).option("--discount-amount-cents <cents>", PRICE_ANNOTATION_FLAGS["discount-amount-cents"].description).option("--watch", "Poll until PAID or timeout (NDJSON output)", false).option(
     "--watch-interval <seconds>",
     "Seconds between polls when --watch is set",
     String(DEFAULT_PAY_WATCH_INTERVAL_SECONDS)
@@ -5076,6 +5496,7 @@ function registerHotelPayOrderCommand(parent, deps) {
       body.authorized_charge_no = opts.authorizedChargeNo;
     }
     if (opts.evoExplicit) body.evo_explicit = true;
+    applyPriceAnnotation(body, opts);
     if (!isYes) {
       const confirmed = await confirm8({
         message: `Settle hotel order ${orderId}? This moves money via the order's configured billing mode (monthly_settlement or pay_per_call).`,
@@ -5155,7 +5576,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}.`);
   }
@@ -5219,7 +5640,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(
@@ -5253,7 +5674,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}.`);
   }
@@ -5306,8 +5727,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, {
@@ -5337,14 +5758,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.`);
   }
@@ -5410,10 +5831,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,
@@ -5456,7 +5877,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}.`);
   }
@@ -5492,7 +5913,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(
@@ -5596,7 +6017,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}.`);
   }
@@ -5630,7 +6051,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;
@@ -5654,14 +6075,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.`);
   }
@@ -5741,7 +6162,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);
@@ -5766,7 +6187,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}.`);
   }
@@ -5799,7 +6220,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",
@@ -5820,7 +6241,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}.`);
   }
@@ -5967,7 +6388,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);
@@ -6175,14 +6596,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.`);
   }
@@ -6203,7 +6624,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());
@@ -6217,7 +6638,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",
@@ -6226,7 +6647,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)
@@ -6255,7 +6676,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));
   });
 }
 
@@ -6280,7 +6701,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));
   });
 }
 
@@ -6300,7 +6721,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));
   });
 }
 
@@ -6314,7 +6735,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"),
@@ -6333,7 +6754,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));
   });
 }
 
@@ -6345,7 +6766,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",
@@ -6354,7 +6775,7 @@ 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));
   });
 }
 
@@ -6366,7 +6787,7 @@ function registerVerifyCommand(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 body = { product_token: productToken };
     if (opts.previousTotalPrice !== void 0) {
       body.previous_total_price = num10(opts.previousTotalPrice, "previous-total-price");
@@ -6383,7 +6804,7 @@ function registerVerifyCommand(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([
@@ -6400,7 +6821,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");
@@ -6410,20 +6834,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) {
@@ -6451,7 +6876,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) => [
@@ -6488,14 +6913,20 @@ function registerPayOrderCommand(parent, deps) {
   ).option(
     "--evo-explicit",
     "[\u65B9\u6848 B/R16] Explicit opt-in to settle this pay_per_call order via the EVO bound-card fallback rail. Set ONLY when the user explicitly chose EVO; forwarded to the pay body as evo_explicit=true. Without it, a pay_per_call settlement lacking --payment-token-id is hard-gated server-side."
-  ).option("--idempotency-key <key>", "Forwarded verbatim as the Idempotency-Key header");
+  ).option("--idempotency-key <key>", "Forwarded verbatim as the Idempotency-Key header").option(
+    "--original-amount-cents <cents>",
+    PRICE_ANNOTATION_FLAGS["original-amount-cents"].description
+  ).option(
+    "--discount-amount-cents <cents>",
+    PRICE_ANNOTATION_FLAGS["discount-amount-cents"].description
+  );
   attachSchemaHelp(cmd, flightPayOrderSchema);
   cmd.action(async () => {
     const opts = cmd.optsWithGlobals();
     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.`,
@@ -6520,6 +6951,7 @@ function registerPayOrderCommand(parent, deps) {
       body.authorized_charge_no = opts.authorizedChargeNo;
     }
     if (opts.evoExplicit) body.evo_explicit = true;
+    applyPriceAnnotation(body, opts);
     const result = await deps.apiClient.post(
       `/flight/${encodeURIComponent(orderNo)}/pay`,
       { type: "api-key", key: apiKey },
@@ -6528,7 +6960,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 ?? "-")],
@@ -6553,7 +6985,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) {
@@ -6578,7 +7010,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([
@@ -6602,7 +7034,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.`,
@@ -6625,7 +7057,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([
@@ -6658,7 +7090,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 ?? "-"),
@@ -6678,10 +7110,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...");
@@ -6692,7 +7124,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));
   });
 }
 
@@ -6707,14 +7139,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({
@@ -6736,7 +7168,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));
   });
 }
 
@@ -6748,7 +7180,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)}`,
@@ -6756,7 +7188,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));
   });
 }
 
@@ -6770,7 +7202,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.");
@@ -6788,7 +7220,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));
   });
 }
 
@@ -6798,17 +7230,23 @@ function registerChangePayCommand(parent, deps) {
   const cmd = parent.command("change-pay").description("Pay a change request fee (like a normal order) and trigger change ticketing").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--change-order-no <id>", "Change order number").option("--order-no <id>", "Original order reference (ownership check)").option("--amount <amount>", "Change fee total in decimal units (change-detail price_total)").option("--currency <currency>", "ISO 4217 currency code", "USD").option("--payment-method-id <id>", "Optional bound-card id (EVO path)").option("--payment-token-id <id>", "Optional UPI network-token id (unionpay charge path)").option(
     "--authorized-merchant-trans-id <id>",
     "Resume a 3DS challenge: merchant trans id of the already-authorised preauth"
-  ).option("--idempotency-key <key>", "Forwarded verbatim as the Idempotency-Key header");
+  ).option("--idempotency-key <key>", "Forwarded verbatim as the Idempotency-Key header").option(
+    "--original-amount-cents <cents>",
+    PRICE_ANNOTATION_FLAGS["original-amount-cents"].description
+  ).option(
+    "--discount-amount-cents <cents>",
+    PRICE_ANNOTATION_FLAGS["discount-amount-cents"].description
+  );
   attachSchemaHelp(cmd, flightChangePaySchema);
   cmd.action(async () => {
     const opts = cmd.optsWithGlobals();
     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,
@@ -6819,6 +7257,7 @@ function registerChangePayCommand(parent, deps) {
     if (opts.authorizedMerchantTransId !== void 0) {
       body.authorized_merchant_trans_id = opts.authorizedMerchantTransId;
     }
+    applyPriceAnnotation(body, opts);
     if (!isYes) {
       const isResume = opts.authorizedMerchantTransId !== void 0;
       const message = isResume ? `Resume change fee ${amount} ${currency} for change order ${changeOrderNo}? The card is already authorised; this captures it and triggers change ticketing.` : `Pay change fee ${amount} ${currency} for change order ${changeOrderNo}? This charges the customer and triggers change ticketing.`;
@@ -6838,7 +7277,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 [
@@ -6879,14 +7318,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) {
@@ -6909,7 +7348,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));
   });
 }
 
@@ -6921,7 +7360,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)}`,
@@ -6929,7 +7368,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));
   });
 }
 
@@ -6943,8 +7382,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).');
     }
@@ -6966,7 +7405,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));
   });
 }
 
@@ -7099,6 +7538,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.
@@ -7128,6 +7570,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 });
@@ -7137,6 +7580,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.