@agenzo/token-cli 0.3.0 → 0.3.2

package/dist/index.js

@@ -270,10 +270,6 @@ var ApiClient = class {
     const headers = {
       "User-Agent": `agenzo-admin-cli/${getCurrentVersion()}`
     };
-    const traceparent = process.env.TRACEPARENT;
-    if (traceparent) {
-      headers["traceparent"] = traceparent;
-    }
     if (auth.type === "bearer") {
       headers["Authorization"] = `Bearer ${auth.token}`;
     } else if (auth.type === "api-key") {
@@ -696,17 +692,11 @@ async function renderWithContext(result, opts, configManager) {
   render({ ...result, data: payload }, opts);
 }
 var PromptEngine = class {
-  /** Return flagValue if provided, else env fallback, else prompt interactively */
+  /** Return flagValue directly if provided, otherwise prompt interactively */
   static async resolveInput(flagValue, config) {
     if (flagValue !== void 0) {
       return flagValue;
     }
-    if (config.envVar) {
-      const envValue = process.env[config.envVar];
-      if (envValue !== void 0 && envValue !== "") {
-        return envValue;
-      }
-    }
     if (config.type === "password") {
       return password({ message: config.message, mask: "*" });
     }
@@ -753,363 +743,232 @@ async function collectPaymentMethodParams(type, flags) {
   return params;
 }
 
-// src/verb-schema.ts
-var CLI_NAME = "agenzo-token-cli";
-function wantsJsonSchema(argv = process.argv) {
-  for (let i = 0; i < argv.length; i++) {
-    const a = argv[i];
-    if (a === "--format=json") return true;
-    if (a === "--format" && argv[i + 1] === "json") return true;
-  }
-  return false;
-}
-function emitSchema(schema) {
-  console.log(JSON.stringify(schema, null, 2));
-}
-function attachSchemaHelp(cmd, schema) {
-  const baseHelp = cmd.helpInformation.bind(cmd);
-  cmd.helpInformation = (context) => {
-    if (!wantsJsonSchema()) return baseHelp(context);
-    emitSchema(schema);
-    return "";
-  };
-  return cmd;
-}
-var pmAddSchema = {
-  cli: CLI_NAME,
-  noun: "payment-methods",
-  verb: "add",
-  description: "Add a payment method (card binding + 3DS verification)",
-  flags: {
-    "card-number": { type: "string", required: true, description: "Card number (PAN)" },
-    "exp-month": { type: "string", required: true, description: "Expiration month (MM)" },
-    "exp-year": { type: "string", required: true, description: "Expiration year (YY or YYYY)" },
-    "cardholder-name": { type: "string", required: true, description: "Name on the card" },
-    "member-id": { type: "string", required: false, description: "Member ID to associate the card with" },
-    "api-key": { type: "string", required: true, description: "API Key for authentication", source: "config" }
-  },
-  response: {
-    id: { type: "string", description: "Payment method ID" },
-    status: { type: "string", description: "PENDING / ACTIVE / FAILED" },
-    card_brand: { type: "string", description: "visa / mastercard / ..." },
-    last_four: { type: "string", description: "Last 4 digits of card" },
-    verification_url: { type: "string|null", description: "3DS verification URL (when PENDING)" }
-  },
-  example: {
-    command: 'agenzo-token-cli payment-methods add --card-number 4111111111111111 --exp-month 12 --exp-year 2027 --cardholder-name "Alice Test"',
-    output_summary: "Returns payment method ID and 3DS verification URL. Complete 3DS to activate."
-  },
-  error_recovery: {
-    INVALID_CARD: "Card number failed Luhn check or is not supported. Verify and retry.",
-    EVO_ERROR: "Upstream payment processor error. Retry after a short delay."
-  }
-};
-var pmListSchema = {
-  cli: CLI_NAME,
-  noun: "payment-methods",
-  verb: "list",
-  description: "List payment methods for the authenticated developer",
-  flags: {
-    "member": { type: "string", required: false, description: "Filter by member ID" },
-    "api-key": { type: "string", required: true, description: "API Key for authentication", source: "config" }
-  },
-  response: {
-    payment_methods: {
-      type: "array",
-      description: "List of payment methods",
-      items: {
-        id: { type: "string", description: "Payment method ID" },
-        status: { type: "string", description: "PENDING / ACTIVE / DISABLED" },
-        card_brand: { type: "string", description: "Card brand" },
-        last_four: { type: "string", description: "Last 4 digits" },
-        created_at: { type: "string", description: "Creation time (ISO 8601)" }
-      }
-    }
-  },
-  example: {
-    command: "agenzo-token-cli payment-methods list",
-    output_summary: "Returns array of payment methods with status and card info."
-  }
-};
-var pmGetSchema = {
-  cli: CLI_NAME,
-  noun: "payment-methods",
-  verb: "get",
-  description: "Get a payment method by ID",
-  flags: {
-    "pm-id": { type: "string", required: true, description: "Payment method ID" },
-    "api-key": { type: "string", required: true, description: "API Key for authentication", source: "config" }
-  },
-  response: {
-    id: { type: "string", description: "Payment method ID" },
-    status: { type: "string", description: "PENDING / ACTIVE / DISABLED / FAILED / EXPIRED" },
-    card_brand: { type: "string", description: "Card brand" },
-    last_four: { type: "string", description: "Last 4 digits" },
-    member_id: { type: "string|null", description: "Associated member ID" },
-    created_at: { type: "string", description: "Creation time" }
-  },
-  example: {
-    command: "agenzo-token-cli payment-methods get pm_01HZXD...",
-    output_summary: "Returns full payment method details including 3DS verification status."
-  }
-};
-var pmDisableSchema = {
-  cli: CLI_NAME,
-  noun: "payment-methods",
-  verb: "disable",
-  description: "Disable a payment method (cascades revoke on active payment tokens)",
-  flags: {
-    "pm-id": { type: "string", required: true, description: "Payment method ID to disable" },
-    "api-key": { type: "string", required: true, description: "API Key for authentication", source: "config" }
-  },
-  response: {
-    id: { type: "string", description: "Disabled payment method ID" },
-    status: { type: "string", description: "DISABLED" },
-    revoked_tokens_count: { type: "int", description: "Number of payment tokens revoked by cascade" }
-  },
-  example: {
-    command: "agenzo-token-cli payment-methods disable pm_01HZXD...",
-    output_summary: "Disables the payment method and revokes any active tokens bound to it."
-  }
-};
-var ptCreateSchema = {
-  cli: CLI_NAME,
-  noun: "payment-tokens",
-  verb: "create",
-  description: "Create a payment token (VCN, Network Token cryptogram, or x402 USDC signature)",
-  flags: {
-    "type": { type: "string", required: true, description: "Token type: vcn / network_token / x402", constraints: "vcn | network_token | x402" },
-    "payment-method-id": { type: "string", required: true, description: "Source payment method ID (must be ACTIVE)" },
-    "amount": { type: "string", required: "conditional", description: "Amount in minor units (required for vcn and x402)" },
-    "currency": { type: "string", required: false, default: "USD", description: "ISO 4217 currency code" },
-    "member-id": { type: "string", required: false, description: "Member ID" },
-    "external-transaction-id": { type: "string", required: false, description: "External reference for reconciliation" },
-    "pay-to": { type: "string", required: "conditional", description: "Recipient address (required for x402)" },
-    "nonce": { type: "string", required: "conditional", description: "Nonce bytes32 hex (required for x402)" },
-    "network": { type: "string", required: "conditional", description: "Chain network (required for x402, e.g. base-sepolia)" },
-    "deadline": { type: "int", required: "conditional", description: "Epoch seconds deadline (required for x402)" },
-    "api-key": { type: "string", required: true, description: "API Key for authentication", source: "config" }
-  },
-  response: {
-    id: { type: "string", description: "Payment token ID" },
-    type: { type: "string", description: "vcn / network_token / x402" },
-    status: { type: "string", description: "ACTIVE / REVOKED / EXPIRED" },
-    token_data: { type: "object", description: "Type-specific token payload (cryptogram / VCN number / x402 signature)" },
-    expires_at: { type: "string|null", description: "Expiration time (ISO 8601)" }
-  },
-  example: {
-    command: "agenzo-token-cli payment-tokens create --type network_token --payment-method-id pm_01HZXD...",
-    output_summary: "Returns token ID and cryptogram/VCN/signature data for payment execution."
-  },
-  error_recovery: {
-    INVALID_PAYMENT_METHOD: "Payment method is not ACTIVE or not found. Verify status with payment-methods get.",
-    UNSUPPORTED_TOKEN_TYPE: "Use vcn, network_token, or x402."
-  }
-};
-var ptListSchema = {
-  cli: CLI_NAME,
-  noun: "payment-tokens",
-  verb: "list",
-  description: "List payment tokens for the authenticated developer",
-  flags: {
-    "type": { type: "string", required: false, description: "Filter by token type (vcn / network_token / x402)" },
-    "member-id": { type: "string", required: false, description: "Filter by member ID" },
-    "payment-method-id": { type: "string", required: false, description: "Filter by source payment method" },
-    "api-key": { type: "string", required: true, description: "API Key for authentication", source: "config" }
-  },
-  response: {
-    payment_tokens: {
-      type: "array",
-      description: "List of payment tokens",
-      items: {
-        id: { type: "string", description: "Token ID" },
-        type: { type: "string", description: "Token type" },
-        status: { type: "string", description: "ACTIVE / REVOKED / EXPIRED" },
-        payment_method_id: { type: "string", description: "Source payment method" },
-        created_at: { type: "string", description: "Creation time" }
-      }
-    }
-  },
-  example: {
-    command: "agenzo-token-cli payment-tokens list --type network_token",
-    output_summary: "Returns array of payment tokens filtered by type."
-  }
-};
-var ptGetSchema = {
-  cli: CLI_NAME,
-  noun: "payment-tokens",
-  verb: "get",
-  description: "Get a payment token by ID",
-  flags: {
-    "payment-token-id": { type: "string", required: true, description: "Payment token ID" },
-    "api-key": { type: "string", required: true, description: "API Key for authentication", source: "config" }
-  },
-  response: {
-    id: { type: "string", description: "Token ID" },
-    type: { type: "string", description: "Token type" },
-    status: { type: "string", description: "ACTIVE / REVOKED / EXPIRED" },
-    token_data: { type: "object", description: "Type-specific payload" },
-    payment_method_id: { type: "string", description: "Source payment method" },
-    created_at: { type: "string", description: "Creation time" },
-    expires_at: { type: "string|null", description: "Expiration time" }
-  },
-  example: {
-    command: "agenzo-token-cli payment-tokens get pt_01HZXD...",
-    output_summary: "Returns full token details including token_data payload."
-  }
-};
-var ptRevokeSchema = {
-  cli: CLI_NAME,
-  noun: "payment-tokens",
-  verb: "revoke",
-  description: "Revoke an active payment token",
-  flags: {
-    "payment-token-id": { type: "string", required: true, description: "Payment token ID to revoke" },
-    "api-key": { type: "string", required: true, description: "API Key for authentication", source: "config" }
-  },
-  response: {
-    id: { type: "string", description: "Revoked token ID" },
-    status: { type: "string", description: "REVOKED" }
-  },
-  example: {
-    command: "agenzo-token-cli payment-tokens revoke pt_01HZXD...",
-    output_summary: "Marks the token as REVOKED. Cannot be undone."
-  }
-};
-
 // src/payment-methods/add.ts
-var POLL_INTERVAL_MS = 3e3;
-var POLL_TIMEOUT_MS = 15 * 60 * 1e3;
+var MANUAL_POLL_INTERVAL_MS = 3e3;
+var MANUAL_POLL_TIMEOUT_MS = 15 * 60 * 1e3;
+var DROPIN_POLL_INTERVAL_MS = 5e3;
+var DROPIN_POLL_TIMEOUT_MS = 30 * 60 * 1e3;
+var TERMINAL_STATUSES = /* @__PURE__ */ new Set(["ACTIVE", "FAILED", "EXPIRED"]);
 function registerAddCommand(parent, deps) {
-  const cmd = parent.command("add").description("Add a payment method (card binding + 3DS)").option("--api-key <key>", "API Key for authentication").option("--type <type>", "Payment method type (default: card)", "card").option("--email <email>", "Email for 3DS verification").option("--card-number <number>", "Card number").option("--expiry <mmyy>", "Expiry date (MMYY format)").option("--cvv <cvv>", "Card CVV").option(
+  const cmd = parent.command("add").description("Add a payment method (manual 3DS or Drop-in session)").option("--api-key <key>", "API Key for authentication").option("--type <type>", "Payment method type (default: card)", "card").option(
+    "--mode <mode>",
+    'Add mode: "manual" (default; CLI collects card details and polls 3DS) or "dropin" (mint a Drop-in session and poll until the user finishes adding the payment method in the browser)',
+    "manual"
+  ).option(
+    "--email <email>",
+    "Manual mode: email for 3DS verification. Dropin mode: email used as the Drop-in session reference."
+  ).option("--card-number <number>", "Card number (manual mode only)").option("--expiry <mmyy>", "Expiry date (MMYY format) (manual mode only)").option("--cvv <cvv>", "Card CVV (manual mode only)").option(
     "--idempotency-key <key>",
-    "Idempotency key forwarded verbatim as the Idempotency-Key header"
+    "Idempotency key forwarded verbatim as the Idempotency-Key header (manual mode only)"
   );
-  attachSchemaHelp(cmd, pmAddSchema);
   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",
-      envVar: "AGENZO_API_KEY"
-    });
-    const type = opts.type || "card";
-    const flags = {
-      email: opts.email,
-      cardNumber: opts.cardNumber,
-      expiry: opts.expiry,
-      cvv: opts.cvv
-    };
-    const params = await collectPaymentMethodParams(type, flags);
-    let idempotencyKey = opts.idempotencyKey;
-    if (!idempotencyKey) {
-      if (isYes) {
-        throw new IdempotencyKeyRequiredError("payment-methods add");
-      }
-      idempotencyKey = await PromptEngine.resolveInput(void 0, {
-        message: "Idempotency key (unique per write, for safe retry):",
-        validate: (v) => v.trim().length > 0 || "Idempotency key is required"
-      });
+    const mode = String(opts.mode ?? "manual").toLowerCase();
+    if (mode !== "manual" && mode !== "dropin") {
+      throw new CliError(
+        "PARAM_INVALID",
+        `Unknown --mode "${opts.mode}". Expected "manual" or "dropin".`
+      );
     }
-    const extraHeaders = {
-      "Idempotency-Key": idempotencyKey
-    };
-    const result = await deps.apiClient.post(
-      "/payment-methods/create",
-      { type: "api-key", key: apiKey },
-      params,
-      extraHeaders
-    );
-    if (!result.success) {
-      throw CliError.fromApi(result, { auth: "api-key" });
+    if (mode === "dropin") {
+      await handleDropinMode(deps, opts, format);
+      return;
     }
-    const pm = result.data;
-    notify(format, "success", "Payment method created");
-    const createdResult = {
-      data: pm,
-      text: () => {
-        const lines = [
-          ["ID", pm.id],
-          ["Type", pm.type],
-          ["Status", pm.status]
-        ];
-        if (pm.brand) lines.push(["Brand", pm.brand]);
-        if (pm.first6) lines.push(["First 6", pm.first6]);
-        if (pm.last4) lines.push(["Last 4", pm.last4]);
-        return Formatter.keyValue(lines);
-      }
-    };
-    const configManager = new ConfigManager();
-    await renderWithContext(createdResult, { format }, configManager);
-    notify(format, "info", "Complete 3DS verification via email to activate");
-    if (type === "card" && pm.status === "PENDING") {
-      const finalStatus = await poll3dsVerification(
-        deps.apiClient,
-        apiKey,
-        pm.id,
-        format
+    await handleManualMode(deps, opts, format, isYes);
+  });
+}
+async function handleManualMode(deps, opts, format, isYes) {
+  const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
+    message: "API Key:",
+    type: "password"
+  });
+  const type = opts.type || "card";
+  const flags = {
+    email: opts.email,
+    cardNumber: opts.cardNumber,
+    expiry: opts.expiry,
+    cvv: opts.cvv
+  };
+  const params = await collectPaymentMethodParams(type, flags);
+  let idempotencyKey = opts.idempotencyKey;
+  if (!idempotencyKey) {
+    if (isYes) {
+      throw new IdempotencyKeyRequiredError("payment-methods add");
+    }
+    idempotencyKey = await PromptEngine.resolveInput(void 0, {
+      message: "Idempotency key (unique per write, for safe retry):",
+      validate: (v) => v.trim().length > 0 || "Idempotency key is required"
+    });
+  }
+  const extraHeaders = {
+    "Idempotency-Key": idempotencyKey
+  };
+  const result = await deps.apiClient.post(
+    "/payment-methods/create",
+    { type: "api-key", key: apiKey },
+    params,
+    extraHeaders
+  );
+  if (!result.success) {
+    throw CliError.fromApi(result, { auth: "api-key" });
+  }
+  const pm = result.data;
+  notify(format, "success", "Payment method created");
+  const createdResult = {
+    data: pm,
+    text: () => {
+      const lines = [
+        ["ID", pm.id],
+        ["Type", pm.type],
+        ["Status", pm.status]
+      ];
+      if (pm.brand) lines.push(["Brand", pm.brand]);
+      if (pm.first6) lines.push(["First 6", pm.first6]);
+      if (pm.last4) lines.push(["Last 4", pm.last4]);
+      return Formatter.keyValue(lines);
+    }
+  };
+  const configManager = new ConfigManager();
+  await renderWithContext(createdResult, { format }, configManager);
+  notify(format, "info", "Complete 3DS verification via email to activate");
+  if (type === "card" && pm.status === "PENDING") {
+    const finalStatus = await poll3dsVerification(deps.apiClient, apiKey, pm.id, format);
+    if (finalStatus === "ACTIVE") {
+      const getResult = await deps.apiClient.get(
+        `/payment-methods/${pm.id}`,
+        { type: "api-key", key: apiKey }
       );
-      if (finalStatus === "ACTIVE") {
-        const getResult = await deps.apiClient.get(
-          `/payment-methods/${pm.id}`,
-          { type: "api-key", key: apiKey }
-        );
-        if (getResult.success) {
-          const activatedPm = getResult.data;
-          notify(format, "success", "Payment method activated");
-          const activatedResult = {
-            data: activatedPm,
-            text: () => {
-              const lines = [
-                ["ID", activatedPm.id],
-                ["Type", activatedPm.type],
-                ["Status", activatedPm.status]
-              ];
-              if (activatedPm.brand) lines.push(["Brand", activatedPm.brand]);
-              if (activatedPm.first6) lines.push(["First 6", activatedPm.first6]);
-              if (activatedPm.last4) lines.push(["Last 4", activatedPm.last4]);
-              return Formatter.keyValue(lines);
-            }
-          };
-          await renderWithContext(activatedResult, { format }, configManager);
-        } else {
-          notify(format, "success", "Payment method activated");
-          const degraded = { ...pm, status: "ACTIVE" };
-          const degradedResult = {
-            data: degraded,
-            text: () => {
-              const lines = [
-                ["ID", degraded.id],
-                ["Type", degraded.type],
-                ["Status", degraded.status]
-              ];
-              if (degraded.brand) lines.push(["Brand", degraded.brand]);
-              if (degraded.first6) lines.push(["First 6", degraded.first6]);
-              if (degraded.last4) lines.push(["Last 4", degraded.last4]);
-              return Formatter.keyValue(lines);
-            }
-          };
-          await renderWithContext(degradedResult, { format }, configManager);
-        }
-      } else if (finalStatus === "FAILED") {
-        notify(format, "error", "3DS verification failed");
-      } else if (finalStatus === "TIMEOUT") {
-        notify(
-          format,
-          "info",
-          `Verification timed out (15 min). Check status with: agenzo-token-cli payment-methods get ${pm.id} --api-key <your_key>`
-        );
+      if (getResult.success) {
+        const activatedPm = getResult.data;
+        notify(format, "success", "Payment method activated");
+        const activatedResult = {
+          data: activatedPm,
+          text: () => {
+            const lines = [
+              ["ID", activatedPm.id],
+              ["Type", activatedPm.type],
+              ["Status", activatedPm.status]
+            ];
+            if (activatedPm.brand) lines.push(["Brand", activatedPm.brand]);
+            if (activatedPm.first6) lines.push(["First 6", activatedPm.first6]);
+            if (activatedPm.last4) lines.push(["Last 4", activatedPm.last4]);
+            return Formatter.keyValue(lines);
+          }
+        };
+        await renderWithContext(activatedResult, { format }, configManager);
+      } else {
+        notify(format, "success", "Payment method activated");
+        const degraded = { ...pm, status: "ACTIVE" };
+        const degradedResult = {
+          data: degraded,
+          text: () => {
+            const lines = [
+              ["ID", degraded.id],
+              ["Type", degraded.type],
+              ["Status", degraded.status]
+            ];
+            if (degraded.brand) lines.push(["Brand", degraded.brand]);
+            if (degraded.first6) lines.push(["First 6", degraded.first6]);
+            if (degraded.last4) lines.push(["Last 4", degraded.last4]);
+            return Formatter.keyValue(lines);
+          }
+        };
+        await renderWithContext(degradedResult, { format }, configManager);
       }
+    } else if (finalStatus === "FAILED") {
+      notify(format, "error", "3DS verification failed");
+    } else if (finalStatus === "TIMEOUT") {
+      notify(
+        format,
+        "info",
+        `Verification timed out (15 min). Check status with: agenzo-token-cli payment-methods get ${pm.id} --api-key <your_key>`
+      );
     }
+  }
+}
+async function handleDropinMode(deps, opts, format) {
+  const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
+    message: "API Key:",
+    type: "password"
   });
+  const email = await PromptEngine.resolveInput(opts.email, {
+    message: "Email:"
+  });
+  const configManager = new ConfigManager();
+  const sessionResult = await deps.apiClient.post(
+    "/payment-methods/dropin/create",
+    { type: "api-key", key: apiKey },
+    { email }
+  );
+  if (!sessionResult.success) {
+    throw CliError.fromApi(sessionResult, { auth: "api-key" });
+  }
+  const session = sessionResult.data;
+  const pmId = session.id;
+  notify(format, "success", "Drop-in session created");
+  const createdResult = {
+    data: session,
+    text: () => Formatter.keyValue([["Session ID", session.session_id || "-"]])
+  };
+  await renderWithContext(createdResult, { format }, configManager);
+  notify(
+    format,
+    "info",
+    "Use the Session ID to add the payment method in the browser via the Drop-in SDK"
+  );
+  const finalPm = await pollVerificationStatus(deps.apiClient, apiKey, pmId, {
+    intervalMs: DROPIN_POLL_INTERVAL_MS,
+    timeoutMs: DROPIN_POLL_TIMEOUT_MS
+  });
+  if (finalPm.status === "ACTIVE") {
+    notify(format, "success", "Payment method activated");
+    const activated = {
+      data: finalPm,
+      text: () => Formatter.keyValue([
+        ["PM ID", finalPm.id],
+        ["Brand", finalPm.brand ?? "-"],
+        ["First 6", finalPm.first6 ?? "-"],
+        ["Last 4", finalPm.last4 ?? "-"],
+        ["Status", finalPm.status]
+      ])
+    };
+    await renderWithContext(activated, { format }, configManager);
+    return;
+  }
+  if (finalPm.status === "FAILED") {
+    notify(format, "error", "Failed to add payment method");
+    await renderPmId(finalPm.id, format, configManager);
+    process.exitCode = 1;
+    return;
+  }
+  if (finalPm.status === "EXPIRED") {
+    notify(format, "error", "Session expired before the payment method was added");
+    await renderPmId(finalPm.id, format, configManager);
+    process.exitCode = 1;
+    return;
+  }
+  notify(
+    format,
+    "error",
+    "Adding payment method did not complete within 30 minutes. Re-run with the same email to resume."
+  );
+  await renderPmId(pmId, format, configManager);
+  process.exitCode = 1;
+}
+async function renderPmId(id, format, configManager) {
+  const result = {
+    data: { id },
+    text: () => Formatter.keyValue([["PM ID", id]])
+  };
+  await renderWithContext(result, { format }, configManager);
 }
 async function poll3dsVerification(apiClient, apiKey, paymentMethodId, format) {
   const startTime = Date.now();
   notify(format, "info", "Waiting for 3DS verification...");
-  while (Date.now() - startTime < POLL_TIMEOUT_MS) {
-    await sleep(POLL_INTERVAL_MS);
+  while (Date.now() - startTime < MANUAL_POLL_TIMEOUT_MS) {
+    await sleep(MANUAL_POLL_INTERVAL_MS);
     const result = await apiClient.get(
       "/payment-methods/verification/status",
       { type: "api-key", key: apiKey },
@@ -1127,6 +986,21 @@ async function poll3dsVerification(apiClient, apiKey, paymentMethodId, format) {
   }
   return "TIMEOUT";
 }
+async function pollVerificationStatus(apiClient, apiKey, pmId, options) {
+  const startTime = Date.now();
+  while (Date.now() - startTime < options.timeoutMs) {
+    const result = await apiClient.get(
+      "/payment-methods/verification/status",
+      { type: "api-key", key: apiKey },
+      { payment_method_id: pmId }
+    );
+    if (result.success && TERMINAL_STATUSES.has(result.data.status)) {
+      return result.data;
+    }
+    await sleep(options.intervalMs);
+  }
+  return { id: pmId, status: "PENDING" };
+}
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -1134,14 +1008,12 @@ function sleep(ms) {
 // src/payment-methods/list.ts
 function registerListCommand(parent, deps) {
   const cmd = parent.command("list").description("List payment methods").option("--api-key <key>", "API Key for authentication").option("--member <member_id>", "Filter by member ID");
-  attachSchemaHelp(cmd, pmListSchema);
   cmd.action(async () => {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
       message: "API Key:",
-      type: "password",
-      envVar: "AGENZO_API_KEY"
+      type: "password"
     });
     const params = {};
     if (opts.member) {
@@ -1182,14 +1054,12 @@ function registerListCommand(parent, deps) {
 // src/payment-methods/get.ts
 function registerGetCommand(parent, deps) {
   const cmd = parent.command("get <pm_id>").description("Get a payment method by ID").option("--api-key <key>", "API key for authentication");
-  attachSchemaHelp(cmd, pmGetSchema);
   cmd.action(async (pmId) => {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
       message: "API Key:",
-      type: "password",
-      envVar: "AGENZO_API_KEY"
+      type: "password"
     });
     const result = await deps.apiClient.get(
       `/payment-methods/${pmId}`,
@@ -1229,14 +1099,12 @@ function registerDisableCommand(parent, deps) {
     "--idempotency-key <key>",
     "Idempotency key forwarded verbatim as the Idempotency-Key header"
   );
-  attachSchemaHelp(cmd, pmDisableSchema);
   cmd.action(async (pmId) => {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
       message: "API Key:",
-      type: "password",
-      envVar: "AGENZO_API_KEY"
+      type: "password"
     });
     let idempotencyKey = opts.idempotencyKey;
     if (!idempotencyKey) {
@@ -1387,15 +1255,13 @@ function registerCreateCommand(parent, deps) {
     "--idempotency-key <key>",
     "Idempotency key forwarded verbatim as the Idempotency-Key header"
   );
-  attachSchemaHelp(cmd, ptCreateSchema);
   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",
-      envVar: "AGENZO_API_KEY"
+      type: "password"
     });
     const cliType = await PromptEngine.resolveInput(opts.type, {
       message: "Token type:",
@@ -1534,7 +1400,7 @@ function registerCreateCommand(parent, deps) {
       body.member_id = member;
     }
     if (opts.externalTxId) {
-      body.external_transaction_id = opts.externalTxId;
+      body.external_tx_id = opts.externalTxId;
     }
     const extraHeaders = {
       "Idempotency-Key": idempotencyKey
@@ -1620,14 +1486,12 @@ function getSummary(token) {
 }
 function registerListCommand2(parent, deps) {
   const cmd = parent.command("list").description("List payment tokens").option("--api-key <key>", "API Key for authentication").option("--type <type>", "Filter by token type").option("--member <member_id>", "Filter by member ID");
-  attachSchemaHelp(cmd, ptListSchema);
   cmd.action(async () => {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
       message: "API Key:",
-      type: "password",
-      envVar: "AGENZO_API_KEY"
+      type: "password"
     });
     const params = {};
     if (opts.type) {
@@ -1758,14 +1622,12 @@ function formatCentsPlain(cents) {
 }
 function registerGetCommand2(parent, deps) {
   const cmd = parent.command("get <payment_token_id>").description("Get a payment token by ID").option("--api-key <key>", "API key for authentication").option("--reveal", "Reveal full VCN card number and CVC in the output");
-  attachSchemaHelp(cmd, ptGetSchema);
   cmd.action(async (paymentTokenId) => {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
       message: "API Key:",
-      type: "password",
-      envVar: "AGENZO_API_KEY"
+      type: "password"
     });
     const result = await deps.apiClient.get(
       `/payment-tokens/${paymentTokenId}`,
@@ -1791,14 +1653,12 @@ function registerRevokeCommand(parent, deps) {
     "--idempotency-key <key>",
     "Idempotency key forwarded verbatim as the Idempotency-Key header"
   );
-  attachSchemaHelp(cmd, ptRevokeSchema);
   cmd.action(async (paymentTokenId) => {
     const opts = cmd.optsWithGlobals();
     const format = resolveFormat(opts.format);
     const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
       message: "API Key:",
-      type: "password",
-      envVar: "AGENZO_API_KEY"
+      type: "password"
     });
     let idempotencyKey = opts.idempotencyKey;
     if (!idempotencyKey) {
@@ -1867,7 +1727,7 @@ async function main() {
   const program = new Command();
   programRef = program;
   program.name("agenzo-token-cli").version(getCurrentVersion()).description(
-    "Agenzo token plane: payment methods (card binding + 3DS) and payment tokens (VCN / Network Token / X402)"
+    "Agenzo token plane: payment methods (add payment method + 3DS) and payment tokens (VCN / Network Token / X402)"
   ).option("--verbose", "Show verbose logs").option("--yes", "Skip confirmation prompts (for automation/AI Agents)").option(
     "--format <format>",
     "Output format: json | table (default: table; or set AGENZO_FORMAT)"
@@ -1886,54 +1746,6 @@ async function main() {
   registerListCommand2(ptCmd, deps);
   registerGetCommand2(ptCmd, deps);
   registerRevokeCommand(ptCmd, deps);
-  const svcCmd = program.command("services").description("Token service discovery");
-  svcCmd.command("list").description("List available token services from platform catalog").option("--api-key <key>", "API Key for authentication").action(async () => {
-    const opts = svcCmd.parent.optsWithGlobals();
-    const format = resolveFormat(opts.format);
-    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
-      message: "API Key:",
-      type: "password",
-      envVar: "AGENZO_API_KEY"
-    });
-    const host = (await configManager.load()).api_host || "http://localhost:8001";
-    const discoveryClient = new ApiClient({ baseUrl: `${host}/api/discovery/v1` });
-    const result = await discoveryClient.get(
-      "/catalog",
-      { type: "api-key", key: apiKey },
-      { category: "payment" }
-    );
-    if (!result.success) {
-      throw CliError.fromApi(result, { auth: "api-key" });
-    }
-    const cmdResult = {
-      text: () => JSON.stringify(result.data, null, 2),
-      data: result.data
-    };
-    await renderWithContext(cmdResult, { format }, configManager);
-  });
-  svcCmd.command("get <service_id>").description("Get a token service capability by ID").option("--api-key <key>", "API Key for authentication").action(async (serviceId) => {
-    const opts = svcCmd.parent.optsWithGlobals();
-    const format = resolveFormat(opts.format);
-    const apiKey = await PromptEngine.resolveInput(opts.apiKey, {
-      message: "API Key:",
-      type: "password",
-      envVar: "AGENZO_API_KEY"
-    });
-    const host2 = (await configManager.load()).api_host || "http://localhost:8001";
-    const discoveryClient2 = new ApiClient({ baseUrl: `${host2}/api/discovery/v1` });
-    const result = await discoveryClient2.get(
-      `/catalog/${serviceId}`,
-      { type: "api-key", key: apiKey }
-    );
-    if (!result.success) {
-      throw CliError.fromApi(result, { auth: "api-key" });
-    }
-    const cmdResult = {
-      text: () => JSON.stringify(result.data, null, 2),
-      data: result.data
-    };
-    await renderWithContext(cmdResult, { format }, configManager);
-  });
   await program.parseAsync(process.argv);
 }
 function resolveActiveFormat() {