@stripe/link-cli 0.1.2 → 0.2.0

package/dist/cli.js

@@ -2470,9 +2470,9 @@ var require_validate = __commonJS({
       }
     }
     function returnResults(it) {
-      const { gen, schemaEnv, validateName, ValidationError: ValidationError2, opts } = it;
+      const { gen, schemaEnv, validateName, ValidationError, opts } = it;
       if (schemaEnv.$async) {
-        gen.if((0, codegen_1._)`${names_1.default.errors} === 0`, () => gen.return(names_1.default.data), () => gen.throw((0, codegen_1._)`new ${ValidationError2}(${names_1.default.vErrors})`));
+        gen.if((0, codegen_1._)`${names_1.default.errors} === 0`, () => gen.return(names_1.default.data), () => gen.throw((0, codegen_1._)`new ${ValidationError}(${names_1.default.vErrors})`));
       } else {
         gen.assign((0, codegen_1._)`${validateName}.errors`, names_1.default.vErrors);
         if (opts.unevaluated)
@@ -2824,14 +2824,14 @@ var require_validation_error = __commonJS({
   "../../node_modules/.pnpm/ajv@8.18.0/node_modules/ajv/dist/runtime/validation_error.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    var ValidationError2 = class extends Error {
+    var ValidationError = class extends Error {
       constructor(errors) {
         super("validation failed");
         this.errors = errors;
         this.ajv = this.validation = true;
       }
     };
-    exports.default = ValidationError2;
+    exports.default = ValidationError;
   }
 });
 
@@ -9549,7 +9549,7 @@ var require_semver2 = __commonJS({
 });
 
 // src/cli.tsx
-import { Command } from "commander";
+import { Cli as Cli5 } from "incur";
 
 // ../sdk/dist/index.js
 import fs3 from "fs";
@@ -10867,7 +10867,8 @@ var Storage = class {
       this.config = new Conf({
         projectName: "link-cli",
         defaults: {
-          auth: null
+          auth: null,
+          pendingDeviceAuth: null
         }
       });
     }
@@ -10885,6 +10886,21 @@ var Storage = class {
   isAuthenticated() {
     return this.getAuth() !== null;
   }
+  getPendingDeviceAuth() {
+    const pending = this.getConfig().get("pendingDeviceAuth");
+    if (!pending) return null;
+    if (Date.now() >= pending.expires_at) {
+      this.clearPendingDeviceAuth();
+      return null;
+    }
+    return pending;
+  }
+  setPendingDeviceAuth(pending) {
+    this.getConfig().set("pendingDeviceAuth", pending);
+  }
+  clearPendingDeviceAuth() {
+    this.getConfig().set("pendingDeviceAuth", null);
+  }
   clearAll() {
     this.getConfig().clear();
   }
@@ -11229,242 +11245,10 @@ var SpendRequestResource = class {
   }
 };
 
-// src/utils/execute-command.tsx
+// src/commands/auth/index.tsx
+import { Cli } from "incur";
 import { render } from "ink";
 
-// src/utils/json-options.ts
-import { z } from "zod";
-var ValidationError = class extends Error {
-  errors;
-  constructor(errors) {
-    super(errors.join("\n"));
-    this.errors = errors;
-  }
-};
-function flagToCommanderKey(flag) {
-  const name = flag.split(" ")[0].replace(/^--/, "");
-  return name.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
-}
-function registerSchemaOptions(cmd, schema) {
-  function collect(value, previous) {
-    return previous.concat([value]);
-  }
-  for (const [, def] of Object.entries(schema)) {
-    const flags = def.alias ? `${def.alias}, ${def.flag}` : def.flag;
-    if (def.schema instanceof z.ZodArray) {
-      cmd.option(flags, def.description, collect, []);
-    } else if (def.defaultValue !== void 0) {
-      cmd.option(flags, def.description, def.defaultValue);
-    } else {
-      cmd.option(flags, def.description);
-    }
-  }
-}
-function resolveInput(options, schema) {
-  const entries = Object.entries(schema);
-  let rawInput;
-  if (options.json !== void 0) {
-    const conflicts = entries.filter(([, def]) => {
-      const val = options[flagToCommanderKey(def.flag)];
-      if (def.schema instanceof z.ZodArray)
-        return Array.isArray(val) && val.length > 0;
-      if (def.defaultValue !== void 0)
-        return val !== void 0 && val !== def.defaultValue;
-      return val !== void 0;
-    });
-    if (conflicts.length > 0) {
-      const names = conflicts.map(([, def]) => def.flag.split(" ")[0]).join(", ");
-      throw new Error(`Cannot combine --json with individual flags (${names})`);
-    }
-    try {
-      rawInput = JSON.parse(options.json);
-    } catch {
-      throw new Error(`Invalid JSON: ${options.json}`);
-    }
-    for (const [key, def] of entries) {
-      if (rawInput[key] === void 0 && def.defaultValue !== void 0) {
-        rawInput[key] = def.defaultValue;
-      }
-    }
-  } else {
-    rawInput = {};
-    for (const [key, def] of entries) {
-      const val = options[flagToCommanderKey(def.flag)];
-      if (def.schema instanceof z.ZodArray) {
-        const arr = val ?? [];
-        if (arr.length > 0) {
-          rawInput[key] = def.flagParser ? arr.map(def.flagParser) : arr;
-        }
-      } else if (val !== void 0) {
-        rawInput[key] = val;
-      }
-    }
-  }
-  const zodShape = Object.fromEntries(
-    entries.map(([key, def]) => [
-      key,
-      def.required ? def.schema : def.schema.optional()
-    ])
-  );
-  const fieldToFlag = Object.fromEntries(
-    entries.map(([key, def]) => [key, def.flag.split(" ")[0]])
-  );
-  const useJsonKeys = !!options.outputJson;
-  try {
-    return z.object(zodShape).strict().parse(rawInput);
-  } catch (err) {
-    if (err instanceof z.ZodError) {
-      const messages = err.issues.map((issue) => {
-        const fieldName = issue.path[0];
-        const label = !useJsonKeys && fieldName && fieldToFlag[fieldName] ? fieldToFlag[fieldName] : issue.path.join(".");
-        return label ? `${label}: ${issue.message}` : issue.message;
-      });
-      throw new ValidationError(messages);
-    }
-    throw err;
-  }
-}
-
-// src/utils/execute-command.tsx
-function outputJson(data) {
-  process.stdout.write(`${JSON.stringify(data, null, 2)}
-
-`);
-}
-function outputError(message, code) {
-  process.stderr.write(
-    `${JSON.stringify({ error: message, ...code && { code } })}
-`
-  );
-  process.exit(1);
-}
-function outputErrors(errors, asJson) {
-  if (asJson) {
-    process.stderr.write(`${JSON.stringify({ errors })}
-`);
-  } else {
-    process.stderr.write(`${errors.join("\n")}
-`);
-  }
-  process.exit(1);
-}
-async function executeCommand(opts) {
-  try {
-    if (opts.outputJson) {
-      const data = await opts.jsonFn();
-      outputJson(data);
-    } else if (!process.stdout.isTTY) {
-      process.stderr.write("No TTY detected \u2014 falling back to JSON output.\n");
-      process.stderr.write(
-        "Run 'link-cli skill' to read the full Link CLI skill file.\n"
-      );
-      const data = await opts.jsonFn();
-      outputJson(data);
-    } else {
-      const { waitUntilExit } = render(opts.renderFn());
-      await waitUntilExit();
-    }
-  } catch (err) {
-    if (err instanceof ValidationError) {
-      outputErrors(err.errors, opts.outputJson);
-    }
-    if (err instanceof LinkAuthenticationError) {
-      outputError(
-        "Not authenticated. Please run `link login` first.",
-        err.code
-      );
-    }
-    const sdkErr = err;
-    outputError(err.message, sdkErr?.code);
-  }
-}
-
-// src/utils/help-text.ts
-import { z as z2 } from "zod";
-function buildInputHelp(schema) {
-  const entries = Object.entries(schema);
-  const nonArrayEntries = entries.filter(
-    ([, def]) => !(def.schema instanceof z2.ZodArray)
-  );
-  const arrayEntries = entries.filter(
-    ([, def]) => def.schema instanceof z2.ZodArray
-  );
-  const nonArrayFlags = nonArrayEntries.map(([, def]) => {
-    const flag = def.flag.split(" ")[0];
-    return def.required ? `${flag} (required)` : flag;
-  });
-  const flagPrefix = "  Flags: ";
-  const indent = " ".repeat(flagPrefix.length);
-  const arrayFlagLines = arrayEntries.map(
-    ([, def]) => `${indent}${def.flag}  (repeatable)`
-  );
-  const flagsLine = `${flagPrefix}${nonArrayFlags.join("  ")}`;
-  const flagsSection = arrayFlagLines.length > 0 ? `${flagsLine}
-${arrayFlagLines.join("\n")}` : flagsLine;
-  const jsonIndent = "    ";
-  const jsonFields = entries.map(([key, def], i) => {
-    const comma = i < entries.length - 1 ? "," : "";
-    const desc = def.jsonDescription ?? def.description;
-    const requiredNote = def.required ? "required" : "";
-    const descNote = desc ? desc : "";
-    const commentParts = [requiredNote, descNote].filter(Boolean);
-    const comment = commentParts.length > 0 ? ` // ${commentParts.join(" \u2014 ")}` : "";
-    if (def.schema instanceof z2.ZodArray) {
-      return `${jsonIndent}"${key}": [...]${comma}${comment}`;
-    }
-    const placeholder = def.defaultValue !== void 0 ? JSON.stringify(def.defaultValue) : '"..."';
-    return `${jsonIndent}"${key}": ${placeholder}${comma}${comment}`;
-  });
-  const jsonLine = `  JSON:  --json '{
-${jsonFields.join("\n")}
-  }'`;
-  const arrayDetails = [];
-  for (const [key, def] of arrayEntries) {
-    const element = def.schema.element;
-    if (!(element instanceof z2.ZodObject)) continue;
-    const keys = Object.keys(element.shape);
-    const flagFormat = `"key:<value>,key:<value>,..."`;
-    const jsonExample = keys.slice(0, 3).map((k) => `"${k}": "..."`).join(", ");
-    const jsonFormat = `"${key}": [{ ${jsonExample}${keys.length > 3 ? ", ..." : ""} }]`;
-    arrayDetails.push(
-      `  ${def.flag}
-    Keys:  ${keys.join(", ")}
-    Flag:  ${flagFormat}
-    JSON:  ${jsonFormat}`
-    );
-  }
-  const parts = ["\nInput formats:", flagsSection, jsonLine];
-  if (arrayDetails.length > 0) {
-    parts.push("", ...arrayDetails);
-  }
-  return `${parts.join("\n")}
-`;
-}
-function buildOutputHelp(schema, isArray = false) {
-  const fields = Object.entries(schema);
-  const lines = ["\nOutput (--output-json):"];
-  const outerIndent = "  ";
-  const innerIndent = isArray ? "      " : "    ";
-  if (isArray) {
-    lines.push(`${outerIndent}[`);
-    lines.push(`${outerIndent}  {`);
-  } else {
-    lines.push(`${outerIndent}{`);
-  }
-  fields.forEach(([key, def], i) => {
-    const comma = i < fields.length - 1 ? "," : "";
-    lines.push(`${innerIndent}"${key}": ${def.outputExample}${comma}`);
-  });
-  if (isArray) {
-    lines.push(`${outerIndent}  }`);
-    lines.push(`${outerIndent}]`);
-  } else {
-    lines.push(`${outerIndent}}`);
-  }
-  return `${lines.join("\n")}
-`;
-}
-
 // src/commands/auth/login.tsx
 import { Box, Text, useInput } from "ink";
 import Spinner from "ink-spinner";
@@ -11608,14 +11392,24 @@ var Login = ({
 import { Box as Box2, Text as Text2 } from "ink";
 import { useEffect as useEffect2, useState as useState2 } from "react";
 import { jsx as jsx2 } from "react/jsx-runtime";
-var Logout = ({ onComplete }) => {
+var Logout = ({ authResource, onComplete }) => {
   const [done, setDone] = useState2(false);
   useEffect2(() => {
-    storage.clearAuth();
-    storage.deleteConfig();
-    setDone(true);
-    setTimeout(onComplete, 1e3);
-  }, [onComplete]);
+    const run = async () => {
+      const auth = storage.getAuth();
+      if (auth?.refresh_token) {
+        try {
+          await authResource.revokeToken(auth.refresh_token);
+        } catch {
+        }
+      }
+      storage.clearAuth();
+      storage.deleteConfig();
+      setDone(true);
+      setTimeout(onComplete, 1e3);
+    };
+    run();
+  }, [authResource, onComplete]);
   if (!done) {
     return null;
   }
@@ -11623,217 +11417,159 @@ var Logout = ({ onComplete }) => {
 };
 
 // src/commands/auth/schema.ts
-import { z as z3 } from "zod";
-var LOGIN_INPUT_SCHEMA = {
-  client_name: {
-    schema: z3.string().trim().min(1),
-    flag: "--client-name <name>",
-    description: "Agent or app name shown in the Link app",
-    jsonDescription: 'Shown to the user when approving the device connection \u2014 use a short, recognizable name (e.g. "Personal Assistant")',
-    defaultValue: "Link CLI"
-  }
-};
-var LOGIN_SCHEMA = {
-  authenticated: {
-    outputExample: "true",
-    description: "Is the user authenticated with Link"
-  },
-  token_type: { outputExample: '"..."', description: "Token type" }
-};
-var LOGOUT_SCHEMA = {
-  authenticated: {
-    outputExample: "false",
-    description: "Is the user authenticated with Link"
-  }
-};
-var AUTH_STATUS_SCHEMA = {
-  authenticated: {
-    outputExample: "true",
-    description: "Is the user authenticated with Link"
-  },
-  access_token: {
-    outputExample: '"liwltoken_abdec12345..." (truncated)',
-    description: "Access token (truncated)"
-  },
-  token_type: { outputExample: '"Bearer"', description: "Token type" },
-  credentials_path: {
-    outputExample: '"~/.link-cli-nodejs/config.json"',
-    description: "Path to credentials file"
-  }
-};
-
-// src/commands/auth/status.tsx
-import { Box as Box3, Text as Text3 } from "ink";
-import { useEffect as useEffect3, useState as useState3 } from "react";
-import { jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
-var AuthStatus = ({ onComplete }) => {
-  const [checked, setChecked] = useState3(false);
-  const [authenticated, setAuthenticated] = useState3(false);
-  const [tokenPreview, setTokenPreview] = useState3("");
-  const [tokenType, setTokenType] = useState3("");
-  const [credentialsPath, setCredentialsPath] = useState3("");
-  useEffect3(() => {
-    const auth = storage.getAuth();
-    const credentialsPath2 = storage.getPath();
-    if (auth) {
-      setAuthenticated(true);
-      setTokenPreview(`${auth.access_token.substring(0, 20)}...`);
-      setTokenType(auth.token_type);
-    }
-    setCredentialsPath(credentialsPath2);
-    setChecked(true);
-    setTimeout(onComplete, 1e3);
-  }, [onComplete]);
-  if (!checked) {
-    return null;
-  }
-  if (authenticated) {
-    return /* @__PURE__ */ jsxs2(Box3, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx3(Text3, { color: "green", children: "\u2713 Authenticated" }),
-      /* @__PURE__ */ jsxs2(Box3, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-        /* @__PURE__ */ jsxs2(Text3, { children: [
-          "Access token: ",
-          /* @__PURE__ */ jsx3(Text3, { bold: true, children: tokenPreview })
-        ] }),
-        /* @__PURE__ */ jsxs2(Text3, { children: [
-          "Token type: ",
-          /* @__PURE__ */ jsx3(Text3, { bold: true, children: tokenType })
-        ] }),
-        /* @__PURE__ */ jsxs2(Text3, { children: [
-          "Credentials: ",
-          /* @__PURE__ */ jsx3(Text3, { bold: true, children: credentialsPath })
-        ] })
-      ] })
-    ] });
-  }
-  return /* @__PURE__ */ jsxs2(Box3, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx3(Text3, { color: "yellow", children: "\u2717 Not authenticated" }),
-    /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: 'Run "link-cli auth login" to authenticate' }),
-    /* @__PURE__ */ jsx3(Box3, { marginTop: 1, paddingX: 2, children: /* @__PURE__ */ jsxs2(Text3, { children: [
-      "Credentials: ",
-      /* @__PURE__ */ jsx3(Text3, { bold: true, children: credentialsPath })
-    ] }) })
-  ] });
-};
+import { z } from "incur";
+var loginOptions = z.object({
+  clientName: z.string().default("Link CLI").describe(
+    "Agent or app name shown in the Link app when approving the device connection"
+  )
+});
+var statusOptions = z.object({
+  interval: z.coerce.number().default(0).describe(
+    "Poll interval in seconds. When > 0, polls until authenticated or timeout is reached, yielding status on each attempt."
+  ),
+  maxAttempts: z.coerce.number().default(0).describe("Max poll attempts. 0 = unlimited (use timeout instead)."),
+  timeout: z.coerce.number().default(300).describe("Polling timeout in seconds.")
+});
 
 // src/commands/auth/index.tsx
-import { jsx as jsx4 } from "react/jsx-runtime";
-function registerAuthCommands(program2, authResource) {
-  const authCommand2 = program2.command("auth").description("Authentication commands").helpCommand(false);
-  const loginCmd = authCommand2.command("login").description("Authenticate with Link");
-  registerSchemaOptions(loginCmd, LOGIN_INPUT_SCHEMA);
-  loginCmd.option(
-    "--json <json>",
-    `JSON input (keys: ${Object.keys(LOGIN_INPUT_SCHEMA).join(", ")})`
-  ).option(
-    "--output-json",
-    "Output result as JSON instead of interactive display"
-  ).addHelpText(
-    "after",
-    buildInputHelp(LOGIN_INPUT_SCHEMA) + buildOutputHelp(LOGIN_SCHEMA)
-  ).action(async (options) => {
-    let input = {};
-    try {
-      input = resolveInput(options, LOGIN_INPUT_SCHEMA);
-    } catch (err) {
-      if (err instanceof ValidationError) {
-        outputErrors(err.errors, !!options.outputJson);
-        process.exit(1);
-      }
-      throw err;
-    }
-    const clientName = input.client_name;
-    await executeCommand({
-      outputJson: !!options.outputJson,
-      jsonFn: async () => {
-        const authRequest = await authResource.initiateDeviceAuth(clientName);
-        outputJson({
-          verification_url: authRequest.verification_url_complete,
-          passphrase: authRequest.user_code
+import { jsx as jsx3 } from "react/jsx-runtime";
+function createAuthCli(authResource) {
+  const cli2 = Cli.create("auth", {
+    description: "Authentication commands"
+  });
+  cli2.command("login", {
+    description: "Authenticate with Link",
+    options: loginOptions,
+    outputPolicy: "agent-only",
+    async *run(c) {
+      const clientName = c.options.clientName?.trim();
+      if (!clientName || clientName.length === 0) {
+        return c.error({
+          code: "INVALID_INPUT",
+          message: "client-name must be a non-empty string"
         });
-        const pollInterval = authRequest.interval * 1e3;
-        const expiresAt = Date.now() + authRequest.expires_in * 1e3;
-        const startTime = Date.now();
-        while (Date.now() < expiresAt) {
-          await new Promise((resolve) => setTimeout(resolve, pollInterval));
-          const elapsedSeconds = Math.floor((Date.now() - startTime) / 1e3);
-          process.stderr.write(
-            `${JSON.stringify({
-              type: "waiting",
-              command: "auth_login",
-              elapsed_seconds: elapsedSeconds,
-              verification_url: authRequest.verification_url_complete,
-              passphrase: authRequest.user_code
-            })}
-`
+      }
+      if (!c.agent && !c.formatExplicit) {
+        return new Promise((resolve) => {
+          const { waitUntilExit } = render(
+            /* @__PURE__ */ jsx3(
+              Login,
+              {
+                authResource,
+                clientName,
+                onComplete: () => {
+                }
+              }
+            )
           );
-          const tokens = await authResource.pollDeviceAuth(
-            authRequest.device_code
+          waitUntilExit().then(
+            () => resolve({ authenticated: true, token_type: "Bearer" })
+          );
+        });
+      }
+      const authRequest = await authResource.initiateDeviceAuth(clientName);
+      storage.setPendingDeviceAuth({
+        device_code: authRequest.device_code,
+        interval: authRequest.interval,
+        expires_at: Date.now() + authRequest.expires_in * 1e3,
+        verification_url: authRequest.verification_url_complete,
+        passphrase: authRequest.user_code
+      });
+      yield {
+        verification_url: authRequest.verification_url_complete,
+        passphrase: authRequest.user_code,
+        instruction: "Present the verification_url to the user and ask them to approve in the Link app. Then call `auth status --interval 5 --max-attempts 60` to poll until authenticated. Do not wait for the user to reply \u2014 start polling immediately.",
+        _next: {
+          command: "auth status --interval 5 --max-attempts 60",
+          poll_interval_seconds: authRequest.interval,
+          until: "authenticated is true"
+        }
+      };
+    }
+  });
+  cli2.command("logout", {
+    description: "Log out from Link",
+    outputPolicy: "agent-only",
+    async run(c) {
+      const auth = storage.getAuth();
+      if (auth?.refresh_token) {
+        try {
+          await authResource.revokeToken(auth.refresh_token);
+        } catch {
+        }
+      }
+      storage.clearAuth();
+      storage.clearPendingDeviceAuth();
+      storage.deleteConfig();
+      const result = { authenticated: false };
+      if (!c.agent && !c.formatExplicit) {
+        return new Promise((resolve) => {
+          const { waitUntilExit } = render(
+            /* @__PURE__ */ jsx3(Logout, { authResource, onComplete: () => {
+            } })
           );
+          waitUntilExit().then(() => resolve(result));
+        });
+      }
+      return result;
+    }
+  });
+  cli2.command("status", {
+    description: "Check authentication status",
+    options: statusOptions,
+    outputPolicy: "agent-only",
+    async *run(c) {
+      const opts = c.options;
+      const interval = opts.interval;
+      const maxAttempts = opts.maxAttempts;
+      const deadline = Date.now() + opts.timeout * 1e3;
+      let attempts = 0;
+      while (true) {
+        const pending = storage.getPendingDeviceAuth();
+        if (pending && !storage.isAuthenticated()) {
+          const tokens = await authResource.pollDeviceAuth(pending.device_code);
           if (tokens) {
             storage.setAuth(tokens);
-            return { authenticated: true, token_type: tokens.token_type };
-          }
-        }
-        throw new Error("Device authorization timed out");
-      },
-      renderFn: () => /* @__PURE__ */ jsx4(
-        Login,
-        {
-          authResource,
-          clientName,
-          onComplete: () => {
+            storage.clearPendingDeviceAuth();
           }
         }
-      )
-    });
-  });
-  authCommand2.command("logout").description("Log out from Link").option(
-    "--output-json",
-    "Output result as JSON instead of interactive display"
-  ).addHelpText("after", buildOutputHelp(LOGOUT_SCHEMA)).action(async (options) => {
-    await executeCommand({
-      outputJson: !!options.outputJson,
-      jsonFn: async () => {
-        storage.clearAuth();
-        storage.deleteConfig();
-        return { authenticated: false };
-      },
-      renderFn: () => /* @__PURE__ */ jsx4(Logout, { onComplete: () => {
-      } })
-    });
-  });
-  authCommand2.command("status").description("Check authentication status").option(
-    "--output-json",
-    "Output result as JSON instead of interactive display"
-  ).addHelpText("after", buildOutputHelp(AUTH_STATUS_SCHEMA)).action(async (options) => {
-    await executeCommand({
-      outputJson: !!options.outputJson,
-      jsonFn: async () => {
         const auth = storage.getAuth();
         if (auth) {
-          return {
+          yield {
             authenticated: true,
             access_token: `${auth.access_token.substring(0, 20)}...`,
             token_type: auth.token_type,
             credentials_path: storage.getPath()
           };
+          return;
         }
-        return { authenticated: false, credentials_path: storage.getPath() };
-      },
-      renderFn: () => /* @__PURE__ */ jsx4(AuthStatus, { onComplete: () => {
-      } })
-    });
+        const currentPending = storage.getPendingDeviceAuth();
+        const status = {
+          authenticated: false,
+          credentials_path: storage.getPath(),
+          ...currentPending ? {
+            pending: true,
+            verification_url: currentPending.verification_url,
+            passphrase: currentPending.passphrase
+          } : {}
+        };
+        attempts++;
+        const shouldStop = interval <= 0 || maxAttempts > 0 && attempts >= maxAttempts || Date.now() >= deadline;
+        if (shouldStop) {
+          yield status;
+          return;
+        }
+        yield status;
+        await new Promise((resolve) => setTimeout(resolve, interval * 1e3));
+      }
+    }
   });
-  return authCommand2;
+  return cli2;
 }
 
-// src/utils/require-auth.ts
-function requireAuth() {
-  if (!storage.isAuthenticated()) {
-    outputError('Not authenticated. Run "link-cli auth login" first.');
-  }
-}
+// src/commands/mpp/index.tsx
+import { Cli as Cli2, z as z3 } from "incur";
+import { render as render2 } from "ink";
 
 // src/commands/mpp/decode.ts
 import { Challenge } from "mppx";
@@ -11863,8 +11599,7 @@ function getMethodDetails(request) {
   }
   return methodDetails;
 }
-function decodeStripeChallenge(challengeHeader) {
-  const challenges = Challenge.deserializeList(challengeHeader);
+function resolveStripeChallenge(challenges) {
   const stripeChallenge = challenges.find(
     (challenge) => challenge.method === "stripe" && challenge.intent === "charge"
   );
@@ -11889,51 +11624,66 @@ function decodeStripeChallenge(challengeHeader) {
     );
   }
   return {
-    id: stripeChallenge.id,
-    realm: stripeChallenge.realm,
+    challenge: stripeChallenge,
+    networkId,
+    request
+  };
+}
+function getStripeChargeChallengeFromResponse(response) {
+  return resolveStripeChallenge(Challenge.fromResponseList(response)).challenge;
+}
+function decodeStripeChallenge(challengeHeader) {
+  const { challenge, networkId, request } = resolveStripeChallenge(
+    Challenge.deserializeList(challengeHeader)
+  );
+  return {
+    id: challenge.id,
+    realm: challenge.realm,
     method: "stripe",
     intent: "charge",
-    description: stripeChallenge.description,
-    digest: stripeChallenge.digest,
-    expires: stripeChallenge.expires,
+    description: challenge.description,
+    digest: challenge.digest,
+    expires: challenge.expires,
     network_id: networkId,
     request_json: request
   };
 }
 
 // src/commands/mpp/decode-view.tsx
-import { Box as Box4, Text as Text4 } from "ink";
-import { jsx as jsx5, jsxs as jsxs3 } from "react/jsx-runtime";
+import { Box as Box3, Text as Text3 } from "ink";
+import { jsx as jsx4, jsxs as jsxs2 } from "react/jsx-runtime";
 function DecodeChallengeView({
   decoded
 }) {
-  return /* @__PURE__ */ jsxs3(Box4, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx5(Text4, { color: "green", children: "\u2713 Stripe challenge decoded" }),
-    /* @__PURE__ */ jsxs3(Box4, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-      /* @__PURE__ */ jsxs3(Text4, { children: [
+  return /* @__PURE__ */ jsxs2(Box3, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx4(Text3, { color: "green", children: "\u2713 Stripe challenge decoded" }),
+    /* @__PURE__ */ jsxs2(Box3, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+      /* @__PURE__ */ jsxs2(Text3, { children: [
         "ID: ",
-        /* @__PURE__ */ jsx5(Text4, { bold: true, children: decoded.id })
+        /* @__PURE__ */ jsx4(Text3, { bold: true, children: decoded.id })
       ] }),
-      /* @__PURE__ */ jsxs3(Text4, { children: [
+      /* @__PURE__ */ jsxs2(Text3, { children: [
         "Realm: ",
-        /* @__PURE__ */ jsx5(Text4, { bold: true, children: decoded.realm })
+        /* @__PURE__ */ jsx4(Text3, { bold: true, children: decoded.realm })
       ] }),
-      /* @__PURE__ */ jsxs3(Text4, { children: [
+      /* @__PURE__ */ jsxs2(Text3, { children: [
         "Network ID: ",
-        /* @__PURE__ */ jsx5(Text4, { bold: true, children: decoded.network_id })
+        /* @__PURE__ */ jsx4(Text3, { bold: true, children: decoded.network_id })
       ] }),
-      /* @__PURE__ */ jsx5(Text4, { children: "Request JSON:" }),
-      /* @__PURE__ */ jsx5(Text4, { children: JSON.stringify(decoded.request_json, null, 2) })
+      /* @__PURE__ */ jsx4(Text3, { children: "Request JSON:" }),
+      /* @__PURE__ */ jsx4(Text3, { children: JSON.stringify(decoded.request_json, null, 2) })
     ] })
   ] });
 }
 
 // src/commands/mpp/pay.tsx
-import { Box as Box5, Text as Text5 } from "ink";
+import { Box as Box4, Text as Text4 } from "ink";
 import Spinner2 from "ink-spinner";
-import { Challenge as Challenge2, Credential } from "mppx";
-import { useEffect as useEffect4, useState as useState4 } from "react";
-import { jsx as jsx6, jsxs as jsxs4 } from "react/jsx-runtime";
+import { Credential, Method } from "mppx";
+import { Mppx, Transport } from "mppx/client";
+import { Methods as StripeMethods } from "mppx/stripe";
+import { useEffect as useEffect3, useState as useState3 } from "react";
+import { jsx as jsx5, jsxs as jsxs3 } from "react/jsx-runtime";
 function buildHeaders(data, headers) {
   const result = {};
   if (data !== void 0) {
@@ -11948,29 +11698,66 @@ function buildHeaders(data, headers) {
   }
   return result;
 }
+async function readPayResult(response, options) {
+  const responseHeaders = Object.fromEntries(response.headers.entries());
+  const body = await response.text();
+  if (options?.failOnError && !response.ok) {
+    throw new Error(
+      `Payment submission failed with status ${response.status}: ${body}`
+    );
+  }
+  return { status: response.status, headers: responseHeaders, body };
+}
+function createStripePaymentClient(spt) {
+  const stripeCharge = Method.toClient(StripeMethods.charge, {
+    async createCredential({ challenge }) {
+      return Credential.serialize({
+        challenge,
+        payload: { spt }
+      });
+    }
+  });
+  return Mppx.create({
+    methods: [stripeCharge],
+    polyfill: false,
+    transport: Transport.from({
+      name: "stripe-http",
+      isPaymentRequired(response) {
+        return response.status === 402;
+      },
+      getChallenge(response) {
+        return getStripeChargeChallengeFromResponse(response);
+      },
+      setCredential(request, credential) {
+        const nextHeaders = new Headers(request.headers);
+        nextHeaders.set("Authorization", credential);
+        return { ...request, headers: nextHeaders };
+      }
+    })
+  });
+}
 async function runMppPay(url, spendRequestId, method, data, headers, repository) {
   const spendRequest = await repository.getSpendRequest(spendRequestId, {
     include: ["shared_payment_token"]
   });
   if (!spendRequest) {
-    outputError(`Spend request ${spendRequestId} not found`);
+    throw new Error(`Spend request ${spendRequestId} not found`);
   }
   if (spendRequest.credential_type !== "shared_payment_token") {
     const type = spendRequest.credential_type ?? "card";
-    outputError(
+    throw new Error(
       `Spend request ${spendRequestId} must have credential_type 'shared_payment_token' (current: '${type}')`
     );
   }
   if (spendRequest.status !== "approved") {
-    outputError(
+    throw new Error(
       `Spend request must be approved (current status: ${spendRequest.status})`
     );
   }
-  const sptObj = spendRequest.shared_payment_token;
-  if (!sptObj) {
-    outputError("Spend request does not have a shared payment token");
+  if (!spendRequest.shared_payment_token) {
+    throw new Error("Spend request does not have a shared payment token");
   }
-  const spt = sptObj.id;
+  const spt = spendRequest.shared_payment_token.id;
   const httpMethod = method ?? (data !== void 0 ? "POST" : "GET");
   const requestHeaders = buildHeaders(data, headers);
   const initialResponse = await fetch(url, {
@@ -11979,30 +11766,9 @@ async function runMppPay(url, spendRequestId, method, data, headers, repository)
     headers: requestHeaders
   });
   if (initialResponse.status !== 402) {
-    const responseHeaders2 = Object.fromEntries(
-      initialResponse.headers.entries()
-    );
-    const body2 = await initialResponse.text();
-    return { status: initialResponse.status, headers: responseHeaders2, body: body2 };
+    return readPayResult(initialResponse);
   }
-  const decoded = decodeStripeChallenge(
-    initialResponse.headers.get("www-authenticate") ?? ""
-  );
-  const stripeChallenge = Challenge2.from({
-    id: decoded.id,
-    realm: decoded.realm,
-    method: decoded.method,
-    intent: decoded.intent,
-    request: decoded.request_json,
-    ...decoded.description ? { description: decoded.description } : {},
-    ...decoded.digest ? { digest: decoded.digest } : {},
-    ...decoded.expires ? { expires: decoded.expires } : {}
-  });
-  const credential = Credential.from({
-    challenge: stripeChallenge,
-    payload: { spt }
-  });
-  const authHeader = Credential.serialize(credential);
+  const authHeader = await createStripePaymentClient(spt).createCredential(initialResponse);
   const retryResponse = await fetch(url, {
     method: httpMethod,
     body: data,
@@ -12011,15 +11777,7 @@ async function runMppPay(url, spendRequestId, method, data, headers, repository)
       Authorization: authHeader
     }
   });
-  if (!retryResponse.ok) {
-    const body2 = await retryResponse.text();
-    outputError(
-      `Payment submission failed with status ${retryResponse.status}: ${body2}`
-    );
-  }
-  const responseHeaders = Object.fromEntries(retryResponse.headers.entries());
-  const body = await retryResponse.text();
-  return { status: retryResponse.status, headers: responseHeaders, body };
+  return readPayResult(retryResponse, { failOnError: true });
 }
 function MppPay({
   url,
@@ -12030,10 +11788,10 @@ function MppPay({
   repository,
   onComplete
 }) {
-  const [step, setStep] = useState4("retrieving");
-  const [result, setResult] = useState4(null);
-  const [error, setError] = useState4(null);
-  useEffect4(() => {
+  const [step, setStep] = useState3("retrieving");
+  const [result, setResult] = useState3(null);
+  const [error, setError] = useState3(null);
+  useEffect3(() => {
     (async () => {
       try {
         setStep("retrieving");
@@ -12067,38 +11825,15 @@ function MppPay({
           headers: requestHeaders
         });
         if (initialResponse.status !== 402) {
-          const responseHeaders2 = Object.fromEntries(
-            initialResponse.headers.entries()
-          );
-          const body2 = await initialResponse.text();
-          setResult({
-            status: initialResponse.status,
-            headers: responseHeaders2,
-            body: body2
-          });
+          setResult(await readPayResult(initialResponse));
           setStep("done");
           onComplete();
           return;
         }
         setStep("signing");
-        const decoded = decodeStripeChallenge(
-          initialResponse.headers.get("www-authenticate") ?? ""
+        const authHeader = await createStripePaymentClient(spt).createCredential(
+          initialResponse
         );
-        const stripeChallenge = Challenge2.from({
-          id: decoded.id,
-          realm: decoded.realm,
-          method: decoded.method,
-          intent: decoded.intent,
-          request: decoded.request_json,
-          ...decoded.description ? { description: decoded.description } : {},
-          ...decoded.digest ? { digest: decoded.digest } : {},
-          ...decoded.expires ? { expires: decoded.expires } : {}
-        });
-        const credential = Credential.from({
-          challenge: stripeChallenge,
-          payload: { spt }
-        });
-        const authHeader = Credential.serialize(credential);
         setStep("submitting");
         const retryResponse = await fetch(url, {
           method: httpMethod,
@@ -12108,15 +11843,7 @@ function MppPay({
             Authorization: authHeader
           }
         });
-        const responseHeaders = Object.fromEntries(
-          retryResponse.headers.entries()
-        );
-        const body = await retryResponse.text();
-        setResult({
-          status: retryResponse.status,
-          headers: responseHeaders,
-          body
-        });
+        setResult(await readPayResult(retryResponse, { failOnError: true }));
         setStep("done");
         onComplete();
       } catch (err) {
@@ -12133,191 +11860,143 @@ function MppPay({
     done: "Done"
   };
   if (error) {
-    return /* @__PURE__ */ jsxs4(Text5, { color: "red", children: [
+    return /* @__PURE__ */ jsxs3(Text4, { color: "red", children: [
       "Error: ",
       error
     ] });
   }
-  return /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", children: [
-    step !== "done" && /* @__PURE__ */ jsx6(Box5, { children: /* @__PURE__ */ jsxs4(Text5, { color: "cyan", children: [
-      /* @__PURE__ */ jsx6(Spinner2, { type: "dots" }),
+  return /* @__PURE__ */ jsxs3(Box4, { flexDirection: "column", children: [
+    step !== "done" && /* @__PURE__ */ jsx5(Box4, { children: /* @__PURE__ */ jsxs3(Text4, { color: "cyan", children: [
+      /* @__PURE__ */ jsx5(Spinner2, { type: "dots" }),
       " ",
       stepLabels[step],
       "..."
     ] }) }),
-    result && /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs4(Text5, { color: "green", children: [
+    result && /* @__PURE__ */ jsxs3(Box4, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs3(Text4, { color: "green", children: [
         "HTTP ",
         result.status
       ] }),
-      /* @__PURE__ */ jsx6(Text5, { children: result.body })
+      /* @__PURE__ */ jsx5(Text4, { children: result.body })
     ] })
   ] });
 }
 
 // src/commands/mpp/schema.ts
-import { z as z4 } from "zod";
-var DECODE_OUTPUT_SCHEMA = {
-  id: { outputExample: '"ch_123"', description: "Challenge ID" },
-  realm: {
-    outputExample: '"merchant.example"',
-    description: "Challenge realm"
-  },
-  method: { outputExample: '"stripe"', description: "Payment method" },
-  intent: { outputExample: '"charge"', description: "Challenge intent" },
-  network_id: {
-    outputExample: '"net_prod_123"',
-    description: "Extracted Stripe network ID"
-  },
-  request_json: {
-    outputExample: '{"networkId":"net_prod_123","amount":"1000","currency":"usd","decimals":2,"paymentMethodTypes":["card"]}',
-    description: "Decoded request payload from the stripe challenge before normalization"
-  }
-};
-var PAY_INPUT_SCHEMA = {
-  spend_request_id: {
-    schema: z4.string().min(1),
-    flag: "--spend-request-id <id>",
-    description: "Approved spend request ID with shared_payment_token credential",
-    jsonDescription: 'Must be an approved spend request with credential_type "shared_payment_token" \u2014 the SPT is one-time use; create a new request if payment fails',
-    required: true
-  },
-  method: {
-    schema: z4.string().min(1),
-    flag: "--method <method>",
-    alias: "-X",
-    description: "HTTP method (default: GET, or POST if --data is provided)"
-  },
-  data: {
-    schema: z4.string().min(1),
-    flag: "--data <body>",
-    alias: "-d",
-    description: "Request body (implies POST if --method is not set)"
-  },
-  headers: {
-    schema: z4.array(z4.string().min(1)),
-    flag: "--header <header>",
-    alias: "-H",
-    description: 'Request header in "Name: Value" format (repeatable)',
-    jsonDescription: 'Repeatable; "Name: Value" format \u2014 Content-Type is auto-set when --data is provided; user headers take precedence'
-  }
-};
-var DECODE_INPUT_SCHEMA = {
-  challenge: {
-    schema: z4.string().min(1),
-    flag: "--challenge <header>",
-    description: "Raw WWW-Authenticate header value to decode",
-    jsonDescription: "Raw WWW-Authenticate header value; may include multiple payment challenges",
-    required: true
-  }
-};
-var PAY_OUTPUT_SCHEMA = {
-  status: { outputExample: "200", description: "HTTP response status code" },
-  headers: {
-    outputExample: '{"content-type":"application/json"}',
-    description: "Response headers"
-  },
-  body: { outputExample: '"..."', description: "Response body" }
-};
+import { z as z2 } from "incur";
+var payOptions = z2.object({
+  spendRequestId: z2.string().describe(
+    'Approved spend request ID with credential_type "shared_payment_token"'
+  ),
+  method: z2.string().optional().describe("HTTP method (default: GET, or POST if --data is provided)"),
+  data: z2.string().optional().describe("Request body (implies POST if --method is not set)"),
+  header: z2.array(z2.string()).default([]).describe('Request header in "Name: Value" format (repeatable)')
+});
+var decodeOptions = z2.object({
+  challenge: z2.string().describe(
+    "Raw WWW-Authenticate header value; may include multiple payment challenges"
+  )
+});
 
 // src/commands/mpp/index.tsx
-import { jsx as jsx7 } from "react/jsx-runtime";
-function registerMppCommands(program2, repository) {
-  const mppCommand2 = program2.command("mpp").description("Machine payment protocol (MPP) commands").helpCommand(false);
-  const payCmd = mppCommand2.command("pay <url>").description(
-    "Complete a machine payment protocol (MPP) payment using an approved spend request"
-  );
-  registerSchemaOptions(payCmd, PAY_INPUT_SCHEMA);
-  payCmd.option(
-    "--json <json>",
-    `JSON input (keys: ${Object.keys(PAY_INPUT_SCHEMA).join(", ")})`
-  ).option(
-    "--output-json",
-    "Output result as JSON instead of interactive display"
-  ).addHelpText(
-    "after",
-    buildInputHelp(PAY_INPUT_SCHEMA) + buildOutputHelp(PAY_OUTPUT_SCHEMA)
-  ).action(async (url, options) => {
-    requireAuth();
-    let resolved = {};
-    try {
-      resolved = resolveInput(options, PAY_INPUT_SCHEMA);
-    } catch (err) {
-      if (err instanceof ValidationError)
-        process.stderr.write(`${err.errors.join("\n")}
-`);
-      process.stderr.write(
-        `${JSON.stringify({ error: err.message })}
-`
-      );
-      process.exit(1);
-    }
-    const spendRequestId = resolved.spend_request_id;
-    const method = resolved.method;
-    const data = resolved.data;
-    const headers = resolved.headers;
-    await executeCommand({
-      outputJson: !!options.outputJson,
-      jsonFn: async () => {
-        return runMppPay(
-          url,
-          spendRequestId,
-          method,
-          data,
-          headers,
-          repository
-        );
-      },
-      renderFn: () => /* @__PURE__ */ jsx7(
-        MppPay,
-        {
-          url,
-          spendRequestId,
-          method,
-          data,
-          headers,
-          repository,
-          onComplete: () => {
+import { jsx as jsx6 } from "react/jsx-runtime";
+function createMppCli(repository) {
+  const cli2 = Cli2.create("mpp", {
+    description: "Machine payment protocol (MPP) commands"
+  });
+  cli2.command("pay", {
+    description: "Complete a machine payment protocol (MPP) payment using an approved spend request",
+    args: z3.object({
+      url: z3.string().describe("URL to pay")
+    }),
+    options: payOptions,
+    alias: { method: "X", data: "d", header: "H" },
+    outputPolicy: "agent-only",
+    async run(c) {
+      if (!storage.isAuthenticated()) {
+        return c.error({
+          code: "NOT_AUTHENTICATED",
+          message: 'Not authenticated. Run "link-cli auth login" first.',
+          cta: {
+            commands: [
+              { command: "auth login", description: "Log in to Link" }
+            ]
           }
-        }
-      )
-    });
+        });
+      }
+      const url = c.args.url;
+      const opts = c.options;
+      const method = opts.method;
+      const data = opts.data;
+      const headers = opts.header?.length ? opts.header : void 0;
+      if (!c.agent && !c.formatExplicit) {
+        return new Promise((resolve) => {
+          const { waitUntilExit } = render2(
+            /* @__PURE__ */ jsx6(
+              MppPay,
+              {
+                url,
+                spendRequestId: opts.spendRequestId,
+                method,
+                data,
+                headers,
+                repository,
+                onComplete: () => {
+                }
+              }
+            )
+          );
+          waitUntilExit().then(async () => {
+            resolve(
+              await runMppPay(
+                url,
+                opts.spendRequestId,
+                method,
+                data,
+                headers,
+                repository
+              )
+            );
+          });
+        });
+      }
+      return runMppPay(
+        url,
+        opts.spendRequestId,
+        method,
+        data,
+        headers,
+        repository
+      );
+    }
   });
-  const decodeCmd = mppCommand2.command("decode").description(
-    "Decode a stripe WWW-Authenticate challenge and extract network_id"
-  );
-  registerSchemaOptions(decodeCmd, DECODE_INPUT_SCHEMA);
-  decodeCmd.option(
-    "--json <json>",
-    `JSON input (keys: ${Object.keys(DECODE_INPUT_SCHEMA).join(", ")})`
-  ).option(
-    "--output-json",
-    "Output result as JSON instead of interactive display"
-  ).addHelpText(
-    "after",
-    buildInputHelp(DECODE_INPUT_SCHEMA) + buildOutputHelp(DECODE_OUTPUT_SCHEMA)
-  ).action(async (options) => {
-    let resolved = {};
-    try {
-      resolved = resolveInput(options, DECODE_INPUT_SCHEMA);
-    } catch (err) {
-      if (err instanceof ValidationError)
-        outputErrors(err.errors, !!options.outputJson);
-      outputError(err.message);
-    }
-    const challenge = resolved.challenge;
-    await executeCommand({
-      outputJson: !!options.outputJson,
-      jsonFn: async () => decodeStripeChallenge(challenge),
-      renderFn: () => /* @__PURE__ */ jsx7(DecodeChallengeView, { decoded: decodeStripeChallenge(challenge) })
-    });
+  cli2.command("decode", {
+    description: "Decode a stripe WWW-Authenticate challenge and extract network_id",
+    options: decodeOptions,
+    outputPolicy: "agent-only",
+    async run(c) {
+      const decoded = decodeStripeChallenge(c.options.challenge);
+      if (!c.agent && !c.formatExplicit) {
+        return new Promise((resolve) => {
+          const { waitUntilExit } = render2(
+            /* @__PURE__ */ jsx6(DecodeChallengeView, { decoded })
+          );
+          waitUntilExit().then(() => resolve(decoded));
+        });
+      }
+      return decoded;
+    }
   });
-  return mppCommand2;
+  return cli2;
 }
 
+// src/commands/payment-methods/index.tsx
+import { Cli as Cli3 } from "incur";
+import { render as render3 } from "ink";
+
 // src/commands/payment-methods/add.tsx
-import { Box as Box6, Text as Text6, useApp, useInput as useInput2 } from "ink";
-import { jsx as jsx8, jsxs as jsxs5 } from "react/jsx-runtime";
+import { Box as Box5, Text as Text5, useApp, useInput as useInput2 } from "ink";
+import { jsx as jsx7, jsxs as jsxs4 } from "react/jsx-runtime";
 var WALLET_URL = "https://app.link.com/wallet";
 var AddPaymentMethod = () => {
   const { exit } = useApp();
@@ -12327,10 +12006,10 @@ var AddPaymentMethod = () => {
       exit();
     }
   });
-  return /* @__PURE__ */ jsxs5(Box6, { flexDirection: "column", paddingY: 1, children: [
-    /* @__PURE__ */ jsx8(Box6, { marginBottom: 1, children: /* @__PURE__ */ jsx8(Text6, { bold: true, children: "Add Payment Method" }) }),
-    /* @__PURE__ */ jsxs5(
-      Box6,
+  return /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", paddingY: 1, children: [
+    /* @__PURE__ */ jsx7(Box5, { marginBottom: 1, children: /* @__PURE__ */ jsx7(Text5, { bold: true, children: "Add Payment Method" }) }),
+    /* @__PURE__ */ jsxs4(
+      Box5,
       {
         flexDirection: "column",
         borderStyle: "round",
@@ -12338,12 +12017,12 @@ var AddPaymentMethod = () => {
         paddingX: 2,
         paddingY: 1,
         children: [
-          /* @__PURE__ */ jsxs5(Text6, { children: [
+          /* @__PURE__ */ jsxs4(Text5, { children: [
             "Open:",
             " ",
-            /* @__PURE__ */ jsx8(Text6, { bold: true, color: "cyan", children: WALLET_URL })
+            /* @__PURE__ */ jsx7(Text5, { bold: true, color: "cyan", children: WALLET_URL })
           ] }),
-          /* @__PURE__ */ jsx8(Text6, { dimColor: true, children: "Press Enter to open in browser" })
+          /* @__PURE__ */ jsx7(Text5, { dimColor: true, children: "Press Enter to open in browser" })
         ]
       }
     )
@@ -12351,20 +12030,20 @@ var AddPaymentMethod = () => {
 };
 
 // src/commands/payment-methods/list.tsx
-import { Box as Box7, Text as Text7 } from "ink";
+import { Box as Box6, Text as Text6 } from "ink";
 import Spinner3 from "ink-spinner";
-import { useEffect as useEffect5, useState as useState5 } from "react";
-import { jsx as jsx9, jsxs as jsxs6 } from "react/jsx-runtime";
+import { useEffect as useEffect4, useState as useState4 } from "react";
+import { jsx as jsx8, jsxs as jsxs5 } from "react/jsx-runtime";
 var PaymentMethodsList = ({
   resource,
   onComplete
 }) => {
-  const [status, setStatus] = useState5(
+  const [status, setStatus] = useState4(
     "loading"
   );
-  const [methods, setMethods] = useState5([]);
-  const [error, setError] = useState5("");
-  useEffect5(() => {
+  const [methods, setMethods] = useState4([]);
+  const [error, setError] = useState4("");
+  useEffect4(() => {
     const fetch2 = async () => {
       try {
         const result = await resource.listPaymentMethods();
@@ -12380,150 +12059,167 @@ var PaymentMethodsList = ({
     fetch2();
   }, [resource, onComplete]);
   if (status === "loading") {
-    return /* @__PURE__ */ jsx9(Box7, { children: /* @__PURE__ */ jsxs6(Text7, { color: "cyan", children: [
-      /* @__PURE__ */ jsx9(Spinner3, { type: "dots" }),
+    return /* @__PURE__ */ jsx8(Box6, { children: /* @__PURE__ */ jsxs5(Text6, { color: "cyan", children: [
+      /* @__PURE__ */ jsx8(Spinner3, { type: "dots" }),
       " Loading payment methods..."
     ] }) });
   }
   if (status === "error") {
-    return /* @__PURE__ */ jsxs6(Box7, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx9(Text7, { color: "red", children: "\u2717 Failed to load payment methods" }),
-      /* @__PURE__ */ jsx9(Text7, { color: "red", children: error })
+    return /* @__PURE__ */ jsxs5(Box6, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx8(Text6, { color: "red", children: "\u2717 Failed to load payment methods" }),
+      /* @__PURE__ */ jsx8(Text6, { color: "red", children: error })
     ] });
   }
   if (methods.length === 0) {
-    return /* @__PURE__ */ jsx9(Box7, { children: /* @__PURE__ */ jsx9(Text7, { dimColor: true, children: "No payment methods found" }) });
+    return /* @__PURE__ */ jsx8(Box6, { children: /* @__PURE__ */ jsx8(Text6, { dimColor: true, children: "No payment methods found" }) });
   }
-  return /* @__PURE__ */ jsxs6(Box7, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx9(Text7, { bold: true, children: "Payment Methods" }),
-    /* @__PURE__ */ jsx9(Box7, { flexDirection: "column", marginTop: 1, children: methods.map((pm) => {
+  return /* @__PURE__ */ jsxs5(Box6, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx8(Text6, { bold: true, children: "Payment Methods" }),
+    /* @__PURE__ */ jsx8(Box6, { flexDirection: "column", marginTop: 1, children: methods.map((pm) => {
       const label = pm.card_details?.brand ?? pm.bank_account_details?.bank_name ?? "Bank account";
       const last4 = pm.card_details?.last4 ?? pm.bank_account_details?.last4;
       const suffix = [pm.nickname ? `(${pm.nickname})` : ""].filter(Boolean).join(" ");
-      return /* @__PURE__ */ jsx9(Box7, { paddingX: 2, children: /* @__PURE__ */ jsxs6(Text7, { children: [
-        /* @__PURE__ */ jsx9(Text7, { dimColor: true, children: pm.id }),
+      return /* @__PURE__ */ jsx8(Box6, { paddingX: 2, children: /* @__PURE__ */ jsxs5(Text6, { children: [
+        /* @__PURE__ */ jsx8(Text6, { dimColor: true, children: pm.id }),
         "  ",
         label,
         " ****",
         last4,
         suffix ? ` ${suffix}` : "",
-        pm.is_default ? /* @__PURE__ */ jsx9(Text7, { color: "green", children: " (default)" }) : ""
+        pm.is_default ? /* @__PURE__ */ jsx8(Text6, { color: "green", children: " (default)" }) : ""
       ] }) }, pm.id);
     }) })
   ] });
 };
 
-// src/commands/payment-methods/schema.ts
-var PAYMENT_METHOD_SCHEMA = {
-  id: { outputExample: '"..."', description: "Payment method ID" },
-  type: {
-    outputExample: '"card|bank_account"',
-    description: "Payment method type"
-  },
-  is_default: {
-    outputExample: "boolean",
-    description: "Whether this is the default payment method"
-  },
-  nickname: {
-    outputExample: '"..."',
-    description: "Optional nickname for the payment method"
-  },
-  card_details: {
-    outputExample: "{ brand, last4, exp_month, exp_year }",
-    description: "Present when type is card"
-  },
-  bank_account_details: {
-    outputExample: "{ last4, bank_name }",
-    description: "Present when type is bank_account"
-  }
-};
-
 // src/commands/payment-methods/index.tsx
-import { jsx as jsx10 } from "react/jsx-runtime";
-function registerPaymentMethodsCommands(program2, createResource) {
-  const paymentMethodsCommand2 = program2.command("payment-methods").description("Payment methods management commands").helpCommand(false);
-  paymentMethodsCommand2.command("list").description("List all payment methods on your account").option(
-    "--output-json",
-    "Output result as JSON instead of interactive display"
-  ).addHelpText("after", buildOutputHelp(PAYMENT_METHOD_SCHEMA, true)).action(async (options) => {
-    requireAuth();
-    const resource = createResource();
-    await executeCommand({
-      outputJson: !!options.outputJson,
-      jsonFn: async () => {
-        return resource.listPaymentMethods();
-      },
-      renderFn: () => /* @__PURE__ */ jsx10(PaymentMethodsList, { resource, onComplete: () => {
-      } })
-    });
+import { jsx as jsx9 } from "react/jsx-runtime";
+function createPaymentMethodsCli(createResource) {
+  const cli2 = Cli3.create("payment-methods", {
+    description: "Payment methods management commands"
   });
-  paymentMethodsCommand2.command("add").description("Open the Link wallet to add a new payment method").option(
-    "--output-json",
-    "Output result as JSON instead of interactive display"
-  ).action(async (options) => {
-    requireAuth();
-    if (options.outputJson) {
-      outputJson({ url: WALLET_URL });
-    } else {
-      const { render: render2 } = await import("ink");
-      const { waitUntilExit } = render2(/* @__PURE__ */ jsx10(AddPaymentMethod, {}));
-      await waitUntilExit();
+  cli2.command("list", {
+    description: "List all payment methods on your account",
+    outputPolicy: "agent-only",
+    async run(c) {
+      if (!storage.isAuthenticated()) {
+        return c.error({
+          code: "NOT_AUTHENTICATED",
+          message: 'Not authenticated. Run "link-cli auth login" first.',
+          cta: {
+            commands: [
+              { command: "auth login", description: "Log in to Link" }
+            ]
+          }
+        });
+      }
+      const resource = createResource();
+      if (!c.agent && !c.formatExplicit) {
+        return new Promise((resolve) => {
+          const { waitUntilExit } = render3(
+            /* @__PURE__ */ jsx9(PaymentMethodsList, { resource, onComplete: () => {
+            } })
+          );
+          waitUntilExit().then(async () => {
+            resolve(await resource.listPaymentMethods());
+          });
+        });
+      }
+      return resource.listPaymentMethods();
     }
   });
-  return paymentMethodsCommand2;
-}
-
-// src/commands/skill/index.ts
-function registerSkillCommand(program2) {
-  return program2.command("skill").description("Output the Link CLI skill file").action(() => {
-    let content = '---\nname: create-payment-credential\ndescription: |\n  Gets secure, one-time-use payment credentials (cards, tokens) from a Link wallet so agents can complete purchases on behalf of users. Use when the user says "get me a card", "buy something", "pay for X", "make a purchase", "I need to pay", "complete checkout", or asks to transact on any merchant site. Use when the user asks to connect or log in to or sign up for their Link account.\nallowed-tools:\n - Bash(link-cli:*)\n - Bash(npx:*)\n - Bash(npm:*)\nlicense: Complete terms in LICENSE\nmetadata:\n  author: stripe\n  url: link.com/agents\n  openclaw:\n    emoji: "\u{1F4B3}"\n    homepage: https://link.com/agents\n    requires:\n      bins:\n        - link-cli\n    install:\n      - kind: node\n        package: "@stripe/link-cli"\n        bins: [link-cli]\nuser-invocable: true\n---\n\n# Creating Payment Credentials\n\nUse the Link CLI to get secure, one-time-use payment credentials from a Link wallet to complete purchases.\n\n## Installation\n\nInstall the CLI with\n\n```bash\nnpm install -g @stripe/link-cli\n```\n\nInstall the skill file with\n\n```bash\nnpx skills add stripe/link-cli\n```\n\n## Running commands\n\nAll commands support `--output-json` for machine-readable output. Use `--json` to pass structured input. Always run `link-cli <command> --help` before running the command to see full schema details, including all fields, types, and constraints.\n\nIMPORTANT: Run `auth login`, `spend-request create`, and `spend-request request-approval` with `run_in_background=true` (or `TaskOutput(task_id, block: false)`). These commands emit JSON to stdout before they exit, then keep running while they poll for user action.\n\nThe JSON stream contract for these long-running commands is:\n\n- `auth login --output-json`: first object contains `verification_url` and `passphrase`; final object contains authentication result after approval succeeds\n- `spend-request create --request-approval --output-json`: first object is the created spend request; final object is the terminal spend request after polling completes\n- `spend-request request-approval --output-json`: first object contains the approval link; final object is the terminal spend request after polling completes\n\nAlways keep reading stdout until the process exits. Do not assume the first JSON object is the full result. The user MUST visit the verification or approval URL to continue, and you should always show that full URL in clear text.\n\n## Core flow\n\nCopy this checklist and track progress:\n\n- Step 1: Authenticate with Link\n- Step 2: Evaluate merchant site (determine credential type)\n- Step 3: Get payment methods\n- Step 4: Create spend request with correct credential type\n- Step 5: Complete payment\n\n### Step 1: Authenticate with Link\n\nCheck auth status:\n\n```bash\nlink-cli auth status --output-json\n```\n\nIf not authenticated:\n\n```bash\nlink-cli auth login --client-name "<your-agent-name>" --output-json\n```\n\nReplace `<your-agent-name>` with the name of your agent or application (e.g. `"Personal Assistant", "Shopping Bot"`). This name appears in the user\'s Link app when they approve the connection. Use a clear, unique, identifiable name. Display the url and passphase to the user, with the guidance "Please visit the following URL to approve secure access to Link.\u201D\n\nDO NOT PROCEED until the user is authenticated with Link.\n\nAlways check the current authentication status before starting a new login flow - the user may already be logged in.\n\n### Step 2: Evaluate the merchant site BEFORE creating a spend request\n\n**CRITICAL \u2014 You MUST complete this step before calling `spend-request create`.** Do NOT default to `card` credential type. The merchant determines the credential type \u2014 you cannot know it without checking first. Skipping this step will produce a spend request with the wrong credential type.\n\nDetermine how the merchant accepts payment:\n\n1. **Navigate to the merchant page** \u2014 browse it, read the page content, and understand how the site accepts payment.\n2. **If the page has a credit card form, Stripe Elements, or traditional checkout UI** \u2014 use `card`.\n3. **If the page describes an API or programmatic payment flow** \u2014 make a request to the relevant endpoint. If it returns **HTTP 402** with a `www-authenticate` header, use `shared_payment_token`.\n\nWhat you find determines which credential type to use:\n\n| What you see | Credential type | What to request |\n|---|---|---|\n| Credit card form / Stripe Elements | `card` (default) | Card |\n| HTTP 402 with `method="stripe"` in `www-authenticate` | `shared_payment_token` | Shared payment token (SPT) |\n| HTTP 402 without `method="stripe"` in `www-authenticate` | not supported | Do not continue |\n\n**For 402 responses:** The `www-authenticate` header may contain **multiple** payment challenges (e.g. `tempo`, `stripe`) in a single header value. Do not try to decode the payload manually. Pass the **full raw `WWW-Authenticate` header value** to Link CLI and let `mpp decode` select and validate the `method="stripe"` challenge.\n\nTo derive `network_id`, use Link CLI\'s challenge decoder:\n\n```bash\nlink-cli mpp decode --challenge \'<raw WWW-Authenticate header>\' --output-json\n```\n\nThis validates the Stripe challenge, decodes the `request` payload, and returns both the extracted `network_id` and the decoded request JSON. Pass the full header exactly as received, even if it also contains non-Stripe or multiple `Payment` challenges.\n\n### Step 3: Get payment methods\n\nUse the default payment method, unless the user explicitly asks to select a different one.\n\n```bash\nlink-cli payment-methods list --output-json\n```\n\n### Step 4: Create the spend request with the right credential type\n\n```bash\nlink-cli spend-request create --json "{request}" --output-json\n```\n\nWait until the user has approved the spend request. If they deny, ask for clarification what to do next.\n\nRecommend the user approves with the [Link app](https://link.com/download). Show the download URL.\n\n**Test mode:** Add `"test": true` to the JSON input (or `--test` flag) to create testmode credentials instead of real ones. Useful for development and integration testing.\n\n### Step 5: Complete payment\n\n**Card:** Run `link-cli spend-request retrieve <id> --include card --output-json` to get the `card` object with `number`, `cvc`, `exp_month`, `exp_year`, `billing_address` (name, line1, line2, city, state, postal_code, country), and `valid_until` (unix timestamp \u2014 the card stops working after this time). Enter these details into the merchant\'s checkout form.\n\n**SPT with 402 flow:** The SPT is **one-time use** \u2014 if the payment fails, you need a new spend request and new SPT.\n\n```bash\nlink-cli mpp pay <url> --spend-request-id <id> [--method POST] [--data \'{"amount":100}\'] [--header \'Name: Value\'] --output-json\n```\n\n`mpp pay` handles the full 402 flow automatically: probes the URL, parses the `www-authenticate` header, builds the `Authorization: Payment` credential using the SPT, and retries.\n\n\n## Important\n\n- Treat the user\'s payment methods and credentials extremely carefully \u2014 card numbers and SPTs grant real spending power; leaking them outside a secure checkout could result in unauthorized charges the user cannot reverse.\n- Respect `/agents.txt` and `/llm.txt` and other directives on sites you browse \u2014 these files declare whether the site permits automated agent interactions; ignoring them may violate the merchant\'s terms.\n- Avoid suspicious merchants, checkout pages and websites \u2014 phishing pages that mimic legitimate merchants can steal credentials; if anything about the page feels off (mismatched domain, unusual redirect, unexpected login prompt), stop and ask the user to verify.\n- When outputting card information to the user apply basic masking to the card number and address to protect their information. Only reveal the raw values if directly requested to do so.\n\n## Errors\n\nAll errors go to stderr as `{"error": "..."}` with exit code 1.\n\n### Common errors and recovery\n\n| Error / Symptom | Cause | Recovery |\n|---|---|---|\n| `verification-failed` in error body from `mpp pay` | SPT was already consumed (one-time use) | Create a new spend request with `credential_type: "shared_payment_token"` \u2014 do not retry with the same spend request ID |\n| `context` validation error on `spend-request create` | `context` field is under 100 characters | Rewrite `context` as a full sentence explaining what is being purchased and why; the user reads this when approving |\n| API rejects `merchant_name` or `merchant_url` | These fields are forbidden when `credential_type` is `shared_payment_token` | Remove both fields from the request; SPT flows identify the merchant via `network_id` instead |\n| Command hangs indefinitely | `auth login` or `spend-request create` run synchronously | Always run these commands with `run_in_background=true` \u2014 they block until the user acts, so synchronous execution freezes the agent |\n| Spend request approved but payment fails immediately | Wrong credential type for the merchant (e.g. `card` on a 402-only endpoint) | Go back to Step 2, re-evaluate the merchant, create a new spend request with the correct `credential_type` |\n| Auth token expired mid-session (exit code 1 during approval polling) | Token refresh failure during background polling | Re-authenticate with `auth login`, then retrieve the existing spend request or resume polling. Only create a new spend request if the original one expired, was denied, or its shared payment token was already consumed |\n\n## Further docs\n\n- MPP/x402 protocol: https://mpp.dev/protocol.md, https://mpp.dev/protocol/http-402.md, https://mpp.dev/protocol/challenges.md\n- Link: https://link.com/agents\n- Link App (for account management): https://app.link.com\n- Link support (if the user needs help with Link): https://support.link.com/topics/about-link\n';
-    try {
-      const version = `${"0.1.2"}+${"1"}`;
-      content = '---\nname: create-payment-credential\ndescription: |\n  Gets secure, one-time-use payment credentials (cards, tokens) from a Link wallet so agents can complete purchases on behalf of users. Use when the user says "get me a card", "buy something", "pay for X", "make a purchase", "I need to pay", "complete checkout", or asks to transact on any merchant site. Use when the user asks to connect or log in to or sign up for their Link account.\nallowed-tools:\n - Bash(link-cli:*)\n - Bash(npx:*)\n - Bash(npm:*)\nlicense: Complete terms in LICENSE\nmetadata:\n  author: stripe\n  url: link.com/agents\n  openclaw:\n    emoji: "\u{1F4B3}"\n    homepage: https://link.com/agents\n    requires:\n      bins:\n        - link-cli\n    install:\n      - kind: node\n        package: "@stripe/link-cli"\n        bins: [link-cli]\nuser-invocable: true\n---\n\n# Creating Payment Credentials\n\nUse the Link CLI to get secure, one-time-use payment credentials from a Link wallet to complete purchases.\n\n## Installation\n\nInstall the CLI with\n\n```bash\nnpm install -g @stripe/link-cli\n```\n\nInstall the skill file with\n\n```bash\nnpx skills add stripe/link-cli\n```\n\n## Running commands\n\nAll commands support `--output-json` for machine-readable output. Use `--json` to pass structured input. Always run `link-cli <command> --help` before running the command to see full schema details, including all fields, types, and constraints.\n\nIMPORTANT: Run `auth login`, `spend-request create`, and `spend-request request-approval` with `run_in_background=true` (or `TaskOutput(task_id, block: false)`). These commands emit JSON to stdout before they exit, then keep running while they poll for user action.\n\nThe JSON stream contract for these long-running commands is:\n\n- `auth login --output-json`: first object contains `verification_url` and `passphrase`; final object contains authentication result after approval succeeds\n- `spend-request create --request-approval --output-json`: first object is the created spend request; final object is the terminal spend request after polling completes\n- `spend-request request-approval --output-json`: first object contains the approval link; final object is the terminal spend request after polling completes\n\nAlways keep reading stdout until the process exits. Do not assume the first JSON object is the full result. The user MUST visit the verification or approval URL to continue, and you should always show that full URL in clear text.\n\n## Core flow\n\nCopy this checklist and track progress:\n\n- Step 1: Authenticate with Link\n- Step 2: Evaluate merchant site (determine credential type)\n- Step 3: Get payment methods\n- Step 4: Create spend request with correct credential type\n- Step 5: Complete payment\n\n### Step 1: Authenticate with Link\n\nCheck auth status:\n\n```bash\nlink-cli auth status --output-json\n```\n\nIf not authenticated:\n\n```bash\nlink-cli auth login --client-name "<your-agent-name>" --output-json\n```\n\nReplace `<your-agent-name>` with the name of your agent or application (e.g. `"Personal Assistant", "Shopping Bot"`). This name appears in the user\'s Link app when they approve the connection. Use a clear, unique, identifiable name. Display the url and passphase to the user, with the guidance "Please visit the following URL to approve secure access to Link.\u201D\n\nDO NOT PROCEED until the user is authenticated with Link.\n\nAlways check the current authentication status before starting a new login flow - the user may already be logged in.\n\n### Step 2: Evaluate the merchant site BEFORE creating a spend request\n\n**CRITICAL \u2014 You MUST complete this step before calling `spend-request create`.** Do NOT default to `card` credential type. The merchant determines the credential type \u2014 you cannot know it without checking first. Skipping this step will produce a spend request with the wrong credential type.\n\nDetermine how the merchant accepts payment:\n\n1. **Navigate to the merchant page** \u2014 browse it, read the page content, and understand how the site accepts payment.\n2. **If the page has a credit card form, Stripe Elements, or traditional checkout UI** \u2014 use `card`.\n3. **If the page describes an API or programmatic payment flow** \u2014 make a request to the relevant endpoint. If it returns **HTTP 402** with a `www-authenticate` header, use `shared_payment_token`.\n\nWhat you find determines which credential type to use:\n\n| What you see | Credential type | What to request |\n|---|---|---|\n| Credit card form / Stripe Elements | `card` (default) | Card |\n| HTTP 402 with `method="stripe"` in `www-authenticate` | `shared_payment_token` | Shared payment token (SPT) |\n| HTTP 402 without `method="stripe"` in `www-authenticate` | not supported | Do not continue |\n\n**For 402 responses:** The `www-authenticate` header may contain **multiple** payment challenges (e.g. `tempo`, `stripe`) in a single header value. Do not try to decode the payload manually. Pass the **full raw `WWW-Authenticate` header value** to Link CLI and let `mpp decode` select and validate the `method="stripe"` challenge.\n\nTo derive `network_id`, use Link CLI\'s challenge decoder:\n\n```bash\nlink-cli mpp decode --challenge \'<raw WWW-Authenticate header>\' --output-json\n```\n\nThis validates the Stripe challenge, decodes the `request` payload, and returns both the extracted `network_id` and the decoded request JSON. Pass the full header exactly as received, even if it also contains non-Stripe or multiple `Payment` challenges.\n\n### Step 3: Get payment methods\n\nUse the default payment method, unless the user explicitly asks to select a different one.\n\n```bash\nlink-cli payment-methods list --output-json\n```\n\n### Step 4: Create the spend request with the right credential type\n\n```bash\nlink-cli spend-request create --json "{request}" --output-json\n```\n\nWait until the user has approved the spend request. If they deny, ask for clarification what to do next.\n\nRecommend the user approves with the [Link app](https://link.com/download). Show the download URL.\n\n**Test mode:** Add `"test": true` to the JSON input (or `--test` flag) to create testmode credentials instead of real ones. Useful for development and integration testing.\n\n### Step 5: Complete payment\n\n**Card:** Run `link-cli spend-request retrieve <id> --include card --output-json` to get the `card` object with `number`, `cvc`, `exp_month`, `exp_year`, `billing_address` (name, line1, line2, city, state, postal_code, country), and `valid_until` (unix timestamp \u2014 the card stops working after this time). Enter these details into the merchant\'s checkout form.\n\n**SPT with 402 flow:** The SPT is **one-time use** \u2014 if the payment fails, you need a new spend request and new SPT.\n\n```bash\nlink-cli mpp pay <url> --spend-request-id <id> [--method POST] [--data \'{"amount":100}\'] [--header \'Name: Value\'] --output-json\n```\n\n`mpp pay` handles the full 402 flow automatically: probes the URL, parses the `www-authenticate` header, builds the `Authorization: Payment` credential using the SPT, and retries.\n\n\n## Important\n\n- Treat the user\'s payment methods and credentials extremely carefully \u2014 card numbers and SPTs grant real spending power; leaking them outside a secure checkout could result in unauthorized charges the user cannot reverse.\n- Respect `/agents.txt` and `/llm.txt` and other directives on sites you browse \u2014 these files declare whether the site permits automated agent interactions; ignoring them may violate the merchant\'s terms.\n- Avoid suspicious merchants, checkout pages and websites \u2014 phishing pages that mimic legitimate merchants can steal credentials; if anything about the page feels off (mismatched domain, unusual redirect, unexpected login prompt), stop and ask the user to verify.\n- When outputting card information to the user apply basic masking to the card number and address to protect their information. Only reveal the raw values if directly requested to do so.\n\n## Errors\n\nAll errors go to stderr as `{"error": "..."}` with exit code 1.\n\n### Common errors and recovery\n\n| Error / Symptom | Cause | Recovery |\n|---|---|---|\n| `verification-failed` in error body from `mpp pay` | SPT was already consumed (one-time use) | Create a new spend request with `credential_type: "shared_payment_token"` \u2014 do not retry with the same spend request ID |\n| `context` validation error on `spend-request create` | `context` field is under 100 characters | Rewrite `context` as a full sentence explaining what is being purchased and why; the user reads this when approving |\n| API rejects `merchant_name` or `merchant_url` | These fields are forbidden when `credential_type` is `shared_payment_token` | Remove both fields from the request; SPT flows identify the merchant via `network_id` instead |\n| Command hangs indefinitely | `auth login` or `spend-request create` run synchronously | Always run these commands with `run_in_background=true` \u2014 they block until the user acts, so synchronous execution freezes the agent |\n| Spend request approved but payment fails immediately | Wrong credential type for the merchant (e.g. `card` on a 402-only endpoint) | Go back to Step 2, re-evaluate the merchant, create a new spend request with the correct `credential_type` |\n| Auth token expired mid-session (exit code 1 during approval polling) | Token refresh failure during background polling | Re-authenticate with `auth login`, then retrieve the existing spend request or resume polling. Only create a new spend request if the original one expired, was denied, or its shared payment token was already consumed |\n\n## Further docs\n\n- MPP/x402 protocol: https://mpp.dev/protocol.md, https://mpp.dev/protocol/http-402.md, https://mpp.dev/protocol/challenges.md\n- Link: https://link.com/agents\n- Link App (for account management): https://app.link.com\n- Link support (if the user needs help with Link): https://support.link.com/topics/about-link\n'.replace(
-        "---\n",
-        `---
-cli_version: "${version}"
-`
-      );
-    } catch {
-      process.stderr.write(
-        "Warning: could not resolve cli_version \u2014 skill output without version\n"
-      );
+  cli2.command("add", {
+    description: "Open the Link wallet to add a new payment method",
+    outputPolicy: "agent-only",
+    async run(c) {
+      if (!storage.isAuthenticated()) {
+        return c.error({
+          code: "NOT_AUTHENTICATED",
+          message: 'Not authenticated. Run "link-cli auth login" first.',
+          cta: {
+            commands: [
+              { command: "auth login", description: "Log in to Link" }
+            ]
+          }
+        });
+      }
+      if (!c.agent && !c.formatExplicit) {
+        return new Promise((resolve) => {
+          const { waitUntilExit } = render3(/* @__PURE__ */ jsx9(AddPaymentMethod, {}));
+          waitUntilExit().then(() => resolve({ url: WALLET_URL }));
+        });
+      }
+      return { url: WALLET_URL };
     }
   });
+  return cli2;
 }
 
-// src/utils/poll-until-approved.ts
-function pollUntilApproved(repository, id, options = {}) {
-  const pollIntervalMs = options.pollIntervalMs ?? 2e3;
-  const timeoutMs = options.timeoutMs ?? 3e5;
-  const startTime = Date.now();
-  const poll = async () => {
-    const elapsed = Date.now() - startTime;
-    if (elapsed > timeoutMs) {
-      throw new Error("Approval polling timed out");
-    }
-    const request = await repository.getSpendRequest(id);
-    if (!request) {
-      throw new Error(`Spend request ${id} not found`);
-    }
-    if (request.status !== "created" && request.status !== "pending_approval") {
-      return request;
+// src/commands/spend-request/index.tsx
+import { Cli as Cli4, z as z6 } from "incur";
+import { render as render4 } from "ink";
+
+// src/utils/line-item-parser.ts
+import { z as z4 } from "zod";
+var LineItemSchema = z4.object({
+  name: z4.string(),
+  url: z4.string().optional(),
+  image_url: z4.string().optional(),
+  description: z4.string().optional(),
+  sku: z4.string().optional(),
+  quantity: z4.coerce.number().optional(),
+  unit_amount: z4.coerce.number().optional(),
+  product_url: z4.string().optional()
+}).strict();
+var TotalSchema = z4.object({
+  type: z4.string(),
+  display_text: z4.string(),
+  amount: z4.coerce.number()
+}).strict();
+function parseKvString(raw) {
+  const result = {};
+  for (const pair of raw.split(",")) {
+    const idx = pair.indexOf(":");
+    if (idx === -1) {
+      throw new Error(`Invalid field (missing ':'): ${pair}`);
     }
-    options.onProgress?.(Math.floor(elapsed / 1e3));
-    await new Promise((r) => setTimeout(r, pollIntervalMs));
-    return poll();
-  };
-  return poll();
+    result[pair.slice(0, idx).trim()] = pair.slice(idx + 1).trim();
+  }
+  return result;
+}
+function formatZodError(err, prefix) {
+  const messages = err.issues.map((issue) => {
+    const key = issue.path[0]?.toString();
+    return key ? `${prefix} ${key}: ${issue.message}` : `${prefix}: ${issue.message}`;
+  });
+  return new Error(messages.join("\n"));
+}
+function parseLineItemFlag(raw) {
+  const obj = parseKvString(raw);
+  try {
+    return LineItemSchema.parse(obj);
+  } catch (err) {
+    if (err instanceof z4.ZodError) throw formatZodError(err, "Line item");
+    throw err;
+  }
+}
+function parseTotalFlag(raw) {
+  const obj = parseKvString(raw);
+  try {
+    return TotalSchema.parse(obj);
+  } catch (err) {
+    if (err instanceof z4.ZodError) throw formatZodError(err, "Total");
+    throw err;
+  }
 }
 
 // src/commands/spend-request/create.tsx
-import { Box as Box10, Text as Text10 } from "ink";
+import { Box as Box9, Text as Text9 } from "ink";
 import Spinner5 from "ink-spinner";
-import { useCallback, useEffect as useEffect7, useState as useState6 } from "react";
+import { useCallback, useEffect as useEffect6, useState as useState5 } from "react";
 
 // src/commands/spend-request/app-download-qr-codes.tsx
-import { Box as Box8, Text as Text8 } from "ink";
+import { Box as Box7, Text as Text7 } from "ink";
 import { useMemo } from "react";
 
 // src/utils/render-qr-matrix.ts
@@ -12560,32 +12256,32 @@ function renderQrMatrix(url) {
 }
 
 // src/commands/spend-request/app-download-qr-codes.tsx
-import { jsx as jsx11, jsxs as jsxs7 } from "react/jsx-runtime";
+import { jsx as jsx10, jsxs as jsxs6 } from "react/jsx-runtime";
 var DOWNLOAD_URL = "https://link.com/download";
 var AppDownloadQrCodes = () => {
   const qrLines = useMemo(() => renderQrMatrix(DOWNLOAD_URL), []);
-  return /* @__PURE__ */ jsxs7(Box8, { flexDirection: "column", marginTop: 1, children: [
-    /* @__PURE__ */ jsx11(Text8, { dimColor: true, children: "New! Get the Link app to approve spend requests easily" }),
-    /* @__PURE__ */ jsxs7(Box8, { flexDirection: "column", alignItems: "flex-start", marginTop: 1, children: [
+  return /* @__PURE__ */ jsxs6(Box7, { flexDirection: "column", marginTop: 1, children: [
+    /* @__PURE__ */ jsx10(Text7, { dimColor: true, children: "New! Get the Link app to approve spend requests easily" }),
+    /* @__PURE__ */ jsxs6(Box7, { flexDirection: "column", alignItems: "flex-start", marginTop: 1, children: [
       qrLines.map((line, i) => (
         // biome-ignore lint/suspicious/noArrayIndexKey: stable static array
-        /* @__PURE__ */ jsx11(Text8, { children: line }, i)
+        /* @__PURE__ */ jsx10(Text7, { children: line }, i)
       )),
-      /* @__PURE__ */ jsx11(Text8, { dimColor: true, children: DOWNLOAD_URL })
+      /* @__PURE__ */ jsx10(Text7, { dimColor: true, children: DOWNLOAD_URL })
     ] })
   ] });
 };
 
 // src/commands/spend-request/approval-waiting-view.tsx
-import { Box as Box9, Text as Text9 } from "ink";
+import { Box as Box8, Text as Text8 } from "ink";
 import Spinner4 from "ink-spinner";
-import { jsx as jsx12, jsxs as jsxs8 } from "react/jsx-runtime";
+import { jsx as jsx11, jsxs as jsxs7 } from "react/jsx-runtime";
 var ApprovalWaitingView = ({
   status,
   approvalUrl
-}) => /* @__PURE__ */ jsxs8(Box9, { flexDirection: "column", paddingY: 1, children: [
-  /* @__PURE__ */ jsxs8(
-    Box9,
+}) => /* @__PURE__ */ jsxs7(Box8, { flexDirection: "column", paddingY: 1, children: [
+  /* @__PURE__ */ jsxs7(
+    Box8,
     {
       flexDirection: "column",
       borderStyle: "round",
@@ -12593,25 +12289,51 @@ var ApprovalWaitingView = ({
       paddingX: 2,
       paddingY: 1,
       children: [
-        /* @__PURE__ */ jsxs8(Text9, { children: [
+        /* @__PURE__ */ jsxs7(Text8, { children: [
           "Approve at:",
           " ",
-          /* @__PURE__ */ jsx12(Text9, { bold: true, color: "cyan", children: approvalUrl })
+          /* @__PURE__ */ jsx11(Text8, { bold: true, color: "cyan", children: approvalUrl })
         ] }),
-        /* @__PURE__ */ jsx12(Text9, { dimColor: true, children: "Press Enter to open in browser" })
+        /* @__PURE__ */ jsx11(Text8, { dimColor: true, children: "Press Enter to open in browser" })
       ]
     }
   ),
-  /* @__PURE__ */ jsx12(AppDownloadQrCodes, {}),
-  /* @__PURE__ */ jsx12(Box9, { marginTop: 1, children: status === "polling" ? /* @__PURE__ */ jsxs8(Text9, { color: "cyan", children: [
-    /* @__PURE__ */ jsx12(Spinner4, { type: "dots" }),
+  /* @__PURE__ */ jsx11(AppDownloadQrCodes, {}),
+  /* @__PURE__ */ jsx11(Box8, { marginTop: 1, children: status === "polling" ? /* @__PURE__ */ jsxs7(Text8, { color: "cyan", children: [
+    /* @__PURE__ */ jsx11(Spinner4, { type: "dots" }),
     " Waiting for approval..."
-  ] }) : /* @__PURE__ */ jsx12(Text9, { dimColor: true, children: "Waiting..." }) })
+  ] }) : /* @__PURE__ */ jsx11(Text8, { dimColor: true, children: "Waiting..." }) })
 ] });
 
 // src/commands/spend-request/use-approval-polling.ts
 import { useInput as useInput3 } from "ink";
-import { useEffect as useEffect6 } from "react";
+import { useEffect as useEffect5 } from "react";
+
+// src/utils/poll-until-approved.ts
+function pollUntilApproved(repository, id, options = {}) {
+  const pollIntervalMs = options.pollIntervalMs ?? 2e3;
+  const timeoutMs = options.timeoutMs ?? 3e5;
+  const startTime = Date.now();
+  const poll = async () => {
+    const elapsed = Date.now() - startTime;
+    if (elapsed > timeoutMs) {
+      throw new Error("Approval polling timed out");
+    }
+    const request = await repository.getSpendRequest(id);
+    if (!request) {
+      throw new Error(`Spend request ${id} not found`);
+    }
+    if (request.status !== "created" && request.status !== "pending_approval") {
+      return request;
+    }
+    options.onProgress?.(Math.floor(elapsed / 1e3));
+    await new Promise((r) => setTimeout(r, pollIntervalMs));
+    return poll();
+  };
+  return poll();
+}
+
+// src/commands/spend-request/use-approval-polling.ts
 function useApprovalPolling({
   status,
   setStatus,
@@ -12629,12 +12351,12 @@ function useApprovalPolling({
     },
     { isActive: isWaiting }
   );
-  useEffect6(() => {
+  useEffect5(() => {
     if (status !== "waiting") return;
     const timeout = setTimeout(() => setStatus("polling"), 1e3);
     return () => clearTimeout(timeout);
   }, [status, setStatus]);
-  useEffect6(() => {
+  useEffect5(() => {
     if (status !== "polling" || !requestId) return;
     let cancelled = false;
     const poll = async () => {
@@ -12668,16 +12390,16 @@ function useApprovalPolling({
 }
 
 // src/commands/spend-request/create.tsx
-import { Fragment, jsx as jsx13, jsxs as jsxs9 } from "react/jsx-runtime";
+import { Fragment, jsx as jsx12, jsxs as jsxs8 } from "react/jsx-runtime";
 var CreateSpendRequest = ({
   repository,
   params,
   requestApproval = false,
   onComplete
 }) => {
-  const [status, setStatus] = useState6("creating");
-  const [request, setRequest] = useState6(null);
-  const [error, setError] = useState6("");
+  const [status, setStatus] = useState5("creating");
+  const [request, setRequest] = useState5(null);
+  const [error, setError] = useState5("");
   const approvalUrl = request?.approval_url ?? "";
   const onSuccess = useCallback(
     (result) => setRequest(result),
@@ -12694,7 +12416,7 @@ var CreateSpendRequest = ({
     onSuccess,
     onError
   });
-  useEffect7(() => {
+  useEffect6(() => {
     const create = async () => {
       try {
         const result = await repository.createSpendRequest(params);
@@ -12714,57 +12436,57 @@ var CreateSpendRequest = ({
     create();
   }, [repository, params, requestApproval, onComplete]);
   if (status === "creating") {
-    return /* @__PURE__ */ jsx13(Box10, { children: /* @__PURE__ */ jsxs9(Text10, { color: "cyan", children: [
-      /* @__PURE__ */ jsx13(Spinner5, { type: "dots" }),
+    return /* @__PURE__ */ jsx12(Box9, { children: /* @__PURE__ */ jsxs8(Text9, { color: "cyan", children: [
+      /* @__PURE__ */ jsx12(Spinner5, { type: "dots" }),
       " Creating spend request..."
     ] }) });
   }
   if (status === "error") {
-    return /* @__PURE__ */ jsxs9(Box10, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx13(Text10, { color: "red", children: "\u2717 Failed to create spend request" }),
-      /* @__PURE__ */ jsx13(Text10, { color: "red", children: error })
+    return /* @__PURE__ */ jsxs8(Box9, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx12(Text9, { color: "red", children: "\u2717 Failed to create spend request" }),
+      /* @__PURE__ */ jsx12(Text9, { color: "red", children: error })
     ] });
   }
   if (status === "success") {
-    return /* @__PURE__ */ jsxs9(Box10, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx13(Text10, { color: "green", children: "\u2713 Spend request created" }),
-      /* @__PURE__ */ jsxs9(Box10, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-        /* @__PURE__ */ jsxs9(Text10, { children: [
+    return /* @__PURE__ */ jsxs8(Box9, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx12(Text9, { color: "green", children: "\u2713 Spend request created" }),
+      /* @__PURE__ */ jsxs8(Box9, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+        /* @__PURE__ */ jsxs8(Text9, { children: [
           "ID: ",
-          /* @__PURE__ */ jsx13(Text10, { bold: true, children: request?.id })
+          /* @__PURE__ */ jsx12(Text9, { bold: true, children: request?.id })
         ] }),
-        /* @__PURE__ */ jsxs9(Text10, { children: [
+        /* @__PURE__ */ jsxs8(Text9, { children: [
           "Status: ",
-          /* @__PURE__ */ jsx13(Text10, { bold: true, children: request?.status })
+          /* @__PURE__ */ jsx12(Text9, { bold: true, children: request?.status })
         ] }),
-        /* @__PURE__ */ jsxs9(Text10, { children: [
+        /* @__PURE__ */ jsxs8(Text9, { children: [
           "Amount:",
           " ",
-          /* @__PURE__ */ jsx13(Text10, { bold: true, children: (() => {
+          /* @__PURE__ */ jsx12(Text9, { bold: true, children: (() => {
             const t = request?.totals.find((t2) => t2.type === "total");
             return t ? String(t.amount) : "N/A";
           })() })
         ] }),
-        /* @__PURE__ */ jsxs9(Text10, { children: [
+        /* @__PURE__ */ jsxs8(Text9, { children: [
           "Merchant: ",
-          /* @__PURE__ */ jsx13(Text10, { bold: true, children: request?.merchant_name })
+          /* @__PURE__ */ jsx12(Text9, { bold: true, children: request?.merchant_name })
         ] }),
-        /* @__PURE__ */ jsxs9(Text10, { children: [
+        /* @__PURE__ */ jsxs8(Text9, { children: [
           "Line Items:",
           " ",
-          /* @__PURE__ */ jsx13(Text10, { bold: true, children: request?.line_items.map((li) => li.name).join(", ") || "N/A" })
+          /* @__PURE__ */ jsx12(Text9, { bold: true, children: request?.line_items.map((li) => li.name).join(", ") || "N/A" })
         ] })
       ] }),
-      /* @__PURE__ */ jsx13(AppDownloadQrCodes, {})
+      /* @__PURE__ */ jsx12(AppDownloadQrCodes, {})
     ] });
   }
-  return /* @__PURE__ */ jsxs9(Fragment, { children: [
-    /* @__PURE__ */ jsx13(Box10, { children: /* @__PURE__ */ jsxs9(Text10, { color: "green", children: [
+  return /* @__PURE__ */ jsxs8(Fragment, { children: [
+    /* @__PURE__ */ jsx12(Box9, { children: /* @__PURE__ */ jsxs8(Text9, { color: "green", children: [
       "\u2713 Spend request created (ID: ",
-      /* @__PURE__ */ jsx13(Text10, { bold: true, children: request?.id }),
+      /* @__PURE__ */ jsx12(Text9, { bold: true, children: request?.id }),
       ")"
     ] }) }),
-    /* @__PURE__ */ jsx13(
+    /* @__PURE__ */ jsx12(
       ApprovalWaitingView,
       {
         status,
@@ -12775,19 +12497,19 @@ var CreateSpendRequest = ({
 };
 
 // src/commands/spend-request/request-approval.tsx
-import { Box as Box11, Text as Text11 } from "ink";
+import { Box as Box10, Text as Text10 } from "ink";
 import Spinner6 from "ink-spinner";
-import { useCallback as useCallback2, useEffect as useEffect8, useState as useState7 } from "react";
-import { jsx as jsx14, jsxs as jsxs10 } from "react/jsx-runtime";
+import { useCallback as useCallback2, useEffect as useEffect7, useState as useState6 } from "react";
+import { jsx as jsx13, jsxs as jsxs9 } from "react/jsx-runtime";
 var RequestApproval = ({
   repository,
   id,
   onComplete
 }) => {
-  const [status, setStatus] = useState7("requesting");
-  const [approvalUrl, setApprovalUrl] = useState7("");
-  const [result, setResult] = useState7(null);
-  const [error, setError] = useState7("");
+  const [status, setStatus] = useState6("requesting");
+  const [approvalUrl, setApprovalUrl] = useState6("");
+  const [result, setResult] = useState6(null);
+  const [error, setError] = useState6("");
   const onSuccess = useCallback2((r) => setResult(r), []);
   const onError = useCallback2((msg) => setError(msg), []);
   useApprovalPolling({
@@ -12800,7 +12522,7 @@ var RequestApproval = ({
     onSuccess,
     onError
   });
-  useEffect8(() => {
+  useEffect7(() => {
     const request = async () => {
       try {
         const res = await repository.requestApproval(id);
@@ -12814,45 +12536,45 @@ var RequestApproval = ({
     request();
   }, [repository, id]);
   if (status === "requesting") {
-    return /* @__PURE__ */ jsx14(Box11, { children: /* @__PURE__ */ jsxs10(Text11, { color: "cyan", children: [
-      /* @__PURE__ */ jsx14(Spinner6, { type: "dots" }),
+    return /* @__PURE__ */ jsx13(Box10, { children: /* @__PURE__ */ jsxs9(Text10, { color: "cyan", children: [
+      /* @__PURE__ */ jsx13(Spinner6, { type: "dots" }),
       " Requesting approval..."
     ] }) });
   }
   if (status === "error") {
-    return /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx14(Text11, { color: "red", children: "\u2717 Failed to request approval" }),
-      /* @__PURE__ */ jsx14(Text11, { color: "red", children: error })
+    return /* @__PURE__ */ jsxs9(Box10, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx13(Text10, { color: "red", children: "\u2717 Failed to request approval" }),
+      /* @__PURE__ */ jsx13(Text10, { color: "red", children: error })
     ] });
   }
   if (status === "success") {
-    return /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx14(Text11, { color: "green", children: "\u2713 Approval completed" }),
-      /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-        /* @__PURE__ */ jsxs10(Text11, { children: [
+    return /* @__PURE__ */ jsxs9(Box10, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx13(Text10, { color: "green", children: "\u2713 Approval completed" }),
+      /* @__PURE__ */ jsxs9(Box10, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+        /* @__PURE__ */ jsxs9(Text10, { children: [
           "ID: ",
-          /* @__PURE__ */ jsx14(Text11, { bold: true, children: result?.id })
+          /* @__PURE__ */ jsx13(Text10, { bold: true, children: result?.id })
         ] }),
-        /* @__PURE__ */ jsxs10(Text11, { children: [
+        /* @__PURE__ */ jsxs9(Text10, { children: [
           "Status: ",
-          /* @__PURE__ */ jsx14(Text11, { bold: true, children: result?.status })
+          /* @__PURE__ */ jsx13(Text10, { bold: true, children: result?.status })
         ] }),
-        /* @__PURE__ */ jsxs10(Text11, { children: [
+        /* @__PURE__ */ jsxs9(Text10, { children: [
           "Amount:",
           " ",
-          /* @__PURE__ */ jsx14(Text11, { bold: true, children: (() => {
+          /* @__PURE__ */ jsx13(Text10, { bold: true, children: (() => {
             const t = result?.totals.find((t2) => t2.type === "total");
             return t ? String(t.amount) : "N/A";
           })() })
         ] }),
-        /* @__PURE__ */ jsxs10(Text11, { children: [
+        /* @__PURE__ */ jsxs9(Text10, { children: [
           "Merchant: ",
-          /* @__PURE__ */ jsx14(Text11, { bold: true, children: result?.merchant_name })
+          /* @__PURE__ */ jsx13(Text10, { bold: true, children: result?.merchant_name })
         ] })
       ] })
     ] });
   }
-  return /* @__PURE__ */ jsx14(
+  return /* @__PURE__ */ jsx13(
     ApprovalWaitingView,
     {
       status,
@@ -12862,10 +12584,10 @@ var RequestApproval = ({
 };
 
 // src/commands/spend-request/retrieve.tsx
-import { Box as Box12, Text as Text12 } from "ink";
+import { Box as Box11, Text as Text11 } from "ink";
 import Spinner7 from "ink-spinner";
-import { useEffect as useEffect9, useRef, useState as useState8 } from "react";
-import { jsx as jsx15, jsxs as jsxs11 } from "react/jsx-runtime";
+import { useEffect as useEffect8, useRef, useState as useState7 } from "react";
+import { jsx as jsx14, jsxs as jsxs10 } from "react/jsx-runtime";
 var RetrieveSpendRequest = ({
   repository,
   id,
@@ -12873,20 +12595,20 @@ var RetrieveSpendRequest = ({
   include,
   onComplete
 }) => {
-  const [phase, setPhase] = useState8("fetching");
-  const [request, setRequest] = useState8(null);
-  const [error, setError] = useState8("");
-  const [elapsed, setElapsed] = useState8(0);
+  const [phase, setPhase] = useState7("fetching");
+  const [request, setRequest] = useState7(null);
+  const [error, setError] = useState7("");
+  const [elapsed, setElapsed] = useState7(0);
   const startTimeRef = useRef(Date.now());
   const pollRef = useRef(null);
   const timerRef = useRef(null);
-  useEffect9(() => {
+  useEffect8(() => {
     return () => {
       if (pollRef.current) clearInterval(pollRef.current);
       if (timerRef.current) clearInterval(timerRef.current);
     };
   }, []);
-  useEffect9(() => {
+  useEffect8(() => {
     const fetch2 = async () => {
       try {
         const result = await repository.getSpendRequest(id, { include });
@@ -12915,7 +12637,7 @@ var RetrieveSpendRequest = ({
     };
     fetch2();
   }, [repository, id, include, onComplete]);
-  useEffect9(() => {
+  useEffect8(() => {
     if (phase !== "polling") return;
     timerRef.current = setInterval(() => {
       const secs = Math.floor((Date.now() - startTimeRef.current) / 1e3);
@@ -12954,170 +12676,170 @@ var RetrieveSpendRequest = ({
     };
   }, [phase, repository, id, include, timeout, onComplete]);
   if (phase === "fetching") {
-    return /* @__PURE__ */ jsx15(Box12, { children: /* @__PURE__ */ jsxs11(Text12, { color: "cyan", children: [
-      /* @__PURE__ */ jsx15(Spinner7, { type: "dots" }),
+    return /* @__PURE__ */ jsx14(Box11, { children: /* @__PURE__ */ jsxs10(Text11, { color: "cyan", children: [
+      /* @__PURE__ */ jsx14(Spinner7, { type: "dots" }),
       " Retrieving spend request ",
       id,
       "..."
     ] }) });
   }
   if (phase === "error") {
-    return /* @__PURE__ */ jsx15(Box12, { flexDirection: "column", children: /* @__PURE__ */ jsxs11(Text12, { color: "red", children: [
+    return /* @__PURE__ */ jsx14(Box11, { flexDirection: "column", children: /* @__PURE__ */ jsxs10(Text11, { color: "red", children: [
       "\u2717 ",
       error
     ] }) });
   }
   if (phase === "timeout") {
-    return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs11(Text12, { color: "yellow", children: [
+    return /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs10(Text11, { color: "yellow", children: [
         "\u2717 Timed out waiting for approval after ",
         timeout,
         "s"
       ] }),
-      request && /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-        /* @__PURE__ */ jsxs11(Text12, { children: [
+      request && /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+        /* @__PURE__ */ jsxs10(Text11, { children: [
           "ID: ",
-          /* @__PURE__ */ jsx15(Text12, { bold: true, children: request.id })
+          /* @__PURE__ */ jsx14(Text11, { bold: true, children: request.id })
         ] }),
-        /* @__PURE__ */ jsxs11(Text12, { children: [
+        /* @__PURE__ */ jsxs10(Text11, { children: [
           "Status: ",
-          /* @__PURE__ */ jsx15(Text12, { bold: true, children: request.status })
+          /* @__PURE__ */ jsx14(Text11, { bold: true, children: request.status })
         ] })
       ] })
     ] });
   }
   if (phase === "polling") {
-    return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx15(Box12, { children: /* @__PURE__ */ jsxs11(Text12, { color: "cyan", children: [
-        /* @__PURE__ */ jsx15(Spinner7, { type: "dots" }),
+    return /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx14(Box11, { children: /* @__PURE__ */ jsxs10(Text11, { color: "cyan", children: [
+        /* @__PURE__ */ jsx14(Spinner7, { type: "dots" }),
         " Awaiting approval... (",
         elapsed,
         "s elapsed)"
       ] }) }),
-      request?.approval_url && /* @__PURE__ */ jsx15(Box12, { marginTop: 1, paddingX: 2, children: /* @__PURE__ */ jsxs11(Text12, { dimColor: true, children: [
+      request?.approval_url && /* @__PURE__ */ jsx14(Box11, { marginTop: 1, paddingX: 2, children: /* @__PURE__ */ jsxs10(Text11, { dimColor: true, children: [
         "Approval URL: ",
-        /* @__PURE__ */ jsx15(Text12, { color: "cyan", children: request.approval_url })
+        /* @__PURE__ */ jsx14(Text11, { color: "cyan", children: request.approval_url })
       ] }) })
     ] });
   }
   if (phase === "declined") {
-    return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx15(Text12, { color: "red", children: "\u2717 Spend request declined" }),
-      /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-        /* @__PURE__ */ jsxs11(Text12, { children: [
+    return /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx14(Text11, { color: "red", children: "\u2717 Spend request declined" }),
+      /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+        /* @__PURE__ */ jsxs10(Text11, { children: [
           "ID: ",
-          /* @__PURE__ */ jsx15(Text12, { bold: true, children: request?.id })
+          /* @__PURE__ */ jsx14(Text11, { bold: true, children: request?.id })
         ] }),
-        /* @__PURE__ */ jsxs11(Text12, { children: [
+        /* @__PURE__ */ jsxs10(Text11, { children: [
           "Status:",
           " ",
-          /* @__PURE__ */ jsx15(Text12, { bold: true, color: "red", children: request?.status })
+          /* @__PURE__ */ jsx14(Text11, { bold: true, color: "red", children: request?.status })
         ] }),
-        /* @__PURE__ */ jsxs11(Text12, { children: [
+        /* @__PURE__ */ jsxs10(Text11, { children: [
           "Amount:",
           " ",
-          /* @__PURE__ */ jsx15(Text12, { bold: true, children: (() => {
+          /* @__PURE__ */ jsx14(Text11, { bold: true, children: (() => {
             const t = request?.totals.find((t2) => t2.type === "total");
             return t ? String(t.amount) : "N/A";
           })() })
         ] }),
-        /* @__PURE__ */ jsxs11(Text12, { children: [
+        /* @__PURE__ */ jsxs10(Text11, { children: [
           "Merchant: ",
-          /* @__PURE__ */ jsx15(Text12, { bold: true, children: request?.merchant_name })
+          /* @__PURE__ */ jsx14(Text11, { bold: true, children: request?.merchant_name })
         ] })
       ] })
     ] });
   }
-  return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx15(Text12, { color: "green", children: "\u2713 Spend request approved" }),
-    /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-      /* @__PURE__ */ jsxs11(Text12, { children: [
+  return /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx14(Text11, { color: "green", children: "\u2713 Spend request approved" }),
+    /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+      /* @__PURE__ */ jsxs10(Text11, { children: [
         "ID: ",
-        /* @__PURE__ */ jsx15(Text12, { bold: true, children: request?.id })
+        /* @__PURE__ */ jsx14(Text11, { bold: true, children: request?.id })
       ] }),
-      /* @__PURE__ */ jsxs11(Text12, { children: [
+      /* @__PURE__ */ jsxs10(Text11, { children: [
         "Status:",
         " ",
-        /* @__PURE__ */ jsx15(Text12, { bold: true, color: "green", children: request?.status })
+        /* @__PURE__ */ jsx14(Text11, { bold: true, color: "green", children: request?.status })
       ] }),
-      /* @__PURE__ */ jsxs11(Text12, { children: [
+      /* @__PURE__ */ jsxs10(Text11, { children: [
         "Amount:",
         " ",
-        /* @__PURE__ */ jsx15(Text12, { bold: true, children: (() => {
+        /* @__PURE__ */ jsx14(Text11, { bold: true, children: (() => {
           const t = request?.totals.find((t2) => t2.type === "total");
           return t ? String(t.amount) : "N/A";
         })() })
       ] }),
-      /* @__PURE__ */ jsxs11(Text12, { children: [
+      /* @__PURE__ */ jsxs10(Text11, { children: [
         "Merchant: ",
-        /* @__PURE__ */ jsx15(Text12, { bold: true, children: request?.merchant_name })
+        /* @__PURE__ */ jsx14(Text11, { bold: true, children: request?.merchant_name })
       ] }),
-      /* @__PURE__ */ jsxs11(Text12, { children: [
+      /* @__PURE__ */ jsxs10(Text11, { children: [
         "Line Items:",
         " ",
-        /* @__PURE__ */ jsx15(Text12, { bold: true, children: request?.line_items.map((li) => li.name).join(", ") })
+        /* @__PURE__ */ jsx14(Text11, { bold: true, children: request?.line_items.map((li) => li.name).join(", ") })
       ] }),
-      request?.shared_payment_token && /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", marginTop: 1, children: [
-        /* @__PURE__ */ jsxs11(Text12, { bold: true, children: [
+      request?.shared_payment_token && /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", marginTop: 1, children: [
+        /* @__PURE__ */ jsxs10(Text11, { bold: true, children: [
           "\x1B]8;;https://docs.stripe.com/agentic-commerce/concepts/shared-payment-tokens\x07",
           "Shared Payment Token",
           "\x1B]8;;\x07",
           ":"
         ] }),
-        /* @__PURE__ */ jsxs11(Text12, { children: [
+        /* @__PURE__ */ jsxs10(Text11, { children: [
           " ",
           "Token: ",
-          /* @__PURE__ */ jsx15(Text12, { bold: true, children: request.shared_payment_token.id })
+          /* @__PURE__ */ jsx14(Text11, { bold: true, children: request.shared_payment_token.id })
         ] })
       ] }),
-      request?.card && /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", marginTop: 1, children: [
-        /* @__PURE__ */ jsx15(Text12, { bold: true, children: "Card Details:" }),
-        /* @__PURE__ */ jsxs11(Text12, { children: [
+      request?.card && /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", marginTop: 1, children: [
+        /* @__PURE__ */ jsx14(Text11, { bold: true, children: "Card Details:" }),
+        /* @__PURE__ */ jsxs10(Text11, { children: [
           " ",
           "Number: ",
-          /* @__PURE__ */ jsx15(Text12, { bold: true, children: request?.card.number })
+          /* @__PURE__ */ jsx14(Text11, { bold: true, children: request?.card.number })
         ] }),
-        /* @__PURE__ */ jsxs11(Text12, { children: [
+        /* @__PURE__ */ jsxs10(Text11, { children: [
           " ",
           "Brand: ",
-          /* @__PURE__ */ jsx15(Text12, { bold: true, children: request?.card.brand })
+          /* @__PURE__ */ jsx14(Text11, { bold: true, children: request?.card.brand })
         ] }),
-        /* @__PURE__ */ jsxs11(Text12, { children: [
+        /* @__PURE__ */ jsxs10(Text11, { children: [
           " ",
           "Expiry:",
           " ",
-          /* @__PURE__ */ jsxs11(Text12, { bold: true, children: [
+          /* @__PURE__ */ jsxs10(Text11, { bold: true, children: [
             String(request?.card.exp_month).padStart(2, "0"),
             "/",
             request?.card.exp_year
           ] })
         ] }),
-        request?.card.cvc && /* @__PURE__ */ jsxs11(Text12, { children: [
+        request?.card.cvc && /* @__PURE__ */ jsxs10(Text11, { children: [
           " ",
           "CVC: ",
-          /* @__PURE__ */ jsx15(Text12, { bold: true, children: request.card.cvc })
+          /* @__PURE__ */ jsx14(Text11, { bold: true, children: request.card.cvc })
         ] }),
-        request?.card.valid_until && /* @__PURE__ */ jsxs11(Text12, { children: [
+        request?.card.valid_until && /* @__PURE__ */ jsxs10(Text11, { children: [
           " ",
           "Valid Until:",
           " ",
-          /* @__PURE__ */ jsx15(Text12, { bold: true, children: new Date(request.card.valid_until * 1e3).toISOString() })
+          /* @__PURE__ */ jsx14(Text11, { bold: true, children: new Date(request.card.valid_until * 1e3).toISOString() })
         ] }),
-        request?.card.billing_address && /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", marginTop: 1, children: [
-          /* @__PURE__ */ jsx15(Text12, { bold: true, children: " Billing Address:" }),
-          /* @__PURE__ */ jsxs11(Text12, { children: [
+        request?.card.billing_address && /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", marginTop: 1, children: [
+          /* @__PURE__ */ jsx14(Text11, { bold: true, children: " Billing Address:" }),
+          /* @__PURE__ */ jsxs10(Text11, { children: [
             "  ",
             request.card.billing_address.name
           ] }),
-          /* @__PURE__ */ jsxs11(Text12, { children: [
+          /* @__PURE__ */ jsxs10(Text11, { children: [
             "  ",
             request.card.billing_address.line1
           ] }),
-          request.card.billing_address.line2 && /* @__PURE__ */ jsxs11(Text12, { children: [
+          request.card.billing_address.line2 && /* @__PURE__ */ jsxs10(Text11, { children: [
             "  ",
             request.card.billing_address.line2
           ] }),
-          /* @__PURE__ */ jsxs11(Text12, { children: [
+          /* @__PURE__ */ jsxs10(Text11, { children: [
             "  ",
             [
               request.card.billing_address.city,
@@ -13125,7 +12847,7 @@ var RetrieveSpendRequest = ({
               request.card.billing_address.postal_code
             ].filter(Boolean).join(", ")
           ] }),
-          /* @__PURE__ */ jsxs11(Text12, { children: [
+          /* @__PURE__ */ jsxs10(Text11, { children: [
             "  ",
             request.card.billing_address.country
           ] })
@@ -13136,226 +12858,69 @@ var RetrieveSpendRequest = ({
 };
 
 // src/commands/spend-request/schema.ts
-import { z as z6 } from "zod";
-
-// src/utils/line-item-parser.ts
-import { z as z5 } from "zod";
-var LineItemSchema = z5.object({
-  name: z5.string(),
-  url: z5.string().optional(),
-  image_url: z5.string().optional(),
-  description: z5.string().optional(),
-  sku: z5.string().optional(),
-  quantity: z5.coerce.number().optional(),
-  unit_amount: z5.coerce.number().optional(),
-  product_url: z5.string().optional()
-}).strict();
-var TotalSchema = z5.object({
-  type: z5.string(),
-  display_text: z5.string(),
-  amount: z5.coerce.number()
-}).strict();
-function parseKvString(raw) {
-  const result = {};
-  for (const pair of raw.split(",")) {
-    const idx = pair.indexOf(":");
-    if (idx === -1) {
-      throw new Error(`Invalid field (missing ':'): ${pair}`);
-    }
-    result[pair.slice(0, idx).trim()] = pair.slice(idx + 1).trim();
-  }
-  return result;
-}
-
-// src/commands/spend-request/schema.ts
-var SPEND_REQUEST_OUTPUT_SCHEMA = {
-  id: { outputExample: '"..."', description: "Spend request ID" },
-  status: {
-    outputExample: '"created|pending_approval|approved|denied|expired|succeeded|failed"',
-    description: "Current status"
-  },
-  created_at: {
-    outputExample: '"2026-04-15T14:17:18Z"',
-    description: "Creation timestamp"
-  },
-  updated_at: {
-    outputExample: '"2026-04-15T14:17:18Z"',
-    description: "Last update timestamp"
-  },
-  payment_details: {
-    outputExample: '"csmrpd_abcde12345"',
-    description: "Payment method ID"
-  },
-  amount: { outputExample: "1000", description: "Amount in cents" },
-  merchant_name: { outputExample: '"Powdur"', description: "Merchant name" },
-  line_items: { outputExample: "[...]", description: "Line items" },
-  totals: { outputExample: "[...]", description: "Totals" },
-  card: {
-    outputExample: '{"number":"4242424242424242","exp_month":12,"exp_year":2027,"cvc":"123","billing_address":{"name":"Jane Doe","line1":"123 Main St","city":"San Francisco","state":"CA","postal_code":"94111","country":"US"},"valid_until":1750000000}',
-    description: "Card credentials (present when credential_type is card and status is approved). Includes billing_address (name, line1, line2, city, state, postal_code, country) and valid_until (unix timestamp) when available."
-  },
-  shared_payment_token: {
-    outputExample: '{"id":"spt_xxx","billing_address":{"name":"Jane Doe","line1":"123 Main St","city":"San Francisco","state":"CA","postal_code":"94111","country":"US"},"valid_until":"2026-04-21T20:46:58Z"}',
-    description: 'Shared payment token object (present when credential_type is shared_payment_token and status is approved). Use the "id" field as the SPT value.'
-  }
-};
-var CREATE_INPUT_SCHEMA = {
-  payment_method_id: {
-    schema: z6.string().min(1),
-    flag: "--payment-method-id <id>",
-    description: "Payment method ID",
-    required: true
-  },
-  credential_type: {
-    schema: z6.enum(["shared_payment_token", "card"]),
-    flag: "--credential-type <type>",
-    description: "Payment credential type",
-    jsonDescription: '"card" for checkout forms/Stripe Elements; "shared_payment_token" for HTTP 402/machine payment flows \u2014 evaluate the merchant site before choosing',
-    defaultValue: "card",
-    required: true
-  },
-  network_id: {
-    schema: z6.string().min(1),
-    flag: "--network-id <id>",
-    description: "Network ID (required for shared_payment_token)",
-    jsonDescription: "Required for shared_payment_token \u2014 use `link-cli mpp decode --challenge <www-authenticate>` to validate the stripe challenge and extract this value"
-  },
-  amount: {
-    schema: z6.coerce.number().int().positive().max(5e4),
-    flag: "--amount <cents>",
-    description: "Amount in cents",
-    jsonDescription: "Total in cents, max 50000 ($500.00)",
-    required: true
-  },
-  currency: {
-    schema: z6.string().length(3),
-    flag: "--currency <code>",
-    description: "Currency code",
-    defaultValue: "usd"
-  },
-  merchant_name: {
-    schema: z6.string().min(3),
-    flag: "--merchant-name <name>",
-    description: "Merchant name",
-    jsonDescription: "Required for card credential type; forbidden for shared_payment_token",
-    alias: "-m"
-  },
-  merchant_url: {
-    schema: z6.url(),
-    flag: "--merchant-url <url>",
-    description: "Merchant URL",
-    jsonDescription: "Required for card credential type; forbidden for shared_payment_token"
-  },
-  context: {
-    schema: z6.string().min(100),
-    flag: "--context <context>",
-    description: "Description of what is being purchased and why",
-    jsonDescription: "Min 100 chars \u2014 write a full sentence describing the purchase and rationale; the user reads this when approving",
-    required: true
-  },
-  line_items: {
-    schema: z6.array(LineItemSchema),
-    flag: "--line-item <item>",
-    description: "Line item (repeatable)",
-    flagParser: parseKvString
-  },
-  totals: {
-    schema: z6.array(TotalSchema),
-    flag: "--total <total>",
-    description: "Total (repeatable)",
-    flagParser: parseKvString
-  },
-  request_approval: {
-    schema: z6.boolean(),
-    flag: "--request-approval",
-    description: "Request approval and wait for user to approve/deny",
-    jsonDescription: "Polls until approved/denied/expired; blocks until the user acts",
-    defaultValue: true
-  },
-  test: {
-    schema: z6.boolean(),
-    flag: "--test",
-    description: "Use test mode (creates testmode credentials from test card data)",
-    jsonDescription: "When true, creates testmode credentials instead of real ones \u2014 safe for development and testing",
-    defaultValue: false
-  }
-};
-var RETRIEVE_INPUT_SCHEMA = {
-  timeout: {
-    schema: z6.coerce.number(),
-    flag: "--timeout <seconds>",
-    description: "Polling timeout in seconds",
-    defaultValue: 300
-  },
-  include: {
-    schema: z6.array(z6.string()),
-    flag: "--include <value>",
-    description: "Include extra data (repeatable, e.g. --include card)"
-  }
-};
-var UPDATE_INPUT_SCHEMA = {
-  payment_method_id: {
-    schema: z6.string().min(1),
-    flag: "--payment-method-id <id>",
-    description: "Payment method ID",
-    required: true
-  },
-  amount: {
-    schema: z6.coerce.number().int().positive(),
-    flag: "--amount <cents>",
-    description: "Amount in cents"
-  },
-  merchant_url: {
-    schema: z6.string().min(1),
-    flag: "--merchant-url <url>",
-    description: "Merchant URL"
-  },
-  profile_id: {
-    schema: z6.string().min(1),
-    flag: "--profile-id <id>",
-    description: "Profile ID"
-  },
-  merchant_id: {
-    schema: z6.string().min(1),
-    flag: "--merchant-id <id>",
-    description: "Merchant ID"
-  },
-  currency: {
-    schema: z6.string().min(1),
-    flag: "--currency <code>",
-    description: "Currency code"
-  },
-  line_items: {
-    schema: z6.array(LineItemSchema),
-    flag: "--line-item <item>",
-    description: "Line item (repeatable)",
-    flagParser: parseKvString
-  },
-  totals: {
-    schema: z6.array(TotalSchema),
-    flag: "--total <total>",
-    description: "Total (repeatable)",
-    flagParser: parseKvString
-  }
-};
+import { z as z5 } from "incur";
+var createOptions = z5.object({
+  paymentMethodId: z5.string().describe("Payment method ID"),
+  credentialType: z5.enum(["shared_payment_token", "card"]).default("card").describe(
+    '"card" for checkout forms/Stripe Elements; "shared_payment_token" for HTTP 402/machine payment flows'
+  ),
+  networkId: z5.string().optional().describe(
+    "Network ID (required for shared_payment_token) \u2014 use `link-cli mpp decode` to extract"
+  ),
+  amount: z5.coerce.number().int().positive().max(5e4).describe("Amount in cents, max 50000 ($500.00)"),
+  currency: z5.string().length(3).default("usd").describe("Currency code"),
+  merchantName: z5.string().optional().describe(
+    "Merchant name (required for card; forbidden for shared_payment_token)"
+  ),
+  merchantUrl: z5.string().optional().describe(
+    "Merchant URL (required for card; forbidden for shared_payment_token)"
+  ),
+  context: z5.string().min(100).describe(
+    "Min 100 chars \u2014 describe the purchase and rationale; the user reads this when approving"
+  ),
+  lineItem: z5.array(z5.union([z5.string(), z5.record(z5.string(), z5.unknown())])).default([]).describe("Line item (repeatable, key:value format)"),
+  total: z5.array(z5.union([z5.string(), z5.record(z5.string(), z5.unknown())])).default([]).describe("Total (repeatable, key:value format)"),
+  requestApproval: z5.boolean().default(true).describe("Request approval and poll until approved/denied/expired"),
+  test: z5.boolean().default(false).describe(
+    "Use test mode (creates testmode credentials from test card data)"
+  )
+});
+var retrieveOptions = z5.object({
+  timeout: z5.coerce.number().default(300).describe("Polling timeout in seconds"),
+  interval: z5.coerce.number().default(0).describe(
+    "Poll interval in seconds. When > 0, polls until status is terminal or timeout is reached, yielding status on each attempt."
+  ),
+  maxAttempts: z5.coerce.number().default(0).describe("Max poll attempts. 0 = unlimited (use timeout instead)."),
+  include: z5.array(z5.string()).default([]).describe("Include extra data (repeatable, e.g. --include card)")
+});
+var updateOptions = z5.object({
+  paymentMethodId: z5.string().optional().describe("Payment method ID"),
+  amount: z5.coerce.number().optional().describe("Amount in cents"),
+  merchantUrl: z5.string().optional().describe("Merchant URL"),
+  profileId: z5.string().optional().describe("Profile ID"),
+  merchantId: z5.string().optional().describe("Merchant ID"),
+  currency: z5.string().optional().describe("Currency code"),
+  lineItem: z5.array(z5.union([z5.string(), z5.record(z5.string(), z5.unknown())])).default([]).describe("Line item (repeatable, key:value format)"),
+  total: z5.array(z5.union([z5.string(), z5.record(z5.string(), z5.unknown())])).default([]).describe("Total (repeatable, key:value format)")
+});
 
 // src/commands/spend-request/update.tsx
-import { Box as Box13, Text as Text13 } from "ink";
+import { Box as Box12, Text as Text12 } from "ink";
 import Spinner8 from "ink-spinner";
-import { useEffect as useEffect10, useState as useState9 } from "react";
-import { jsx as jsx16, jsxs as jsxs12 } from "react/jsx-runtime";
+import { useEffect as useEffect9, useState as useState8 } from "react";
+import { jsx as jsx15, jsxs as jsxs11 } from "react/jsx-runtime";
 var UpdateSpendRequest = ({
   repository,
   id,
   params,
   onComplete
 }) => {
-  const [status, setStatus] = useState9(
+  const [status, setStatus] = useState8(
     "loading"
   );
-  const [request, setRequest] = useState9(null);
-  const [error, setError] = useState9("");
-  useEffect10(() => {
+  const [request, setRequest] = useState8(null);
+  const [error, setError] = useState8("");
+  useEffect9(() => {
     const update = async () => {
       try {
         const result = await repository.updateSpendRequest(id, params);
@@ -13371,369 +12936,354 @@ var UpdateSpendRequest = ({
     update();
   }, [repository, id, params, onComplete]);
   if (status === "loading") {
-    return /* @__PURE__ */ jsx16(Box13, { children: /* @__PURE__ */ jsxs12(Text13, { color: "cyan", children: [
-      /* @__PURE__ */ jsx16(Spinner8, { type: "dots" }),
+    return /* @__PURE__ */ jsx15(Box12, { children: /* @__PURE__ */ jsxs11(Text12, { color: "cyan", children: [
+      /* @__PURE__ */ jsx15(Spinner8, { type: "dots" }),
       " Updating spend request ",
       id,
       "..."
     ] }) });
   }
   if (status === "error") {
-    return /* @__PURE__ */ jsxs12(Box13, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx16(Text13, { color: "red", children: "\u2717 Failed to update spend request" }),
-      /* @__PURE__ */ jsx16(Text13, { color: "red", children: error })
+    return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx15(Text12, { color: "red", children: "\u2717 Failed to update spend request" }),
+      /* @__PURE__ */ jsx15(Text12, { color: "red", children: error })
     ] });
   }
-  return /* @__PURE__ */ jsxs12(Box13, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx16(Text13, { color: "green", children: "\u2713 Spend request updated" }),
-    /* @__PURE__ */ jsxs12(Box13, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-      /* @__PURE__ */ jsxs12(Text13, { children: [
+  return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx15(Text12, { color: "green", children: "\u2713 Spend request updated" }),
+    /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+      /* @__PURE__ */ jsxs11(Text12, { children: [
         "ID: ",
-        /* @__PURE__ */ jsx16(Text13, { bold: true, children: request?.id })
+        /* @__PURE__ */ jsx15(Text12, { bold: true, children: request?.id })
       ] }),
-      /* @__PURE__ */ jsxs12(Text13, { children: [
+      /* @__PURE__ */ jsxs11(Text12, { children: [
         "Status: ",
-        /* @__PURE__ */ jsx16(Text13, { bold: true, children: request?.status })
+        /* @__PURE__ */ jsx15(Text12, { bold: true, children: request?.status })
       ] }),
-      /* @__PURE__ */ jsxs12(Text13, { children: [
+      /* @__PURE__ */ jsxs11(Text12, { children: [
         "Amount:",
         " ",
-        /* @__PURE__ */ jsx16(Text13, { bold: true, children: (() => {
+        /* @__PURE__ */ jsx15(Text12, { bold: true, children: (() => {
           const t = request?.totals.find((t2) => t2.type === "total");
           return t ? String(t.amount) : "N/A";
         })() })
       ] }),
-      /* @__PURE__ */ jsxs12(Text13, { children: [
+      /* @__PURE__ */ jsxs11(Text12, { children: [
         "Merchant: ",
-        /* @__PURE__ */ jsx16(Text13, { bold: true, children: request?.merchant_name })
+        /* @__PURE__ */ jsx15(Text12, { bold: true, children: request?.merchant_name })
       ] }),
-      /* @__PURE__ */ jsxs12(Text13, { children: [
+      /* @__PURE__ */ jsxs11(Text12, { children: [
         "Line Items:",
         " ",
-        /* @__PURE__ */ jsx16(Text13, { bold: true, children: request?.line_items.map((li) => li.name).join(", ") })
+        /* @__PURE__ */ jsx15(Text12, { bold: true, children: request?.line_items.map((li) => li.name).join(", ") })
       ] })
     ] })
   ] });
 };
 
 // src/commands/spend-request/index.tsx
-import { jsx as jsx17 } from "react/jsx-runtime";
-function registerSpendRequestCommands(program2, repository) {
-  const spendRequestCommand2 = program2.command("spend-request").description("Spend request management commands").helpCommand(false);
-  const createCmd = spendRequestCommand2.command("create").description("Create a new spend request");
-  registerSchemaOptions(createCmd, CREATE_INPUT_SCHEMA);
-  createCmd.option(
-    "--json <json>",
-    `JSON input (keys: ${Object.keys(CREATE_INPUT_SCHEMA).join(", ")})`
-  ).option(
-    "--output-json",
-    "Output result as JSON instead of interactive display"
-  ).addHelpText(
-    "after",
-    buildInputHelp(CREATE_INPUT_SCHEMA) + buildOutputHelp(SPEND_REQUEST_OUTPUT_SCHEMA)
-  ).action(async (options) => {
-    requireAuth();
-    let resolved = {};
-    try {
-      resolved = resolveInput(options, CREATE_INPUT_SCHEMA);
-    } catch (err) {
-      if (err instanceof ValidationError)
-        outputErrors(err.errors, !!options.outputJson);
-      outputError(err.message);
-    }
-    const requestApproval = !!resolved.request_approval;
-    const credentialType = resolved.credential_type;
-    const networkId = resolved.network_id;
-    if (credentialType === "shared_payment_token" && !networkId) {
-      outputError(
-        "network-id is required when credential-type is shared_payment_token"
-      );
-    }
-    if (networkId && credentialType !== "shared_payment_token") {
-      outputError(
-        "network-id can only be used when credential-type is shared_payment_token"
-      );
-    }
-    if (credentialType !== "shared_payment_token" && !resolved.merchant_name) {
-      outputError("merchant-name is required when credential-type is card");
-    }
-    if (credentialType !== "shared_payment_token" && !resolved.merchant_url) {
-      outputError("merchant-url is required when credential-type is card");
-    }
-    const createParams = {
-      payment_details: resolved.payment_method_id,
-      credential_type: credentialType,
-      network_id: networkId,
-      amount: resolved.amount,
-      currency: resolved.currency,
-      merchant_name: resolved.merchant_name,
-      merchant_url: resolved.merchant_url,
-      context: resolved.context,
-      line_items: resolved.line_items,
-      totals: resolved.totals,
-      request_approval: requestApproval || void 0,
-      test: resolved.test ? true : void 0
-    };
-    await executeCommand({
-      outputJson: !!options.outputJson,
-      jsonFn: async () => {
-        const created = await repository.createSpendRequest(createParams);
-        if (requestApproval) {
-          outputJson(created);
-          return pollUntilApproved(repository, created.id, {
-            onProgress: (elapsedSeconds) => {
-              process.stderr.write(
-                `${JSON.stringify({
-                  type: "waiting",
-                  command: "spend_request_approval",
-                  elapsed_seconds: elapsedSeconds,
-                  approval_url: created.approval_url ?? null,
-                  spend_request_id: created.id
-                })}
-`
-              );
-            }
-          });
-        }
-        return created;
-      },
-      renderFn: () => /* @__PURE__ */ jsx17(
-        CreateSpendRequest,
-        {
-          repository,
-          params: createParams,
-          requestApproval,
-          onComplete: () => {
-          }
-        }
-      )
-    });
+import { jsx as jsx16 } from "react/jsx-runtime";
+function createSpendRequestCli(repository) {
+  const cli2 = Cli4.create("spend-request", {
+    description: "Spend request management commands"
   });
-  const updateCmd = spendRequestCommand2.command("update <id>").description("Update a spend request");
-  registerSchemaOptions(updateCmd, UPDATE_INPUT_SCHEMA);
-  updateCmd.option(
-    "--json <json>",
-    `JSON input (keys: ${Object.keys(UPDATE_INPUT_SCHEMA).join(", ")})`
-  ).option(
-    "--output-json",
-    "Output result as JSON instead of interactive display"
-  ).addHelpText(
-    "after",
-    buildInputHelp(UPDATE_INPUT_SCHEMA) + buildOutputHelp(SPEND_REQUEST_OUTPUT_SCHEMA)
-  ).action(async (id, options) => {
-    requireAuth();
-    let resolved = {};
-    try {
-      resolved = resolveInput(options, UPDATE_INPUT_SCHEMA);
-    } catch (err) {
-      if (err instanceof ValidationError)
-        outputErrors(err.errors, !!options.outputJson);
-      outputError(err.message);
-    }
-    const params = {};
-    if (resolved.payment_method_id !== void 0)
-      params.payment_details = resolved.payment_method_id;
-    if (resolved.amount !== void 0) params.amount = resolved.amount;
-    if (resolved.merchant_url !== void 0)
-      params.merchant_url = resolved.merchant_url;
-    if (resolved.profile_id !== void 0)
-      params.profile_id = resolved.profile_id;
-    if (resolved.merchant_id !== void 0)
-      params.merchant_id = resolved.merchant_id;
-    if (resolved.currency !== void 0) params.currency = resolved.currency;
-    if (resolved.line_items !== void 0)
-      params.line_items = resolved.line_items;
-    if (resolved.totals !== void 0) params.totals = resolved.totals;
-    await executeCommand({
-      outputJson: !!options.outputJson,
-      jsonFn: async () => {
-        return repository.updateSpendRequest(id, params);
-      },
-      renderFn: () => /* @__PURE__ */ jsx17(
-        UpdateSpendRequest,
-        {
-          repository,
-          id,
-          params,
-          onComplete: () => {
+  cli2.command("create", {
+    description: "Create a new spend request",
+    options: createOptions,
+    alias: { merchantName: "m" },
+    outputPolicy: "agent-only",
+    async *run(c) {
+      if (!storage.isAuthenticated()) {
+        return c.error({
+          code: "NOT_AUTHENTICATED",
+          message: 'Not authenticated. Run "link-cli auth login" first.',
+          cta: {
+            commands: [
+              { command: "auth login", description: "Log in to Link" }
+            ]
+          }
+        });
+      }
+      const opts = c.options;
+      const requestApproval = !!opts.requestApproval;
+      const credentialType = opts.credentialType;
+      const networkId = opts.networkId;
+      if (credentialType === "shared_payment_token" && !networkId) {
+        return c.error({
+          code: "INVALID_INPUT",
+          message: "network-id is required when credential-type is shared_payment_token",
+          cta: {
+            commands: [
+              {
+                command: "mpp decode",
+                description: "Decode a WWW-Authenticate challenge to extract network-id"
+              }
+            ]
           }
+        });
+      }
+      if (networkId && credentialType !== "shared_payment_token") {
+        return c.error({
+          code: "INVALID_INPUT",
+          message: "network-id can only be used when credential-type is shared_payment_token"
+        });
+      }
+      if (credentialType !== "shared_payment_token" && !opts.merchantName) {
+        return c.error({
+          code: "INVALID_INPUT",
+          message: "merchant-name is required when credential-type is card"
+        });
+      }
+      if (credentialType !== "shared_payment_token" && !opts.merchantUrl) {
+        return c.error({
+          code: "INVALID_INPUT",
+          message: "merchant-url is required when credential-type is card"
+        });
+      }
+      const lineItems = opts.lineItem?.length ? opts.lineItem.map(
+        (item) => typeof item === "string" ? parseLineItemFlag(item) : item
+      ) : void 0;
+      const totals = opts.total?.length ? opts.total.map(
+        (item) => typeof item === "string" ? parseTotalFlag(item) : item
+      ) : void 0;
+      const createParams = {
+        payment_details: opts.paymentMethodId,
+        credential_type: credentialType,
+        network_id: networkId,
+        amount: opts.amount,
+        currency: opts.currency,
+        merchant_name: opts.merchantName,
+        merchant_url: opts.merchantUrl,
+        context: opts.context,
+        line_items: lineItems,
+        totals,
+        request_approval: requestApproval || void 0,
+        test: opts.test ? true : void 0
+      };
+      if (!c.agent && !c.formatExplicit) {
+        return new Promise((resolve) => {
+          const { waitUntilExit } = render4(
+            /* @__PURE__ */ jsx16(
+              CreateSpendRequest,
+              {
+                repository,
+                params: createParams,
+                requestApproval,
+                onComplete: () => {
+                }
+              }
+            )
+          );
+          waitUntilExit().then(async () => {
+            const created2 = await repository.createSpendRequest(createParams);
+            resolve(created2);
+          });
+        });
+      }
+      const created = await repository.createSpendRequest(createParams);
+      if (!requestApproval) {
+        yield created;
+        return;
+      }
+      yield {
+        ...created,
+        instruction: `Present the approval_url to the user and ask them to approve in the Link app. Then call \`spend-request retrieve ${created.id} --interval 2 --max-attempts 150\` to poll until approved. Do not wait for the user to reply \u2014 start polling immediately.`,
+        _next: {
+          command: `spend-request retrieve ${created.id} --interval 2 --max-attempts 150`,
+          until: "status changes from pending_approval"
         }
-      )
-    });
+      };
+    }
   });
-  spendRequestCommand2.command("request-approval <id>").description("Request approval for a spend request").option(
-    "--output-json",
-    "Output result as JSON instead of interactive display"
-  ).addHelpText("after", buildOutputHelp(SPEND_REQUEST_OUTPUT_SCHEMA)).action(async (id, options) => {
-    requireAuth();
-    await executeCommand({
-      outputJson: !!options.outputJson,
-      jsonFn: async () => {
-        const approval = await repository.requestApproval(id);
-        outputJson(approval);
-        return pollUntilApproved(repository, id, {
-          onProgress: (elapsedSeconds) => {
-            process.stderr.write(
-              `${JSON.stringify({
-                type: "waiting",
-                command: "spend_request_approval",
-                elapsed_seconds: elapsedSeconds,
-                approval_url: approval.approval_link ?? null,
-                spend_request_id: id
-              })}
-`
-            );
+  cli2.command("update", {
+    description: "Update a spend request",
+    args: z6.object({
+      id: z6.string().describe("Spend request ID")
+    }),
+    options: updateOptions,
+    outputPolicy: "agent-only",
+    async run(c) {
+      if (!storage.isAuthenticated()) {
+        return c.error({
+          code: "NOT_AUTHENTICATED",
+          message: 'Not authenticated. Run "link-cli auth login" first.',
+          cta: {
+            commands: [
+              { command: "auth login", description: "Log in to Link" }
+            ]
           }
         });
-      },
-      renderFn: () => /* @__PURE__ */ jsx17(
-        RequestApproval,
-        {
-          repository,
-          id,
-          onComplete: () => {
+      }
+      const id = c.args.id;
+      const opts = c.options;
+      const params = {};
+      if (opts.paymentMethodId !== void 0)
+        params.payment_details = opts.paymentMethodId;
+      if (opts.amount !== void 0) params.amount = opts.amount;
+      if (opts.merchantUrl !== void 0)
+        params.merchant_url = opts.merchantUrl;
+      if (opts.profileId !== void 0) params.profile_id = opts.profileId;
+      if (opts.merchantId !== void 0) params.merchant_id = opts.merchantId;
+      if (opts.currency !== void 0) params.currency = opts.currency;
+      if (opts.lineItem?.length)
+        params.line_items = opts.lineItem.map(
+          (item) => typeof item === "string" ? parseLineItemFlag(item) : item
+        );
+      if (opts.total?.length)
+        params.totals = opts.total.map(
+          (item) => typeof item === "string" ? parseTotalFlag(item) : item
+        );
+      if (!c.agent && !c.formatExplicit) {
+        return new Promise((resolve) => {
+          const { waitUntilExit } = render4(
+            /* @__PURE__ */ jsx16(
+              UpdateSpendRequest,
+              {
+                repository,
+                id,
+                params,
+                onComplete: () => {
+                }
+              }
+            )
+          );
+          waitUntilExit().then(async () => {
+            resolve(await repository.updateSpendRequest(id, params));
+          });
+        });
+      }
+      return repository.updateSpendRequest(id, params);
+    }
+  });
+  cli2.command("request-approval", {
+    description: "Request approval for a spend request",
+    args: z6.object({
+      id: z6.string().describe("Spend request ID")
+    }),
+    outputPolicy: "agent-only",
+    async *run(c) {
+      if (!storage.isAuthenticated()) {
+        return c.error({
+          code: "NOT_AUTHENTICATED",
+          message: 'Not authenticated. Run "link-cli auth login" first.',
+          cta: {
+            commands: [
+              { command: "auth login", description: "Log in to Link" }
+            ]
           }
+        });
+      }
+      const id = c.args.id;
+      if (!c.agent && !c.formatExplicit) {
+        return new Promise((resolve) => {
+          const { waitUntilExit } = render4(
+            /* @__PURE__ */ jsx16(
+              RequestApproval,
+              {
+                repository,
+                id,
+                onComplete: () => {
+                }
+              }
+            )
+          );
+          waitUntilExit().then(async () => {
+            const approval2 = await repository.requestApproval(id);
+            resolve(approval2);
+          });
+        });
+      }
+      const approval = await repository.requestApproval(id);
+      yield {
+        ...approval,
+        instruction: `Present the approval_url to the user and ask them to approve in the Link app. Then call \`spend-request retrieve ${id} --interval 2 --max-attempts 150\` to poll until approved. Do not wait for the user to reply \u2014 start polling immediately.`,
+        _next: {
+          command: `spend-request retrieve ${id} --interval 2 --max-attempts 150`,
+          until: "status changes from pending_approval"
         }
-      )
-    });
+      };
+    }
   });
-  const retrieveCmd = spendRequestCommand2.command("retrieve <id>").description("Retrieve a spend request");
-  registerSchemaOptions(retrieveCmd, RETRIEVE_INPUT_SCHEMA);
-  retrieveCmd.option(
-    "--json <json>",
-    `JSON input (keys: ${Object.keys(RETRIEVE_INPUT_SCHEMA).join(", ")})`
-  ).option(
-    "--output-json",
-    "Output result as JSON instead of interactive display"
-  ).addHelpText(
-    "after",
-    buildInputHelp(RETRIEVE_INPUT_SCHEMA) + buildOutputHelp(SPEND_REQUEST_OUTPUT_SCHEMA)
-  ).action(async (id, options) => {
-    requireAuth();
-    let resolved = {};
-    try {
-      resolved = resolveInput(options, RETRIEVE_INPUT_SCHEMA);
-    } catch (err) {
-      if (err instanceof ValidationError)
-        outputErrors(err.errors, !!options.outputJson);
-      outputError(err.message);
-    }
-    const timeout = resolved.timeout;
-    const includeArr = resolved.include;
-    const include = includeArr?.length ? includeArr : void 0;
-    await executeCommand({
-      outputJson: !!options.outputJson,
-      jsonFn: async () => {
+  cli2.command("retrieve", {
+    description: "Retrieve a spend request",
+    args: z6.object({
+      id: z6.string().describe("Spend request ID")
+    }),
+    options: retrieveOptions,
+    outputPolicy: "agent-only",
+    async *run(c) {
+      if (!storage.isAuthenticated()) {
+        return c.error({
+          code: "NOT_AUTHENTICATED",
+          message: 'Not authenticated. Run "link-cli auth login" first.',
+          cta: {
+            commands: [
+              { command: "auth login", description: "Log in to Link" }
+            ]
+          }
+        });
+      }
+      const id = c.args.id;
+      const opts = c.options;
+      const timeout = opts.timeout;
+      const interval = opts.interval;
+      const maxAttempts = opts.maxAttempts;
+      const includeArr = opts.include;
+      const include = includeArr?.length ? includeArr : void 0;
+      if (!c.agent && !c.formatExplicit) {
+        return new Promise((resolve) => {
+          const { waitUntilExit } = render4(
+            /* @__PURE__ */ jsx16(
+              RetrieveSpendRequest,
+              {
+                repository,
+                id,
+                timeout,
+                include,
+                onComplete: () => {
+                }
+              }
+            )
+          );
+          waitUntilExit().then(async () => {
+            const request = await repository.getSpendRequest(id, { include });
+            resolve(request);
+          });
+        });
+      }
+      const terminalStatuses = /* @__PURE__ */ new Set([
+        "approved",
+        "denied",
+        "expired",
+        "succeeded",
+        "failed"
+      ]);
+      const deadline = Date.now() + timeout * 1e3;
+      let attempts = 0;
+      while (true) {
         const request = await repository.getSpendRequest(id, { include });
         if (!request) {
-          throw new Error(`Spend request ${id} not found`);
+          return c.error({
+            code: "NOT_FOUND",
+            message: `Spend request ${id} not found`
+          });
         }
-        return request;
-      },
-      renderFn: () => /* @__PURE__ */ jsx17(
-        RetrieveSpendRequest,
-        {
-          repository,
-          id,
-          timeout,
-          include,
-          onComplete: () => {
-          }
+        if (terminalStatuses.has(request.status)) {
+          yield request;
+          return;
         }
-      )
-    });
-  });
-  return spendRequestCommand2;
-}
-
-// src/utils/configure-root-help.ts
-function configureRootHelp(program2, authCommand2, spendIntentCommand, paymentMethodsCommand2, skillCommand2, mppCommand2) {
-  program2.configureHelp({
-    formatHelp(cmd, helper) {
-      const helpWidth = helper.helpWidth || 80;
-      const itemIndent = 2;
-      const itemSeparator = 2;
-      function formatItem(term, termWidth, description) {
-        if (description) {
-          const fullText = `${term.padEnd(termWidth + itemSeparator)}${description}`;
-          return helper.wrap(
-            fullText,
-            helpWidth - itemIndent,
-            termWidth + itemSeparator
-          );
+        attempts++;
+        const shouldStop = interval <= 0 || maxAttempts > 0 && attempts >= maxAttempts || Date.now() >= deadline;
+        if (shouldStop) {
+          yield request;
+          return;
         }
-        return term;
-      }
-      function formatList(items) {
-        return items.join("\n").replace(/^/gm, " ".repeat(itemIndent));
-      }
-      const output = [`Usage: ${helper.commandUsage(cmd)}`, ""];
-      const desc = helper.commandDescription(cmd);
-      if (desc.length > 0) {
-        output.push(helper.wrap(desc, helpWidth, 0), "");
+        yield request;
+        await new Promise((resolve) => setTimeout(resolve, interval * 1e3));
       }
-      output.push(
-        "Getting started:",
-        formatList([
-          "As an agent, you MUST run `link-cli skill` to fully understand how to get setup.",
-          "Optional: Run `npx skills add stripe/link-cli` to install the skill for future use."
-        ]),
-        ""
-      );
-      const optTermWidth = helper.longestOptionTermLength(cmd, helper);
-      const optionList = helper.visibleOptions(cmd).map(
-        (option) => formatItem(
-          helper.optionTerm(option),
-          optTermWidth,
-          helper.optionDescription(option)
-        )
-      );
-      if (optionList.length > 0) {
-        output.push("Options:", formatList(optionList), "");
-      }
-      const commandGroups = [
-        { heading: "Auth:", parent: authCommand2 },
-        { heading: "Spend Requests:", parent: spendIntentCommand },
-        { heading: "Payment Methods:", parent: paymentMethodsCommand2 },
-        { heading: "MPP:", parent: mppCommand2 }
-      ];
-      const allLeafCmds = commandGroups.flatMap(
-        ({ parent }) => helper.visibleCommands(parent)
-      );
-      const maxTermWidth = allLeafCmds.reduce(
-        (max, sub) => Math.max(
-          max,
-          // biome-ignore lint/style/noNonNullAssertion: sub is always a subcommand and always has a parent
-          `${sub.parent.name()} ${helper.subcommandTerm(sub)}`.length
-        ),
-        skillCommand2.name().length
-      );
-      for (const { heading, parent } of commandGroups) {
-        const cmds = helper.visibleCommands(parent);
-        if (cmds.length === 0) continue;
-        const list = cmds.map(
-          (sub) => formatItem(
-            `${parent.name()} ${helper.subcommandTerm(sub)}`,
-            maxTermWidth,
-            helper.subcommandDescription(sub)
-          )
-        );
-        output.push(heading, formatList(list), "");
-      }
-      output.push(
-        "Other:",
-        formatList([
-          formatItem(
-            skillCommand2.name(),
-            maxTermWidth,
-            skillCommand2.description()
-          )
-        ]),
-        ""
-      );
-      return output.join("\n");
     }
   });
+  return cli2;
 }
 
 // src/auth/auth-resource.ts
@@ -13908,6 +13458,26 @@ ${JSON.stringify(redacted, null, 2)}`
       }
     );
   }
+  async revokeToken(token) {
+    const { status, data, rawBody } = await this.postForm(
+      `${this.config.authBaseUrl}/device/revoke`,
+      {
+        client_id: CLIENT_ID,
+        token
+      }
+    );
+    if (status < 200 || status >= 300) {
+      throw new LinkApiError(
+        formatOAuthError("Token revocation failed", status, data, rawBody),
+        {
+          status,
+          code: data?.error,
+          rawBody,
+          details: data
+        }
+      );
+    }
+  }
   async refreshToken(refreshToken) {
     const { status, data, rawBody } = await this.postForm(
       `${this.config.authBaseUrl}/device/token`,
@@ -14016,46 +13586,28 @@ var ResourceFactory = class {
 };
 
 // src/cli.tsx
-var cliVersion = "0.1.2";
+var cliVersion = "0.2.0";
 var buildNumber = "1";
 var defaultHeaders = {
   "User-Agent": `link-cli/${cliVersion} (build ${buildNumber})`,
   "X-Build-Number": buildNumber
 };
-var program = new Command();
 var verbose = process.argv.includes("--verbose");
 var factory = new ResourceFactory({ verbose, defaultHeaders });
 var authRepo = factory.createAuthResource();
 var spendRequestRepo = factory.createSpendRequestResource();
-program.name("link-cli").description(
-  "Create a secure, one-time payment credential from a Link wallet to let agents complete purchases on behalf of users."
-).version(`${cliVersion} (build ${buildNumber})`).option("--verbose", "Print API request and response details to stderr").helpCommand(false).configureOutput({
-  outputError: (str, write) => {
-    write(str);
-    const isJsonMode = process.argv.includes("--output-json");
-    if (str.includes("unknown command") && !isJsonMode) {
-      write("\nRun 'link-cli --help' to see available commands.\n");
-      write("Run 'link-cli --skill' for full instructions.\n");
-    }
-  }
-});
-var authCommand = registerAuthCommands(program, authRepo);
-var spendRequestCommand = registerSpendRequestCommands(
-  program,
-  spendRequestRepo
+var cli = Cli5.create("link-cli", {
+  description: "Create a secure, one-time payment credential from a Link wallet to let agents complete purchases on behalf of users.",
+  version: `${cliVersion} (build ${buildNumber})`
+});
+cli.command(createAuthCli(authRepo));
+cli.command(createSpendRequestCli(spendRequestRepo));
+cli.command(
+  createPaymentMethodsCli(() => factory.createPaymentMethodsResource())
 );
-var paymentMethodsCommand = registerPaymentMethodsCommands(
-  program,
-  () => factory.createPaymentMethodsResource()
-);
-var skillCommand = registerSkillCommand(program);
-var mppCommand = registerMppCommands(program, spendRequestRepo);
-configureRootHelp(
-  program,
-  authCommand,
-  spendRequestCommand,
-  paymentMethodsCommand,
-  skillCommand,
-  mppCommand
-);
-program.parse();
+cli.command(createMppCli(spendRequestRepo));
+cli.serve();
+var cli_default = cli;
+export {
+  cli_default as default
+};