@agenzo/merchant-cli 0.2.2 → 0.3.2

package/dist/index.js

@@ -1,839 +1,1567 @@
 #!/usr/bin/env node
 
 // src/index.ts
-import { Command as Command8 } from "commander";
+import { Command } from "commander";
 
-// src/core/errors.ts
-var ErrorCodes = {
-  // -- Ride/elife domain (raised by the backend, recognized here) --
-  QUOTE_EXPIRED: "QUOTE_EXPIRED",
-  VEHICLE_UNAVAILABLE: "VEHICLE_UNAVAILABLE",
-  BOOKING_FAILED: "BOOKING_FAILED",
-  CANCELLATION_NOT_ALLOWED: "CANCELLATION_NOT_ALLOWED",
-  // -- Billing / settlement-account (monthly_settlement) --
-  BILLING_MODE_MISMATCH: "BILLING_MODE_MISMATCH",
-  ACCOUNT_NOT_FOUND: "ACCOUNT_NOT_FOUND",
-  ACCOUNT_SUSPENDED: "ACCOUNT_SUSPENDED",
-  ACCOUNT_INSUFFICIENT_BALANCE: "ACCOUNT_INSUFFICIENT_BALANCE",
-  // -- Payment order (pay_per_call; reserved until payment-cli ships) --
-  PAYMENT_ORDER_NOT_FOUND: "PAYMENT_ORDER_NOT_FOUND",
-  PAYMENT_ORDER_NOT_PAID: "PAYMENT_ORDER_NOT_PAID",
-  PAYMENT_ORDER_MISMATCH: "PAYMENT_ORDER_MISMATCH",
-  PAYMENT_ORDER_ALREADY_CONSUMED: "PAYMENT_ORDER_ALREADY_CONSUMED",
-  // -- Parameter / idempotency --
-  PARAM_IDEMPOTENCY_KEY_REQUIRED: "PARAM_IDEMPOTENCY_KEY_REQUIRED",
-  PARAM_IDEMPOTENCY_KEY_CONFLICT: "PARAM_IDEMPOTENCY_KEY_CONFLICT",
-  // -- Service discovery --
-  SERVICE_NOT_FOUND: "SERVICE_NOT_FOUND",
-  // -- CLI-local / transport --
-  NETWORK_ERROR: "NETWORK_ERROR",
-  TIMEOUT: "TIMEOUT",
-  CLI_OUTDATED: "CLI_OUTDATED",
-  CONFIG_ERROR: "CONFIG_ERROR",
-  NOT_IMPLEMENTED: "NOT_IMPLEMENTED",
-  INTERNAL_ERROR: "INTERNAL_ERROR"
+// ../../packages/cli-core/dist/index.js
+import { readFileSync } from "fs";
+import { dirname, join } from "path";
+import { fileURLToPath } from "url";
+import { readFile as readFile3, writeFile as writeFile3, mkdir as mkdir3, chmod as chmod3 } from "fs/promises";
+import { join as join4 } from "path";
+import { homedir as homedir3 } from "os";
+import { input, password, select } from "@inquirer/prompts";
+var CODE_NUM = {
+  AUTH_SESSION_EXPIRED: 1001,
+  AUTH_MAGIC_LINK_EXPIRED: 1002,
+  AUTH_INVITE_CODE_REQUIRED: 1003,
+  AUTH_INVITE_CODE_INVALID: 1004,
+  KEY_INVALID: 1101,
+  KEY_SCOPE_DENIED: 1102,
+  RESOURCE_NOT_FOUND: 2001,
+  RESOURCE_CONFLICT: 2002,
+  RESOURCE_STATE_INVALID: 2003,
+  PARAM_INVALID: 2101,
+  PARAM_IDEMPOTENCY_KEY_REQUIRED: 2102,
+  PARAM_IDEMPOTENCY_KEY_CONFLICT: 2103,
+  BILLING_MODE_MISMATCH: 3001,
+  ACCOUNT_NOT_FOUND: 3101,
+  ACCOUNT_SUSPENDED: 3102,
+  ACCOUNT_INSUFFICIENT_BALANCE: 3103,
+  PAYMENT_ORDER_NOT_FOUND: 3201,
+  PAYMENT_ORDER_NOT_PAID: 3202,
+  PAYMENT_ORDER_MISMATCH: 3203,
+  PAYMENT_ORDER_ALREADY_CONSUMED: 3204,
+  TOKEN_FEATURE_DISABLED: 4001,
+  SERVICE_NOT_FOUND: 4101,
+  VEHICLE_UNAVAILABLE: 4201,
+  QUOTE_EXPIRED: 4202,
+  BOOKING_FAILED: 4203,
+  CANCELLATION_NOT_ALLOWED: 4204,
+  RATE_LIMITED: 5001,
+  UPSTREAM_ERROR: 5101,
+  INTERNAL_ERROR: 5201,
+  NOT_IMPLEMENTED: 5300,
+  CLIENT_NOT_SIGNED_IN: 9001,
+  CLIENT_LOGIN_TIMEOUT: 9002,
+  CLIENT_ORG_NOT_LOCAL: 9003,
+  CLIENT_ORG_WRONG_ENV: 9004,
+  CLIENT_NO_PAYMENT_METHOD: 9005,
+  CLIENT_CARD_NOT_MATCHED: 9006,
+  CLIENT_ABORTED: 9007,
+  UPGRADE_REQUIRED: 9008
 };
-var CliError = class extends Error {
-  constructor(code, message, recovery, exitCode = 1) {
+function codeNum(code) {
+  return CODE_NUM[code];
+}
+var CliError = class _CliError extends Error {
+  constructor(code, message, statusCode, requestId, upstream) {
     super(message);
     this.code = code;
-    this.recovery = recovery;
-    this.exitCode = exitCode;
+    this.statusCode = statusCode;
+    this.requestId = requestId;
+    this.upstream = upstream;
     this.name = "CliError";
   }
   code;
-  recovery;
-  exitCode;
-};
-
-// src/core/config-manager.ts
-import { mkdirSync, readFileSync, writeFileSync } from "fs";
-import { homedir } from "os";
-import { join } from "path";
-var DEFAULT_HOST = "https://agent.everonet.com";
-var CONFIG_DIR = join(homedir(), ".agenzo-merchant-cli");
-var CONFIG_PATH = join(CONFIG_DIR, "config.json");
-function read() {
-  let raw;
-  try {
-    raw = readFileSync(CONFIG_PATH, "utf-8");
-  } catch (error) {
-    if (error.code === "ENOENT") {
-      return { host: DEFAULT_HOST };
+  statusCode;
+  requestId;
+  upstream;
+  /**
+   * Map a backend ApiError to a CLI-facing code (§8.5 transitional mapping).
+   * Backend numeric codes / HTTP status are translated to §8.4 string codes;
+   * the raw backend message is NOT passed through (§8.1 principle 4) — a
+   * stable, fixed message per code is used instead.
+   *
+   * The optional `opts.auth` selects the auth semantics for the 401 mapping:
+   * - `'bearer'` (default, admin-cli Bearer Token): 401 → `AUTH_SESSION_EXPIRED`.
+   * - `'api-key'` (token-cli `X-Api-Key`): 401 → `KEY_INVALID`.
+   * 403 maps to `KEY_SCOPE_DENIED` under both auth modes. Omitting `opts`
+   * preserves the original Bearer behavior exactly (§8.5 / requirement 6.4).
+   *
+   * Domain string-code routing (D3 / requirement 5.4): when the backend
+   * supplies a string `error.code` in the v3 envelope that is a known §8 code
+   * (present in {@link CODE_NUM}), it is used verbatim as the CLI-facing code
+   * so ride/merchant-specific codes (`QUOTE_EXPIRED`, `VEHICLE_UNAVAILABLE`,
+   * `BILLING_MODE_MISMATCH`, `PAYMENT_ORDER_*`, …) survive intact. Otherwise —
+   * including when no string code is provided, as is the case for admin/token
+   * today — mapping falls back to the HTTP-status table below, leaving the
+   * existing Bearer/api-key behavior unchanged.
+   */
+  static fromApi(error, opts) {
+    if (error.code && isKnownErrorCode(error.code)) {
+      return new _CliError(
+        error.code,
+        STABLE_MESSAGE[error.code] ?? "Request failed. Please check your input and retry.",
+        error.statusCode,
+        error.requestId,
+        error.upstream
+      );
     }
-    throw error;
+    const status = error.statusCode;
+    let code;
+    if (status === 401) code = opts?.auth === "api-key" ? "KEY_INVALID" : "AUTH_SESSION_EXPIRED";
+    else if (status === 403) code = "KEY_SCOPE_DENIED";
+    else if (status === 404) code = "RESOURCE_NOT_FOUND";
+    else if (status === 409) code = "RESOURCE_CONFLICT";
+    else if (status === 429) code = "RATE_LIMITED";
+    else if (status >= 500) code = "INTERNAL_ERROR";
+    else code = "PARAM_INVALID";
+    return new _CliError(
+      code,
+      STABLE_MESSAGE[code] ?? "Request failed. Please check your input and retry.",
+      status,
+      error.requestId,
+      error.upstream
+    );
   }
-  try {
-    const parsed = JSON.parse(raw);
-    return { host: parsed.host ?? DEFAULT_HOST };
-  } catch {
-    throw new CliError(
-      ErrorCodes.CONFIG_ERROR,
-      `Invalid config file: ${CONFIG_PATH}`,
-      "Delete the file to reset to defaults."
+};
+var NetworkError = class extends CliError {
+  constructor(_url, timeout, _cause) {
+    super(
+      "UPSTREAM_ERROR",
+      timeout ? "The request timed out. The service may be temporarily unavailable \u2014 please retry." : "Connection failed. The service may be temporarily unavailable \u2014 please retry."
     );
   }
-}
-function write(config) {
-  mkdirSync(CONFIG_DIR, { recursive: true });
-  writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2), "utf-8");
-}
-function getHost() {
-  return read().host;
-}
-function setHost(host) {
-  write({ host: host.replace(/\/+$/, "") });
-}
-function resetHost() {
-  write({ host: DEFAULT_HOST });
-}
-
-// src/core/formatter.ts
-var ICONS = {
-  success: "\u2713",
-  error: "\u2717",
-  info: "\u2139",
-  warning: "\u26A0"
 };
-var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
-function createSpinner(message) {
-  const isTty = Boolean(process.stderr.isTTY);
-  let current = message;
-  if (!isTty) {
-    return {
-      update(msg) {
-        current = msg;
-      },
-      stop() {
-      },
-      succeed(msg) {
-        if (msg) process.stderr.write(`${Formatter.status("success", msg)}
-`);
-      },
-      fail(msg) {
-        process.stderr.write(`${Formatter.status("error", msg ?? current)}
-`);
-      }
-    };
+var ConfigError = class extends CliError {
+  constructor(message, filePath) {
+    super("INTERNAL_ERROR", message || "Unknown error");
+    this.filePath = filePath;
   }
-  let frame = 0;
-  const render = () => {
-    process.stderr.write(`\r\x1B[K${SPINNER_FRAMES[frame]} ${current}`);
-    frame = (frame + 1) % SPINNER_FRAMES.length;
-  };
-  render();
-  const timer = setInterval(render, 80);
-  const clear = () => {
-    clearInterval(timer);
-    process.stderr.write("\r\x1B[K");
-  };
-  return {
-    update(msg) {
-      current = msg;
-    },
-    stop() {
-      clear();
-    },
-    succeed(msg) {
-      clear();
-      if (msg) process.stderr.write(`${Formatter.status("success", msg)}
-`);
-    },
-    fail(msg) {
-      clear();
-      process.stderr.write(`${Formatter.status("error", msg ?? current)}
-`);
-    }
-  };
-}
-function stringify(value) {
-  if (value === null || value === void 0) return "";
-  if (typeof value === "object") return JSON.stringify(value);
-  return String(value);
-}
-var Formatter = class _Formatter {
-  /** Status-prefixed line, e.g. "✓ done". */
-  static status(type, message) {
-    return `${ICONS[type]} ${message}`;
+  filePath;
+};
+var ValidationError = class extends CliError {
+  constructor(message) {
+    super("PARAM_INVALID", message || "Unknown error");
   }
-  /** Aligned columnar table for list output. */
-  static table(headers, rows) {
-    const widths = headers.map(
-      (h, i) => Math.max(h.length, ...rows.map((r) => (r[i] ?? "").length))
+};
+var IdempotencyKeyRequiredError = class extends CliError {
+  constructor(commandPath) {
+    super(
+      "PARAM_IDEMPOTENCY_KEY_REQUIRED",
+      `\`${commandPath}\` requires --idempotency-key <key>. Supply a unique key so the write can be safely retried.`
     );
-    const line = (cells) => cells.map((c, i) => (c ?? "").padEnd(widths[i])).join("  ");
-    return [
-      line(headers),
-      widths.map((w) => "-".repeat(w)).join("  "),
-      ...rows.map(line)
-    ].join("\n");
   }
-  /** Key-value detail output with left-aligned keys. */
-  static keyValue(entries) {
-    const width = Math.max(0, ...entries.map(([k]) => k.length));
-    return entries.map(([k, v]) => `${k.padEnd(width)}  ${v}`).join("\n");
-  }
-  /** Best-effort human-readable rendering of arbitrary data. */
-  static auto(data) {
-    if (Array.isArray(data)) {
-      return _Formatter.arrayTable(data);
-    }
-    if (data && typeof data === "object") {
-      const obj = data;
-      const scalarEntries = [];
-      const tableSections = [];
-      for (const [k, v] of Object.entries(obj)) {
-        if (Array.isArray(v) && v.some((i) => i && typeof i === "object")) {
-          tableSections.push(`${k}:
-${_Formatter.arrayTable(v)}`);
-        } else {
-          scalarEntries.push([k, stringify(v)]);
-        }
-      }
-      const parts = [];
-      if (scalarEntries.length) parts.push(_Formatter.keyValue(scalarEntries));
-      parts.push(...tableSections);
-      return parts.join("\n\n");
-    }
-    return stringify(data);
-  }
-  /** Render an array of objects as an aligned table; falls back gracefully. */
-  static arrayTable(items) {
-    if (items.length === 0) return "(empty)";
-    const rows = items.filter(
-      (i) => Boolean(i) && typeof i === "object"
-    );
-    if (rows.length === 0) {
-      return items.map((i) => stringify(i)).join(", ");
-    }
-    const headers = Object.keys(rows[0]);
-    return _Formatter.table(
-      headers,
-      rows.map((r) => headers.map((h) => stringify(r[h])))
+};
+var UpgradeRequiredError = class extends CliError {
+  constructor(currentVersion, minVersion, upgradeCommand) {
+    super(
+      "UPGRADE_REQUIRED",
+      `agenzo-admin-cli ${currentVersion} is out of date \u2014 the server requires ${minVersion} or newer. To upgrade, run: ${upgradeCommand}`
     );
   }
 };
-
-// src/core/output.ts
-function emit(data, format = "json") {
-  if (format === "table") {
-    console.log(Formatter.auto(data));
-  } else {
-    console.log(JSON.stringify(data, null, 2));
+var UserCancelError = class extends CliError {
+  constructor(message = "Operation cancelled by user") {
+    super("CLIENT_ABORTED", message || "Unknown error");
   }
+};
+function isKnownErrorCode(value) {
+  return Object.prototype.hasOwnProperty.call(CODE_NUM, value);
 }
-function emitNdjsonLine(data) {
-  console.log(JSON.stringify(data));
-}
-function emitSchema(schema, format = "json") {
-  if (format === "table") {
-    console.log(Formatter.keyValue(Object.entries(schema.params)));
-  } else {
-    console.log(JSON.stringify(schema, null, 2));
+var STABLE_MESSAGE = {
+  AUTH_SESSION_EXPIRED: "Your session has expired. Please run `agenzo-admin-cli auth login` again.",
+  AUTH_MAGIC_LINK_EXPIRED: "Verification link is invalid or has expired. Please request a new one.",
+  AUTH_INVITE_CODE_REQUIRED: "An invitation code is required to register.",
+  AUTH_INVITE_CODE_INVALID: "The invitation code is invalid.",
+  KEY_INVALID: "The API key is invalid or has been revoked. Please check your --api-key and retry.",
+  KEY_SCOPE_DENIED: "This API key does not have the required scope for this command.",
+  RESOURCE_NOT_FOUND: "The resource was not found or does not belong to the current organization.",
+  RESOURCE_CONFLICT: "A resource with the same unique value already exists.",
+  RESOURCE_STATE_INVALID: "The resource is in a state that does not permit this operation.",
+  RATE_LIMITED: "Too many requests. Please back off and retry.",
+  UPSTREAM_ERROR: "A third-party service is temporarily unavailable. Please try again later.",
+  INTERNAL_ERROR: "Something went wrong on the server. Please retry and note the request_id.",
+  PARAM_INVALID: "One or more parameters are invalid. Please check your input and retry.",
+  PARAM_IDEMPOTENCY_KEY_CONFLICT: "A request with this idempotency key was already processed with different parameters.",
+  TOKEN_FEATURE_DISABLED: "This token feature is currently unavailable.",
+  BILLING_MODE_MISMATCH: "The billing mode does not match this operation. Please verify your account billing configuration.",
+  ACCOUNT_NOT_FOUND: "The settlement account was not found.",
+  ACCOUNT_SUSPENDED: "The settlement account is suspended. Please contact support.",
+  ACCOUNT_INSUFFICIENT_BALANCE: "The settlement account has insufficient balance for this operation.",
+  PAYMENT_ORDER_NOT_FOUND: "The payment order was not found.",
+  PAYMENT_ORDER_NOT_PAID: "The payment order has not been paid. Please complete payment and retry.",
+  PAYMENT_ORDER_MISMATCH: "The payment order does not match this order. Please check the --payment-order-id.",
+  PAYMENT_ORDER_ALREADY_CONSUMED: "The payment order has already been consumed by another booking.",
+  SERVICE_NOT_FOUND: "The requested service was not found.",
+  VEHICLE_UNAVAILABLE: "No vehicle is available for the requested trip. Please try a different time or class.",
+  QUOTE_EXPIRED: "The quote has expired. Please request a new quote and retry.",
+  BOOKING_FAILED: "The booking could not be completed. Please retry.",
+  CANCELLATION_NOT_ALLOWED: "This order cannot be cancelled in its current state.",
+  NOT_IMPLEMENTED: "This operation is not implemented yet."
+};
+function toErrorEnvelope(error) {
+  if (error instanceof CliError) {
+    return {
+      error: {
+        code: error.code,
+        code_num: codeNum(error.code),
+        message: error.message || "Unknown error",
+        ...error.requestId ? { request_id: error.requestId } : {},
+        ...error.upstream ? { upstream: error.upstream } : {}
+      }
+    };
   }
+  const message = error instanceof Error ? error.message : typeof error === "string" ? error : "Unexpected error";
+  return {
+    error: {
+      code: "INTERNAL_ERROR",
+      code_num: codeNum("INTERNAL_ERROR"),
+      message: message || "Unknown error"
+    }
+  };
 }
-
-// src/core/version.ts
-import { readFileSync as readFileSync2 } from "fs";
-import { dirname, join as join2 } from "path";
-import { fileURLToPath } from "url";
-var UPGRADE_COMMAND = "npm install -g agenzo-merchant-cli@latest";
-var FALLBACK_VERSION = "0.1.0";
-var cached = null;
+var UPGRADE_COMMAND = "npm install -g agenzo-admin-cli@latest";
+var FALLBACK_VERSION = "0.1.1";
+var cachedVersion = null;
 function getCurrentVersion() {
-  if (cached !== null) return cached;
+  if (cachedVersion !== null) return cachedVersion;
   const here = dirname(fileURLToPath(import.meta.url));
   const candidates = [
-    join2(here, "..", "package.json"),
-    join2(here, "..", "..", "package.json")
+    join(here, "..", "package.json"),
+    // dist/ → project root
+    join(here, "..", "..", "package.json")
+    // src/utils/ → project root
   ];
   for (const p of candidates) {
     try {
-      const pkg = JSON.parse(readFileSync2(p, "utf-8"));
+      const pkg = JSON.parse(readFileSync(p, "utf-8"));
       if (typeof pkg.version === "string") {
-        cached = pkg.version;
-        return cached;
+        cachedVersion = pkg.version;
+        return cachedVersion;
       }
     } catch {
     }
   }
-  cached = FALLBACK_VERSION;
-  return cached;
+  cachedVersion = FALLBACK_VERSION;
+  console.warn(
+    `[agenzo-admin-cli] package.json not found; using fallback version ${FALLBACK_VERSION}`
+  );
+  return cachedVersion;
 }
-function compareVersion(a, b) {
-  const parse = (v) => v.trim().replace(/^v/, "").split(/[-+]/)[0].split(".").map((n) => parseInt(n, 10) || 0);
-  const pa = parse(a);
-  const pb = parse(b);
-  for (let i = 0; i < 3; i++) {
-    const diff = (pa[i] ?? 0) - (pb[i] ?? 0);
-    if (diff !== 0) return diff;
-  }
-  return 0;
+function compareVersions(a, b) {
+  const parse = (v) => {
+    const clean = v.trim().replace(/^v/, "").split(/[-+]/)[0];
+    const parts = clean.split(".");
+    return [
+      parseInt(parts[0] ?? "0", 10) || 0,
+      parseInt(parts[1] ?? "0", 10) || 0,
+      parseInt(parts[2] ?? "0", 10) || 0
+    ];
+  };
+  const [a1, a2, a3] = parse(a);
+  const [b1, b2, b3] = parse(b);
+  if (a1 !== b1) return a1 - b1;
+  if (a2 !== b2) return a2 - b2;
+  return a3 - b3;
 }
-function enforceMinVersion(header) {
-  const min = header?.trim();
-  if (!min) return;
-  const current = getCurrentVersion();
-  if (compareVersion(current, min) < 0) {
-    throw new CliError(
-      ErrorCodes.CLI_OUTDATED,
-      `CLI ${current} is below the required minimum ${min}.`,
-      `Upgrade: ${UPGRADE_COMMAND}`,
-      2
-    );
-  }
+function isBelow(current, minimum) {
+  return compareVersions(current, minimum) < 0;
 }
-
-// src/ride/quote.ts
-import { Command } from "commander";
-
-// src/core/api-client.ts
-var RIDE_PREFIX = "/api/v3/agent-pay";
 var ApiClient = class {
-  host;
-  apiKey;
+  baseUrl;
   timeout;
-  constructor(options) {
-    this.apiKey = options.apiKey;
-    this.host = (options.host ?? getHost()).replace(/\/+$/, "");
-    this.timeout = options.timeout ?? 3e4;
-  }
-  get(path, options = {}) {
-    return this.request("GET", path, options);
-  }
-  post(path, options = {}) {
-    return this.request("POST", path, options);
-  }
-  async request(method, path, options) {
-    let url = `${this.host}${RIDE_PREFIX}${path}`;
-    if (options.query) {
-      const params = new URLSearchParams();
-      for (const [key, value] of Object.entries(options.query)) {
-        if (value !== void 0) params.set(key, String(value));
-      }
-      const qs = params.toString();
-      if (qs) url += `?${qs}`;
-    }
+  constructor(config) {
+    this.baseUrl = config.baseUrl.replace(/\/+$/, "");
+    this.timeout = config.timeout ?? 6e4;
+  }
+  buildHeaders(auth) {
     const headers = {
-      "X-Api-Key": this.apiKey,
-      "User-Agent": `agenzo-merchant-cli/${getCurrentVersion()}`
+      "User-Agent": `agenzo-admin-cli/${getCurrentVersion()}`
     };
-    if (options.body) headers["Content-Type"] = "application/json";
-    if (options.idempotencyKey) headers["Idempotency-Key"] = options.idempotencyKey;
+    if (auth.type === "bearer") {
+      headers["Authorization"] = `Bearer ${auth.token}`;
+    } else if (auth.type === "api-key") {
+      headers["X-Api-Key"] = auth.key;
+    }
+    return headers;
+  }
+  async get(path, auth, params) {
+    let url = `${this.baseUrl}${path}`;
+    if (params && Object.keys(params).length > 0) {
+      const searchParams = new URLSearchParams(params);
+      url += `?${searchParams.toString()}`;
+    }
+    return this.request(url, {
+      method: "GET",
+      headers: this.buildHeaders(auth)
+    });
+  }
+  async post(path, auth, body, extraHeaders) {
+    const url = `${this.baseUrl}${path}`;
+    const headers = this.buildHeaders(auth);
+    headers["Content-Type"] = "application/json";
+    if (extraHeaders) {
+      Object.assign(headers, extraHeaders);
+    }
+    return this.request(url, {
+      method: "POST",
+      headers,
+      body: body ? JSON.stringify(body) : void 0
+    });
+  }
+  async request(url, init) {
     const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), this.timeout);
-    let response;
+    const timeoutId = setTimeout(() => controller.abort(), this.timeout);
     try {
-      response = await fetch(url, {
-        method,
-        headers,
-        body: options.body ? JSON.stringify(options.body) : void 0,
+      const response = await fetch(url, {
+        ...init,
         signal: controller.signal
       });
+      this.enforceMinVersion(response.headers.get("x-cli-min-version"));
+      const contentType = response.headers.get("content-type") ?? "";
+      let responseBody;
+      if (contentType.includes("application/json")) {
+        responseBody = await response.json();
+      } else {
+        const text = await response.text();
+        if (!response.ok) {
+          const statusMsg = this.friendlyStatusMessage(response.status);
+          return {
+            success: false,
+            errorCode: 0,
+            errorMessage: statusMsg,
+            statusCode: response.status
+          };
+        }
+        try {
+          responseBody = JSON.parse(text);
+        } catch {
+          return {
+            success: false,
+            errorCode: 0,
+            errorMessage: `Unexpected response from server (${response.status})`,
+            statusCode: response.status
+          };
+        }
+      }
+      const code = responseBody.code;
+      const message = responseBody.message;
+      const data = responseBody.data;
+      if (response.ok && (!code || code === "0000")) {
+        const payload = data ?? responseBody;
+        return { success: true, data: payload, message };
+      }
+      const errorCode = code ? parseInt(code, 10) : 0;
+      let errorMsg = message ?? response.statusText;
+      if (!errorMsg || errorMsg === response.statusText) {
+        const detail = responseBody.detail;
+        if (Array.isArray(detail)) {
+          errorMsg = detail.map((d) => {
+            const loc = d.loc?.slice(1).join(".") ?? "";
+            return loc ? `${loc}: ${d.msg}` : String(d.msg);
+          }).join("; ");
+        } else if (typeof detail === "string") {
+          errorMsg = detail;
+        }
+      }
+      const errorCodeStr = responseBody.error_code;
+      const rawData = responseBody.data;
+      const upstream = rawData?.upstream && typeof rawData.upstream === "object" ? rawData.upstream : void 0;
+      return {
+        success: false,
+        errorCode: isNaN(errorCode) ? 0 : errorCode,
+        errorMessage: errorMsg,
+        statusCode: response.status,
+        ...errorCodeStr ? { code: errorCodeStr } : typeof code === "string" && code ? { code } : {},
+        requestId: responseBody.request_id ?? responseBody.requestId,
+        ...upstream ? { upstream } : {}
+      };
     } catch (error) {
-      if (error instanceof Error && error.name === "AbortError") {
-        throw new CliError(
-          ErrorCodes.TIMEOUT,
-          `Request timed out after ${this.timeout}ms: ${url}`,
-          "Retry, or check your network connection."
-        );
+      if (error instanceof UpgradeRequiredError) {
+        throw error;
       }
-      throw new CliError(
-        ErrorCodes.NETWORK_ERROR,
-        `Network request failed: ${url}`,
-        "Check your network connection and the configured API host."
-      );
+      if (error instanceof DOMException && error.name === "AbortError") {
+        throw new NetworkError(url, this.timeout);
+      }
+      throw new NetworkError(url, void 0, error instanceof Error ? error : void 0);
     } finally {
-      clearTimeout(timer);
+      clearTimeout(timeoutId);
+    }
+  }
+  /**
+   * Validate that the running CLI meets the server-advertised minimum.
+   * Missing or empty header → skip (backward compat with servers that don't
+   * advertise yet, and clients hitting legacy proxies).
+   */
+  enforceMinVersion(headerValue) {
+    const minVersion = headerValue?.trim();
+    if (!minVersion) return;
+    const current = getCurrentVersion();
+    if (isBelow(current, minVersion)) {
+      throw new UpgradeRequiredError(current, minVersion, UPGRADE_COMMAND);
     }
-    enforceMinVersion(response.headers.get("x-cli-min-version"));
-    const text = await response.text();
-    let envelope;
+  }
+  friendlyStatusMessage(status) {
+    const messages = {
+      400: "Invalid request. Please check your input.",
+      401: "Authentication failed. Please check your API key or login again.",
+      403: "Access denied. You do not have permission for this operation.",
+      404: "Resource not found. Please check the ID.",
+      409: "Conflict. This resource may already exist.",
+      422: "Invalid input. Please check the request parameters.",
+      429: "Too many requests. Please wait and try again.",
+      500: "Something went wrong on the server. Please try again later.",
+      502: "Service is temporarily unavailable. Please try again in a moment.",
+      503: "Service is temporarily unavailable. Please try again in a moment.",
+      504: "The request took too long. Please try again."
+    };
+    return messages[status] ?? `Something went wrong (${status}). Please try again later.`;
+  }
+};
+var DEFAULT_API_PATH = "/api/admin/v1";
+var DEFAULT_CONFIG = {
+  active_org: null,
+  active_developer_id: null,
+  api_host: "https://agent.everonet.com",
+  api_path: DEFAULT_API_PATH
+};
+var BUILTIN_PROFILES = {
+  production: "https://agent.everonet.com",
+  testing: "https://agent-test.everonet.com"
+};
+function resolveApiHost(host) {
+  if (BUILTIN_PROFILES[host]) {
+    return BUILTIN_PROFILES[host];
+  }
+  let url;
+  try {
+    url = new URL(host);
+  } catch {
+    throw new ValidationError(`Unknown profile or invalid URL: ${host}`);
+  }
+  if (url.protocol === "https:") {
+    return host;
+  }
+  if (url.protocol === "http:" && (url.hostname === "localhost" || url.hostname === "127.0.0.1")) {
+    return host;
+  }
+  throw new ValidationError(
+    `Insecure API host is not allowed: ${host}. Use HTTPS, except for localhost or 127.0.0.1.`
+  );
+}
+var ConfigManager = class {
+  basePath;
+  configPath;
+  /**
+   * Product-line API prefix this CLI targets (e.g. /api/admin/v1,
+   * /api/token/v1). Injected per binary so the four CLIs share one api_host
+   * but route to different product lines. Overrides any persisted api_path.
+   */
+  apiPath;
+  constructor(basePath, apiPath) {
+    this.basePath = basePath ?? join4(homedir3(), ".agenzo-admin-cli");
+    this.configPath = join4(this.basePath, "config.json");
+    this.apiPath = apiPath ?? DEFAULT_API_PATH;
+  }
+  /** The resolved product-line API prefix for this CLI (per-binary constant). */
+  getApiPath() {
+    return this.apiPath;
+  }
+  async ensureDirectories() {
+    await mkdir3(this.basePath, { recursive: true, mode: 448 });
+    await chmod3(this.basePath, 448);
+    const credDir = join4(this.basePath, "credentials");
+    await mkdir3(credDir, { recursive: true, mode: 448 });
+    await chmod3(credDir, 448);
+  }
+  async load() {
     try {
-      envelope = JSON.parse(text);
-    } catch {
-      throw new CliError(
-        ErrorCodes.NETWORK_ERROR,
-        `Unexpected non-JSON response (HTTP ${response.status}) from ${url}`
-      );
+      const content = await readFile3(this.configPath, "utf-8");
+      try {
+        const raw = JSON.parse(content);
+        if (raw.api_base_url && !raw.api_host) {
+          const url = String(raw.api_base_url);
+          const pathIndex = url.indexOf("/api/");
+          raw.api_host = pathIndex > 0 ? url.slice(0, pathIndex) : url;
+          raw.api_path = pathIndex > 0 ? url.slice(pathIndex) : DEFAULT_CONFIG.api_path;
+          delete raw.api_base_url;
+        }
+        return {
+          active_org: raw.active_org ?? null,
+          active_developer_id: raw.active_developer_id ?? null,
+          api_host: raw.api_host ?? DEFAULT_CONFIG.api_host,
+          api_path: raw.api_path ?? DEFAULT_CONFIG.api_path
+        };
+      } catch {
+        throw new ConfigError(
+          `Invalid config file: ${this.configPath}`,
+          this.configPath
+        );
+      }
+    } catch (error) {
+      if (error instanceof ConfigError) throw error;
+      if (error.code === "ENOENT") {
+        return { ...DEFAULT_CONFIG };
+      }
+      throw error;
     }
-    if (envelope.code !== void 0 && envelope.code !== "0000") {
-      const code = envelope.code;
-      const message = envelope.message ?? `Request failed (HTTP ${response.status})`;
-      throw new CliError(code, message);
+  }
+  async save(config) {
+    await this.ensureDirectories();
+    await writeFile3(this.configPath, JSON.stringify(config, null, 2), {
+      encoding: "utf-8",
+      mode: 384
+    });
+    await chmod3(this.configPath, 384);
+  }
+  async getActiveOrg() {
+    const config = await this.load();
+    return config.active_org;
+  }
+  async setActiveOrg(orgId) {
+    const config = await this.load();
+    config.active_org = orgId;
+    await this.save(config);
+  }
+  async getApiBaseUrl() {
+    const config = await this.load();
+    const host = resolveApiHost(config.api_host).replace(/\/+$/, "");
+    const path = this.apiPath.startsWith("/") ? this.apiPath : `/${this.apiPath}`;
+    return `${host}${path}`;
+  }
+  async setApiHost(host) {
+    const config = await this.load();
+    config.api_host = resolveApiHost(host);
+    await this.save(config);
+  }
+  async getApiHost() {
+    const config = await this.load();
+    return resolveApiHost(config.api_host);
+  }
+};
+function exitCodeFor(error) {
+  if (!(error instanceof CliError)) {
+    return 1;
+  }
+  const code = error.code;
+  if (code === "UPGRADE_REQUIRED") {
+    return 2;
+  }
+  if (code === "CLIENT_ABORTED") {
+    return 5;
+  }
+  if (code.startsWith("AUTH_") || code.startsWith("KEY_")) {
+    return 3;
+  }
+  if (code === "UPSTREAM_ERROR" || code === "INTERNAL_ERROR" || code === "RATE_LIMITED") {
+    return 4;
+  }
+  return 1;
+}
+var STATUS_ICONS = {
+  success: "\u2713",
+  error: "\u2717",
+  info: "\u2139",
+  warning: "\u26A0",
+  loading: "\u280B"
+};
+var Formatter = class _Formatter {
+  /** Get display width of a string (CJK characters count as 2) */
+  static displayWidth(str) {
+    let width = 0;
+    for (const char of str) {
+      const code = char.codePointAt(0);
+      if (code >= 19968 && code <= 40959 || // CJK Unified
+      code >= 12288 && code <= 12351 || // CJK Punctuation
+      code >= 13312 && code <= 19903 || // CJK Extension A
+      code >= 65280 && code <= 65519 || // Fullwidth Forms
+      code >= 63744 && code <= 64255 || // CJK Compatibility
+      code >= 131072 && code <= 173791) {
+        width += 2;
+      } else {
+        width += 1;
+      }
     }
-    return envelope.data;
+    return width;
+  }
+  /** Pad string to target display width (right-pad with spaces) */
+  static padEndDisplay(str, targetWidth) {
+    const currentWidth = _Formatter.displayWidth(str);
+    const padding = Math.max(0, targetWidth - currentWidth);
+    return str + " ".repeat(padding);
+  }
+  /** Pad string to target display width (left-pad with spaces) */
+  static padStartDisplay(str, targetWidth) {
+    const currentWidth = _Formatter.displayWidth(str);
+    const padding = Math.max(0, targetWidth - currentWidth);
+    return " ".repeat(padding) + str;
+  }
+  /** Table output for list commands — columns aligned by max width */
+  static table(headers, rows) {
+    const colWidths = headers.map((h, i) => {
+      const cellWidths = rows.map((r) => _Formatter.displayWidth(r[i] ?? ""));
+      return Math.max(_Formatter.displayWidth(h), ...cellWidths);
+    });
+    const sep = "  ";
+    const headerLine = headers.map((h, i) => _Formatter.padEndDisplay(h, colWidths[i])).join(sep);
+    const divider = colWidths.map((w) => "-".repeat(w)).join(sep);
+    const dataLines = rows.map(
+      (row) => row.map((cell, i) => _Formatter.padEndDisplay(cell ?? "", colWidths[i])).join(sep)
+    );
+    return [headerLine, divider, ...dataLines].join("\n");
+  }
+  /** Key-value output for detail commands — keys left-aligned */
+  static keyValue(entries) {
+    const maxKeyWidth = Math.max(...entries.map(([k]) => _Formatter.displayWidth(k)));
+    return entries.map(([key, value]) => `${_Formatter.padEndDisplay(key, maxKeyWidth)}  ${value}`).join("\n");
+  }
+  /** Status-prefixed message */
+  static status(type, message) {
+    return `${STATUS_ICONS[type]} ${message}`;
+  }
+  /** Mask sensitive info, keeping only the prefix */
+  static maskKey(key, prefixLength = 8) {
+    if (key.length <= prefixLength) {
+      return key;
+    }
+    return key.slice(0, prefixLength) + "*".repeat(key.length - prefixLength);
+  }
+  /**
+   * Format ISO 8601 timestamp to local timezone display.
+   * Automatically uses the user's system timezone.
+   * e.g. "2026-05-07T03:24:53+00:00" → "2026-05-07 11:24:53" (in CST)
+   *      "2026-05-07T03:24:53+00:00" → "2026-05-06 20:24:53" (in PDT)
+   * Returns the original string if parsing fails or input is empty.
+   */
+  static formatTime(iso) {
+    if (!iso) return "";
+    const date = new Date(iso);
+    if (isNaN(date.getTime())) return iso;
+    const pad = (n) => String(n).padStart(2, "0");
+    const y = date.getFullYear();
+    const m = pad(date.getMonth() + 1);
+    const d = pad(date.getDate());
+    const h = pad(date.getHours());
+    const min = pad(date.getMinutes());
+    const s = pad(date.getSeconds());
+    const offsetMin = -date.getTimezoneOffset();
+    const sign = offsetMin >= 0 ? "+" : "-";
+    const absOffset = Math.abs(offsetMin);
+    const tzH = pad(Math.floor(absOffset / 60));
+    const tzM = pad(absOffset % 60);
+    return `${y}-${m}-${d} ${h}:${min}:${s} (UTC${sign}${tzH}:${tzM})`;
   }
 };
-
-// src/core/prompt-engine.ts
-import { confirm, input, password, select } from "@inquirer/prompts";
+var DEFAULT_FORMAT = "table";
+function isOutputFormat(value) {
+  return value === "json" || value === "table";
+}
+function resolveFormat(flag, env = process.env.AGENZO_FORMAT) {
+  if (flag !== void 0) {
+    return isOutputFormat(flag) ? flag : DEFAULT_FORMAT;
+  }
+  if (env !== void 0 && isOutputFormat(env)) {
+    return env;
+  }
+  return DEFAULT_FORMAT;
+}
+function render(result, opts) {
+  if (opts.format === "json") {
+    process.stdout.write(`${JSON.stringify(result.data, null, 2)}
+`);
+    return;
+  }
+  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);
+    return;
+  }
+  const config = await configManager.load();
+  const host = config.api_host.replace(/\/+$/, "");
+  const profile = Object.entries(BUILTIN_PROFILES).find(([, v]) => v === host)?.[0] ?? "custom";
+  const dataObj = result.data && typeof result.data === "object" ? result.data : { value: result.data };
+  const payload = {
+    profile,
+    endpoint: host,
+    ...dataObj
+  };
+  render({ ...result, data: payload }, opts);
+}
 var PromptEngine = class {
-  static async resolveInput(flagValue, options) {
-    if (flagValue !== void 0) return flagValue;
-    if (options.type === "password") {
-      return password({ message: options.message, mask: "*" });
+  /** Return flagValue directly if provided, otherwise prompt interactively */
+  static async resolveInput(flagValue, config) {
+    if (flagValue !== void 0) {
+      return flagValue;
     }
-    if (options.type === "select" && options.choices) {
-      return select({ message: options.message, choices: options.choices });
+    if (config.type === "password") {
+      return password({ message: config.message, mask: "*" });
     }
-    return input({ message: options.message, validate: options.validate });
+    if (config.type === "select" && config.choices) {
+      return select({
+        message: config.message,
+        choices: config.choices
+      });
+    }
+    return input({
+      message: config.message,
+      validate: config.validate
+    });
   }
-  /** Confirmation prompt; auto-approves when `--yes` is set. */
-  static async confirm(message, yes) {
-    if (yes) return true;
-    return confirm({ message });
+};
+
+// src/ride-elife/watch.ts
+var TERMINAL_STATUSES = /* @__PURE__ */ new Set([
+  "At destination",
+  "Cancelled",
+  "Rejected",
+  "Customer no show",
+  "Driver no show"
+]);
+var DEFAULT_WATCH_INTERVAL_SECONDS = 5;
+var DEFAULT_WATCH_TIMEOUT_SECONDS = 600;
+function isTerminalStatus(status) {
+  return status !== void 0 && status !== null && TERMINAL_STATUSES.has(status);
+}
+function statusOf(data) {
+  const status = data.status;
+  return typeof status === "string" ? status : void 0;
+}
+async function runWatch(deps, opts) {
+  const deadline = deps.now() + opts.timeoutMs;
+  for (; ; ) {
+    const data = await deps.fetchStatus();
+    deps.writeLine(data);
+    const status = statusOf(data);
+    if (isTerminalStatus(status)) {
+      return;
+    }
+    if (deps.now() + opts.intervalMs >= deadline) {
+      const timeoutLine = {
+        watch_status: "timeout",
+        message: `Polling stopped after ${opts.timeoutMs / 1e3}s without reaching a terminal status.`,
+        last_status: status ?? null
+      };
+      deps.writeLine(timeoutLine);
+      return;
+    }
+    await deps.sleep(opts.intervalMs);
   }
+}
+function resolveSeconds(value, fallback) {
+  if (value === void 0) return fallback;
+  const n = Number(value);
+  return Number.isFinite(n) && n > 0 ? n : fallback;
+}
+var realSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var ndjsonWriteLine = (record) => {
+  process.stdout.write(`${JSON.stringify(record)}
+`);
 };
+async function watchRideStatus(apiClient, apiKey, orderId, opts) {
+  const path = `/ride/${encodeURIComponent(orderId)}/status`;
+  await runWatch(
+    {
+      fetchStatus: async () => {
+        const result = await apiClient.get(path, {
+          type: "api-key",
+          key: apiKey
+        });
+        if (!result.success) {
+          throw CliError.fromApi(result, { auth: "api-key" });
+        }
+        return result.data;
+      },
+      writeLine: ndjsonWriteLine,
+      sleep: realSleep,
+      now: () => Date.now()
+    },
+    {
+      intervalMs: opts.intervalSeconds * 1e3,
+      timeoutMs: opts.timeoutSeconds * 1e3
+    }
+  );
+}
 
-// src/utils/cli-help.ts
-function explicitFormat() {
-  const argv = process.argv;
+// src/verb-schema.ts
+var CLI_NAME = "agenzo-merchant-cli";
+var NOUN = "ride-elife";
+function wantsJsonSchema(argv = process.argv) {
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i];
-    if (a === "--format=json" || a === "--format" && argv[i + 1] === "json") return "json";
-    if (a === "--format=table" || a === "--format" && argv[i + 1] === "table") return "table";
+    if (a === "--format=json") return true;
+    if (a === "--format" && argv[i + 1] === "json") return true;
   }
-  return void 0;
+  return false;
+}
+function emitSchema(schema) {
+  console.log(JSON.stringify(schema, null, 2));
 }
 function attachSchemaHelp(cmd, schema) {
   const baseHelp = cmd.helpInformation.bind(cmd);
-  cmd.helpInformation = (ctx) => {
-    const format = explicitFormat();
-    if (!format) return baseHelp(ctx);
-    emitSchema(schema, format);
+  cmd.helpInformation = (context) => {
+    if (!wantsJsonSchema()) return baseHelp(context);
+    emitSchema(schema);
     return "";
   };
   return cmd;
 }
-
-// src/ride/quote.ts
 var quoteSchema = {
-  description: "Request fare quotes for a ride between two points.",
-  params: {
-    "pickup-lat": "number \u2014 pickup latitude",
-    "pickup-lng": "number \u2014 pickup longitude",
-    "pickup-name": "string \u2014 pickup location name",
-    "dropoff-lat": "number \u2014 dropoff latitude",
-    "dropoff-lng": "number \u2014 dropoff longitude",
-    "dropoff-name": "string \u2014 dropoff location name",
-    "pickup-time": 'number|string \u2014 epoch seconds, or "now"',
-    "passenger-name": "string \u2014 optional, lead passenger full name",
-    "passenger-phone": "string \u2014 optional, passenger phone in E.164 format",
-    "passenger-count": "number \u2014 optional passenger count",
-    "luggage-count": "number \u2014 optional luggage count",
-    "passenger-email": "string \u2014 optional passenger email",
-    "children-count": "number \u2014 optional children count"
+  cli: CLI_NAME,
+  noun: NOUN,
+  verb: "quote",
+  description: "Request fare quotes for a ride between two points",
+  flags: {
+    "pickup-lat": { type: "float", required: true, description: "Pickup latitude", constraints: "-90 to 90" },
+    "pickup-lng": { type: "float", required: true, description: "Pickup longitude", constraints: "-180 to 180" },
+    "pickup-name": { type: "string", required: true, description: "Pickup location name" },
+    "dropoff-lat": { type: "float", required: true, description: "Dropoff latitude", constraints: "-90 to 90" },
+    "dropoff-lng": { type: "float", required: true, description: "Dropoff longitude", constraints: "-180 to 180" },
+    "dropoff-name": { type: "string", required: true, description: "Dropoff location name" },
+    "pickup-time": {
+      type: "int|string",
+      required: true,
+      description: "Epoch seconds or the literal 'now'"
+    },
+    "passenger-name": { type: "string", required: false, description: "Lead passenger full name" },
+    "passenger-phone": { type: "string", required: false, description: "Passenger phone in E.164 format (e.g. +14155551234)" },
+    "passenger-count": { type: "int", required: false, description: "Number of passengers" },
+    "luggage-count": { type: "int", required: false, description: "Number of luggage items" },
+    "passenger-email": { type: "string", required: false, description: "Passenger email address" },
+    "children-count": { type: "int", required: false, description: "Number of children" }
   },
   response: {
-    vehicle_classes: "VehicleClass[] \u2014 each: vehicle_class, price{amount,currency,quote_id}, passenger_capacity, luggage_capacity (amount is a decimal in the currency standard unit, e.g. 42.50 = $42.50)",
-    meet_and_greet: "object|null \u2014 { available: boolean, price: { amount, currency } } when applicable",
-    is_airport_transfer: "boolean",
-    airport_direction: "string|null \u2014 pickup/dropoff direction for airport transfers"
+    vehicle_classes: {
+      type: "array",
+      description: "Available vehicle options with pricing",
+      items: {
+        vehicle_class: { type: "string", description: "Sedan / SUV / MPV-5 / MPV-7 / Van / Luxury / Train" },
+        "price.amount": { type: "float", description: "Price in currency units (e.g. 42.50), NOT cents" },
+        "price.currency": { type: "string", description: "ISO 4217 (e.g. USD)" },
+        "price.quote_id": { type: "string", description: "Use this in `ride-elife book --quote-id`" },
+        passenger_capacity: { type: "int", description: "Max passengers" },
+        luggage_capacity: { type: "int", description: "Max luggage items" }
+      }
+    },
+    meet_and_greet: { type: "object|null", description: "Meet & greet availability and price" },
+    is_airport_transfer: { type: "bool", description: "Whether this is an airport transfer" },
+    airport_direction: { type: "string|null", description: "pickup / dropoff / null" }
+  },
+  example: {
+    command: 'agenzo-merchant-cli ride-elife quote --pickup-lat 37.7937 --pickup-lng -122.3956 --pickup-name "1 Market St" --dropoff-lat 37.6213 --dropoff-lng -122.3790 --dropoff-name "SFO Airport" --pickup-time now',
+    output_summary: "Returns vehicle_classes[] with a quote_id per option. Use quote_id and vehicle_class for booking."
+  },
+  error_recovery: {
+    VEHICLE_UNAVAILABLE: "No vehicles for this route/time. Try a different pickup-time or location. Do NOT blindly retry.",
+    PARAM_INVALID: "Fix the offending flag (coordinates must be numbers; required pickup/dropoff/pickup-time present), then retry."
   }
 };
+var bookSchema = {
+  cli: CLI_NAME,
+  noun: NOUN,
+  verb: "book",
+  description: "Book a ride using a quote_id returned by a previous quote call",
+  flags: {
+    "quote-id": { type: "string", required: true, description: "Quote id from quote response (vehicle_classes[].price.quote_id)" },
+    "vehicle-class": { type: "string", required: true, description: "Vehicle class: Sedan / SUV / MPV-5 / MPV-7 / Van / Luxury / Train" },
+    "price-amount": { type: "float", required: true, description: "Fare in decimal currency units (NOT cents), from the quote" },
+    "price-currency": { type: "string", required: false, default: "USD", description: "ISO 4217 currency code" },
+    "payment-order-id": {
+      type: "string",
+      required: "conditional",
+      description: "Required when billing_mode=pay_per_call (a PAID payment order). Forbidden when billing_mode=monthly_settlement"
+    },
+    "passenger-name": { type: "string", required: true, description: "Passenger full name" },
+    "passenger-phone": { type: "string", required: true, description: "Passenger phone in E.164 format (e.g. +14155551234)" },
+    "passenger-email": { type: "string", required: true, description: "Passenger email (required by eLife for booking)" },
+    "luggage-count": { type: "int", required: false, description: "Number of luggage items" },
+    "special-requests": { type: "string", required: false, description: "Free-text special requests or notes" },
+    "pickup-lat": { type: "float", required: false, description: "Pickup latitude (must match the quote)", constraints: "-90 to 90" },
+    "pickup-lng": { type: "float", required: false, description: "Pickup longitude (must match the quote)", constraints: "-180 to 180" },
+    "pickup-name": { type: "string", required: false, description: "Pickup location name (must match the quote)" },
+    "dropoff-lat": { type: "float", required: false, description: "Dropoff latitude (must match the quote)", constraints: "-90 to 90" },
+    "dropoff-lng": { type: "float", required: false, description: "Dropoff longitude (must match the quote)", constraints: "-180 to 180" },
+    "dropoff-name": { type: "string", required: false, description: "Dropoff location name (must match the quote)" },
+    "pickup-time": { type: "int|string", required: false, description: "Epoch seconds or 'now' (must match the quote)" },
+    "meet-and-greet": { type: "bool", required: false, default: false, description: "Enable meet & greet service" },
+    "meet-and-greet-price": { type: "float", required: false, description: "Meet & greet surcharge from the quote (meet_and_greet.price.amount)" },
+    "welcome-sign": { type: "string", required: false, description: "Welcome sign text (meet & greet)" },
+    "child-seat-count": { type: "int", required: false, description: "Number of child seats needed", constraints: "0 to 5" },
+    "infant-seat-count": { type: "int", required: false, description: "Number of infant seats needed", constraints: "0 to 5" },
+    "toddler-seat-count": { type: "int", required: false, description: "Number of toddler seats needed", constraints: "0 to 5" },
+    "arrival-flight-no": { type: "string", required: false, description: "Arrival flight number (airport pickup)" },
+    "arrival-airline": { type: "string", required: false, description: "Arrival airline name" },
+    "departure-flight-no": { type: "string", required: false, description: "Departure flight number (airport dropoff)" },
+    "departure-airline": { type: "string", required: false, description: "Departure airline name" },
+    "idempotency-key": {
+      type: "string",
+      required: true,
+      description: "Unique key (1-128 chars [A-Za-z0-9_-]) forwarded verbatim as the Idempotency-Key header; never auto-generated"
+    }
+  },
+  response: {
+    ride_id: { type: "string|int", description: "Ride identifier \u2014 use for `ride-elife get` / `ride-elife cancel`" },
+    order_id: { type: "string|int", description: "Internal order id for reconciliation" },
+    status: { type: "string", description: "Ride status (case-sensitive server casing)" },
+    is_scheduled: { type: "bool", description: "true = scheduled/airport ride; false = realtime" },
+    order_type: { type: "string", description: "'realtime' or 'airport'" },
+    price: { type: "object", description: "{ amount, currency, quote_id }" },
+    payment_status: { type: "string", description: "PAID (pay_per_call) or ON_ACCOUNT (monthly_settlement)" },
+    billing_entry_id: { type: "string|absent", description: "Only in monthly_settlement mode" },
+    payment_order_id: { type: "string|absent", description: "Only in pay_per_call mode (echoes the request)" }
+  },
+  example: {
+    command: 'agenzo-merchant-cli ride-elife book --quote-id qte_01HZXD --vehicle-class Sedan --price-amount 42.50 --passenger-name "Alice" --passenger-phone +14155551234 --idempotency-key book-123',
+    output_summary: "Returns ride_id. Use ride_id in `ride-elife get` to poll status."
+  },
+  error_recovery: {
+    QUOTE_EXPIRED: "Re-invoke 'quote' for a fresh quote_id, then retry 'book' with the SAME --idempotency-key.",
+    BILLING_MODE_MISMATCH: "Check Developer.billing_mode. pay_per_call requires --payment-order-id; monthly_settlement forbids it.",
+    PAYMENT_ORDER_NOT_PAID: "Wait for the payment order status=PAID, then retry with the SAME --idempotency-key.",
+    PAYMENT_ORDER_ALREADY_CONSUMED: "Create a new payment order, then retry with the new payment-order-id and a NEW --idempotency-key.",
+    ACCOUNT_INSUFFICIENT_BALANCE: "Top up the settlement account (offline) or pick a cheaper vehicle_class, then retry.",
+    BOOKING_FAILED: "elife rejected after settlement. The message contains a ref: for manual reconciliation. Do NOT auto-retry.",
+    PARAM_IDEMPOTENCY_KEY_REQUIRED: "Supply --idempotency-key (1-128 chars [A-Za-z0-9_-]); the CLI never generates one under --yes."
+  }
+};
+var rideGetSchema = {
+  cli: CLI_NAME,
+  noun: NOUN,
+  verb: "get",
+  description: "Retrieve a ride order status by id; with --watch, poll until a terminal status",
+  flags: {
+    "order-id": { type: "string", required: true, description: "The numeric ride_id (e.g. 4112961) \u2014 use the `ride_id` field from book/list-orders responses, NOT the rio_... order_id" },
+    watch: { type: "bool", required: false, default: false, description: "Poll until a terminal status, emitting one NDJSON line per update" },
+    "watch-interval": { type: "int", required: false, default: DEFAULT_WATCH_INTERVAL_SECONDS, description: "Seconds between polls when --watch is set" },
+    "watch-timeout": { type: "int", required: false, default: 600, description: "Max seconds to poll before giving up" }
+  },
+  response: {
+    ride_id: { type: "string|int", description: "Ride identifier" },
+    status: { type: "string", description: "Pending / Accepted / On my way / Waiting / On board / At destination / Rejected / Cancelled / Customer no show / Driver no show" },
+    source: { type: "string", description: "'local_cache' when served from the local fallback; 'mock' in sandbox" },
+    is_scheduled: { type: "bool", description: "true = scheduled/airport ride" },
+    from_location: { type: "object", description: "Pickup { lat, lng, name, address } (v3 snake_case, NOT elife from/to)" },
+    to_location: { type: "object", description: "Dropoff { lat, lng, name, address }" },
+    pickup_time: { type: "int|string", description: "Pickup time" },
+    vehicle_class: { type: "string|null", description: "Vehicle class" },
+    price: { type: "object", description: "{ amount, currency, quote_id }" },
+    final_amount: { type: "float|null", description: "Final settled fare (realtime, after final-fare settlement)" },
+    final_settlement_status: { type: "string", description: "pending / settled / no_adjustment / settlement_pending / not_applicable" },
+    driver: { type: "object|null", description: "{ name, phone_number } \u2014 available after a driver is assigned" },
+    vehicle: { type: "object|null", description: "{ make, model, color, license_plate, image_url } \u2014 available after a driver is assigned" },
+    created_at: { type: "string", description: "Order creation time" }
+  },
+  example: {
+    command: "agenzo-merchant-cli ride-elife get --order-id EL-20260527-1023456",
+    output_summary: "Returns current status and driver/vehicle info. Terminal statuses: At destination, Cancelled, Rejected, Customer no show, Driver no show."
+  },
+  polling: {
+    recommended_interval_seconds: DEFAULT_WATCH_INTERVAL_SECONDS,
+    terminal_statuses: [...TERMINAL_STATUSES],
+    in_progress_statuses: ["Pending", "Accepted", "On my way", "Waiting", "On board"],
+    field_availability: {
+      driver: "Populated from status 'Accepted' onwards (after a driver is dispatched). Null in 'Pending'.",
+      vehicle: "Populated from status 'Accepted' onwards. Null in 'Pending'."
+    }
+  },
+  error_recovery: {
+    VEHICLE_UNAVAILABLE: "Order not found. Verify --order-id is the ride_id from book. Do NOT retry.",
+    BOOKING_FAILED: "Transient elife error. Retry once after 5s."
+  }
+};
+var cancelSchema = {
+  cli: CLI_NAME,
+  noun: NOUN,
+  verb: "cancel",
+  description: "Cancel a ride order by id (a cancellation fee may apply depending on ride status)",
+  flags: {
+    "order-id": { type: "string", required: true, description: "The numeric ride_id (e.g. 4112961) to cancel \u2014 use the `ride_id` field from book/list-orders responses, NOT the rio_... order_id" },
+    "idempotency-key": {
+      type: "string",
+      required: true,
+      description: "Unique key (1-128 chars [A-Za-z0-9_-]) forwarded verbatim as the Idempotency-Key header; never auto-generated"
+    }
+  },
+  response: {
+    ride_id: { type: "string|int", description: "Cancelled ride id" },
+    ride_stat: { type: "string", description: "Status after cancellation (typically 'Cancelled')" },
+    cancellation: {
+      type: "object|null",
+      description: "Cancellation details",
+      properties: {
+        cancellation_fee: { type: "float", description: "Fee charged for cancellation" },
+        reversal_amount: { type: "float", description: "Amount reversed/refunded" },
+        currency: { type: "string", description: "ISO 4217 currency code" }
+      }
+    },
+    refund_amount: { type: "float", description: "Amount credited back to the settlement balance (paid \u2212 cancellation_fee)" }
+  },
+  example: {
+    command: "agenzo-merchant-cli ride-elife cancel --order-id EL-20260527-1023456 --idempotency-key cancel-456",
+    output_summary: "Returns cancellation fee and refund amount."
+  },
+  error_recovery: {
+    CANCELLATION_NOT_ALLOWED: "The ride is in a non-cancellable state. Do NOT retry; query status with `ride-elife get`.",
+    PARAM_IDEMPOTENCY_KEY_REQUIRED: "Supply --idempotency-key (1-128 chars [A-Za-z0-9_-]); the CLI never generates one under --yes."
+  }
+};
+var listOrdersSchema = {
+  cli: CLI_NAME,
+  noun: NOUN,
+  verb: "list-orders",
+  description: "List previously placed ride orders with optional filters and pagination",
+  flags: {
+    status: { type: "string", required: false, description: "Filter by ride status (case-sensitive server casing)" },
+    "order-type": { type: "string", required: false, description: "Filter by order type (e.g. realtime / airport)" },
+    page: { type: "int", required: false, default: 1, description: "Page number", constraints: ">= 1" },
+    "page-size": { type: "int", required: false, default: 20, description: "Items per page", constraints: ">= 1" }
+  },
+  response: {
+    orders: {
+      type: "array",
+      description: "List of ride orders (slim list-item shape)",
+      items: {
+        order_id: { type: "string", description: "Internal order id" },
+        ride_id: { type: "string", description: "Ride id (same as ride_id from book)" },
+        status: { type: "string", description: "Current ride status" },
+        vehicle_class: { type: "string", description: "Vehicle class" },
+        is_scheduled: { type: "bool", description: "true = scheduled/airport, false = realtime" },
+        scheduled_at: { type: "string", description: "ISO 8601 datetime; empty for realtime orders" },
+        price_amount: { type: "float|null", description: "Price in decimal currency units (NOT cents)" },
+        final_amount: { type: "float|null", description: "Final settled amount" },
+        price_currency: { type: "string", description: "ISO 4217 currency code" },
+        payment_status: { type: "string", description: "Payment status" },
+        final_settlement_status: { type: "string", description: "pending / settled / no_adjustment / settlement_pending / not_applicable" },
+        cancellation_fee: { type: "float|null", description: "Cancellation fee for cancelled orders; null otherwise" },
+        provider: { type: "string", description: "Service provider (elife)" },
+        created_at: { type: "string|null", description: "Order creation time (ISO 8601)" },
+        updated_at: { type: "string|null", description: "Last update time (ISO 8601)" }
+      }
+    },
+    total: { type: "int", description: "Total matching orders" },
+    page: { type: "int", description: "Current page" },
+    page_size: { type: "int", description: "Items per page" }
+  },
+  example: {
+    command: "agenzo-merchant-cli ride-elife list-orders --status Pending --page 1 --page-size 10",
+    output_summary: "Returns a paginated list of ride orders with status and amount info."
+  },
+  error_recovery: {
+    INTERNAL_ERROR: "Transient backend error. Retry once after a short delay.",
+    PARAM_INVALID: "Ensure --page / --page-size are positive integers, then retry."
+  }
+};
+
+// src/ride-elife/quote.ts
 function need(value, flag) {
-  if (value === void 0) throw new CliError("PARAM_REQUIRED", `Missing required --${flag}.`);
+  if (value === void 0) {
+    throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
+  }
   return value;
 }
 function num(value, flag) {
   const n = Number(need(value, flag));
-  if (!Number.isFinite(n)) throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
+  if (!Number.isFinite(n)) {
+    throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
+  }
   return n;
 }
-function buildQuoteCommand() {
-  const cmd = new Command("quote").description(quoteSchema.description).option("--pickup-lat <lat>", "Pickup latitude").option("--pickup-lng <lng>", "Pickup longitude").option("--pickup-name <name>", "Pickup location name").option("--dropoff-lat <lat>", "Dropoff latitude").option("--dropoff-lng <lng>", "Dropoff longitude").option("--dropoff-name <name>", "Dropoff location name").option("--pickup-time <time>", 'Pickup time: epoch seconds, or "now"').option("--passenger-name <name>", "Lead passenger full name").option("--passenger-phone <phone>", "Passenger phone (E.164)").option("--passenger-count <n>", "Passenger count").option("--luggage-count <n>", "Luggage count").option("--passenger-email <email>", "Passenger email").option("--children-count <n>", "Children count").action(async (_opts, command) => {
-    const o = command.optsWithGlobals();
-    const format = o.format === "table" ? "table" : "json";
-    const apiKey = await PromptEngine.resolveInput(o.apiKey, {
-      message: "API key:",
+function formatQuote(data) {
+  const classes = data.vehicle_classes ?? [];
+  if (classes.length === 0) {
+    return Formatter.status("info", "No vehicle classes available for this route");
+  }
+  const headers = ["Vehicle Class", "Price", "Currency", "Quote ID", "Pax", "Luggage"];
+  const rows = classes.map((vc) => [
+    String(vc.vehicle_class ?? "-"),
+    String(vc.price?.amount ?? "-"),
+    String(vc.price?.currency ?? "-"),
+    String(vc.price?.quote_id ?? "-"),
+    String(vc.passenger_capacity ?? "-"),
+    String(vc.luggage_capacity ?? "-")
+  ]);
+  const lines = [
+    ["Airport transfer", String(data.is_airport_transfer ?? false)]
+  ];
+  if (data.airport_direction) {
+    lines.push(["Airport direction", String(data.airport_direction)]);
+  }
+  if (data.meet_and_greet) {
+    const mg = data.meet_and_greet;
+    const mgPrice = mg.price ? ` (${mg.price.amount} ${mg.price.currency})` : "";
+    lines.push(["Meet & greet", `${mg.available ? "available" : "unavailable"}${mgPrice}`]);
+  }
+  return `${Formatter.table(headers, rows)}
+${Formatter.keyValue(lines)}`;
+}
+function registerQuoteCommand(parent, deps) {
+  const cmd = parent.command("quote").description("Request fare quotes for a ride between two points").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--pickup-lat <lat>", "Pickup latitude").option("--pickup-lng <lng>", "Pickup longitude").option("--pickup-name <name>", "Pickup location name").option("--dropoff-lat <lat>", "Dropoff latitude").option("--dropoff-lng <lng>", "Dropoff longitude").option("--dropoff-name <name>", "Dropoff location name").option("--pickup-time <time>", 'Pickup time: epoch seconds, or "now"').option("--passenger-name <name>", "Lead passenger full name").option("--passenger-phone <phone>", "Passenger phone (E.164)").option("--passenger-count <n>", "Passenger count").option("--luggage-count <n>", "Luggage count").option("--passenger-email <email>", "Passenger email").option("--children-count <n>", "Children count");
+  attachSchemaHelp(cmd, quoteSchema);
+  cmd.action(async () => {
+    const opts = cmd.optsWithGlobals();
+    const format = resolveFormat(opts.format);
+    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
+      message: "API Key:",
       type: "password"
     });
     const body = {
       pickup: {
-        lat: num(o.pickupLat, "pickup-lat"),
-        lng: num(o.pickupLng, "pickup-lng"),
-        name: need(o.pickupName, "pickup-name")
+        lat: num(opts.pickupLat, "pickup-lat"),
+        lng: num(opts.pickupLng, "pickup-lng"),
+        name: need(opts.pickupName, "pickup-name")
       },
       dropoff: {
-        lat: num(o.dropoffLat, "dropoff-lat"),
-        lng: num(o.dropoffLng, "dropoff-lng"),
-        name: need(o.dropoffName, "dropoff-name")
+        lat: num(opts.dropoffLat, "dropoff-lat"),
+        lng: num(opts.dropoffLng, "dropoff-lng"),
+        name: need(opts.dropoffName, "dropoff-name")
       },
-      pickup_time: o.pickupTime === "now" ? "now" : num(o.pickupTime, "pickup-time")
+      pickup_time: opts.pickupTime === "now" ? "now" : num(opts.pickupTime, "pickup-time")
     };
-    if (o.passengerName) body.passenger_name = o.passengerName;
-    if (o.passengerPhone) body.passenger_phone = o.passengerPhone;
-    if (o.passengerCount !== void 0) body.passenger_count = num(o.passengerCount, "passenger-count");
-    if (o.luggageCount !== void 0) body.luggage_count = num(o.luggageCount, "luggage-count");
-    if (o.childrenCount !== void 0) body.children_count = num(o.childrenCount, "children-count");
-    if (o.passengerEmail !== void 0) body.passenger_email = o.passengerEmail;
-    const client = new ApiClient({ apiKey });
-    const spinner = createSpinner("Fetching quotes...");
-    try {
-      const data = await client.post("/ride/quote", { body });
-      spinner.stop();
-      emit(data, format);
-    } catch (err) {
-      spinner.fail("Quote request failed");
-      throw err;
+    if (opts.passengerName) body.passenger_name = opts.passengerName;
+    if (opts.passengerPhone) body.passenger_phone = opts.passengerPhone;
+    if (opts.passengerCount !== void 0) {
+      body.passenger_count = num(opts.passengerCount, "passenger-count");
+    }
+    if (opts.luggageCount !== void 0) {
+      body.luggage_count = num(opts.luggageCount, "luggage-count");
     }
+    if (opts.childrenCount !== void 0) {
+      body.children_count = num(opts.childrenCount, "children-count");
+    }
+    if (opts.passengerEmail !== void 0) {
+      body.passenger_email = opts.passengerEmail;
+    }
+    notify(format, "loading", "Fetching quotes...");
+    const result = await deps.apiClient.post(
+      "/ride/quote",
+      { type: "api-key", key: apiKey },
+      body
+    );
+    if (!result.success) {
+      throw CliError.fromApi(result, { auth: "api-key" });
+    }
+    const data = result.data;
+    const configManager = new ConfigManager();
+    const commandResult = {
+      data,
+      text: () => formatQuote(data)
+    };
+    await renderWithContext(commandResult, { format }, configManager);
   });
-  return attachSchemaHelp(cmd, quoteSchema);
 }
 
-// src/ride/book.ts
-import { Command as Command2 } from "commander";
+// src/ride-elife/book.ts
+import { confirm } from "@inquirer/prompts";
 
-// src/utils/idempotency.ts
-import { input as input2 } from "@inquirer/prompts";
-var KEY_PATTERN = /^[A-Za-z0-9_-]{1,128}$/;
-var RULE = "Use 1-128 characters from [A-Za-z0-9_-].";
+// src/idempotency.ts
+var IDEMPOTENCY_KEY_PATTERN = /^[A-Za-z0-9_-]{1,128}$/;
+var IDEMPOTENCY_KEY_RULE = "Use 1-128 characters from [A-Za-z0-9_-].";
 function normalizeIdempotencyKey(key) {
   const trimmed = key.trim();
-  if (!KEY_PATTERN.test(trimmed)) {
+  if (!IDEMPOTENCY_KEY_PATTERN.test(trimmed)) {
     throw new CliError(
-      ErrorCodes.PARAM_IDEMPOTENCY_KEY_REQUIRED,
-      `Invalid idempotency key: "${key}".`,
-      RULE
+      "PARAM_INVALID",
+      `Invalid idempotency key: "${key}". ${IDEMPOTENCY_KEY_RULE}`
     );
   }
   return trimmed;
 }
-async function resolveIdempotencyKey(flagValue, options) {
-  if (flagValue !== void 0) return normalizeIdempotencyKey(flagValue);
-  if (options.yes) {
-    throw new CliError(
-      ErrorCodes.PARAM_IDEMPOTENCY_KEY_REQUIRED,
-      "An idempotency key is required for write operations.",
-      "Pass --idempotency-key <key>; the CLI never auto-generates one."
-    );
+async function resolveIdempotencyKey(flagValue, opts) {
+  if (flagValue !== void 0) {
+    return normalizeIdempotencyKey(flagValue);
+  }
+  if (opts.yes) {
+    throw new IdempotencyKeyRequiredError(opts.commandPath);
   }
-  const entered = await input2({
-    message: "Idempotency key:",
-    validate: (v) => KEY_PATTERN.test(v.trim()) || RULE
+  const entered = await PromptEngine.resolveInput(void 0, {
+    message: "Idempotency key (unique per write, for safe retry):",
+    validate: (v) => IDEMPOTENCY_KEY_PATTERN.test(v.trim()) || IDEMPOTENCY_KEY_RULE
   });
   return normalizeIdempotencyKey(entered);
 }
 
-// src/ride/book.ts
-var bookSchema = {
-  description: "Book a ride against a previously returned quote.",
-  params: {
-    "quote-id": "string \u2014 required, quote id from `ride-elife quote`",
-    "vehicle-class": "string \u2014 required, chosen vehicle class",
-    "price-amount": "number \u2014 required, fare in decimal currency units (not cents)",
-    "price-currency": "string \u2014 currency code (default USD)",
-    "payment-order-id": "string \u2014 conditional. Required for pay_per_call billing (a PAID order from payment-cli); omit for monthly_settlement (deducted from the settlement account)",
-    "passenger-name": "string \u2014 required, passenger full name",
-    "passenger-phone": "string \u2014 required, passenger phone",
-    "passenger-email": "string \u2014 optional passenger email",
-    "luggage-count": "number \u2014 optional luggage count",
-    "special-requests": "string \u2014 optional free-text requests",
-    "pickup-lat": "number \u2014 required, pickup latitude",
-    "pickup-lng": "number \u2014 required, pickup longitude",
-    "pickup-name": "string \u2014 required, pickup location name",
-    "dropoff-lat": "number \u2014 required, dropoff latitude",
-    "dropoff-lng": "number \u2014 required, dropoff longitude",
-    "dropoff-name": "string \u2014 required, dropoff location name",
-    "pickup-time": 'number|string \u2014 required, epoch seconds or "now" (must match quote)',
-    "meet-and-greet": "boolean \u2014 optional meet & greet service",
-    "meet-and-greet-price": "number \u2014 optional meet & greet surcharge",
-    "welcome-sign": "string \u2014 optional welcome sign text",
-    "child-seat-count": "number \u2014 optional child seats (0-5)",
-    "infant-seat-count": "number \u2014 optional infant seats (0-5)",
-    "toddler-seat-count": "number \u2014 optional toddler seats (0-5)",
-    "arrival-flight-no": "string \u2014 optional arrival flight number",
-    "arrival-airline": "string \u2014 optional arrival airline",
-    "departure-flight-no": "string \u2014 optional departure flight number",
-    "departure-airline": "string \u2014 optional departure airline",
-    "idempotency-key": "string \u2014 required, sent as the Idempotency-Key header (never in body)"
-  },
-  response: {
-    ride_id: "string \u2014 booked ride id, used by `ride-elife get` / `ride-elife cancel`",
-    order_id: "string \u2014 internal ride order id (rio_...)",
-    status: "string \u2014 initial ride status (e.g. INIT / Pending)",
-    is_scheduled: "boolean \u2014 true = scheduled/airport ride, false = realtime",
-    order_type: "string \u2014 realtime / airport (derived from pickup-time)",
-    price: "{ amount, currency, quote_id } \u2014 confirmed fare",
-    payment_status: "string \u2014 ON_ACCOUNT (monthly_settlement) or PAID (pay_per_call)",
-    billing_entry_id: "string \u2014 settlement ledger entry id (monthly_settlement only)"
+// src/ride-elife/book.ts
+function need2(value, flag) {
+  if (value === void 0) {
+    throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
-};
-function buildBookCommand() {
-  return new Command2("book").description(bookSchema.description).helpOption(false).option("--help", "Show help (add --format json for the machine-readable schema)").option("--format <format>", "Output format: json|table").option("--api-key <key>", "API key for runtime requests").option("--yes", "Skip confirmation prompts").option("--quote-id <id>", "Quote id from `ride-elife quote`").option("--vehicle-class <class>", "Chosen vehicle class").option("--price-amount <amount>", "Fare in decimal currency units (not cents)").option("--price-currency <currency>", "Currency code (default USD)").option("--payment-order-id <id>", "Paid payment order id (pay_per_call mode only)").option("--passenger-name <name>", "Passenger full name").option("--passenger-phone <phone>", "Passenger phone").option("--passenger-email <email>", "Passenger email").option("--luggage-count <n>", "Luggage count").option("--special-requests <text>", "Free-text special requests").option("--pickup-lat <lat>", "Pickup latitude").option("--pickup-lng <lng>", "Pickup longitude").option("--pickup-name <name>", "Pickup location name").option("--dropoff-lat <lat>", "Dropoff latitude").option("--dropoff-lng <lng>", "Dropoff longitude").option("--dropoff-name <name>", "Dropoff location name").option("--pickup-time <time>", 'Pickup time: epoch seconds, or "now"').option("--meet-and-greet", "Enable meet & greet service").option("--meet-and-greet-price <amount>", "Meet & greet surcharge").option("--welcome-sign <text>", "Welcome sign text").option("--child-seat-count <n>", "Number of child seats needed").option("--infant-seat-count <n>", "Number of infant seats needed").option("--toddler-seat-count <n>", "Number of toddler seats needed").option("--arrival-flight-no <no>", "Arrival flight number").option("--arrival-airline <airline>", "Arrival airline").option("--departure-flight-no <no>", "Departure flight number").option("--departure-airline <airline>", "Departure airline").option("--idempotency-key <key>", "Caller-supplied idempotency key").action(async (_options, command) => {
-    const merged = command.optsWithGlobals();
-    const format = merged.format === "table" ? "table" : "json";
-    if (merged.help) {
-      const wantsSchema = process.argv.some((a) => a === "--format" || a.startsWith("--format="));
-      if (wantsSchema) emitSchema(bookSchema, format);
-      else command.outputHelp();
-      return;
-    }
-    const yes = merged.yes === true;
-    const apiKey = await PromptEngine.resolveInput(merged.apiKey, {
-      message: "API key:",
+  return value;
+}
+function num2(value, flag) {
+  const n = Number(need2(value, flag));
+  if (!Number.isFinite(n)) {
+    throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
+  }
+  return n;
+}
+function seatCount(value, flag) {
+  const n = num2(value, flag);
+  if (!Number.isInteger(n) || n < 0 || n > 5) {
+    throw new CliError("PARAM_INVALID", `--${flag} must be an integer between 0 and 5.`);
+  }
+  return n;
+}
+function formatBook(data) {
+  const lines = [
+    ["Ride ID", String(data.ride_id ?? "-")],
+    ["Order ID", String(data.order_id ?? "-")],
+    ["Status", String(data.status ?? "-")],
+    ["Scheduled", String(data.is_scheduled ?? false)],
+    ["Order type", String(data.order_type ?? "-")]
+  ];
+  if (data.price) {
+    lines.push(["Price", `${data.price.amount} ${data.price.currency}`]);
+    if (data.price.quote_id) lines.push(["Quote ID", String(data.price.quote_id)]);
+  }
+  lines.push(["Payment status", String(data.payment_status ?? "-")]);
+  if (data.billing_entry_id) lines.push(["Billing entry", String(data.billing_entry_id)]);
+  if (data.payment_order_id) lines.push(["Payment order", String(data.payment_order_id)]);
+  return Formatter.keyValue(lines);
+}
+function registerBookCommand(parent, deps) {
+  const cmd = parent.command("book").description("Book a ride using a quote_id returned by quote").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--quote-id <id>", "Quote id from `ride-elife quote`").option("--vehicle-class <class>", "Chosen vehicle class").option("--price-amount <amount>", "Fare in decimal currency units (not cents)").option("--price-currency <currency>", "Currency code (default USD)").option("--payment-order-id <id>", "Paid payment order id (pay_per_call mode only)").option("--passenger-name <name>", "Passenger full name").option("--passenger-phone <phone>", "Passenger phone").option("--passenger-email <email>", "Passenger email").option("--luggage-count <n>", "Luggage count").option("--special-requests <text>", "Free-text special requests").option("--pickup-lat <lat>", "Pickup latitude").option("--pickup-lng <lng>", "Pickup longitude").option("--pickup-name <name>", "Pickup location name").option("--dropoff-lat <lat>", "Dropoff latitude").option("--dropoff-lng <lng>", "Dropoff longitude").option("--dropoff-name <name>", "Dropoff location name").option("--pickup-time <time>", 'Pickup time: epoch seconds, or "now"').option("--meet-and-greet", "Enable meet & greet service").option("--meet-and-greet-price <amount>", "Meet & greet surcharge").option("--welcome-sign <text>", "Welcome sign text").option("--child-seat-count <n>", "Number of child seats needed (0-5)").option("--infant-seat-count <n>", "Number of infant seats needed (0-5)").option("--toddler-seat-count <n>", "Number of toddler seats needed (0-5)").option("--arrival-flight-no <no>", "Arrival flight number").option("--arrival-airline <airline>", "Arrival airline").option("--departure-flight-no <no>", "Departure flight number").option("--departure-airline <airline>", "Departure airline").option(
+    "--idempotency-key <key>",
+    "Idempotency key forwarded verbatim as the Idempotency-Key header"
+  );
+  attachSchemaHelp(cmd, bookSchema);
+  cmd.action(async () => {
+    const opts = cmd.optsWithGlobals();
+    const format = resolveFormat(opts.format);
+    const isYes = Boolean(opts.yes);
+    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
+      message: "API Key:",
       type: "password"
     });
-    const quoteId = await PromptEngine.resolveInput(merged.quoteId, { message: "Quote id:" });
-    const vehicleClass = await PromptEngine.resolveInput(merged.vehicleClass, {
-      message: "Vehicle class:"
-    });
-    const priceAmount = await PromptEngine.resolveInput(merged.priceAmount, {
-      message: "Price amount (decimal):"
-    });
-    const passengerName = await PromptEngine.resolveInput(merged.passengerName, {
-      message: "Passenger name:"
-    });
-    const passengerPhone = await PromptEngine.resolveInput(merged.passengerPhone, {
-      message: "Passenger phone:"
-    });
+    const quoteId = need2(opts.quoteId, "quote-id");
     const body = {
       quote_id: quoteId,
-      vehicle_class: vehicleClass,
-      price_amount: Number(priceAmount),
-      price_currency: merged.priceCurrency ?? "USD",
-      passenger_name: passengerName,
-      passenger_phone: passengerPhone
+      vehicle_class: need2(opts.vehicleClass, "vehicle-class"),
+      price_amount: num2(opts.priceAmount, "price-amount"),
+      price_currency: opts.priceCurrency ?? "USD",
+      passenger_name: need2(opts.passengerName, "passenger-name"),
+      passenger_phone: need2(opts.passengerPhone, "passenger-phone")
     };
-    if (merged.paymentOrderId) body.payment_order_id = merged.paymentOrderId;
-    if (merged.passengerEmail) body.passenger_email = merged.passengerEmail;
-    if (merged.luggageCount !== void 0) body.luggage_count = Number(merged.luggageCount);
-    if (merged.specialRequests) body.special_requests = merged.specialRequests;
-    if (merged.pickupLat || merged.pickupLng || merged.pickupName) {
-      body.pickup = { lat: Number(merged.pickupLat), lng: Number(merged.pickupLng), name: merged.pickupName };
-    }
-    if (merged.dropoffLat || merged.dropoffLng || merged.dropoffName) {
-      body.dropoff = { lat: Number(merged.dropoffLat), lng: Number(merged.dropoffLng), name: merged.dropoffName };
-    }
-    if (merged.pickupTime) {
-      body.pickup_time = merged.pickupTime === "now" ? "now" : Number(merged.pickupTime);
-    }
-    if (merged.meetAndGreet) body.meet_and_greet = true;
-    if (merged.meetAndGreetPrice !== void 0) body.meet_and_greet_price = Number(merged.meetAndGreetPrice);
-    if (merged.welcomeSign) body.welcome_sign = merged.welcomeSign;
-    if (merged.childSeatCount !== void 0) body.child_seat_count = Number(merged.childSeatCount);
-    if (merged.infantSeatCount !== void 0) body.infant_seat_count = Number(merged.infantSeatCount);
-    if (merged.toddlerSeatCount !== void 0) body.toddler_seat_count = Number(merged.toddlerSeatCount);
-    if (merged.arrivalFlightNo || merged.arrivalAirline) {
-      body.arrival_flight = { flight_no: merged.arrivalFlightNo, airline: merged.arrivalAirline };
-    }
-    if (merged.departureFlightNo || merged.departureAirline) {
-      body.departure_flight = { flight_no: merged.departureFlightNo, airline: merged.departureAirline };
-    }
-    if (!await PromptEngine.confirm(`Book ride with quote ${quoteId}?`, yes)) {
-      console.log(Formatter.status("info", "Booking aborted."));
-      return;
+    if (opts.paymentOrderId) body.payment_order_id = opts.paymentOrderId;
+    if (opts.passengerEmail) body.passenger_email = opts.passengerEmail;
+    if (opts.luggageCount !== void 0) {
+      body.luggage_count = num2(opts.luggageCount, "luggage-count");
     }
-    const idempotencyKey = await resolveIdempotencyKey(merged.idempotencyKey, { yes });
-    const client = new ApiClient({ apiKey });
-    const spinner = createSpinner("Booking ride...");
-    try {
-      const data = await client.post("/ride/book", { body, idempotencyKey });
-      spinner.stop();
-      emit(data, format);
-    } catch (err) {
-      spinner.fail("Booking failed");
-      throw err;
+    if (opts.specialRequests) body.special_requests = opts.specialRequests;
+    if (opts.pickupLat || opts.pickupLng || opts.pickupName) {
+      body.pickup = {
+        lat: num2(opts.pickupLat, "pickup-lat"),
+        lng: num2(opts.pickupLng, "pickup-lng"),
+        name: need2(opts.pickupName, "pickup-name")
+      };
+    }
+    if (opts.dropoffLat || opts.dropoffLng || opts.dropoffName) {
+      body.dropoff = {
+        lat: num2(opts.dropoffLat, "dropoff-lat"),
+        lng: num2(opts.dropoffLng, "dropoff-lng"),
+        name: need2(opts.dropoffName, "dropoff-name")
+      };
+    }
+    if (opts.pickupTime) {
+      body.pickup_time = opts.pickupTime === "now" ? "now" : num2(opts.pickupTime, "pickup-time");
+    }
+    if (opts.meetAndGreet) body.meet_and_greet = true;
+    if (opts.meetAndGreetPrice !== void 0) {
+      body.meet_and_greet_price = num2(opts.meetAndGreetPrice, "meet-and-greet-price");
     }
+    if (opts.welcomeSign) body.welcome_sign = opts.welcomeSign;
+    if (opts.childSeatCount !== void 0) {
+      body.child_seat_count = seatCount(opts.childSeatCount, "child-seat-count");
+    }
+    if (opts.infantSeatCount !== void 0) {
+      body.infant_seat_count = seatCount(opts.infantSeatCount, "infant-seat-count");
+    }
+    if (opts.toddlerSeatCount !== void 0) {
+      body.toddler_seat_count = seatCount(opts.toddlerSeatCount, "toddler-seat-count");
+    }
+    if (opts.arrivalFlightNo || opts.arrivalAirline) {
+      body.arrival_flight = {
+        flight_no: opts.arrivalFlightNo,
+        airline: opts.arrivalAirline
+      };
+    }
+    if (opts.departureFlightNo || opts.departureAirline) {
+      body.departure_flight = {
+        flight_no: opts.departureFlightNo,
+        airline: opts.departureAirline
+      };
+    }
+    if (!isYes) {
+      const confirmed = await confirm({
+        message: `Book ride with quote ${quoteId}?`,
+        default: true
+      });
+      if (!confirmed) {
+        throw new CliError("CLIENT_ABORTED", "Booking cancelled by user.");
+      }
+    }
+    const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
+      yes: isYes,
+      commandPath: "ride-elife book"
+    });
+    notify(format, "loading", "Booking ride...");
+    const result = await deps.apiClient.post(
+      "/ride/book",
+      { type: "api-key", key: apiKey },
+      body,
+      { "Idempotency-Key": idempotencyKey }
+    );
+    if (!result.success) {
+      throw CliError.fromApi(result, { auth: "api-key" });
+    }
+    const data = result.data;
+    const configManager = new ConfigManager();
+    const commandResult = {
+      data,
+      text: () => formatBook(data)
+    };
+    await renderWithContext(commandResult, { format }, configManager);
   });
 }
 
-// src/ride/get.ts
-import { Command as Command3 } from "commander";
-var TERMINAL_STATUSES = /* @__PURE__ */ new Set([
-  "At destination",
-  "Cancelled",
-  "Rejected",
-  "Customer no show",
-  "Driver no show"
-]);
-var DEFAULT_WATCH_INTERVAL_SECONDS = 5;
-var DEFAULT_WATCH_TIMEOUT_SECONDS = 600;
-var rideGetSchema = {
-  description: "Retrieve a single ride order status by id (repeatable for polling).",
-  params: {
-    "order-id": "string \u2014 ride order id (the ride_id returned by `ride-elife book`)",
-    watch: "boolean \u2014 poll until a terminal status, emitting one NDJSON line per update (default off)",
-    "watch-interval": `number \u2014 seconds between polls when --watch is set (default ${DEFAULT_WATCH_INTERVAL_SECONDS})`,
-    "watch-timeout": `number \u2014 max seconds to poll before giving up (default ${DEFAULT_WATCH_TIMEOUT_SECONDS})`
-  },
-  response: {
-    status: "OrderStatus \u2014 case-sensitive; terminal states: At destination | Cancelled | Rejected | Customer no show | Driver no show",
-    from_location: "GeoPoint \u2014 pickup",
-    to_location: "GeoPoint \u2014 dropoff",
-    pickup_time: "number|string",
-    vehicle_class: "string",
-    price: "Price{amount,currency} \u2014 amount is a decimal in the currency standard unit",
-    final_amount: "number \u2014 final settled fare (realtime, after final-fare settlement); local-cache path only",
-    final_settlement_status: "string \u2014 pending | settled | no_adjustment | settlement_pending | not_applicable (local-cache path)",
-    passenger: "Passenger",
-    driver: "Driver \u2014 present after assignment",
-    vehicle: "Vehicle \u2014 present after assignment"
+// src/ride-elife/get.ts
+function need3(value, flag) {
+  if (value === void 0) {
+    throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
-};
-function num2(value, fallback) {
-  if (value === void 0) return fallback;
-  const n = Number(value);
-  return Number.isFinite(n) && n > 0 ? n : fallback;
+  return value;
 }
-var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
-function statusOf(data) {
-  return data.status;
-}
-function buildRideGetCommand() {
-  const cmd = new Command3("get").description(rideGetSchema.description).option("--order-id <id>", "Ride order id (the ride_id returned by `ride-elife book`)").option("--watch", "Poll until a terminal status, emitting one NDJSON line per update").option("--watch-interval <seconds>", "Seconds between polls when --watch is set").option("--watch-timeout <seconds>", "Max seconds to poll before giving up").action(async (_opts, command) => {
-    const o = command.optsWithGlobals();
-    const format = o.format === "table" ? "table" : "json";
-    const apiKey = await PromptEngine.resolveInput(o.apiKey, {
-      message: "API key:",
+function formatGetOrder(data) {
+  const lines = [
+    ["Ride ID", String(data.ride_id ?? "-")],
+    ["Status", String(data.status ?? "-")]
+  ];
+  if (data.source) lines.push(["Source", String(data.source)]);
+  if (data.is_scheduled !== void 0) lines.push(["Scheduled", String(data.is_scheduled)]);
+  if (data.from_location) {
+    lines.push(["From", String(data.from_location.name ?? "-")]);
+  }
+  if (data.to_location) {
+    lines.push(["To", String(data.to_location.name ?? "-")]);
+  }
+  if (data.pickup_time !== void 0) lines.push(["Pickup time", String(data.pickup_time)]);
+  if (data.vehicle_class) lines.push(["Vehicle class", String(data.vehicle_class)]);
+  if (data.price) {
+    lines.push(["Price", `${data.price.amount} ${data.price.currency}`]);
+  }
+  if (data.final_amount !== void 0 && data.final_amount !== null) {
+    lines.push(["Final amount", String(data.final_amount)]);
+  }
+  if (data.final_settlement_status) {
+    lines.push(["Settlement", String(data.final_settlement_status)]);
+  }
+  if (data.driver) {
+    const driver = data.driver;
+    const phone = driver.phone_number ? ` (${driver.phone_number})` : "";
+    lines.push(["Driver", `${driver.name ?? "-"}${phone}`]);
+  }
+  if (data.vehicle) {
+    const v = data.vehicle;
+    const desc = [v.color, v.make, v.model].filter(Boolean).join(" ") || "-";
+    const plate = v.license_plate ? ` [${v.license_plate}]` : "";
+    lines.push(["Vehicle", `${desc}${plate}`]);
+  }
+  if (data.created_at) lines.push(["Created at", String(data.created_at)]);
+  return Formatter.keyValue(lines);
+}
+function registerRideGetCommand(parent, deps) {
+  const cmd = parent.command("get").description("Retrieve a ride order status by id (repeatable for polling)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-id <id>", "Ride order id (the ride_id returned by `ride-elife book`)").option("--watch", "Poll until a terminal status, emitting one NDJSON line per update").option(
+    "--watch-interval <seconds>",
+    `Seconds between polls when --watch is set (default ${DEFAULT_WATCH_INTERVAL_SECONDS})`
+  ).option(
+    "--watch-timeout <seconds>",
+    `Max seconds to poll before giving up (default ${DEFAULT_WATCH_TIMEOUT_SECONDS})`
+  );
+  attachSchemaHelp(cmd, rideGetSchema);
+  cmd.action(async () => {
+    const opts = cmd.optsWithGlobals();
+    const format = resolveFormat(opts.format);
+    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
+      message: "API Key:",
       type: "password"
     });
-    const orderId = await PromptEngine.resolveInput(o.orderId, { message: "Order id:" });
-    const client = new ApiClient({ apiKey });
-    const path = `/ride/${encodeURIComponent(orderId)}/status`;
-    if (o.watch) {
-      await watchUntilTerminal(client, path, {
-        intervalMs: num2(o.watchInterval, DEFAULT_WATCH_INTERVAL_SECONDS) * 1e3,
-        timeoutMs: num2(o.watchTimeout, DEFAULT_WATCH_TIMEOUT_SECONDS) * 1e3
+    const orderId = need3(opts.orderId, "order-id");
+    if (opts.watch) {
+      await watchRideStatus(deps.apiClient, apiKey, orderId, {
+        intervalSeconds: resolveSeconds(
+          opts.watchInterval,
+          DEFAULT_WATCH_INTERVAL_SECONDS
+        ),
+        timeoutSeconds: resolveSeconds(
+          opts.watchTimeout,
+          DEFAULT_WATCH_TIMEOUT_SECONDS
+        )
       });
       return;
     }
-    const spinner = createSpinner("Fetching ride status...");
-    try {
-      const data = await client.get(path);
-      spinner.stop();
-      emit(data, format);
-    } catch (err) {
-      spinner.fail("Failed to fetch ride status");
-      throw err;
+    notify(format, "loading", "Fetching ride status...");
+    const result = await deps.apiClient.get(
+      `/ride/${encodeURIComponent(orderId)}/status`,
+      { type: "api-key", key: apiKey }
+    );
+    if (!result.success) {
+      throw CliError.fromApi(result, { auth: "api-key" });
     }
+    const data = result.data;
+    const configManager = new ConfigManager();
+    const commandResult = {
+      data,
+      text: () => formatGetOrder(data)
+    };
+    await renderWithContext(commandResult, { format }, configManager);
   });
-  return attachSchemaHelp(cmd, rideGetSchema);
 }
-async function watchUntilTerminal(client, path, opts) {
-  const deadline = Date.now() + opts.timeoutMs;
-  for (; ; ) {
-    const data = await client.get(path);
-    emitNdjsonLine(data);
-    const status = statusOf(data);
-    if (status !== void 0 && TERMINAL_STATUSES.has(status)) return;
-    if (Date.now() + opts.intervalMs >= deadline) {
-      emitNdjsonLine({
-        watch_status: "timeout",
-        message: `Polling stopped after ${opts.timeoutMs / 1e3}s without reaching a terminal status.`,
-        last_status: status ?? null
-      });
-      return;
-    }
-    await sleep(opts.intervalMs);
+
+// src/ride-elife/cancel.ts
+import { confirm as confirm2 } from "@inquirer/prompts";
+function need4(value, flag) {
+  if (value === void 0) {
+    throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
+  return value;
 }
-
-// src/ride/cancel.ts
-import { Command as Command4 } from "commander";
-var cancelSchema = {
-  description: "Cancel a ride order; may incur a cancellation fee.",
-  params: {
-    "order-id": "string \u2014 required, order id (a.k.a. ride id) to cancel",
-    "idempotency-key": "string \u2014 required, sent as the Idempotency-Key header (never in body)"
-  },
-  response: {
-    ride_id: "string \u2014 cancelled ride id",
-    ride_stat: "string \u2014 resulting ride status",
-    cancellation: "{ cancellation_fee, reversal_amount, currency }",
-    refund_amount: "number \u2014 amount credited back to the settlement balance (paid \u2212 cancellation_fee)"
+function formatCancel(data) {
+  const lines = [
+    ["Ride ID", String(data.ride_id ?? "-")],
+    ["Status", String(data.ride_stat ?? "-")]
+  ];
+  if (data.cancellation) {
+    const c = data.cancellation;
+    lines.push(["Cancellation fee", `${c.cancellation_fee} ${c.currency}`]);
+    lines.push(["Reversal amount", `${c.reversal_amount} ${c.currency}`]);
   }
-};
-function buildCancelCommand() {
-  return new Command4("cancel").description(cancelSchema.description).helpOption(false).option("--help", "Show help (add --format json for the machine-readable schema)").option("--format <format>", "Output format: json|table").option("--api-key <key>", "API key for runtime requests").option("--yes", "Skip confirmation prompts").option("--order-id <id>", "Order id (a.k.a. ride id) to cancel").option("--idempotency-key <key>", "Caller-supplied idempotency key").action(async (_options, command) => {
-    const merged = command.optsWithGlobals();
-    const format = merged.format === "table" ? "table" : "json";
-    if (merged.help) {
-      const wantsSchema = process.argv.some((a) => a === "--format" || a.startsWith("--format="));
-      if (wantsSchema) emitSchema(cancelSchema, format);
-      else command.outputHelp();
-      return;
-    }
-    const yes = merged.yes === true;
-    const apiKey = await PromptEngine.resolveInput(merged.apiKey, {
-      message: "API key:",
+  if (data.refund_amount !== void 0 && data.refund_amount !== null) {
+    lines.push(["Refund amount", String(data.refund_amount)]);
+  }
+  return Formatter.keyValue(lines);
+}
+function registerCancelCommand(parent, deps) {
+  const cmd = parent.command("cancel").description("Cancel a ride order by id (may incur a cancellation fee)").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--order-id <id>", "Ride order id to cancel (the ride_id returned by book)").option(
+    "--idempotency-key <key>",
+    "Idempotency key forwarded verbatim as the Idempotency-Key header"
+  );
+  attachSchemaHelp(cmd, cancelSchema);
+  cmd.action(async () => {
+    const opts = cmd.optsWithGlobals();
+    const format = resolveFormat(opts.format);
+    const isYes = Boolean(opts.yes);
+    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
+      message: "API Key:",
       type: "password"
     });
-    const orderId = await PromptEngine.resolveInput(merged.orderId, { message: "Order id:" });
-    if (!await PromptEngine.confirm(`Cancel order ${orderId}? This may incur a fee.`, yes)) {
-      console.log(Formatter.status("info", "Cancellation aborted."));
-      return;
+    const orderId = need4(opts.orderId, "order-id");
+    if (!isYes) {
+      const confirmed = await confirm2({
+        message: `Cancel ride ${orderId}? This may incur a fee.`,
+        default: false
+      });
+      if (!confirmed) {
+        throw new CliError("CLIENT_ABORTED", "Cancellation aborted by user.");
+      }
     }
-    const idempotencyKey = await resolveIdempotencyKey(merged.idempotencyKey, { yes });
-    const client = new ApiClient({ apiKey });
-    const spinner = createSpinner("Cancelling ride...");
-    try {
-      const data = await client.post(`/ride/${encodeURIComponent(orderId)}/cancel`, { idempotencyKey });
-      spinner.stop();
-      emit(data, format);
-    } catch (err) {
-      spinner.fail("Cancellation failed");
-      throw err;
+    const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
+      yes: isYes,
+      commandPath: "ride-elife cancel"
+    });
+    notify(format, "loading", "Cancelling ride...");
+    const result = await deps.apiClient.post(
+      `/ride/${encodeURIComponent(orderId)}/cancel`,
+      { type: "api-key", key: apiKey },
+      void 0,
+      { "Idempotency-Key": idempotencyKey }
+    );
+    if (!result.success) {
+      throw CliError.fromApi(result, { auth: "api-key" });
     }
+    const data = result.data;
+    const configManager = new ConfigManager();
+    const commandResult = {
+      data,
+      text: () => formatCancel(data)
+    };
+    await renderWithContext(commandResult, { format }, configManager);
   });
 }
 
-// src/ride/list-orders.ts
-import { Command as Command5 } from "commander";
-var listOrdersSchema = {
-  description: "List ride orders with pagination and optional filters.",
-  params: {
-    page: "number \u2014 page number (default 1)",
-    "page-size": "number \u2014 page size (default 20)",
-    status: "OrderStatus \u2014 optional status filter",
-    "order-type": "string \u2014 optional order type filter"
-  },
-  response: {
-    orders: "RideOrderListItem[] \u2014 each: order_id, ride_id, status, vehicle_class, is_scheduled, scheduled_at, price_amount, final_amount, price_currency, payment_status, final_settlement_status (pending|settled|no_adjustment|settlement_pending|not_applicable), cancellation_fee, provider, created_at, updated_at",
-    total: "number",
-    page: "number",
-    page_size: "number"
+// src/ride-elife/list-orders.ts
+var DEFAULT_PAGE = "1";
+var DEFAULT_PAGE_SIZE = "20";
+function positiveInt(value, flag) {
+  const n = Number(value);
+  if (!Number.isFinite(n) || !Number.isInteger(n) || n < 1) {
+    throw new CliError("PARAM_INVALID", `--${flag} must be a positive integer.`);
   }
-};
-function buildListOrdersCommand() {
-  const cmd = new Command5("list-orders").description(listOrdersSchema.description).option("--page <page>", "Page number", "1").option("--page-size <size>", "Page size", "20").option("--status <status>", "Filter by order status").option("--order-type <type>", "Filter by order type").action(async (_opts, command) => {
-    const o = command.optsWithGlobals();
-    const format = o.format === "table" ? "table" : "json";
-    const apiKey = await PromptEngine.resolveInput(o.apiKey, {
-      message: "API key:",
+  return String(n);
+}
+function formatOrders(data) {
+  const orders = data.orders ?? [];
+  if (orders.length === 0) {
+    return Formatter.status("info", "No ride orders found");
+  }
+  const headers = ["Order ID", "Ride ID", "Status", "Vehicle Class", "Price", "Currency", "Payment"];
+  const rows = orders.map((o) => [
+    String(o.order_id ?? "-"),
+    String(o.ride_id ?? "-"),
+    String(o.status ?? "-"),
+    String(o.vehicle_class ?? "-"),
+    String(o.price_amount ?? "-"),
+    String(o.price_currency ?? "-"),
+    String(o.payment_status ?? "-")
+  ]);
+  const summary = [
+    ["Total", String(data.total ?? "-")],
+    ["Page", String(data.page ?? "-")],
+    ["Page size", String(data.page_size ?? "-")]
+  ];
+  return `${Formatter.table(headers, rows)}
+${Formatter.keyValue(summary)}`;
+}
+function registerListOrdersCommand(parent, deps) {
+  const cmd = parent.command("list-orders").description("List previously placed ride orders").option("--api-key <key>", "API Key for authentication (X-Api-Key)").option("--page <page>", "Page number", DEFAULT_PAGE).option("--page-size <size>", "Page size", DEFAULT_PAGE_SIZE).option("--status <status>", "Filter by order status").option("--order-type <type>", "Filter by order type");
+  attachSchemaHelp(cmd, listOrdersSchema);
+  cmd.action(async () => {
+    const opts = cmd.optsWithGlobals();
+    const format = resolveFormat(opts.format);
+    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
+      message: "API Key:",
       type: "password"
     });
-    const client = new ApiClient({ apiKey });
-    const spinner = createSpinner("Fetching orders...");
-    try {
-      const data = await client.get("/ride/orders", {
-        query: {
-          page: Number(o.page),
-          page_size: Number(o.pageSize),
-          status: o.status,
-          order_type: o.orderType
-        }
-      });
-      spinner.stop();
-      emit(data, format);
-    } catch (err) {
-      spinner.fail("Failed to fetch orders");
-      throw err;
+    const params = {
+      page: positiveInt(opts.page ?? DEFAULT_PAGE, "page"),
+      page_size: positiveInt(opts.pageSize ?? DEFAULT_PAGE_SIZE, "page-size")
+    };
+    if (opts.status !== void 0) params.status = opts.status;
+    if (opts.orderType !== void 0) params.order_type = opts.orderType;
+    notify(format, "loading", "Fetching orders...");
+    const result = await deps.apiClient.get(
+      "/ride/orders",
+      { type: "api-key", key: apiKey },
+      params
+    );
+    if (!result.success) {
+      throw CliError.fromApi(result, { auth: "api-key" });
     }
+    const data = result.data;
+    const configManager = new ConfigManager();
+    const commandResult = {
+      data,
+      text: () => formatOrders(data)
+    };
+    await renderWithContext(commandResult, { format }, configManager);
   });
-  return attachSchemaHelp(cmd, listOrdersSchema);
 }
 
-// src/services/list.ts
-import { Command as Command6 } from "commander";
-
 // src/services/registry.ts
 var SERVICE_REGISTRY = [
   {
     service_id: "ride-elife",
     name: "Ride hailing (eLife)",
     description: "On-demand ride ordering: quote a fare, book it, poll status, and cancel.",
+    category: "ride",
     version: "1.0.0",
     provider: "elife",
     cli_noun: "ride-elife",
@@ -841,8 +1569,8 @@ var SERVICE_REGISTRY = [
     verb_descriptions: {
       quote: "Request fare quotes for a ride between two points.",
       book: "Book a ride using a quote_id returned by quote.",
-      get: "Retrieve a ride order by id (poll for status changes).",
-      cancel: "Cancel a ride order by id.",
+      get: "Retrieve a ride order by id (poll for status changes with --watch).",
+      cancel: "Cancel a ride order by id (may incur a fee).",
       "list-orders": "List previously placed ride orders."
     },
     workflow: ["quote", "book", "get (poll for status)", "cancel (optional)"],
@@ -855,117 +1583,142 @@ function findService(serviceId) {
 }
 
 // src/services/list.ts
-var servicesListSchema = {
-  description: "List available merchant services from the registry.",
-  params: {},
-  response: {
-    services: "Service[] \u2014 each with service_id, name, provider, cli_noun, version, verbs"
-  }
-};
-function resolveFormat(cmd) {
-  return cmd.optsWithGlobals().format === "table" ? "table" : "json";
-}
-function buildServicesListCommand() {
-  return new Command6("list").description(servicesListSchema.description).helpOption(false).option("-h, --help", "Show help; with --format json prints the schema").action((opts, cmd) => {
-    const format = resolveFormat(cmd);
-    if (opts.help) {
-      emitSchema(servicesListSchema, format);
-      return;
-    }
-    const services = SERVICE_REGISTRY.map((s) => ({
-      service_id: s.service_id,
-      name: s.name,
-      provider: s.provider,
-      cli_noun: s.cli_noun,
-      version: s.version,
-      verbs: s.verbs.join(", ")
-    }));
-    emit(services, format);
+function toListItem(s) {
+  return {
+    service_id: s.service_id,
+    name: s.name,
+    category: s.category,
+    provider: s.provider,
+    cli_noun: s.cli_noun,
+    version: s.version,
+    verbs: s.verbs,
+    since: s.since,
+    discovery: s.discovery
+  };
+}
+function registerServicesListCommand(parent) {
+  const cmd = parent.command("list").description("List available merchant services from the registry");
+  cmd.action(async () => {
+    const opts = cmd.optsWithGlobals();
+    const format = resolveFormat(opts.format);
+    const services = SERVICE_REGISTRY.map(toListItem);
+    const configManager = new ConfigManager();
+    const commandResult = {
+      data: { services },
+      text: () => {
+        if (services.length === 0) {
+          return Formatter.status("info", "No services found");
+        }
+        const headers = ["Service ID", "Name", "Category", "Provider", "Version", "Verbs"];
+        const rows = services.map((s) => [
+          s.service_id,
+          s.name,
+          s.category,
+          s.provider,
+          s.version,
+          s.verbs.join(", ")
+        ]);
+        return Formatter.table(headers, rows);
+      }
+    };
+    await renderWithContext(commandResult, { format }, configManager);
   });
 }
 
 // src/services/get.ts
-import { Command as Command7 } from "commander";
-var serviceGetSchema = {
-  description: "Retrieve a single merchant service by id, with verb and workflow detail.",
-  params: {
-    "service-id": "string \u2014 service id to retrieve"
-  },
-  response: {
-    service_id: "string",
-    name: "string",
-    description: "string",
-    version: "string",
-    provider: "string",
-    cli_noun: "string",
-    verbs: "string[]",
-    verb_descriptions: "Record<verb, description>",
-    workflow: "string[] \u2014 ordered steps quote\u2192book\u2192get(poll)\u2192[cancel]",
-    since: "string \u2014 ISO date",
-    discovery: "{ help_command: string }"
-  }
-};
-function resolveFormat2(cmd) {
-  return cmd.optsWithGlobals().format === "table" ? "table" : "json";
-}
-function buildServiceGetCommand() {
-  return new Command7("get").description(serviceGetSchema.description).argument("[service-id]", "Service id to retrieve").helpOption(false).option("-h, --help", "Show help; with --format json prints the schema").action((serviceId, opts, cmd) => {
-    const format = resolveFormat2(cmd);
-    if (opts.help) {
-      emitSchema(serviceGetSchema, format);
-      return;
-    }
-    const service = serviceId ? findService(serviceId) : void 0;
+function formatServiceGet(s) {
+  const lines = [
+    ["Service ID", s.service_id],
+    ["Name", s.name],
+    ["Description", s.description],
+    ["Category", s.category],
+    ["Version", s.version],
+    ["Provider", s.provider],
+    ["CLI Noun", s.cli_noun],
+    ["Verbs", s.verbs.join(", ")],
+    ["Workflow", s.workflow.join(" \u2192 ")],
+    ["Since", s.since],
+    ["Help", s.discovery.help_command]
+  ];
+  const verbDetail = s.verbs.map((v) => `  ${v}: ${s.verb_descriptions[v] ?? ""}`).join("\n");
+  return `${Formatter.keyValue(lines)}
+Verb descriptions:
+${verbDetail}`;
+}
+function registerServiceGetCommand(parent) {
+  const cmd = parent.command("get <service-id>").description("Retrieve a single merchant service by id");
+  cmd.action(async (serviceId) => {
+    const opts = cmd.optsWithGlobals();
+    const format = resolveFormat(opts.format);
+    const service = findService(serviceId);
     if (!service) {
       throw new CliError(
-        ErrorCodes.SERVICE_NOT_FOUND,
-        `Service '${serviceId ?? ""}' not found in the registry (SERVICE_NOT_FOUND).`,
-        'Run "services list" to see available services.'
+        "SERVICE_NOT_FOUND",
+        `Service '${serviceId}' was not found in the registry. Run "services list" to see available services.`
       );
     }
-    emit(service, format);
+    const configManager = new ConfigManager();
+    const commandResult = {
+      data: service,
+      text: () => formatServiceGet(service)
+    };
+    await renderWithContext(commandResult, { format }, configManager);
   });
 }
 
 // src/index.ts
-function resolveFormat3(cmd) {
-  return cmd.optsWithGlobals().format === "table" ? "table" : "json";
-}
+var programRef;
 async function main() {
-  const program = new Command8();
-  program.name("agenzo-merchant-cli").description("CLI for ordering rides and querying merchant services").version(getCurrentVersion()).option("--format <format>", "Output format: json|table", "json").option("--yes", "Skip confirmation prompts (for automation/AI Agents)", false).option("--api-key <key>", "API key for runtime requests");
-  const config = program.command("config").description("Local API host configuration");
-  config.command("set-host <url>").description("Set the API host").action((url) => {
-    setHost(url);
-    console.log(Formatter.status("success", `API host set to ${getHost()}`));
+  const configManager = new ConfigManager(void 0, "/api/merchant/v1");
+  await configManager.ensureDirectories();
+  const apiBaseUrl = await configManager.getApiBaseUrl();
+  const apiClient = new ApiClient({ baseUrl: apiBaseUrl });
+  const deps = { apiClient };
+  const program = new Command();
+  programRef = program;
+  program.name("agenzo-merchant-cli").version(getCurrentVersion()).description(
+    "Agenzo merchant fulfillment plane: service discovery (services) and ride ordering (ride-elife)"
+  ).option("--verbose", "Show verbose logs").option("--yes", "Skip confirmation prompts (for automation/AI Agents)").option(
+    "--format <format>",
+    "Output format: json | table (default: json; or set AGENZO_FORMAT)",
+    "json"
+  ).option("--api-key <key>", "API Key for authentication (X-Api-Key)");
+  program.hook("preAction", (thisCommand) => {
+    const flag = thisCommand.opts().format;
+    process.env.AGENZO_FORMAT = resolveFormat(flag);
   });
-  config.command("reset-host").description("Reset the API host to the default").action(() => {
-    resetHost();
-    console.log(Formatter.status("success", `API host reset to ${getHost()}`));
-  });
-  config.command("show").description("Show the current configuration").action((_options, cmd) => {
-    emit({ host: getHost() }, resolveFormat3(cmd));
-  });
-  const rideElife = program.command("ride-elife").description("Ride ordering (eLife): quote, book, get, cancel, list-orders");
-  rideElife.addCommand(buildQuoteCommand());
-  rideElife.addCommand(buildBookCommand());
-  rideElife.addCommand(buildRideGetCommand());
-  rideElife.addCommand(buildCancelCommand());
-  rideElife.addCommand(buildListOrdersCommand());
-  const services = program.command("services").description("Service registry: list, get");
-  services.addCommand(buildServicesListCommand());
-  services.addCommand(buildServiceGetCommand());
+  const rideCmd = program.command("ride-elife").description("Ride ordering (eLife)");
+  registerQuoteCommand(rideCmd, deps);
+  registerBookCommand(rideCmd, deps);
+  registerRideGetCommand(rideCmd, deps);
+  registerCancelCommand(rideCmd, deps);
+  registerListOrdersCommand(rideCmd, deps);
+  const servicesCmd = program.command("services").description("Merchant service discovery");
+  registerServicesListCommand(servicesCmd);
+  registerServiceGetCommand(servicesCmd);
   await program.parseAsync(process.argv);
 }
-main().catch((error) => {
-  if (error instanceof CliError) {
-    console.error(Formatter.status("error", error.message));
-    if (error.recovery) console.error(Formatter.status("info", error.recovery));
-    process.exit(error.exitCode);
+function resolveActiveFormat() {
+  const flag = programRef?.opts().format;
+  return resolveFormat(flag);
+}
+function reportError(error) {
+  const envelope = toErrorEnvelope(error);
+  const format = resolveActiveFormat();
+  if (format === "json") {
+    console.error(JSON.stringify(envelope));
+  } else {
+    console.error(
+      Formatter.status("error", `[${envelope.error.code_num}] ${envelope.error.message}`)
+    );
+    if (!(error instanceof CliError) && process.argv.includes("--verbose")) {
+      console.error(error);
+    }
   }
-  console.error(
-    Formatter.status("error", error instanceof Error ? error.message : "An unexpected error occurred")
-  );
-  process.exit(1);
+  process.exit(exitCodeFor(error));
+}
+process.on("SIGINT", () => {
+  reportError(new UserCancelError());
 });
+main().catch(reportError);
 //# sourceMappingURL=index.js.map