@agenzo/merchant-cli 0.3.0 → 0.3.3

package/dist/index.js

@@ -2,31 +2,715 @@
 
 // src/index.ts
 import { Command } from "commander";
-import {
-  ApiClient as ApiClient6,
-  ConfigManager as ConfigManager8,
-  Formatter as Formatter8,
-  CliError as CliError9,
-  UserCancelError,
-  toErrorEnvelope,
-  resolveFormat as resolveFormat8,
-  exitCodeFor,
-  getCurrentVersion
-} from "@agenzo/cli-core";
 
-// src/ride-elife/quote.ts
-import {
-  ConfigManager,
-  PromptEngine,
-  Formatter,
-  resolveFormat,
-  notify,
-  CliError as CliError2,
-  renderWithContext
-} from "@agenzo/cli-core";
+// ../../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
+};
+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.statusCode = statusCode;
+    this.requestId = requestId;
+    this.upstream = upstream;
+    this.name = "CliError";
+  }
+  code;
+  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
+      );
+    }
+    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
+    );
+  }
+};
+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."
+    );
+  }
+};
+var ConfigError = class extends CliError {
+  constructor(message, filePath) {
+    super("INTERNAL_ERROR", message || "Unknown error");
+    this.filePath = filePath;
+  }
+  filePath;
+};
+var ValidationError = class extends CliError {
+  constructor(message) {
+    super("PARAM_INVALID", message || "Unknown error");
+  }
+};
+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.`
+    );
+  }
+};
+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}`
+    );
+  }
+};
+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);
+}
+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"
+    }
+  };
+}
+var UPGRADE_COMMAND = "npm install -g agenzo-admin-cli@latest";
+var FALLBACK_VERSION = "0.1.1";
+var cachedVersion = null;
+function getCurrentVersion() {
+  if (cachedVersion !== null) return cachedVersion;
+  const here = dirname(fileURLToPath(import.meta.url));
+  const candidates = [
+    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(readFileSync(p, "utf-8"));
+      if (typeof pkg.version === "string") {
+        cachedVersion = pkg.version;
+        return cachedVersion;
+      }
+    } catch {
+    }
+  }
+  cachedVersion = FALLBACK_VERSION;
+  console.warn(
+    `[agenzo-admin-cli] package.json not found; using fallback version ${FALLBACK_VERSION}`
+  );
+  return cachedVersion;
+}
+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 isBelow(current, minimum) {
+  return compareVersions(current, minimum) < 0;
+}
+var ApiClient = class {
+  baseUrl;
+  timeout;
+  constructor(config) {
+    this.baseUrl = config.baseUrl.replace(/\/+$/, "");
+    this.timeout = config.timeout ?? 6e4;
+  }
+  buildHeaders(auth) {
+    const headers = {
+      "User-Agent": `agenzo-admin-cli/${getCurrentVersion()}`
+    };
+    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 timeoutId = setTimeout(() => controller.abort(), this.timeout);
+    try {
+      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 UpgradeRequiredError) {
+        throw error;
+      }
+      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(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);
+    }
+  }
+  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 {
+      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;
+    }
+  }
+  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 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})`;
+  }
+};
+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 {
+  /** Return flagValue directly if provided, otherwise prompt interactively */
+  static async resolveInput(flagValue, config) {
+    if (flagValue !== void 0) {
+      return flagValue;
+    }
+    if (config.type === "password") {
+      return password({ message: config.message, mask: "*" });
+    }
+    if (config.type === "select" && config.choices) {
+      return select({
+        message: config.message,
+        choices: config.choices
+      });
+    }
+    return input({
+      message: config.message,
+      validate: config.validate
+    });
+  }
+};
 
 // src/ride-elife/watch.ts
-import { CliError } from "@agenzo/cli-core";
 var TERMINAL_STATUSES = /* @__PURE__ */ new Set([
   "At destination",
   "Cancelled",
@@ -371,14 +1055,14 @@ var listOrdersSchema = {
 // src/ride-elife/quote.ts
 function need(value, flag) {
   if (value === void 0) {
-    throw new CliError2("PARAM_INVALID", `Missing required --${flag}.`);
+    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 CliError2("PARAM_INVALID", `--${flag} must be a number.`);
+    throw new CliError("PARAM_INVALID", `--${flag} must be a number.`);
   }
   return n;
 }
@@ -454,7 +1138,7 @@ function registerQuoteCommand(parent, deps) {
       body
     );
     if (!result.success) {
-      throw CliError2.fromApi(result, { auth: "api-key" });
+      throw CliError.fromApi(result, { auth: "api-key" });
     }
     const data = result.data;
     const configManager = new ConfigManager();
@@ -468,28 +1152,14 @@ function registerQuoteCommand(parent, deps) {
 
 // src/ride-elife/book.ts
 import { confirm } from "@inquirer/prompts";
-import {
-  ConfigManager as ConfigManager2,
-  PromptEngine as PromptEngine3,
-  Formatter as Formatter2,
-  resolveFormat as resolveFormat2,
-  notify as notify2,
-  CliError as CliError4,
-  renderWithContext as renderWithContext2
-} from "@agenzo/cli-core";
 
 // src/idempotency.ts
-import {
-  CliError as CliError3,
-  IdempotencyKeyRequiredError,
-  PromptEngine as PromptEngine2
-} from "@agenzo/cli-core";
 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 (!IDEMPOTENCY_KEY_PATTERN.test(trimmed)) {
-    throw new CliError3(
+    throw new CliError(
       "PARAM_INVALID",
       `Invalid idempotency key: "${key}". ${IDEMPOTENCY_KEY_RULE}`
     );
@@ -503,7 +1173,7 @@ async function resolveIdempotencyKey(flagValue, opts) {
   if (opts.yes) {
     throw new IdempotencyKeyRequiredError(opts.commandPath);
   }
-  const entered = await PromptEngine2.resolveInput(void 0, {
+  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
   });
@@ -513,21 +1183,21 @@ async function resolveIdempotencyKey(flagValue, opts) {
 // src/ride-elife/book.ts
 function need2(value, flag) {
   if (value === void 0) {
-    throw new CliError4("PARAM_INVALID", `Missing required --${flag}.`);
+    throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
 function num2(value, flag) {
   const n = Number(need2(value, flag));
   if (!Number.isFinite(n)) {
-    throw new CliError4("PARAM_INVALID", `--${flag} must be a number.`);
+    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 CliError4("PARAM_INVALID", `--${flag} must be an integer between 0 and 5.`);
+    throw new CliError("PARAM_INVALID", `--${flag} must be an integer between 0 and 5.`);
   }
   return n;
 }
@@ -546,7 +1216,7 @@ function formatBook(data) {
   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 Formatter2.keyValue(lines);
+  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(
@@ -556,9 +1226,9 @@ function registerBookCommand(parent, deps) {
   attachSchemaHelp(cmd, bookSchema);
   cmd.action(async () => {
     const opts = cmd.optsWithGlobals();
-    const format = resolveFormat2(opts.format);
+    const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
-    const apiKey = await PromptEngine3.resolveInput(opts.apiKey, {
+    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
       message: "API Key:",
       type: "password"
     });
@@ -626,14 +1296,14 @@ function registerBookCommand(parent, deps) {
         default: true
       });
       if (!confirmed) {
-        throw new CliError4("CLIENT_ABORTED", "Booking cancelled by user.");
+        throw new CliError("CLIENT_ABORTED", "Booking cancelled by user.");
       }
     }
     const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
       yes: isYes,
       commandPath: "ride-elife book"
     });
-    notify2(format, "loading", "Booking ride...");
+    notify(format, "loading", "Booking ride...");
     const result = await deps.apiClient.post(
       "/ride/book",
       { type: "api-key", key: apiKey },
@@ -641,31 +1311,22 @@ function registerBookCommand(parent, deps) {
       { "Idempotency-Key": idempotencyKey }
     );
     if (!result.success) {
-      throw CliError4.fromApi(result, { auth: "api-key" });
+      throw CliError.fromApi(result, { auth: "api-key" });
     }
     const data = result.data;
-    const configManager = new ConfigManager2();
+    const configManager = new ConfigManager();
     const commandResult = {
       data,
       text: () => formatBook(data)
     };
-    await renderWithContext2(commandResult, { format }, configManager);
+    await renderWithContext(commandResult, { format }, configManager);
   });
 }
 
 // src/ride-elife/get.ts
-import {
-  ConfigManager as ConfigManager3,
-  PromptEngine as PromptEngine4,
-  Formatter as Formatter3,
-  resolveFormat as resolveFormat3,
-  notify as notify3,
-  CliError as CliError5,
-  renderWithContext as renderWithContext3
-} from "@agenzo/cli-core";
 function need3(value, flag) {
   if (value === void 0) {
-    throw new CliError5("PARAM_INVALID", `Missing required --${flag}.`);
+    throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
@@ -705,7 +1366,7 @@ function formatGetOrder(data) {
     lines.push(["Vehicle", `${desc}${plate}`]);
   }
   if (data.created_at) lines.push(["Created at", String(data.created_at)]);
-  return Formatter3.keyValue(lines);
+  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(
@@ -718,8 +1379,8 @@ function registerRideGetCommand(parent, deps) {
   attachSchemaHelp(cmd, rideGetSchema);
   cmd.action(async () => {
     const opts = cmd.optsWithGlobals();
-    const format = resolveFormat3(opts.format);
-    const apiKey = await PromptEngine4.resolveInput(opts.apiKey, {
+    const format = resolveFormat(opts.format);
+    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
       message: "API Key:",
       type: "password"
     });
@@ -737,38 +1398,29 @@ function registerRideGetCommand(parent, deps) {
       });
       return;
     }
-    notify3(format, "loading", "Fetching ride status...");
+    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 CliError5.fromApi(result, { auth: "api-key" });
+      throw CliError.fromApi(result, { auth: "api-key" });
     }
     const data = result.data;
-    const configManager = new ConfigManager3();
+    const configManager = new ConfigManager();
     const commandResult = {
       data,
       text: () => formatGetOrder(data)
     };
-    await renderWithContext3(commandResult, { format }, configManager);
+    await renderWithContext(commandResult, { format }, configManager);
   });
 }
 
 // src/ride-elife/cancel.ts
 import { confirm as confirm2 } from "@inquirer/prompts";
-import {
-  ConfigManager as ConfigManager4,
-  PromptEngine as PromptEngine5,
-  Formatter as Formatter4,
-  resolveFormat as resolveFormat4,
-  notify as notify4,
-  CliError as CliError6,
-  renderWithContext as renderWithContext4
-} from "@agenzo/cli-core";
 function need4(value, flag) {
   if (value === void 0) {
-    throw new CliError6("PARAM_INVALID", `Missing required --${flag}.`);
+    throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
   }
   return value;
 }
@@ -785,7 +1437,7 @@ function formatCancel(data) {
   if (data.refund_amount !== void 0 && data.refund_amount !== null) {
     lines.push(["Refund amount", String(data.refund_amount)]);
   }
-  return Formatter4.keyValue(lines);
+  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(
@@ -795,9 +1447,9 @@ function registerCancelCommand(parent, deps) {
   attachSchemaHelp(cmd, cancelSchema);
   cmd.action(async () => {
     const opts = cmd.optsWithGlobals();
-    const format = resolveFormat4(opts.format);
+    const format = resolveFormat(opts.format);
     const isYes = Boolean(opts.yes);
-    const apiKey = await PromptEngine5.resolveInput(opts.apiKey, {
+    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
       message: "API Key:",
       type: "password"
     });
@@ -808,14 +1460,14 @@ function registerCancelCommand(parent, deps) {
         default: false
       });
       if (!confirmed) {
-        throw new CliError6("CLIENT_ABORTED", "Cancellation aborted by user.");
+        throw new CliError("CLIENT_ABORTED", "Cancellation aborted by user.");
       }
     }
     const idempotencyKey = await resolveIdempotencyKey(opts.idempotencyKey, {
       yes: isYes,
       commandPath: "ride-elife cancel"
     });
-    notify4(format, "loading", "Cancelling ride...");
+    notify(format, "loading", "Cancelling ride...");
     const result = await deps.apiClient.post(
       `/ride/${encodeURIComponent(orderId)}/cancel`,
       { type: "api-key", key: apiKey },
@@ -823,41 +1475,32 @@ function registerCancelCommand(parent, deps) {
       { "Idempotency-Key": idempotencyKey }
     );
     if (!result.success) {
-      throw CliError6.fromApi(result, { auth: "api-key" });
+      throw CliError.fromApi(result, { auth: "api-key" });
     }
     const data = result.data;
-    const configManager = new ConfigManager4();
+    const configManager = new ConfigManager();
     const commandResult = {
       data,
       text: () => formatCancel(data)
     };
-    await renderWithContext4(commandResult, { format }, configManager);
+    await renderWithContext(commandResult, { format }, configManager);
   });
 }
 
 // src/ride-elife/list-orders.ts
-import {
-  ConfigManager as ConfigManager5,
-  PromptEngine as PromptEngine6,
-  Formatter as Formatter5,
-  resolveFormat as resolveFormat5,
-  notify as notify5,
-  CliError as CliError7,
-  renderWithContext as renderWithContext5
-} from "@agenzo/cli-core";
 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 CliError7("PARAM_INVALID", `--${flag} must be a positive integer.`);
+    throw new CliError("PARAM_INVALID", `--${flag} must be a positive integer.`);
   }
   return String(n);
 }
 function formatOrders(data) {
   const orders = data.orders ?? [];
   if (orders.length === 0) {
-    return Formatter5.status("info", "No ride orders found");
+    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) => [
@@ -874,16 +1517,16 @@ function formatOrders(data) {
     ["Page", String(data.page ?? "-")],
     ["Page size", String(data.page_size ?? "-")]
   ];
-  return `${Formatter5.table(headers, rows)}
-${Formatter5.keyValue(summary)}`;
+  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 = resolveFormat5(opts.format);
-    const apiKey = await PromptEngine6.resolveInput(opts.apiKey, {
+    const format = resolveFormat(opts.format);
+    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
       message: "API Key:",
       type: "password"
     });
@@ -893,28 +1536,25 @@ function registerListOrdersCommand(parent, deps) {
     };
     if (opts.status !== void 0) params.status = opts.status;
     if (opts.orderType !== void 0) params.order_type = opts.orderType;
-    notify5(format, "loading", "Fetching orders...");
+    notify(format, "loading", "Fetching orders...");
     const result = await deps.apiClient.get(
       "/ride/orders",
       { type: "api-key", key: apiKey },
       params
     );
     if (!result.success) {
-      throw CliError7.fromApi(result, { auth: "api-key" });
+      throw CliError.fromApi(result, { auth: "api-key" });
     }
     const data = result.data;
-    const configManager = new ConfigManager5();
+    const configManager = new ConfigManager();
     const commandResult = {
       data,
       text: () => formatOrders(data)
     };
-    await renderWithContext5(commandResult, { format }, configManager);
+    await renderWithContext(commandResult, { format }, configManager);
   });
 }
 
-// src/services/list.ts
-import { ConfigManager as ConfigManager6, Formatter as Formatter6, resolveFormat as resolveFormat6, renderWithContext as renderWithContext6 } from "@agenzo/cli-core";
-
 // src/services/registry.ts
 var SERVICE_REGISTRY = [
   {
@@ -960,14 +1600,14 @@ 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 = resolveFormat6(opts.format);
+    const format = resolveFormat(opts.format);
     const services = SERVICE_REGISTRY.map(toListItem);
-    const configManager = new ConfigManager6();
+    const configManager = new ConfigManager();
     const commandResult = {
       data: { services },
       text: () => {
         if (services.length === 0) {
-          return Formatter6.status("info", "No services found");
+          return Formatter.status("info", "No services found");
         }
         const headers = ["Service ID", "Name", "Category", "Provider", "Version", "Verbs"];
         const rows = services.map((s) => [
@@ -978,21 +1618,14 @@ function registerServicesListCommand(parent) {
           s.version,
           s.verbs.join(", ")
         ]);
-        return Formatter6.table(headers, rows);
+        return Formatter.table(headers, rows);
       }
     };
-    await renderWithContext6(commandResult, { format }, configManager);
+    await renderWithContext(commandResult, { format }, configManager);
   });
 }
 
 // src/services/get.ts
-import {
-  ConfigManager as ConfigManager7,
-  Formatter as Formatter7,
-  CliError as CliError8,
-  resolveFormat as resolveFormat7,
-  renderWithContext as renderWithContext7
-} from "@agenzo/cli-core";
 function formatServiceGet(s) {
   const lines = [
     ["Service ID", s.service_id],
@@ -1008,7 +1641,7 @@ function formatServiceGet(s) {
     ["Help", s.discovery.help_command]
   ];
   const verbDetail = s.verbs.map((v) => `  ${v}: ${s.verb_descriptions[v] ?? ""}`).join("\n");
-  return `${Formatter7.keyValue(lines)}
+  return `${Formatter.keyValue(lines)}
 Verb descriptions:
 ${verbDetail}`;
 }
@@ -1016,30 +1649,30 @@ 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 = resolveFormat7(opts.format);
+    const format = resolveFormat(opts.format);
     const service = findService(serviceId);
     if (!service) {
-      throw new CliError8(
+      throw new CliError(
         "SERVICE_NOT_FOUND",
         `Service '${serviceId}' was not found in the registry. Run "services list" to see available services.`
       );
     }
-    const configManager = new ConfigManager7();
+    const configManager = new ConfigManager();
     const commandResult = {
       data: service,
       text: () => formatServiceGet(service)
     };
-    await renderWithContext7(commandResult, { format }, configManager);
+    await renderWithContext(commandResult, { format }, configManager);
   });
 }
 
 // src/index.ts
 var programRef;
 async function main() {
-  const configManager = new ConfigManager8();
+  const configManager = new ConfigManager();
   await configManager.ensureDirectories();
   const apiBaseUrl = await configManager.getApiBaseUrl();
-  const apiClient = new ApiClient6({ baseUrl: apiBaseUrl });
+  const apiClient = new ApiClient({ baseUrl: apiBaseUrl });
   const deps = { apiClient };
   const program = new Command();
   programRef = program;
@@ -1052,7 +1685,7 @@ async function main() {
   ).option("--api-key <key>", "API Key for authentication (X-Api-Key)");
   program.hook("preAction", (thisCommand) => {
     const flag = thisCommand.opts().format;
-    process.env.AGENZO_FORMAT = resolveFormat8(flag);
+    process.env.AGENZO_FORMAT = resolveFormat(flag);
   });
   const rideCmd = program.command("ride-elife").description("Ride ordering (eLife)");
   registerQuoteCommand(rideCmd, deps);
@@ -1067,7 +1700,7 @@ async function main() {
 }
 function resolveActiveFormat() {
   const flag = programRef?.opts().format;
-  return resolveFormat8(flag);
+  return resolveFormat(flag);
 }
 function reportError(error) {
   const envelope = toErrorEnvelope(error);
@@ -1076,9 +1709,9 @@ function reportError(error) {
     console.error(JSON.stringify(envelope));
   } else {
     console.error(
-      Formatter8.status("error", `[${envelope.error.code_num}] ${envelope.error.message}`)
+      Formatter.status("error", `[${envelope.error.code_num}] ${envelope.error.message}`)
     );
-    if (!(error instanceof CliError9) && process.argv.includes("--verbose")) {
+    if (!(error instanceof CliError) && process.argv.includes("--verbose")) {
       console.error(error);
     }
   }