@stripe/link-cli 0.4.2 → 0.5.0

package/dist/cli.js

@@ -3218,8 +3218,8 @@ var require_utils = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path5) {
-      let input = path5;
+    function removeDotSegments(path7) {
+      let input = path7;
       const output = [];
       let nextSlash = -1;
       let len = 0;
@@ -3418,8 +3418,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path5, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path5 && path5 !== "/" ? path5 : void 0;
+        const [path7, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path7 && path7 !== "/" ? path7 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -7605,12 +7605,12 @@ var require_dist = __commonJS({
         throw new Error(`Unknown format "${name}"`);
       return f;
     };
-    function addFormats(ajv, list, fs4, exportName) {
+    function addFormats(ajv, list, fs5, exportName) {
       var _a;
       var _b;
       (_a = (_b = ajv.opts.code).formats) !== null && _a !== void 0 ? _a : _b.formats = (0, codegen_1._)`require("ajv-formats/dist/formats").${exportName}`;
       for (const f of list)
-        ajv.addFormat(f, fs4[f]);
+        ajv.addFormat(f, fs5[f]);
     }
     module.exports = exports = formatsPlugin;
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -9548,12 +9548,9 @@ var require_semver2 = __commonJS({
   }
 });
 
-// src/cli.tsx
-import { Cli as Cli7 } from "incur";
-import updateNotifier from "update-notifier";
-
 // ../sdk/dist/index.js
 import fs3 from "fs";
+import path5 from "path";
 
 // ../../node_modules/.pnpm/conf@13.1.0/node_modules/conf/dist/source/index.js
 import { isDeepStrictEqual } from "util";
@@ -9574,12 +9571,12 @@ var disallowedKeys = /* @__PURE__ */ new Set([
   "constructor"
 ]);
 var digits = new Set("0123456789");
-function getPathSegments(path5) {
+function getPathSegments(path7) {
   const parts = [];
   let currentSegment = "";
   let currentPart = "start";
   let isIgnoring = false;
-  for (const character of path5) {
+  for (const character of path7) {
     switch (character) {
       case "\\": {
         if (currentPart === "index") {
@@ -9701,11 +9698,11 @@ function assertNotStringIndex(object, key) {
     throw new Error("Cannot use string index");
   }
 }
-function getProperty(object, path5, value) {
-  if (!isObject(object) || typeof path5 !== "string") {
+function getProperty(object, path7, value) {
+  if (!isObject(object) || typeof path7 !== "string") {
     return value === void 0 ? object : value;
   }
-  const pathArray = getPathSegments(path5);
+  const pathArray = getPathSegments(path7);
   if (pathArray.length === 0) {
     return value;
   }
@@ -9725,12 +9722,12 @@ function getProperty(object, path5, value) {
   }
   return object === void 0 ? value : object;
 }
-function setProperty(object, path5, value) {
-  if (!isObject(object) || typeof path5 !== "string") {
+function setProperty(object, path7, value) {
+  if (!isObject(object) || typeof path7 !== "string") {
     return object;
   }
   const root = object;
-  const pathArray = getPathSegments(path5);
+  const pathArray = getPathSegments(path7);
   for (let index = 0; index < pathArray.length; index++) {
     const key = pathArray[index];
     assertNotStringIndex(object, key);
@@ -9743,11 +9740,11 @@ function setProperty(object, path5, value) {
   }
   return root;
 }
-function deleteProperty(object, path5) {
-  if (!isObject(object) || typeof path5 !== "string") {
+function deleteProperty(object, path7) {
+  if (!isObject(object) || typeof path7 !== "string") {
     return false;
   }
-  const pathArray = getPathSegments(path5);
+  const pathArray = getPathSegments(path7);
   for (let index = 0; index < pathArray.length; index++) {
     const key = pathArray[index];
     assertNotStringIndex(object, key);
@@ -9761,11 +9758,11 @@ function deleteProperty(object, path5) {
     }
   }
 }
-function hasProperty(object, path5) {
-  if (!isObject(object) || typeof path5 !== "string") {
+function hasProperty(object, path7) {
+  if (!isObject(object) || typeof path7 !== "string") {
     return false;
   }
-  const pathArray = getPathSegments(path5);
+  const pathArray = getPathSegments(path7);
   if (pathArray.length === 0) {
     return false;
   }
@@ -10861,12 +10858,27 @@ function withComputedExpiry(auth) {
     expires_at: auth.expires_at ?? Date.now() + auth.expires_in * 1e3
   };
 }
+var CONFIG_FILE_MODE = 384;
 var Storage = class {
   config;
+  options;
+  constructor(options = {}) {
+    this.options = options;
+  }
   getConfig() {
     if (!this.config) {
+      let locationOverride;
+      if (this.options.configPath) {
+        const parsed = path5.parse(path5.resolve(this.options.configPath));
+        const configName = parsed.ext === ".json" ? parsed.name : parsed.base;
+        locationOverride = { cwd: parsed.dir, configName };
+      } else if (this.options.cwd) {
+        locationOverride = { cwd: this.options.cwd };
+      }
       this.config = new Conf({
         projectName: "link-cli",
+        configFileMode: CONFIG_FILE_MODE,
+        ...locationOverride,
         defaults: {
           auth: null,
           pendingDeviceAuth: null
@@ -11076,6 +11088,91 @@ var PaymentMethodsResource = class {
     return body?.payment_details ?? [];
   }
 };
+var ShippingAddressResource = class {
+  verbose;
+  getAccessToken;
+  fetchImpl;
+  shippingAddressesEndpoint;
+  logger;
+  constructor(options) {
+    const config = resolveLinkSdkConfig(options);
+    this.verbose = config.verbose;
+    this.getAccessToken = config.getAccessToken;
+    this.fetchImpl = requireFetchImplementation(config);
+    this.shippingAddressesEndpoint = `${config.apiBaseUrl}/shipping_addresses`;
+    this.logger = config.logger;
+  }
+  async rawFetch(opts) {
+    if (this.verbose) {
+      const redactedHeaders = { ...opts.headers };
+      if (redactedHeaders.Authorization)
+        redactedHeaders.Authorization = "Bearer <redacted>";
+      this.logger.debug(`> ${opts.method} ${opts.url}`);
+      this.logger.debug(`  Headers: ${JSON.stringify(redactedHeaders)}`);
+    }
+    let response;
+    try {
+      response = await this.fetchImpl(opts.url, {
+        method: opts.method,
+        headers: opts.headers
+      });
+    } catch (error) {
+      throw new LinkTransportError(
+        `Request failed: ${opts.method} ${opts.url}`,
+        {
+          cause: error
+        }
+      );
+    }
+    const rawBody = await response.text();
+    let data = null;
+    try {
+      data = JSON.parse(rawBody);
+    } catch {
+    }
+    if (this.verbose) {
+      this.logger.debug(`< ${response.status} ${response.statusText}`);
+      response.headers.forEach((value, key) => {
+        this.logger.debug(`  ${key}: ${value}`);
+      });
+      this.logger.debug(rawBody);
+    }
+    return { status: response.status, data, rawBody };
+  }
+  async apiFetch(opts) {
+    const token = await this.getAccessToken();
+    const authedOpts = {
+      ...opts,
+      headers: { ...opts.headers, Authorization: `Bearer ${token}` }
+    };
+    const res = await this.rawFetch(authedOpts);
+    if (res.status === 401) {
+      const refreshedToken = await this.getAccessToken({ forceRefresh: true });
+      authedOpts.headers.Authorization = `Bearer ${refreshedToken}`;
+      return this.rawFetch(authedOpts);
+    }
+    return res;
+  }
+  list() {
+    return this.listShippingAddresses();
+  }
+  async listShippingAddresses() {
+    const { status, data, rawBody } = await this.apiFetch({
+      method: "GET",
+      url: this.shippingAddressesEndpoint
+    });
+    if (status < 200 || status >= 300) {
+      const body2 = data;
+      const msg = body2?.error ?? body2?.message ?? (rawBody || "unknown error");
+      throw new LinkApiError(
+        `Failed to list shipping addresses (${status}): ${msg}`,
+        { status, rawBody, details: data }
+      );
+    }
+    const body = data;
+    return body?.shipping_addresses ?? [];
+  }
+};
 function normalizeSpendRequest(data) {
   const sr = data;
   if (typeof sr.shared_payment_token === "string") {
@@ -11208,6 +11305,22 @@ var SpendRequestResource = class {
     }
     return normalizeSpendRequest(data);
   }
+  cancel(id) {
+    return this.cancelSpendRequest(id);
+  }
+  async cancelSpendRequest(id) {
+    const { status, data, rawBody } = await this.apiFetch({
+      method: "POST",
+      url: `${this.spendRequestsEndpoint}/${id}/cancel`
+    });
+    if (status < 200 || status >= 300) {
+      throw new LinkApiError(
+        `Failed to cancel spend request (${status}): ${extractApiError(data, rawBody)}`,
+        { status, rawBody, details: data }
+      );
+    }
+    return normalizeSpendRequest(data);
+  }
   async requestApproval(id) {
     const { status, data, rawBody } = await this.apiFetch({
       method: "POST",
@@ -11245,16 +11358,155 @@ var SpendRequestResource = class {
     return normalizeSpendRequest(data);
   }
 };
+var UserInfoResource = class {
+  verbose;
+  getAccessToken;
+  fetchImpl;
+  userInfoEndpoint;
+  logger;
+  constructor(options) {
+    const config = resolveLinkSdkConfig(options);
+    this.verbose = config.verbose;
+    this.getAccessToken = config.getAccessToken;
+    this.fetchImpl = requireFetchImplementation(config);
+    this.userInfoEndpoint = `${config.apiBaseUrl}/userinfo`;
+    this.logger = config.logger;
+  }
+  async rawFetch(opts) {
+    if (this.verbose) {
+      const redactedHeaders = { ...opts.headers };
+      if (redactedHeaders.Authorization)
+        redactedHeaders.Authorization = "Bearer <redacted>";
+      this.logger.debug(`> ${opts.method} ${opts.url}`);
+      this.logger.debug(`  Headers: ${JSON.stringify(redactedHeaders)}`);
+    }
+    let response;
+    try {
+      response = await this.fetchImpl(opts.url, {
+        method: opts.method,
+        headers: opts.headers
+      });
+    } catch (error) {
+      throw new LinkTransportError(
+        `Request failed: ${opts.method} ${opts.url}`,
+        {
+          cause: error
+        }
+      );
+    }
+    const rawBody = await response.text();
+    let data = null;
+    try {
+      data = JSON.parse(rawBody);
+    } catch {
+    }
+    if (this.verbose) {
+      this.logger.debug(`< ${response.status} ${response.statusText}`);
+      response.headers.forEach((value, key) => {
+        this.logger.debug(`  ${key}: ${value}`);
+      });
+      this.logger.debug(rawBody);
+    }
+    return { status: response.status, data, rawBody };
+  }
+  async apiFetch(opts) {
+    const token = await this.getAccessToken();
+    const authedOpts = {
+      ...opts,
+      headers: { ...opts.headers, Authorization: `Bearer ${token}` }
+    };
+    const res = await this.rawFetch(authedOpts);
+    if (res.status === 401) {
+      const refreshedToken = await this.getAccessToken({ forceRefresh: true });
+      authedOpts.headers.Authorization = `Bearer ${refreshedToken}`;
+      return this.rawFetch(authedOpts);
+    }
+    return res;
+  }
+  async retrieve() {
+    const { status, data, rawBody } = await this.apiFetch({
+      method: "GET",
+      url: this.userInfoEndpoint
+    });
+    if (status < 200 || status >= 300) {
+      const body2 = data;
+      const msg = body2?.error ?? body2?.message ?? (rawBody || "unknown error");
+      throw new LinkApiError(
+        `Failed to retrieve user info (${status}): ${msg}`,
+        {
+          status,
+          rawBody,
+          details: data
+        }
+      );
+    }
+    const body = data;
+    return {
+      email: body?.email ?? null,
+      name: body?.name ?? null,
+      first_name: body?.first_name ?? null,
+      last_name: body?.last_name ?? null,
+      phone: body?.phone ?? null
+    };
+  }
+};
+
+// src/cli.tsx
+import { Cli as Cli9 } from "incur";
 
 // src/commands/auth/index.tsx
 import { Cli } from "incur";
+
+// src/utils/poll-until.ts
+async function* pollUntil(options) {
+  const { fn, isTerminal, interval, timeout, maxAttempts } = options;
+  const deadline = timeout !== void 0 && timeout >= 0 ? Date.now() + timeout * 1e3 : void 0;
+  let attempts = 0;
+  let previousSnapshot;
+  while (true) {
+    const value = await fn();
+    if (isTerminal(value) || interval <= 0) {
+      yield { value, terminal: true };
+      return;
+    }
+    attempts++;
+    const maxAttemptsExhausted = maxAttempts > 0 && attempts >= maxAttempts;
+    const timeoutReached = deadline !== void 0 && Date.now() >= deadline;
+    if (maxAttemptsExhausted) {
+      yield { value, terminal: true, reason: "max_attempts" };
+      return;
+    }
+    if (timeoutReached) {
+      yield { value, terminal: true, reason: "timeout" };
+      return;
+    }
+    const snapshot = JSON.stringify(value);
+    if (snapshot !== previousSnapshot) {
+      previousSnapshot = snapshot;
+      yield { value, terminal: false };
+    }
+    await new Promise((resolve) => setTimeout(resolve, interval * 1e3));
+  }
+}
+
+// src/utils/render-interactive.tsx
 import { render } from "ink";
+async function renderInteractive(element, getResult) {
+  const { waitUntilExit } = render(element);
+  await waitUntilExit();
+  if (getResult) {
+    return getResult();
+  }
+}
 
 // src/commands/auth/login.tsx
 import { Box, Text, useInput } from "ink";
 import Spinner from "ink-spinner";
 import { useEffect, useState } from "react";
 
+// src/utils/constants.ts
+var DISPLAY_DELAY_MS = 1500;
+
 // src/utils/open-url.ts
 import { spawn } from "child_process";
 function openUrl(url) {
@@ -11286,8 +11538,10 @@ import { jsx, jsxs } from "react/jsx-runtime";
 var Login = ({
   authResource,
   clientName,
+  authStorage: authStorage2 = storage,
   onComplete
 }) => {
+  const storage2 = authStorage2;
   const [status, setStatus] = useState("initiating");
   const [userCode, setUserCode] = useState("");
   const [verificationUrl, setVerificationUrl] = useState("");
@@ -11324,9 +11578,9 @@ var Login = ({
           const tokens = await authResource.pollDeviceAuth(deviceCode);
           if (tokens) {
             clearInterval(pollInterval);
-            storage.setAuth(tokens);
+            storage2.setAuth(tokens);
             setStatus("success");
-            setTimeout(onComplete, 1e3);
+            setTimeout(onComplete, DISPLAY_DELAY_MS);
           }
         } catch (err) {
           clearInterval(pollInterval);
@@ -11338,7 +11592,7 @@ var Login = ({
     };
     const timeout = setTimeout(startPolling, 1e3);
     return () => clearTimeout(timeout);
-  }, [status, deviceCode, authResource, onComplete]);
+  }, [status, deviceCode, authResource, onComplete, storage2]);
   if (status === "initiating") {
     return /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsxs(Text, { color: "cyan", children: [
       /* @__PURE__ */ jsx(Spinner, { type: "dots" }),
@@ -11391,28 +11645,75 @@ var Login = ({
 
 // src/commands/auth/logout.tsx
 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 = ({ authResource, onComplete }) => {
-  const [done, setDone] = useState2(false);
+import Spinner2 from "ink-spinner";
+import { useCallback } from "react";
+
+// src/hooks/use-async-action.ts
+import { useEffect as useEffect2, useRef, useState as useState2 } from "react";
+function useAsyncAction(action, onComplete) {
+  const [status, setStatus] = useState2("loading");
+  const [data, setData] = useState2(null);
+  const [error, setError] = useState2("");
+  const onCompleteRef = useRef(onComplete);
+  onCompleteRef.current = onComplete;
   useEffect2(() => {
+    let timeoutId = null;
+    let cancelled = false;
     const run = async () => {
-      const auth = storage.getAuth();
-      if (auth?.refresh_token) {
-        try {
-          await authResource.revokeToken(auth.refresh_token);
-        } catch {
-        }
+      try {
+        const result = await action();
+        if (cancelled) return;
+        setData(result);
+        setStatus("success");
+        timeoutId = setTimeout(
+          () => onCompleteRef.current(result),
+          DISPLAY_DELAY_MS
+        );
+      } catch (err) {
+        if (cancelled) return;
+        const message = err instanceof Error ? err.message : String(err);
+        setError(message);
+        setStatus("error");
+        timeoutId = setTimeout(
+          () => onCompleteRef.current(null),
+          DISPLAY_DELAY_MS
+        );
       }
-      storage.clearAuth();
-      storage.deleteConfig();
-      setDone(true);
-      setTimeout(onComplete, 1e3);
     };
     run();
-  }, [authResource, onComplete]);
-  if (!done) {
-    return null;
+    return () => {
+      cancelled = true;
+      if (timeoutId) clearTimeout(timeoutId);
+    };
+  }, [action]);
+  return { status, data, error };
+}
+
+// src/commands/auth/logout.tsx
+import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+var Logout = ({
+  authResource,
+  authStorage: authStorage2 = storage,
+  onComplete
+}) => {
+  const storage2 = authStorage2;
+  const action = useCallback(async () => {
+    const auth = storage2.getAuth();
+    if (auth?.refresh_token) {
+      try {
+        await authResource.revokeToken(auth.refresh_token);
+      } catch {
+      }
+    }
+    storage2.clearAuth();
+    storage2.deleteConfig();
+  }, [authResource, storage2]);
+  const { status } = useAsyncAction(action, onComplete);
+  if (status === "loading") {
+    return /* @__PURE__ */ jsx2(Box2, { children: /* @__PURE__ */ jsxs2(Text2, { color: "cyan", children: [
+      /* @__PURE__ */ jsx2(Spinner2, { type: "dots" }),
+      " Logging out..."
+    ] }) });
   }
   return /* @__PURE__ */ jsx2(Box2, { children: /* @__PURE__ */ jsx2(Text2, { color: "green", children: "\u2713 Logged out successfully" }) });
 };
@@ -11435,16 +11736,20 @@ var statusOptions = z.object({
 // 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 }) => {
+import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
+var AuthStatus = ({
+  authStorage: authStorage2 = storage,
+  onComplete
+}) => {
+  const storage2 = authStorage2;
   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();
+    const auth = storage2.getAuth();
+    const credentialsPath2 = storage2.getPath();
     if (auth) {
       setAuthenticated(true);
       setTokenPreview(`${auth.access_token.substring(0, 20)}...`);
@@ -11452,34 +11757,34 @@ var AuthStatus = ({ onComplete }) => {
     }
     setCredentialsPath(credentialsPath2);
     setChecked(true);
-    setTimeout(onComplete, 1e3);
-  }, [onComplete]);
+    setTimeout(onComplete, DISPLAY_DELAY_MS);
+  }, [onComplete, storage2]);
   if (!checked) {
     return null;
   }
   if (authenticated) {
-    return /* @__PURE__ */ jsxs2(Box3, { flexDirection: "column", children: [
+    return /* @__PURE__ */ jsxs3(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: [
+      /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+        /* @__PURE__ */ jsxs3(Text3, { children: [
           "Access token: ",
           /* @__PURE__ */ jsx3(Text3, { bold: true, children: tokenPreview })
         ] }),
-        /* @__PURE__ */ jsxs2(Text3, { children: [
+        /* @__PURE__ */ jsxs3(Text3, { children: [
           "Token type: ",
           /* @__PURE__ */ jsx3(Text3, { bold: true, children: tokenType })
         ] }),
-        /* @__PURE__ */ jsxs2(Text3, { children: [
+        /* @__PURE__ */ jsxs3(Text3, { children: [
           "Credentials: ",
           /* @__PURE__ */ jsx3(Text3, { bold: true, children: credentialsPath })
         ] })
       ] })
     ] });
   }
-  return /* @__PURE__ */ jsxs2(Box3, { flexDirection: "column", children: [
+  return /* @__PURE__ */ jsxs3(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: [
+    /* @__PURE__ */ jsx3(Box3, { marginTop: 1, paddingX: 2, children: /* @__PURE__ */ jsxs3(Text3, { children: [
       "Credentials: ",
       /* @__PURE__ */ jsx3(Text3, { bold: true, children: credentialsPath })
     ] }) })
@@ -11488,7 +11793,8 @@ var AuthStatus = ({ onComplete }) => {
 
 // src/commands/auth/index.tsx
 import { jsx as jsx4 } from "react/jsx-runtime";
-function createAuthCli(authResource, updateInfo) {
+function createAuthCli(authResource, getUpdateInfo2, authStorage2) {
+  const storage2 = authStorage2 ?? storage;
   const cli2 = Cli.create("auth", {
     description: "Authentication commands"
   });
@@ -11505,25 +11811,22 @@ function createAuthCli(authResource, updateInfo) {
         });
       }
       if (!c.agent && !c.formatExplicit) {
-        return new Promise((resolve) => {
-          const { waitUntilExit } = render(
-            /* @__PURE__ */ jsx4(
-              Login,
-              {
-                authResource,
-                clientName,
-                onComplete: () => {
-                }
+        return renderInteractive(
+          /* @__PURE__ */ jsx4(
+            Login,
+            {
+              authResource,
+              clientName,
+              authStorage: storage2,
+              onComplete: () => {
               }
-            )
-          );
-          waitUntilExit().then(
-            () => resolve({ authenticated: true, token_type: "Bearer" })
-          );
-        });
+            }
+          ),
+          () => ({ authenticated: true, token_type: "Bearer" })
+        );
       }
       const authRequest = await authResource.initiateDeviceAuth(clientName);
-      storage.setPendingDeviceAuth({
+      storage2.setPendingDeviceAuth({
         device_code: authRequest.device_code,
         interval: authRequest.interval,
         expires_at: Date.now() + authRequest.expires_in * 1e3,
@@ -11546,25 +11849,30 @@ function createAuthCli(authResource, updateInfo) {
     description: "Log out from Link",
     outputPolicy: "agent-only",
     async run(c) {
-      const auth = storage.getAuth();
+      const auth = storage2.getAuth();
       if (auth?.refresh_token) {
         try {
           await authResource.revokeToken(auth.refresh_token);
         } catch {
         }
       }
-      storage.clearAuth();
-      storage.clearPendingDeviceAuth();
-      storage.deleteConfig();
+      storage2.clearAuth();
+      storage2.clearPendingDeviceAuth();
+      storage2.deleteConfig();
       const result = { authenticated: false };
       if (!c.agent && !c.formatExplicit) {
-        return new Promise((resolve) => {
-          const { waitUntilExit } = render(
-            /* @__PURE__ */ jsx4(Logout, { authResource, onComplete: () => {
-            } })
-          );
-          waitUntilExit().then(() => resolve(result));
-        });
+        return renderInteractive(
+          /* @__PURE__ */ jsx4(
+            Logout,
+            {
+              authResource,
+              authStorage: storage2,
+              onComplete: () => {
+              }
+            }
+          ),
+          () => result
+        );
       }
       return result;
     }
@@ -11574,79 +11882,75 @@ function createAuthCli(authResource, updateInfo) {
     options: statusOptions,
     outputPolicy: "agent-only",
     async *run(c) {
+      const opts = c.options;
+      const interval = opts.interval;
+      const maxAttempts = opts.maxAttempts;
+      const updateInfo = await getUpdateInfo2?.({
+        polling: interval > 0
+      });
+      const update = updateInfo ? {
+        current_version: updateInfo.current,
+        latest_version: updateInfo.latest,
+        update_command: "npm install -g @stripe/link-cli"
+      } : void 0;
       if (!c.agent && !c.formatExplicit) {
-        return new Promise((resolve) => {
-          const { waitUntilExit } = render(
-            /* @__PURE__ */ jsx4(AuthStatus, { onComplete: () => {
-            } })
-          );
-          waitUntilExit().then(() => {
-            const auth = storage.getAuth();
-            resolve({
+        return renderInteractive(
+          /* @__PURE__ */ jsx4(AuthStatus, { authStorage: storage2, onComplete: () => {
+          } }),
+          () => {
+            const auth = storage2.getAuth();
+            return {
               authenticated: !!auth,
               ...auth ? {
                 access_token: `${auth.access_token.substring(0, 20)}...`,
                 token_type: auth.token_type
               } : {},
-              credentials_path: storage.getPath()
-            });
-          });
-        });
+              credentials_path: storage2.getPath(),
+              ...update && { update }
+            };
+          }
+        );
       }
-      const opts = c.options;
-      const interval = opts.interval;
-      const maxAttempts = opts.maxAttempts;
-      const deadline = Date.now() + opts.timeout * 1e3;
-      let attempts = 0;
-      let previousAttemptData;
-      while (true) {
-        const pending = storage.getPendingDeviceAuth();
-        if (pending && !storage.isAuthenticated()) {
-          const tokens = await authResource.pollDeviceAuth(pending.device_code);
-          if (tokens) {
-            storage.setAuth(tokens);
-            storage.clearPendingDeviceAuth();
-          }
-        }
-        const auth = storage.getAuth();
-        const update = updateInfo ? {
-          current_version: updateInfo.current,
-          latest_version: updateInfo.latest,
-          update_command: "npm install -g @stripe/link-cli"
-        } : void 0;
-        if (auth) {
-          yield {
-            authenticated: true,
-            access_token: `${auth.access_token.substring(0, 20)}...`,
-            token_type: auth.token_type,
-            credentials_path: storage.getPath(),
-            ...update && { update }
+      for await (const result of pollUntil({
+        fn: async () => {
+          const pending = storage2.getPendingDeviceAuth();
+          if (pending && !storage2.isAuthenticated()) {
+            const tokens = await authResource.pollDeviceAuth(
+              pending.device_code
+            );
+            if (tokens) {
+              storage2.setAuth(tokens);
+              storage2.clearPendingDeviceAuth();
+            }
+          }
+          const auth = storage2.getAuth();
+          if (auth) {
+            return {
+              authenticated: true,
+              access_token: `${auth.access_token.substring(0, 20)}...`,
+              token_type: auth.token_type,
+              credentials_path: storage2.getPath(),
+              ...update && { update }
+            };
+          }
+          const currentPending = storage2.getPendingDeviceAuth();
+          return {
+            authenticated: false,
+            credentials_path: storage2.getPath(),
+            ...update && { update },
+            ...currentPending ? {
+              pending: true,
+              verification_url: currentPending.verification_url,
+              phrase: currentPending.phrase
+            } : {}
           };
-          return;
-        }
-        const currentPending = storage.getPendingDeviceAuth();
-        const status = {
-          authenticated: false,
-          credentials_path: storage.getPath(),
-          ...update && { update },
-          ...currentPending ? {
-            pending: true,
-            verification_url: currentPending.verification_url,
-            phrase: currentPending.phrase
-          } : {}
-        };
-        attempts++;
-        const shouldStop = interval <= 0 || maxAttempts > 0 && attempts >= maxAttempts || Date.now() >= deadline;
-        if (shouldStop) {
-          yield status;
-          return;
-        }
-        const snapshot = JSON.stringify(status);
-        if (snapshot !== previousAttemptData) {
-          previousAttemptData = snapshot;
-          yield status;
-        }
-        await new Promise((resolve) => setTimeout(resolve, interval * 1e3));
+        },
+        isTerminal: (status) => status.authenticated,
+        interval,
+        maxAttempts,
+        timeout: opts.timeout
+      })) {
+        yield result.value;
       }
     }
   });
@@ -11655,11 +11959,10 @@ function createAuthCli(authResource, updateInfo) {
 
 // src/commands/demo/index.tsx
 import { Cli as Cli2, z as z2 } from "incur";
-import { render as render2 } from "ink";
 
 // src/commands/demo/demo-runner.tsx
-import { Box as Box8, Text as Text9, useInput as useInput4 } from "ink";
-import { useCallback, useState as useState7 } from "react";
+import { Box as Box8, Text as Text9, useApp, useInput as useInput4 } from "ink";
+import { useCallback as useCallback2, useState as useState7 } from "react";
 
 // src/utils/markdown-text.tsx
 import { Text as Text4 } from "ink";
@@ -11748,13 +12051,13 @@ function renderQrMatrix(url) {
 }
 
 // src/commands/spend-request/app-download-qr-codes.tsx
-import { jsx as jsx6, jsxs as jsxs3 } from "react/jsx-runtime";
+import { jsx as jsx6, jsxs as jsxs4 } from "react/jsx-runtime";
 var DOWNLOAD_URL = "https://link.com/download";
 var AppDownloadQrCodes = () => {
   const qrLines = useMemo(() => renderQrMatrix(DOWNLOAD_URL), []);
-  return /* @__PURE__ */ jsxs3(Box4, { flexDirection: "column", marginTop: 1, children: [
+  return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", marginTop: 1, children: [
     /* @__PURE__ */ jsx6(Text5, { dimColor: true, children: "Get the Link app to approve spend requests from your phone" }),
-    /* @__PURE__ */ jsxs3(Box4, { flexDirection: "column", alignItems: "flex-start", marginTop: 1, children: [
+    /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", alignItems: "flex-start", marginTop: 1, children: [
       qrLines.map((line, i) => (
         // biome-ignore lint/suspicious/noArrayIndexKey: stable static array
         /* @__PURE__ */ jsx6(Text5, { children: line }, i)
@@ -11766,7 +12069,7 @@ var AppDownloadQrCodes = () => {
 
 // src/commands/demo/card-flow.tsx
 import { Box as Box5, Text as Text6, useInput as useInput2 } from "ink";
-import { useEffect as useEffect4, useRef, useState as useState4 } from "react";
+import { useEffect as useEffect4, useRef as useRef2, useState as useState4 } from "react";
 
 // src/utils/poll-until-approved.ts
 function pollUntilApproved(repository, id, options = {}) {
@@ -11930,7 +12233,7 @@ var ONBOARD = {
 };
 
 // src/commands/demo/card-flow.tsx
-import { Fragment, jsx as jsx7, jsxs as jsxs4 } from "react/jsx-runtime";
+import { Fragment, jsx as jsx7, jsxs as jsxs5 } from "react/jsx-runtime";
 function formatPmLabel(pm) {
   return `${pm.card_details?.brand ?? pm.type} ****${pm.card_details?.last4 ?? ""}`;
 }
@@ -11955,9 +12258,9 @@ var CardFlow = ({
   const [spendRequest, setSpendRequest] = useState4(null);
   const [error, setError] = useState4("");
   const approvalUrl = spendRequest?.approval_url ?? "";
-  const enterResolver = useRef(null);
-  const pmResolver = useRef(null);
-  const retryChoiceResolver = useRef(null);
+  const enterResolver = useRef2(null);
+  const pmResolver = useRef2(null);
+  const retryChoiceResolver = useRef2(null);
   function waitForEnter() {
     return new Promise((resolve) => {
       enterResolver.current = resolve;
@@ -12005,7 +12308,7 @@ var CardFlow = ({
       }
     }
   });
-  const started = useRef(false);
+  const started = useRef2(false);
   useEffect4(() => {
     if (started.current) return;
     started.current = true;
@@ -12056,7 +12359,12 @@ var CardFlow = ({
         setStep("await-approval");
         for (; ; ) {
           try {
-            await pollUntilApproved(spendRequestRepo2, result.id);
+            const final = await pollUntilApproved(spendRequestRepo2, result.id);
+            if (final.status !== "approved") {
+              throw new Error(
+                `Spend request did not reach approved (status: ${final.status})`
+              );
+            }
             break;
           } catch (err) {
             if (err.message === "Approval polling timed out") {
@@ -12109,21 +12417,21 @@ var CardFlow = ({
     ];
     return order.indexOf(step) > order.indexOf(target);
   };
-  const prompt = (label = "Press [Enter] to continue") => /* @__PURE__ */ jsxs4(Text6, { dimColor: true, children: [
+  const prompt = (label = "Press [Enter] to continue") => /* @__PURE__ */ jsxs5(Text6, { dimColor: true, children: [
     "\n",
     ">",
     " ",
     label
   ] });
-  return /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", gap: 1, children: [
+  return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", gap: 1, children: [
     /* @__PURE__ */ jsx7(Text6, { bold: true, color: "cyan", children: CARD_FLOW.title }),
-    /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs4(Box5, { flexDirection: "row", gap: 1, children: [
+    /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs5(Box5, { flexDirection: "row", gap: 1, children: [
         /* @__PURE__ */ jsx7(Text6, { color: "yellow", children: "[testmode]" }),
         /* @__PURE__ */ jsx7(Text6, { dimColor: true, children: DEMO_MERCHANT_URL })
       ] }),
       /* @__PURE__ */ jsx7(MarkdownText, { children: CARD_FLOW.intro.description }),
-      /* @__PURE__ */ jsxs4(Box5, { marginTop: 1, flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs5(Box5, { marginTop: 1, flexDirection: "column", children: [
         /* @__PURE__ */ jsx7(Text6, { children: "What happens:" }),
         CARD_FLOW.intro.steps.map((s, i) => {
           const doneAfter = [
@@ -12140,17 +12448,17 @@ var CardFlow = ({
           ];
           const done = pastStep(doneAfter[i]);
           const active = !done && (step === activeFrom[i] || pastStep(activeFrom[i]));
-          return done ? /* @__PURE__ */ jsxs4(Text6, { dimColor: true, strikethrough: true, children: [
+          return done ? /* @__PURE__ */ jsxs5(Text6, { dimColor: true, strikethrough: true, children: [
             " ",
             i + 1,
             ". ",
             s
-          ] }, s) : active ? /* @__PURE__ */ jsxs4(Text6, { bold: true, color: "cyan", children: [
+          ] }, s) : active ? /* @__PURE__ */ jsxs5(Text6, { bold: true, color: "cyan", children: [
             " ",
             i + 1,
             ". ",
             s
-          ] }, s) : /* @__PURE__ */ jsxs4(Text6, { dimColor: true, children: [
+          ] }, s) : /* @__PURE__ */ jsxs5(Text6, { dimColor: true, children: [
             " ",
             i + 1,
             ". ",
@@ -12161,23 +12469,23 @@ var CardFlow = ({
       step === "intro" && prompt(CARD_FLOW.intro.prompt)
     ] }),
     step === "fetch-pm" && /* @__PURE__ */ jsx7(Box5, { flexDirection: "column", children: /* @__PURE__ */ jsx7(Text6, { dimColor: true, children: "Fetching payment methods from your Link wallet..." }) }),
-    (step === "pick-pm" || step === "explain-pm") && /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", children: [
-      step === "pick-pm" && paymentMethods.length > 1 && /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", children: [
+    (step === "pick-pm" || step === "explain-pm") && /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
+      step === "pick-pm" && paymentMethods.length > 1 && /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
         /* @__PURE__ */ jsx7(Text6, { children: "Which payment method should we use for the demo?" }),
-        /* @__PURE__ */ jsx7(Box5, { flexDirection: "column", marginTop: 1, children: paymentMethods.map((pm, i) => /* @__PURE__ */ jsx7(Text6, { children: i === selectedPmIndex ? /* @__PURE__ */ jsxs4(Text6, { color: "cyan", bold: true, children: [
+        /* @__PURE__ */ jsx7(Box5, { flexDirection: "column", marginTop: 1, children: paymentMethods.map((pm, i) => /* @__PURE__ */ jsx7(Text6, { children: i === selectedPmIndex ? /* @__PURE__ */ jsxs5(Text6, { color: "cyan", bold: true, children: [
           ">",
           " ",
           formatPmLabel(pm),
           pm.is_default ? " (default)" : ""
-        ] }) : /* @__PURE__ */ jsxs4(Text6, { dimColor: true, children: [
+        ] }) : /* @__PURE__ */ jsxs5(Text6, { dimColor: true, children: [
           "  ",
           formatPmLabel(pm),
           pm.is_default ? " (default)" : ""
         ] }) }, pm.id)) }),
         /* @__PURE__ */ jsx7(Box5, { marginTop: 1, children: /* @__PURE__ */ jsx7(Text6, { dimColor: true, children: "Use \u2191\u2193 to select, [Enter] to confirm" }) })
       ] }),
-      paymentMethod && /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", children: [
-        /* @__PURE__ */ jsxs4(Text6, { color: "green", children: [
+      paymentMethod && /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
+        /* @__PURE__ */ jsxs5(Text6, { color: "green", children: [
           "\u2713 Using ",
           /* @__PURE__ */ jsx7(Text6, { bold: true, children: pmLabel }),
           paymentMethod.is_default ? " (default)" : ""
@@ -12185,19 +12493,19 @@ var CardFlow = ({
         step === "explain-pm" && prompt(CARD_FLOW.explainPm.prompt)
       ] })
     ] }),
-    step === "create-spend" && /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", children: [
+    step === "create-spend" && /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx7(MarkdownText, { children: CARD_FLOW.createSpend.description }),
       /* @__PURE__ */ jsx7(Box5, { marginY: 1, children: /* @__PURE__ */ jsx7(Text6, { color: "cyan", children: CARD_FLOW.createSpend.loading }) })
     ] }),
-    (step === "await-approval" || step === "approval-timeout") && spendRequest && /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs4(Text6, { color: "green", children: [
+    (step === "await-approval" || step === "approval-timeout") && spendRequest && /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs5(Text6, { color: "green", children: [
         "\u2713 Spend request created (",
         spendRequest.id,
         ")"
       ] }),
-      step === "await-approval" && /* @__PURE__ */ jsxs4(Fragment, { children: [
+      step === "await-approval" && /* @__PURE__ */ jsxs5(Fragment, { children: [
         /* @__PURE__ */ jsx7(Text6, { children: CARD_FLOW.approval.description }),
-        /* @__PURE__ */ jsxs4(
+        /* @__PURE__ */ jsxs5(
           Box5,
           {
             flexDirection: "column",
@@ -12207,7 +12515,7 @@ var CardFlow = ({
             paddingY: 1,
             marginTop: 1,
             children: [
-              /* @__PURE__ */ jsxs4(Text6, { children: [
+              /* @__PURE__ */ jsxs5(Text6, { children: [
                 "Approve at:",
                 " ",
                 /* @__PURE__ */ jsx7(Text6, { bold: true, color: "cyan", children: approvalUrl })
@@ -12218,9 +12526,9 @@ var CardFlow = ({
         ),
         /* @__PURE__ */ jsx7(Box5, { marginY: 1, children: /* @__PURE__ */ jsx7(Text6, { color: "cyan", children: CARD_FLOW.approval.loading }) })
       ] }),
-      step === "approval-timeout" && /* @__PURE__ */ jsxs4(Fragment, { children: [
+      step === "approval-timeout" && /* @__PURE__ */ jsxs5(Fragment, { children: [
         /* @__PURE__ */ jsx7(Text6, { color: "yellow", children: "\u26A0 Approval timed out (5 min). Still pending \u2014 you can still approve." }),
-        /* @__PURE__ */ jsxs4(
+        /* @__PURE__ */ jsxs5(
           Box5,
           {
             flexDirection: "column",
@@ -12230,7 +12538,7 @@ var CardFlow = ({
             paddingY: 1,
             marginTop: 1,
             children: [
-              /* @__PURE__ */ jsxs4(Text6, { children: [
+              /* @__PURE__ */ jsxs5(Text6, { children: [
                 "Approve at:",
                 " ",
                 /* @__PURE__ */ jsx7(Text6, { bold: true, color: "cyan", children: approvalUrl })
@@ -12242,10 +12550,10 @@ var CardFlow = ({
         /* @__PURE__ */ jsx7(Box5, { marginTop: 1, children: /* @__PURE__ */ jsx7(Text6, { dimColor: true, children: "r Retry polling q Quit demo" }) })
       ] })
     ] }),
-    (step === "show-card" || step === "open-url" || step === "done") && card && /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", children: [
+    (step === "show-card" || step === "open-url" || step === "done") && card && /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx7(Text6, { color: "green", children: "\u2713 Approved!" }),
       /* @__PURE__ */ jsx7(MarkdownText, { children: CARD_FLOW.showCard.description }),
-      /* @__PURE__ */ jsx7(Box5, { flexDirection: "column", paddingX: 2, marginTop: 1, children: /* @__PURE__ */ jsxs4(Text6, { children: [
+      /* @__PURE__ */ jsx7(Box5, { flexDirection: "column", paddingX: 2, marginTop: 1, children: /* @__PURE__ */ jsxs5(Text6, { children: [
         /* @__PURE__ */ jsx7(Text6, { dimColor: true, children: "Number " }),
         /* @__PURE__ */ jsx7(Text6, { bold: true, children: formatCardNumber(card.number) }),
         "  ",
@@ -12254,14 +12562,14 @@ var CardFlow = ({
         "  ",
         /* @__PURE__ */ jsx7(Text6, { dimColor: true, children: "CVC " }),
         /* @__PURE__ */ jsx7(Text6, { bold: true, children: card.cvc }),
-        card.billing_address?.postal_code && /* @__PURE__ */ jsxs4(Fragment, { children: [
+        card.billing_address?.postal_code && /* @__PURE__ */ jsxs5(Fragment, { children: [
           "  ",
           /* @__PURE__ */ jsx7(Text6, { dimColor: true, children: "Zip " }),
           /* @__PURE__ */ jsx7(Text6, { bold: true, children: card.billing_address.postal_code })
         ] }),
-        card.valid_until && /* @__PURE__ */ jsxs4(Fragment, { children: [
+        card.valid_until && /* @__PURE__ */ jsxs5(Fragment, { children: [
           "  ",
-          /* @__PURE__ */ jsxs4(Text6, { dimColor: true, children: [
+          /* @__PURE__ */ jsxs5(Text6, { dimColor: true, children: [
             "expires",
             " ",
             new Date(card.valid_until).toLocaleTimeString([], {
@@ -12273,14 +12581,14 @@ var CardFlow = ({
       ] }) }),
       step === "show-card" && prompt(CARD_FLOW.showCard.prompt)
     ] }),
-    step === "done" && /* @__PURE__ */ jsxs4(Box5, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs4(Text6, { color: "green", children: [
+    step === "done" && /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs5(Text6, { color: "green", children: [
         "\u2713 ",
         CARD_FLOW.done.success
       ] }),
       /* @__PURE__ */ jsx7(Text6, { children: CARD_FLOW.done.detail })
     ] }),
-    step === "error" && /* @__PURE__ */ jsxs4(Text6, { color: "red", children: [
+    step === "error" && /* @__PURE__ */ jsxs5(Text6, { color: "red", children: [
       "Error: ",
       error
     ] })
@@ -12289,20 +12597,20 @@ var CardFlow = ({
 
 // src/commands/demo/spt-flow.tsx
 import { Box as Box7, Text as Text8, useInput as useInput3 } from "ink";
-import { useEffect as useEffect6, useRef as useRef2, useState as useState6 } from "react";
+import { useEffect as useEffect6, useRef as useRef3, useState as useState6 } from "react";
 
 // src/commands/mpp/decode.ts
 import { Challenge } from "mppx";
-function getString(value, path5, required = true) {
+function getString(value, path7, required = true) {
   if (value == null) {
     if (required) {
-      throw new Error(`Invalid stripe challenge request: ${path5}: missing`);
+      throw new Error(`Invalid stripe challenge request: ${path7}: missing`);
     }
     return void 0;
   }
   if (typeof value !== "string") {
     throw new Error(
-      `Invalid stripe challenge request: ${path5}: expected string, received ${typeof value}`
+      `Invalid stripe challenge request: ${path7}: expected string, received ${typeof value}`
     );
   }
   return value;
@@ -12371,12 +12679,12 @@ function decodeStripeChallenge(challengeHeader) {
 
 // src/commands/mpp/pay.tsx
 import { Box as Box6, Text as Text7 } from "ink";
-import Spinner2 from "ink-spinner";
+import Spinner3 from "ink-spinner";
 import { Credential, Method } from "mppx";
 import { Mppx, Transport } from "mppx/client";
 import { Methods as StripeMethods } from "mppx/stripe";
 import { useEffect as useEffect5, useState as useState5 } from "react";
-import { jsx as jsx8, jsxs as jsxs5 } from "react/jsx-runtime";
+import { jsx as jsx8, jsxs as jsxs6 } from "react/jsx-runtime";
 function buildHeaders(data, headers) {
   const result = {};
   if (data !== void 0) {
@@ -12391,14 +12699,9 @@ function buildHeaders(data, headers) {
   }
   return result;
 }
-async function readPayResult(response, options) {
+async function readPayResult(response) {
   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) {
@@ -12470,7 +12773,7 @@ async function runMppPay(url, spendRequestId, method, data, headers, repository)
       Authorization: authHeader
     }
   });
-  return readPayResult(retryResponse, { failOnError: true });
+  return readPayResult(retryResponse);
 }
 function MppPay({
   url,
@@ -12518,9 +12821,10 @@ function MppPay({
           headers: requestHeaders
         });
         if (initialResponse.status !== 402) {
-          setResult(await readPayResult(initialResponse));
+          const payResult2 = await readPayResult(initialResponse);
+          setResult(payResult2);
           setStep("done");
-          onComplete();
+          onComplete(payResult2);
           return;
         }
         setStep("signing");
@@ -12536,12 +12840,13 @@ function MppPay({
             Authorization: authHeader
           }
         });
-        setResult(await readPayResult(retryResponse, { failOnError: true }));
+        const payResult = await readPayResult(retryResponse);
+        setResult(payResult);
         setStep("done");
-        onComplete();
+        onComplete(payResult);
       } catch (err) {
         setError(err.message);
-        onComplete();
+        onComplete(null);
       }
     })();
   }, [url, spendRequestId, method, data, headers, repository, onComplete]);
@@ -12553,30 +12858,36 @@ function MppPay({
     done: "Done"
   };
   if (error) {
-    return /* @__PURE__ */ jsxs5(Text7, { color: "red", children: [
+    return /* @__PURE__ */ jsxs6(Text7, { color: "red", children: [
       "Error: ",
       error
     ] });
   }
-  return /* @__PURE__ */ jsxs5(Box6, { flexDirection: "column", children: [
-    step !== "done" && /* @__PURE__ */ jsx8(Box6, { children: /* @__PURE__ */ jsxs5(Text7, { color: "cyan", children: [
-      /* @__PURE__ */ jsx8(Spinner2, { type: "dots" }),
+  return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
+    step !== "done" && /* @__PURE__ */ jsx8(Box6, { children: /* @__PURE__ */ jsxs6(Text7, { color: "cyan", children: [
+      /* @__PURE__ */ jsx8(Spinner3, { type: "dots" }),
       " ",
       stepLabels[step],
       "..."
     ] }) }),
-    result && /* @__PURE__ */ jsxs5(Box6, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs5(Text7, { color: "green", children: [
-        "HTTP ",
-        result.status
-      ] }),
+    result && /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs6(
+        Text7,
+        {
+          color: result.status >= 400 ? "red" : result.status >= 300 ? "yellow" : "green",
+          children: [
+            "HTTP ",
+            result.status
+          ]
+        }
+      ),
       /* @__PURE__ */ jsx8(Text7, { children: result.body })
     ] })
   ] });
 }
 
 // src/commands/demo/spt-flow.tsx
-import { Fragment as Fragment2, jsx as jsx9, jsxs as jsxs6 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx9, jsxs as jsxs7 } from "react/jsx-runtime";
 var SptFlow = ({
   spendRequestRepo: spendRequestRepo2,
   paymentMethodsResource,
@@ -12591,9 +12902,9 @@ var SptFlow = ({
   const [payResult, setPayResult] = useState6(null);
   const [error, setError] = useState6("");
   const approvalUrl = spendRequest?.approval_url ?? "";
-  const enterResolver = useRef2(null);
-  const pmResolver = useRef2(null);
-  const retryChoiceResolver = useRef2(null);
+  const enterResolver = useRef3(null);
+  const pmResolver = useRef3(null);
+  const retryChoiceResolver = useRef3(null);
   function waitForEnter() {
     return new Promise((resolve) => {
       enterResolver.current = resolve;
@@ -12641,7 +12952,7 @@ var SptFlow = ({
       }
     }
   });
-  const started = useRef2(false);
+  const started = useRef3(false);
   useEffect6(() => {
     if (started.current) return;
     started.current = true;
@@ -12701,6 +13012,11 @@ var SptFlow = ({
               spendRequestRepo2,
               result.id
             );
+            if (approved.status !== "approved") {
+              throw new Error(
+                `Spend request did not reach approved (status: ${approved.status})`
+              );
+            }
             setSpendRequest(approved);
             break;
           } catch (err) {
@@ -12754,25 +13070,25 @@ var SptFlow = ({
     ];
     return order.indexOf(step) > order.indexOf(target);
   };
-  const prompt = (label = "Press [Enter] to continue") => /* @__PURE__ */ jsxs6(Text8, { dimColor: true, children: [
+  const prompt = (label = "Press [Enter] to continue") => /* @__PURE__ */ jsxs7(Text8, { dimColor: true, children: [
     "\n",
     ">",
     " ",
     label
   ] });
-  return /* @__PURE__ */ jsxs6(Box7, { flexDirection: "column", gap: 1, children: [
+  return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", gap: 1, children: [
     /* @__PURE__ */ jsx9(Text8, { bold: true, color: "cyan", children: SPT_FLOW.title }),
-    /* @__PURE__ */ jsxs6(Box7, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs6(Box7, { flexDirection: "row", gap: 1, children: [
+    /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs7(Box7, { flexDirection: "row", gap: 1, children: [
         /* @__PURE__ */ jsx9(Text8, { color: "yellow", children: "[testmode]" }),
-        /* @__PURE__ */ jsxs6(Text8, { dimColor: true, children: [
+        /* @__PURE__ */ jsxs7(Text8, { dimColor: true, children: [
           DEMO_CLIMATE_API_URL,
           "  ",
           DEMO_MPP_DEV_URL
         ] })
       ] }),
       /* @__PURE__ */ jsx9(MarkdownText, { children: SPT_FLOW.intro.description }),
-      /* @__PURE__ */ jsxs6(Box7, { marginTop: 1, flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs7(Box7, { marginTop: 1, flexDirection: "column", children: [
         /* @__PURE__ */ jsx9(Text8, { children: SPT_FLOW.intro.preamble }),
         SPT_FLOW.intro.steps.map((s, i) => {
           const doneAfter = [
@@ -12792,17 +13108,17 @@ var SptFlow = ({
           const done = pastStep(doneAfter[i]);
           const active = !done && (step === activeFrom[i] || pastStep(activeFrom[i]));
           const label = s.replace(/`/g, "");
-          return done ? /* @__PURE__ */ jsxs6(Text8, { dimColor: true, strikethrough: true, children: [
+          return done ? /* @__PURE__ */ jsxs7(Text8, { dimColor: true, strikethrough: true, children: [
             " ",
             i + 1,
             ". ",
             label
-          ] }, s) : active ? /* @__PURE__ */ jsxs6(Text8, { bold: true, color: "cyan", children: [
+          ] }, s) : active ? /* @__PURE__ */ jsxs7(Text8, { bold: true, color: "cyan", children: [
             " ",
             i + 1,
             ". ",
             label
-          ] }, s) : /* @__PURE__ */ jsxs6(Text8, { dimColor: true, children: [
+          ] }, s) : /* @__PURE__ */ jsxs7(Text8, { dimColor: true, children: [
             " ",
             i + 1,
             ". ",
@@ -12813,45 +13129,45 @@ var SptFlow = ({
       step === "intro" && prompt(SPT_FLOW.intro.prompt)
     ] }),
     step === "fetch-pm" && /* @__PURE__ */ jsx9(Box7, { marginY: 1, children: /* @__PURE__ */ jsx9(Text8, { color: "cyan", children: "Fetching payment methods..." }) }),
-    step === "pick-pm" && paymentMethods.length > 1 && /* @__PURE__ */ jsxs6(Box7, { flexDirection: "column", children: [
+    step === "pick-pm" && paymentMethods.length > 1 && /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx9(Text8, { children: "Which payment method should we use for the demo?" }),
-      /* @__PURE__ */ jsx9(Box7, { flexDirection: "column", marginTop: 1, children: paymentMethods.map((pm, i) => /* @__PURE__ */ jsx9(Text8, { children: i === selectedPmIndex ? /* @__PURE__ */ jsxs6(Text8, { color: "cyan", bold: true, children: [
+      /* @__PURE__ */ jsx9(Box7, { flexDirection: "column", marginTop: 1, children: paymentMethods.map((pm, i) => /* @__PURE__ */ jsx9(Text8, { children: i === selectedPmIndex ? /* @__PURE__ */ jsxs7(Text8, { color: "cyan", bold: true, children: [
         ">",
         " ",
         pm.card_details ? `${pm.card_details.brand} ****${pm.card_details.last4}` : pm.type,
         pm.is_default ? " (default)" : ""
-      ] }) : /* @__PURE__ */ jsxs6(Text8, { dimColor: true, children: [
+      ] }) : /* @__PURE__ */ jsxs7(Text8, { dimColor: true, children: [
         "  ",
         pm.card_details ? `${pm.card_details.brand} ****${pm.card_details.last4}` : pm.type,
         pm.is_default ? " (default)" : ""
       ] }) }, pm.id)) }),
       /* @__PURE__ */ jsx9(Box7, { marginTop: 1, children: /* @__PURE__ */ jsx9(Text8, { dimColor: true, children: "Use \u2191\u2193 to select, [Enter] to confirm" }) })
     ] }),
-    (step === "probe" || step === "explain-402") && /* @__PURE__ */ jsxs6(Box7, { flexDirection: "column", children: [
+    (step === "probe" || step === "explain-402") && /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx9(MarkdownText, { children: SPT_FLOW.probe.description }),
       step === "probe" && /* @__PURE__ */ jsx9(Box7, { marginY: 1, children: /* @__PURE__ */ jsx9(Text8, { color: "cyan", children: SPT_FLOW.probe.loading }) }),
-      step === "explain-402" && networkId && /* @__PURE__ */ jsxs6(Fragment2, { children: [
+      step === "explain-402" && networkId && /* @__PURE__ */ jsxs7(Fragment2, { children: [
         /* @__PURE__ */ jsx9(MarkdownText, { children: SPT_FLOW.probe.detail }),
-        /* @__PURE__ */ jsxs6(Text8, { color: "green", children: [
+        /* @__PURE__ */ jsxs7(Text8, { color: "green", children: [
           "\u2713 Got HTTP 402 \u2014 network_id: ",
           /* @__PURE__ */ jsx9(Text8, { bold: true, children: networkId })
         ] }),
         prompt(SPT_FLOW.probe.prompt)
       ] })
     ] }),
-    step === "create-spend" && /* @__PURE__ */ jsxs6(Box7, { flexDirection: "column", children: [
+    step === "create-spend" && /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx9(MarkdownText, { children: SPT_FLOW.createSpend.description }),
       /* @__PURE__ */ jsx9(Box7, { marginY: 1, children: /* @__PURE__ */ jsx9(Text8, { color: "cyan", children: SPT_FLOW.createSpend.loading }) })
     ] }),
-    (step === "await-approval" || step === "approval-timeout") && spendRequest && /* @__PURE__ */ jsxs6(Box7, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs6(Text8, { color: "green", children: [
+    (step === "await-approval" || step === "approval-timeout") && spendRequest && /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs7(Text8, { color: "green", children: [
         "\u2713 Spend request created (",
         spendRequest.id,
         ")"
       ] }),
-      step === "await-approval" && /* @__PURE__ */ jsxs6(Fragment2, { children: [
+      step === "await-approval" && /* @__PURE__ */ jsxs7(Fragment2, { children: [
         /* @__PURE__ */ jsx9(Text8, { children: SPT_FLOW.approval.description }),
-        /* @__PURE__ */ jsxs6(
+        /* @__PURE__ */ jsxs7(
           Box7,
           {
             flexDirection: "column",
@@ -12861,7 +13177,7 @@ var SptFlow = ({
             paddingY: 1,
             marginTop: 1,
             children: [
-              /* @__PURE__ */ jsxs6(Text8, { children: [
+              /* @__PURE__ */ jsxs7(Text8, { children: [
                 "Approve at:",
                 " ",
                 /* @__PURE__ */ jsx9(Text8, { bold: true, color: "cyan", children: approvalUrl })
@@ -12872,9 +13188,9 @@ var SptFlow = ({
         ),
         /* @__PURE__ */ jsx9(Box7, { marginY: 1, children: /* @__PURE__ */ jsx9(Text8, { color: "cyan", children: SPT_FLOW.approval.loading }) })
       ] }),
-      step === "approval-timeout" && /* @__PURE__ */ jsxs6(Fragment2, { children: [
+      step === "approval-timeout" && /* @__PURE__ */ jsxs7(Fragment2, { children: [
         /* @__PURE__ */ jsx9(Text8, { color: "yellow", children: "\u26A0 Approval timed out (5 min). Still pending \u2014 you can still approve." }),
-        /* @__PURE__ */ jsxs6(
+        /* @__PURE__ */ jsxs7(
           Box7,
           {
             flexDirection: "column",
@@ -12884,7 +13200,7 @@ var SptFlow = ({
             paddingY: 1,
             marginTop: 1,
             children: [
-              /* @__PURE__ */ jsxs6(Text8, { children: [
+              /* @__PURE__ */ jsxs7(Text8, { children: [
                 "Approve at:",
                 " ",
                 /* @__PURE__ */ jsx9(Text8, { bold: true, color: "cyan", children: approvalUrl })
@@ -12896,14 +13212,14 @@ var SptFlow = ({
         /* @__PURE__ */ jsx9(Box7, { marginTop: 1, children: /* @__PURE__ */ jsx9(Text8, { dimColor: true, children: "r Retry polling q Quit demo" }) })
       ] })
     ] }),
-    (step === "mpp-pay-gate" || step === "mpp-pay") && /* @__PURE__ */ jsxs6(Box7, { flexDirection: "column", children: [
+    (step === "mpp-pay-gate" || step === "mpp-pay") && /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx9(Text8, { color: "green", children: "\u2713 Approved!" }),
       /* @__PURE__ */ jsx9(MarkdownText, { children: SPT_FLOW.mppPay.description }),
       step === "mpp-pay-gate" && prompt(SPT_FLOW.mppPay.prompt),
       step === "mpp-pay" && /* @__PURE__ */ jsx9(Box7, { marginY: 1, children: /* @__PURE__ */ jsx9(Text8, { color: "cyan", children: SPT_FLOW.mppPay.loading }) })
     ] }),
-    step === "done" && payResult && /* @__PURE__ */ jsxs6(Box7, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs6(Text8, { bold: true, color: "green", children: [
+    step === "done" && payResult && /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs7(Text8, { bold: true, color: "green", children: [
         "\u2713 ",
         SPT_FLOW.done.success,
         " (HTTP ",
@@ -12912,7 +13228,7 @@ var SptFlow = ({
       ] }),
       /* @__PURE__ */ jsx9(MarkdownText, { children: SPT_FLOW.done.detail })
     ] }),
-    step === "error" && /* @__PURE__ */ jsxs6(Text8, { color: "red", children: [
+    step === "error" && /* @__PURE__ */ jsxs7(Text8, { color: "red", children: [
       "Error: ",
       error
     ] })
@@ -12920,22 +13236,25 @@ var SptFlow = ({
 };
 
 // src/commands/demo/demo-runner.tsx
-import { Fragment as Fragment3, jsx as jsx10, jsxs as jsxs7 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx10, jsxs as jsxs8 } from "react/jsx-runtime";
 var DemoRunner = ({
   authRepo: authRepo2,
   spendRequestRepo: spendRequestRepo2,
   paymentMethodsResource,
+  authStorage: authStorage2 = storage,
   paymentMethodId: preselectedPmId,
   onlyCard,
   onlySpt,
   onComplete
 }) => {
+  const { exit } = useApp();
+  const storage2 = authStorage2;
   const preselected = onlyCard ? "card" : onlySpt ? "spt" : null;
   const [choice, setChoice] = useState7(preselected);
   const [menuIndex, setMenuIndex] = useState7(0);
   const postAuthPhase = preselected === "spt" ? "spt-flow" : preselected ? "card-flow" : "menu";
   const [phase, setPhase] = useState7(
-    storage.isAuthenticated() ? postAuthPhase : "auth"
+    storage2.isAuthenticated() ? postAuthPhase : "auth"
   );
   const [paymentMethodId, setPaymentMethodId] = useState7(
     preselectedPmId ?? ""
@@ -12959,29 +13278,35 @@ var DemoRunner = ({
       setPhase("spt-flow");
     }
   });
-  const onCardComplete = useCallback(
+  const onCardComplete = useCallback2(
     (result) => {
       setPaymentMethodId(result.paymentMethodId);
       setCardSuccess(result.success);
       if (!runSpt) {
         setPhase("summary");
-        setTimeout(onComplete, 1500);
+        setTimeout(() => {
+          onComplete();
+          exit();
+        }, DISPLAY_DELAY_MS);
       } else {
         setPhase("card-done");
       }
     },
-    [runSpt, onComplete]
+    [runSpt, onComplete, exit]
   );
-  const onSptComplete = useCallback(
+  const onSptComplete = useCallback2(
     (success) => {
       setSptSuccess(success);
       setPhase("summary");
-      setTimeout(onComplete, 1500);
+      setTimeout(() => {
+        onComplete();
+        exit();
+      }, DISPLAY_DELAY_MS);
     },
-    [onComplete]
+    [onComplete, exit]
   );
-  return /* @__PURE__ */ jsxs7(Box8, { flexDirection: "column", gap: 1, children: [
-    /* @__PURE__ */ jsxs7(Box8, { flexDirection: "column", children: [
+  return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", gap: 1, children: [
+    /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx10(Text9, { bold: true, children: DEMO_MENU.title }),
       /* @__PURE__ */ jsx10(Text9, { children: DEMO_MENU.subtitle })
     ] }),
@@ -12990,22 +13315,23 @@ var DemoRunner = ({
       {
         authResource: authRepo2,
         clientName: ONBOARD.auth.clientName,
+        authStorage: storage2,
         onComplete: () => setPhase(postAuthPhase)
       }
     ),
-    phase === "menu" && /* @__PURE__ */ jsxs7(Box8, { flexDirection: "column", children: [
+    phase === "menu" && /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx10(Text9, { children: DEMO_MENU.question }),
-      /* @__PURE__ */ jsx10(Box8, { flexDirection: "column", marginTop: 1, gap: 1, children: DEMO_MENU.options.map((opt, i) => /* @__PURE__ */ jsx10(Box8, { flexDirection: "column", children: i === menuIndex ? /* @__PURE__ */ jsxs7(Fragment3, { children: [
-        /* @__PURE__ */ jsxs7(Text9, { color: "cyan", bold: true, children: [
+      /* @__PURE__ */ jsx10(Box8, { flexDirection: "column", marginTop: 1, gap: 1, children: DEMO_MENU.options.map((opt, i) => /* @__PURE__ */ jsx10(Box8, { flexDirection: "column", children: i === menuIndex ? /* @__PURE__ */ jsxs8(Fragment3, { children: [
+        /* @__PURE__ */ jsxs8(Text9, { color: "cyan", bold: true, children: [
           ">",
           " ",
           opt.label
         ] }),
-        /* @__PURE__ */ jsxs7(Text9, { color: "cyan", children: [
+        /* @__PURE__ */ jsxs8(Text9, { color: "cyan", children: [
           "  ",
           opt.description
         ] })
-      ] }) : /* @__PURE__ */ jsxs7(Text9, { dimColor: true, children: [
+      ] }) : /* @__PURE__ */ jsxs8(Text9, { dimColor: true, children: [
         "  ",
         opt.label
       ] }) }, opt.key)) }),
@@ -13020,17 +13346,17 @@ var DemoRunner = ({
         onComplete: onCardComplete
       }
     ),
-    phase === "card-done" && /* @__PURE__ */ jsxs7(Box8, { flexDirection: "column", children: [
+    phase === "card-done" && /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx10(Text9, { dimColor: true, children: "\u2500\u2500\u2500" }),
       /* @__PURE__ */ jsx10(MarkdownText, { children: DEMO_MENU.transition }),
-      /* @__PURE__ */ jsxs7(Text9, { dimColor: true, children: [
+      /* @__PURE__ */ jsxs8(Text9, { dimColor: true, children: [
         "\n",
         ">",
         " ",
         DEMO_MENU.transitionPrompt
       ] })
     ] }),
-    runSpt && (phase === "spt-flow" || phase === "summary") && /* @__PURE__ */ jsxs7(Box8, { flexDirection: "column", children: [
+    runSpt && (phase === "spt-flow" || phase === "summary") && /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", children: [
       runCard && /* @__PURE__ */ jsx10(Text9, { dimColor: true, children: "\u2500\u2500\u2500" }),
       /* @__PURE__ */ jsx10(
         SptFlow,
@@ -13042,14 +13368,14 @@ var DemoRunner = ({
         }
       )
     ] }),
-    phase === "summary" && /* @__PURE__ */ jsxs7(Box8, { flexDirection: "column", children: [
+    phase === "summary" && /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx10(Text9, { dimColor: true, children: "\u2500\u2500\u2500" }),
       /* @__PURE__ */ jsx10(Text9, { bold: true, children: "Done!" }),
-      cardSuccess !== null && /* @__PURE__ */ jsxs7(Text9, { color: cardSuccess ? "green" : "red", children: [
+      cardSuccess !== null && /* @__PURE__ */ jsxs8(Text9, { color: cardSuccess ? "green" : "red", children: [
         cardSuccess ? "\u2713" : "\u2717",
         " Virtual card flow"
       ] }),
-      sptSuccess !== null && /* @__PURE__ */ jsxs7(Text9, { color: sptSuccess ? "green" : "red", children: [
+      sptSuccess !== null && /* @__PURE__ */ jsxs8(Text9, { color: sptSuccess ? "green" : "red", children: [
         sptSuccess ? "\u2713" : "\u2717",
         " Machine payment flow"
       ] }),
@@ -13064,7 +13390,7 @@ var demoOptions = z2.object({
   onlyCard: z2.boolean().default(false).describe("Run only the virtual card flow"),
   onlySpt: z2.boolean().default(false).describe("Run only the machine payment (SPT) flow")
 });
-function createDemoCli(authRepo2, spendRequestRepo2, createPaymentMethodsResource) {
+function createDemoCli(authRepo2, spendRequestRepo2, createPaymentMethodsResource, authStorage2) {
   return Cli2.create("demo", {
     description: "Run an interactive demo of both Link payment flows (virtual card + machine payment)",
     options: demoOptions,
@@ -13077,48 +13403,71 @@ function createDemoCli(authRepo2, spendRequestRepo2, createPaymentMethodsResourc
         });
       }
       const paymentMethodsResource = createPaymentMethodsResource();
-      return new Promise((resolve) => {
-        const { waitUntilExit, unmount } = render2(
-          /* @__PURE__ */ jsx11(
-            DemoRunner,
-            {
-              authRepo: authRepo2,
-              spendRequestRepo: spendRequestRepo2,
-              paymentMethodsResource,
-              onlyCard: c.options.onlyCard,
-              onlySpt: c.options.onlySpt,
-              onComplete: () => unmount()
+      return renderInteractive(
+        /* @__PURE__ */ jsx11(
+          DemoRunner,
+          {
+            authRepo: authRepo2,
+            spendRequestRepo: spendRequestRepo2,
+            paymentMethodsResource,
+            authStorage: authStorage2,
+            onlyCard: c.options.onlyCard,
+            onlySpt: c.options.onlySpt,
+            onComplete: () => {
             }
-          )
-        );
-        waitUntilExit().then(() => resolve({}));
-      });
+          }
+        ),
+        () => ({})
+      );
     }
   });
 }
 
 // src/commands/mpp/index.tsx
 import { Cli as Cli3, z as z4 } from "incur";
-import { render as render3 } from "ink";
+
+// src/utils/require-auth.ts
+var NOT_AUTHENTICATED_ERROR = {
+  code: "NOT_AUTHENTICATED",
+  message: 'Not authenticated. Run "link-cli auth login" first.',
+  cta: {
+    commands: [{ command: "auth login", description: "Log in to Link" }]
+  }
+};
+function requireAuth(authStorage2) {
+  const store = authStorage2 ?? storage;
+  return (c, next) => {
+    if (!store.isAuthenticated()) {
+      return c.error(NOT_AUTHENTICATED_ERROR);
+    }
+    return next();
+  };
+}
+function requireAuthGuard(c, authStorage2) {
+  const store = authStorage2 ?? storage;
+  if (!store.isAuthenticated()) {
+    c.error(NOT_AUTHENTICATED_ERROR);
+  }
+}
 
 // src/commands/mpp/decode-view.tsx
 import { Box as Box9, Text as Text10 } from "ink";
-import { jsx as jsx12, jsxs as jsxs8 } from "react/jsx-runtime";
+import { jsx as jsx12, jsxs as jsxs9 } from "react/jsx-runtime";
 function DecodeChallengeView({
   decoded
 }) {
-  return /* @__PURE__ */ jsxs8(Box9, { flexDirection: "column", children: [
+  return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx12(Text10, { color: "green", children: "\u2713 Stripe challenge decoded" }),
-    /* @__PURE__ */ jsxs8(Box9, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-      /* @__PURE__ */ jsxs8(Text10, { children: [
+    /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+      /* @__PURE__ */ jsxs9(Text10, { children: [
         "ID: ",
         /* @__PURE__ */ jsx12(Text10, { bold: true, children: decoded.id })
       ] }),
-      /* @__PURE__ */ jsxs8(Text10, { children: [
+      /* @__PURE__ */ jsxs9(Text10, { children: [
         "Realm: ",
         /* @__PURE__ */ jsx12(Text10, { bold: true, children: decoded.realm })
       ] }),
-      /* @__PURE__ */ jsxs8(Text10, { children: [
+      /* @__PURE__ */ jsxs9(Text10, { children: [
         "Network ID: ",
         /* @__PURE__ */ jsx12(Text10, { bold: true, children: decoded.network_id })
       ] }),
@@ -13146,7 +13495,7 @@ var decodeOptions = z3.object({
 
 // src/commands/mpp/index.tsx
 import { jsx as jsx13 } from "react/jsx-runtime";
-function createMppCli(repository) {
+function createMppCli(repository, authStorage2) {
   const cli2 = Cli3.create("mpp", {
     description: "Machine payment protocol (MPP) commands"
   });
@@ -13158,53 +13507,36 @@ function createMppCli(repository) {
     options: payOptions,
     alias: { method: "X", data: "d", header: "H" },
     outputPolicy: "agent-only",
+    middleware: [requireAuth(authStorage2)],
     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 } = render3(
-            /* @__PURE__ */ jsx13(
-              MppPay,
-              {
-                url,
-                spendRequestId: opts.spendRequestId,
-                method,
-                data,
-                headers,
-                repository,
-                onComplete: () => {
-                }
+        let capturedResult = null;
+        return renderInteractive(
+          /* @__PURE__ */ jsx13(
+            MppPay,
+            {
+              url,
+              spendRequestId: opts.spendRequestId,
+              method,
+              data,
+              headers,
+              repository,
+              onComplete: (result) => {
+                capturedResult = result;
               }
-            )
-          );
-          waitUntilExit().then(async () => {
-            resolve(
-              await runMppPay(
-                url,
-                opts.spendRequestId,
-                method,
-                data,
-                headers,
-                repository
-              )
-            );
-          });
-        });
+            }
+          ),
+          () => {
+            if (!capturedResult)
+              throw new Error("Component exited without producing a result");
+            return capturedResult;
+          }
+        );
       }
       return runMppPay(
         url,
@@ -13223,12 +13555,10 @@ function createMppCli(repository) {
     async run(c) {
       const decoded = decodeStripeChallenge(c.options.challenge);
       if (!c.agent && !c.formatExplicit) {
-        return new Promise((resolve) => {
-          const { waitUntilExit } = render3(
-            /* @__PURE__ */ jsx13(DecodeChallengeView, { decoded })
-          );
-          waitUntilExit().then(() => resolve(decoded));
-        });
+        return renderInteractive(
+          /* @__PURE__ */ jsx13(DecodeChallengeView, { decoded }),
+          () => decoded
+        );
       }
       return decoded;
     }
@@ -13238,29 +13568,31 @@ function createMppCli(repository) {
 
 // src/commands/onboard/index.tsx
 import { Cli as Cli4 } from "incur";
-import { render as render4 } from "ink";
 
 // src/commands/onboard/onboard-runner.tsx
-import { Box as Box10, Text as Text11, useInput as useInput5 } from "ink";
-import { useEffect as useEffect7, useRef as useRef3, useState as useState8 } from "react";
-import { jsx as jsx14, jsxs as jsxs9 } from "react/jsx-runtime";
+import { Box as Box10, Text as Text11, useApp as useApp2, useInput as useInput5 } from "ink";
+import { useEffect as useEffect7, useRef as useRef4, useState as useState8 } from "react";
+import { jsx as jsx14, jsxs as jsxs10 } from "react/jsx-runtime";
 var OnboardRunner = ({
   authRepo: authRepo2,
   spendRequestRepo: spendRequestRepo2,
   paymentMethodsResource,
+  authStorage: authStorage2 = storage,
   onComplete
 }) => {
+  const { exit } = useApp2();
+  const storage2 = authStorage2;
   const [phase, setPhase] = useState8("welcome");
   const [authSkipped, setAuthSkipped] = useState8(false);
   const [pmMissing, setPmMissing] = useState8(false);
   const [error, setError] = useState8("");
-  const enterResolver = useRef3(null);
+  const enterResolver = useRef4(null);
   function waitForEnter() {
     return new Promise((resolve) => {
       enterResolver.current = resolve;
     });
   }
-  const authResolver = useRef3(null);
+  const authResolver = useRef4(null);
   function waitForAuth() {
     return new Promise((resolve) => {
       authResolver.current = resolve;
@@ -13273,14 +13605,14 @@ var OnboardRunner = ({
       resolve();
     }
   });
-  const started = useRef3(false);
+  const started = useRef4(false);
   useEffect7(() => {
     if (started.current) return;
     started.current = true;
     const run = async () => {
       try {
         setPhase("auth");
-        if (storage.isAuthenticated()) {
+        if (storage2.isAuthenticated()) {
           setAuthSkipped(true);
         } else {
           setAuthSkipped(false);
@@ -13297,6 +13629,7 @@ var OnboardRunner = ({
         setPhase("demo");
       } catch (err) {
         setError(err.message);
+        setTimeout(exit, 2e3);
       }
     };
     run();
@@ -13305,33 +13638,34 @@ var OnboardRunner = ({
     const order = ["welcome", "auth", "payment-methods", "demo"];
     return order.indexOf(phase) > order.indexOf(target);
   };
-  const prompt = (label = "Press [Enter] to continue") => /* @__PURE__ */ jsxs9(Text11, { dimColor: true, children: [
+  const prompt = (label = "Press [Enter] to continue") => /* @__PURE__ */ jsxs10(Text11, { dimColor: true, children: [
     "\n",
     ">",
     " ",
     label
   ] });
-  return /* @__PURE__ */ jsxs9(Box10, { flexDirection: "column", gap: 1, children: [
-    /* @__PURE__ */ jsxs9(Box10, { flexDirection: "column", children: [
+  return /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", gap: 1, children: [
+    /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx14(Text11, { bold: true, children: ONBOARD.title }),
       /* @__PURE__ */ jsx14(Text11, { children: ONBOARD.subtitle })
     ] }),
-    /* @__PURE__ */ jsx14(Box10, { flexDirection: "column", children: authSkipped || pastPhase("auth") ? /* @__PURE__ */ jsxs9(Text11, { color: "green", children: [
+    /* @__PURE__ */ jsx14(Box10, { flexDirection: "column", children: authSkipped || pastPhase("auth") ? /* @__PURE__ */ jsxs10(Text11, { color: "green", children: [
       "\u2713 ",
       authSkipped ? ONBOARD.auth.alreadyLoggedIn : ONBOARD.auth.authenticated
-    ] }) : phase === "auth" && !storage.isAuthenticated() ? /* @__PURE__ */ jsx14(
+    ] }) : phase === "auth" && !storage2.isAuthenticated() ? /* @__PURE__ */ jsx14(
       Login,
       {
         authResource: authRepo2,
         clientName: ONBOARD.auth.clientName,
+        authStorage: storage2,
         onComplete: () => authResolver.current?.()
       }
     ) : null }),
-    pastPhase("auth") && /* @__PURE__ */ jsxs9(Box10, { flexDirection: "column", children: [
+    pastPhase("auth") && /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", children: [
       phase === "payment-methods" && !pmMissing && /* @__PURE__ */ jsx14(Text11, { color: "cyan", children: ONBOARD.paymentMethods.loading }),
-      pmMissing && /* @__PURE__ */ jsxs9(Box10, { flexDirection: "column", children: [
+      pmMissing && /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", children: [
         /* @__PURE__ */ jsx14(Text11, { color: "yellow", children: ONBOARD.paymentMethods.missing }),
-        /* @__PURE__ */ jsx14(Box10, { marginTop: 1, children: /* @__PURE__ */ jsxs9(Text11, { children: [
+        /* @__PURE__ */ jsx14(Box10, { marginTop: 1, children: /* @__PURE__ */ jsxs10(Text11, { children: [
           "Visit",
           " ",
           /* @__PURE__ */ jsx14(Text11, { bold: true, color: "cyan", children: "app.link.com/wallet" }),
@@ -13342,7 +13676,7 @@ var OnboardRunner = ({
       ] }),
       pastPhase("payment-methods") && /* @__PURE__ */ jsx14(Text11, { color: "green", children: "\u2713 Payment method found" })
     ] }),
-    phase === "demo" && /* @__PURE__ */ jsxs9(Box10, { flexDirection: "column", children: [
+    phase === "demo" && /* @__PURE__ */ jsxs10(Box10, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx14(Text11, { dimColor: true, children: "\u2500\u2500\u2500" }),
       /* @__PURE__ */ jsx14(
         DemoRunner,
@@ -13350,11 +13684,12 @@ var OnboardRunner = ({
           authRepo: authRepo2,
           spendRequestRepo: spendRequestRepo2,
           paymentMethodsResource,
+          authStorage: storage2,
           onComplete
         }
       )
     ] }),
-    error && /* @__PURE__ */ jsxs9(Text11, { color: "red", children: [
+    error && /* @__PURE__ */ jsxs10(Text11, { color: "red", children: [
       "Error: ",
       error
     ] })
@@ -13363,7 +13698,7 @@ var OnboardRunner = ({
 
 // src/commands/onboard/index.tsx
 import { jsx as jsx15 } from "react/jsx-runtime";
-function createOnboardCli(authRepo2, spendRequestRepo2, createPaymentMethodsResource) {
+function createOnboardCli(authRepo2, spendRequestRepo2, createPaymentMethodsResource, authStorage2) {
   return Cli4.create("onboard", {
     description: "Guided setup: authenticate, verify payment methods, and demo both payment flows",
     outputPolicy: "agent-only",
@@ -13375,43 +13710,42 @@ function createOnboardCli(authRepo2, spendRequestRepo2, createPaymentMethodsReso
         });
       }
       const paymentMethodsResource = createPaymentMethodsResource();
-      return new Promise((resolve) => {
-        const { waitUntilExit, unmount } = render4(
-          /* @__PURE__ */ jsx15(
-            OnboardRunner,
-            {
-              authRepo: authRepo2,
-              spendRequestRepo: spendRequestRepo2,
-              paymentMethodsResource,
-              onComplete: () => unmount()
+      return renderInteractive(
+        /* @__PURE__ */ jsx15(
+          OnboardRunner,
+          {
+            authRepo: authRepo2,
+            spendRequestRepo: spendRequestRepo2,
+            paymentMethodsResource,
+            authStorage: authStorage2,
+            onComplete: () => {
             }
-          )
-        );
-        waitUntilExit().then(() => resolve({}));
-      });
+          }
+        ),
+        () => ({})
+      );
     }
   });
 }
 
 // src/commands/payment-methods/index.tsx
 import { Cli as Cli5 } from "incur";
-import { render as render5 } from "ink";
 
 // src/commands/payment-methods/add.tsx
-import { Box as Box11, Text as Text12, useApp, useInput as useInput6 } from "ink";
-import { jsx as jsx16, jsxs as jsxs10 } from "react/jsx-runtime";
+import { Box as Box11, Text as Text12, useApp as useApp3, useInput as useInput6 } from "ink";
+import { jsx as jsx16, jsxs as jsxs11 } from "react/jsx-runtime";
 var WALLET_URL = "https://app.link.com/wallet";
 var AddPaymentMethod = () => {
-  const { exit } = useApp();
+  const { exit } = useApp3();
   useInput6((_input, key) => {
     if (key.return) {
       openUrl(WALLET_URL);
       exit();
     }
   });
-  return /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", paddingY: 1, children: [
+  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", paddingY: 1, children: [
     /* @__PURE__ */ jsx16(Box11, { marginBottom: 1, children: /* @__PURE__ */ jsx16(Text12, { bold: true, children: "Add Payment Method" }) }),
-    /* @__PURE__ */ jsxs10(
+    /* @__PURE__ */ jsxs11(
       Box11,
       {
         flexDirection: "column",
@@ -13420,7 +13754,7 @@ var AddPaymentMethod = () => {
         paddingX: 2,
         paddingY: 1,
         children: [
-          /* @__PURE__ */ jsxs10(Text12, { children: [
+          /* @__PURE__ */ jsxs11(Text12, { children: [
             "Open:",
             " ",
             /* @__PURE__ */ jsx16(Text12, { bold: true, color: "cyan", children: WALLET_URL })
@@ -13434,55 +13768,37 @@ var AddPaymentMethod = () => {
 
 // src/commands/payment-methods/list.tsx
 import { Box as Box12, Text as Text13 } from "ink";
-import Spinner3 from "ink-spinner";
-import { useEffect as useEffect8, useState as useState9 } from "react";
-import { jsx as jsx17, jsxs as jsxs11 } from "react/jsx-runtime";
+import Spinner4 from "ink-spinner";
+import { useCallback as useCallback3 } from "react";
+import { jsx as jsx17, jsxs as jsxs12 } from "react/jsx-runtime";
 var PaymentMethodsList = ({
   resource,
   onComplete
 }) => {
-  const [status, setStatus] = useState9(
-    "loading"
-  );
-  const [methods, setMethods] = useState9([]);
-  const [error, setError] = useState9("");
-  useEffect8(() => {
-    const fetch2 = async () => {
-      try {
-        const result = await resource.listPaymentMethods();
-        setMethods(result);
-        setStatus("success");
-        setTimeout(onComplete, 1500);
-      } catch (err) {
-        setError(err.message);
-        setStatus("error");
-        setTimeout(onComplete, 1500);
-      }
-    };
-    fetch2();
-  }, [resource, onComplete]);
+  const action = useCallback3(() => resource.listPaymentMethods(), [resource]);
+  const { status, data: methods, error } = useAsyncAction(action, onComplete);
   if (status === "loading") {
-    return /* @__PURE__ */ jsx17(Box12, { children: /* @__PURE__ */ jsxs11(Text13, { color: "cyan", children: [
-      /* @__PURE__ */ jsx17(Spinner3, { type: "dots" }),
+    return /* @__PURE__ */ jsx17(Box12, { children: /* @__PURE__ */ jsxs12(Text13, { color: "cyan", children: [
+      /* @__PURE__ */ jsx17(Spinner4, { type: "dots" }),
       " Loading payment methods..."
     ] }) });
   }
   if (status === "error") {
-    return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", children: [
+    return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", children: [
       /* @__PURE__ */ jsx17(Text13, { color: "red", children: "\u2717 Failed to load payment methods" }),
       /* @__PURE__ */ jsx17(Text13, { color: "red", children: error })
     ] });
   }
-  if (methods.length === 0) {
+  if (!methods || methods.length === 0) {
     return /* @__PURE__ */ jsx17(Box12, { children: /* @__PURE__ */ jsx17(Text13, { dimColor: true, children: "No payment methods found" }) });
   }
-  return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", children: [
+  return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx17(Text13, { bold: true, children: "Payment Methods" }),
     /* @__PURE__ */ jsx17(Box12, { 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__ */ jsx17(Box12, { paddingX: 2, children: /* @__PURE__ */ jsxs11(Text13, { children: [
+      const suffix = pm.nickname ? `(${pm.nickname})` : "";
+      return /* @__PURE__ */ jsx17(Box12, { paddingX: 2, children: /* @__PURE__ */ jsxs12(Text13, { children: [
         /* @__PURE__ */ jsx17(Text13, { dimColor: true, children: pm.id }),
         "  ",
         label,
@@ -13497,36 +13813,22 @@ var PaymentMethodsList = ({
 
 // src/commands/payment-methods/index.tsx
 import { jsx as jsx18 } from "react/jsx-runtime";
-function createPaymentMethodsCli(createResource) {
+function createPaymentMethodsCli(createResource, authStorage2) {
   const cli2 = Cli5.create("payment-methods", {
     description: "Payment methods management commands"
   });
   cli2.command("list", {
     description: "List all payment methods on your account",
     outputPolicy: "agent-only",
+    middleware: [requireAuth(authStorage2)],
     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 } = render5(
-            /* @__PURE__ */ jsx18(PaymentMethodsList, { resource, onComplete: () => {
-            } })
-          );
-          waitUntilExit().then(async () => {
-            resolve(await resource.listPaymentMethods());
-          });
-        });
+        return renderInteractive(
+          /* @__PURE__ */ jsx18(PaymentMethodsList, { resource, onComplete: () => {
+          } }),
+          () => resource.listPaymentMethods()
+        );
       }
       return resource.listPaymentMethods();
     }
@@ -13534,23 +13836,12 @@ function createPaymentMethodsCli(createResource) {
   cli2.command("add", {
     description: "Open the Link wallet to add a new payment method",
     outputPolicy: "agent-only",
+    middleware: [requireAuth(authStorage2)],
     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 } = render5(/* @__PURE__ */ jsx18(AddPaymentMethod, {}));
-          waitUntilExit().then(() => resolve({ url: WALLET_URL }));
-        });
+        return renderInteractive(/* @__PURE__ */ jsx18(AddPaymentMethod, {}), () => ({
+          url: WALLET_URL
+        }));
       }
       return { url: WALLET_URL };
     }
@@ -13558,9 +13849,147 @@ function createPaymentMethodsCli(createResource) {
   return cli2;
 }
 
+// src/commands/shipping-address/index.tsx
+import { Cli as Cli6 } from "incur";
+
+// src/commands/shipping-address/list.tsx
+import { Box as Box13, Text as Text14 } from "ink";
+import Spinner5 from "ink-spinner";
+import { useCallback as useCallback4 } from "react";
+import { jsx as jsx19, jsxs as jsxs13 } from "react/jsx-runtime";
+function formatStreetLine(address) {
+  const parts = [address.line_1, address.line_2].filter(Boolean);
+  return parts.length > 0 ? parts.join(", ") : null;
+}
+function formatLocalityLine(address) {
+  const locality = [
+    address.dependent_locality,
+    address.locality,
+    address.administrative_area
+  ].filter(Boolean).join(", ");
+  const postal = [address.postal_code, address.sorting_code].filter(Boolean).join(" ");
+  const localityPostal = locality && postal ? `${locality} ${postal}` : locality || postal || null;
+  if (localityPostal && address.country_code) {
+    return `${localityPostal}, ${address.country_code}`;
+  }
+  return localityPostal || address.country_code || null;
+}
+function formatAddressLines(addressRecord) {
+  if (!addressRecord.address) {
+    return ["Address details unavailable"];
+  }
+  const address = addressRecord.address;
+  const lines = [formatStreetLine(address), formatLocalityLine(address)].filter(
+    (line) => Boolean(line)
+  );
+  return lines.length > 0 ? lines : ["Address details unavailable"];
+}
+var ShippingAddressList = ({
+  resource,
+  onComplete
+}) => {
+  const action = useCallback4(
+    () => resource.listShippingAddresses(),
+    [resource]
+  );
+  const {
+    status,
+    data: shippingAddresses,
+    error
+  } = useAsyncAction(action, onComplete);
+  if (status === "loading") {
+    return /* @__PURE__ */ jsx19(Box13, { children: /* @__PURE__ */ jsxs13(Text14, { color: "cyan", children: [
+      /* @__PURE__ */ jsx19(Spinner5, { type: "dots" }),
+      " Loading shipping addresses..."
+    ] }) });
+  }
+  if (status === "error") {
+    return /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx19(Text14, { color: "red", children: "\u2717 Failed to load shipping addresses" }),
+      /* @__PURE__ */ jsx19(Text14, { color: "red", children: error })
+    ] });
+  }
+  if (!shippingAddresses || shippingAddresses.length === 0) {
+    return /* @__PURE__ */ jsx19(Box13, { children: /* @__PURE__ */ jsx19(Text14, { dimColor: true, children: "No shipping addresses found" }) });
+  }
+  return /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx19(Text14, { bold: true, children: "Shipping Addresses" }),
+    /* @__PURE__ */ jsx19(Box13, { flexDirection: "column", marginTop: 1, children: shippingAddresses.map((shippingAddress) => {
+      const addressName = shippingAddress.address?.name;
+      const nickname = shippingAddress.nickname ? ` (${shippingAddress.nickname})` : "";
+      return /* @__PURE__ */ jsxs13(
+        Box13,
+        {
+          flexDirection: "column",
+          paddingX: 2,
+          marginBottom: 1,
+          children: [
+            /* @__PURE__ */ jsxs13(Text14, { children: [
+              /* @__PURE__ */ jsx19(Text14, { dimColor: true, children: shippingAddress.id }),
+              nickname,
+              shippingAddress.is_default ? /* @__PURE__ */ jsx19(Text14, { color: "green", children: " (default)" }) : null
+            ] }),
+            /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", marginTop: 1, children: [
+              addressName ? /* @__PURE__ */ jsx19(Text14, { bold: true, children: addressName }) : null,
+              formatAddressLines(shippingAddress).map((line) => /* @__PURE__ */ jsx19(Text14, { children: line }, `${shippingAddress.id}:${line}`))
+            ] })
+          ]
+        },
+        shippingAddress.id
+      );
+    }) })
+  ] });
+};
+
+// src/commands/shipping-address/index.tsx
+import { jsx as jsx20 } from "react/jsx-runtime";
+function createShippingAddressCli(createResource, authStorage2) {
+  const cli2 = Cli6.create("shipping-address", {
+    description: "Shipping address management commands"
+  });
+  cli2.command("list", {
+    description: "List all shipping addresses on your account",
+    outputPolicy: "agent-only",
+    middleware: [requireAuth(authStorage2)],
+    async run(c) {
+      const resource = createResource();
+      if (!c.agent && !c.formatExplicit) {
+        return renderInteractive(
+          /* @__PURE__ */ jsx20(ShippingAddressList, { resource, onComplete: () => {
+          } }),
+          () => resource.listShippingAddresses()
+        );
+      }
+      return resource.listShippingAddresses();
+    }
+  });
+  return cli2;
+}
+
 // src/commands/spend-request/index.tsx
-import { Cli as Cli6, z as z7 } from "incur";
-import { render as render6 } from "ink";
+import { Cli as Cli7, z as z7 } from "incur";
+
+// src/utils/credential-output.ts
+import fs4 from "fs/promises";
+import path6 from "path";
+async function writeCredentialFile(filePath, data, force) {
+  const resolved = path6.resolve(filePath);
+  if (!force) {
+    try {
+      await fs4.access(resolved);
+      throw new Error(
+        `OUTPUT_FILE_EXISTS: ${resolved} already exists. Use --force to overwrite.`
+      );
+    } catch (err) {
+      if (err.code !== "ENOENT") throw err;
+    }
+  }
+  await fs4.writeFile(resolved, JSON.stringify(data, null, 2), {
+    mode: 384
+  });
+  await fs4.chmod(resolved, 384);
+  return resolved;
+}
 
 // src/utils/line-item-parser.ts
 import { z as z5 } from "zod";
@@ -13623,21 +14052,59 @@ function parseTotalFlag(raw) {
   }
 }
 
-// src/commands/spend-request/create.tsx
+// src/commands/spend-request/cancel.tsx
 import { Box as Box14, Text as Text15 } from "ink";
-import Spinner5 from "ink-spinner";
-import { useCallback as useCallback2, useEffect as useEffect10, useState as useState10 } from "react";
+import Spinner6 from "ink-spinner";
+import { useCallback as useCallback5 } from "react";
+import { jsx as jsx21, jsxs as jsxs14 } from "react/jsx-runtime";
+var CancelSpendRequest = ({
+  repository,
+  id,
+  onComplete
+}) => {
+  const action = useCallback5(
+    () => repository.cancelSpendRequest(id),
+    [repository, id]
+  );
+  const { status, data: request, error } = useAsyncAction(action, onComplete);
+  if (status === "loading") {
+    return /* @__PURE__ */ jsx21(Box14, { children: /* @__PURE__ */ jsxs14(Text15, { color: "cyan", children: [
+      /* @__PURE__ */ jsx21(Spinner6, { type: "dots" }),
+      " Canceling spend request ",
+      id,
+      "..."
+    ] }) });
+  }
+  if (status === "error") {
+    return /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx21(Text15, { color: "red", children: "\u2717 Failed to cancel spend request" }),
+      /* @__PURE__ */ jsx21(Text15, { color: "red", children: error })
+    ] });
+  }
+  return /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx21(Text15, { color: "green", children: "\u2713 Spend request canceled" }),
+    /* @__PURE__ */ jsx21(Box14, { flexDirection: "column", marginTop: 1, paddingX: 2, children: /* @__PURE__ */ jsxs14(Text15, { children: [
+      "ID: ",
+      /* @__PURE__ */ jsx21(Text15, { bold: true, children: request?.id })
+    ] }) })
+  ] });
+};
+
+// src/commands/spend-request/create.tsx
+import { Box as Box16, Text as Text17 } from "ink";
+import Spinner8 from "ink-spinner";
+import { useCallback as useCallback6, useEffect as useEffect9, useState as useState9 } from "react";
 
 // src/commands/spend-request/approval-waiting-view.tsx
-import { Box as Box13, Text as Text14 } from "ink";
-import Spinner4 from "ink-spinner";
-import { jsx as jsx19, jsxs as jsxs12 } from "react/jsx-runtime";
+import { Box as Box15, Text as Text16 } from "ink";
+import Spinner7 from "ink-spinner";
+import { jsx as jsx22, jsxs as jsxs15 } from "react/jsx-runtime";
 var ApprovalWaitingView = ({
   status,
   approvalUrl
-}) => /* @__PURE__ */ jsxs12(Box13, { flexDirection: "column", paddingY: 1, children: [
-  /* @__PURE__ */ jsxs12(
-    Box13,
+}) => /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", paddingY: 1, children: [
+  /* @__PURE__ */ jsxs15(
+    Box15,
     {
       flexDirection: "column",
       borderStyle: "round",
@@ -13645,25 +14112,25 @@ var ApprovalWaitingView = ({
       paddingX: 2,
       paddingY: 1,
       children: [
-        /* @__PURE__ */ jsxs12(Text14, { children: [
+        /* @__PURE__ */ jsxs15(Text16, { children: [
           "Approve at:",
           " ",
-          /* @__PURE__ */ jsx19(Text14, { bold: true, color: "cyan", children: approvalUrl })
+          /* @__PURE__ */ jsx22(Text16, { bold: true, color: "cyan", children: approvalUrl })
         ] }),
-        /* @__PURE__ */ jsx19(Text14, { dimColor: true, children: "Press Enter to open in browser" })
+        /* @__PURE__ */ jsx22(Text16, { dimColor: true, children: "Press Enter to open in browser" })
       ]
     }
   ),
-  /* @__PURE__ */ jsx19(AppDownloadQrCodes, {}),
-  /* @__PURE__ */ jsx19(Box13, { marginTop: 1, children: status === "polling" ? /* @__PURE__ */ jsxs12(Text14, { color: "cyan", children: [
-    /* @__PURE__ */ jsx19(Spinner4, { type: "dots" }),
+  /* @__PURE__ */ jsx22(AppDownloadQrCodes, {}),
+  /* @__PURE__ */ jsx22(Box15, { marginTop: 1, children: status === "polling" ? /* @__PURE__ */ jsxs15(Text16, { color: "cyan", children: [
+    /* @__PURE__ */ jsx22(Spinner7, { type: "dots" }),
     " Waiting for approval..."
-  ] }) : /* @__PURE__ */ jsx19(Text14, { dimColor: true, children: "Waiting..." }) })
+  ] }) : /* @__PURE__ */ jsx22(Text16, { dimColor: true, children: "Waiting..." }) })
 ] });
 
 // src/commands/spend-request/use-approval-polling.ts
 import { useInput as useInput7 } from "ink";
-import { useEffect as useEffect9 } from "react";
+import { useEffect as useEffect8 } from "react";
 function useApprovalPolling({
   status,
   setStatus,
@@ -13681,22 +14148,29 @@ function useApprovalPolling({
     },
     { isActive: isWaiting }
   );
-  useEffect9(() => {
+  useEffect8(() => {
     if (status !== "waiting") return;
     const timeout = setTimeout(() => setStatus("polling"), 1e3);
     return () => clearTimeout(timeout);
   }, [status, setStatus]);
-  useEffect9(() => {
+  useEffect8(() => {
     if (status !== "polling" || !requestId) return;
     let cancelled = false;
     const poll = async () => {
       try {
         const final = await pollUntilApproved(repository, requestId);
-        if (!cancelled) {
-          onSuccess(final);
-          setStatus("success");
-          setTimeout(() => onComplete(final), 1e3);
+        if (cancelled) return;
+        if (final.status !== "approved") {
+          onError(
+            `Spend request did not reach approved (status: ${final.status})`
+          );
+          setStatus("error");
+          setTimeout(() => onComplete(final), DISPLAY_DELAY_MS);
+          return;
         }
+        onSuccess(final);
+        setStatus("success");
+        setTimeout(() => onComplete(final), DISPLAY_DELAY_MS);
       } catch (err) {
         if (!cancelled) {
           onError(err.message);
@@ -13720,22 +14194,26 @@ function useApprovalPolling({
 }
 
 // src/commands/spend-request/create.tsx
-import { Fragment as Fragment4, jsx as jsx20, jsxs as jsxs13 } from "react/jsx-runtime";
+import { Fragment as Fragment4, jsx as jsx23, jsxs as jsxs16 } from "react/jsx-runtime";
 var CreateSpendRequest = ({
   repository,
   params,
   requestApproval = false,
+  outputFile,
+  force,
   onComplete
 }) => {
-  const [status, setStatus] = useState10("creating");
-  const [request, setRequest] = useState10(null);
-  const [error, setError] = useState10("");
+  const [status, setStatus] = useState9("creating");
+  const [request, setRequest] = useState9(null);
+  const [error, setError] = useState9("");
+  const [outputFilePath, setOutputFilePath] = useState9(null);
+  const [fileError, setFileError] = useState9("");
   const approvalUrl = request?.approval_url ?? "";
-  const onSuccess = useCallback2(
+  const onSuccess = useCallback6(
     (result) => setRequest(result),
     []
   );
-  const onError = useCallback2((msg) => setError(msg), []);
+  const onError = useCallback6((msg) => setError(msg), []);
   useApprovalPolling({
     status,
     setStatus,
@@ -13746,7 +14224,7 @@ var CreateSpendRequest = ({
     onSuccess,
     onError
   });
-  useEffect10(() => {
+  useEffect9(() => {
     const create = async () => {
       try {
         const result = await repository.createSpendRequest(params);
@@ -13755,69 +14233,124 @@ var CreateSpendRequest = ({
           setStatus("waiting");
         } else {
           setStatus("success");
-          setTimeout(() => onComplete(result), 1500);
+          setTimeout(() => onComplete(result), DISPLAY_DELAY_MS);
         }
       } catch (err) {
         setError(err.message);
         setStatus("error");
-        setTimeout(() => onComplete(null), 1500);
+        setTimeout(() => onComplete(null), DISPLAY_DELAY_MS);
       }
     };
     create();
   }, [repository, params, requestApproval, onComplete]);
+  useEffect9(() => {
+    if (status !== "success" || !outputFile || !request?.card) return;
+    const fileData = {
+      spend_request_id: request.id,
+      merchant_name: request.merchant_name,
+      merchant_url: request.merchant_url,
+      context: request.context,
+      created_at: request.created_at,
+      card: request.card
+    };
+    writeCredentialFile(outputFile, fileData, force ?? false).then((path7) => setOutputFilePath(path7)).catch((err) => setFileError(err.message));
+  }, [status, outputFile, force, request]);
   if (status === "creating") {
-    return /* @__PURE__ */ jsx20(Box14, { children: /* @__PURE__ */ jsxs13(Text15, { color: "cyan", children: [
-      /* @__PURE__ */ jsx20(Spinner5, { type: "dots" }),
+    return /* @__PURE__ */ jsx23(Box16, { children: /* @__PURE__ */ jsxs16(Text17, { color: "cyan", children: [
+      /* @__PURE__ */ jsx23(Spinner8, { type: "dots" }),
       " Creating spend request..."
     ] }) });
   }
   if (status === "error") {
-    return /* @__PURE__ */ jsxs13(Box14, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx20(Text15, { color: "red", children: "\u2717 Failed to create spend request" }),
-      /* @__PURE__ */ jsx20(Text15, { color: "red", children: error })
+    return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx23(Text17, { color: "red", children: "\u2717 Failed to create spend request" }),
+      /* @__PURE__ */ jsx23(Text17, { color: "red", children: error })
     ] });
   }
   if (status === "success") {
-    return /* @__PURE__ */ jsxs13(Box14, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx20(Text15, { color: "green", children: "\u2713 Spend request created" }),
-      /* @__PURE__ */ jsxs13(Box14, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-        /* @__PURE__ */ jsxs13(Text15, { children: [
+    return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx23(Text17, { color: "green", children: "\u2713 Spend request created" }),
+      /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+        /* @__PURE__ */ jsxs16(Text17, { children: [
           "ID: ",
-          /* @__PURE__ */ jsx20(Text15, { bold: true, children: request?.id })
+          /* @__PURE__ */ jsx23(Text17, { bold: true, children: request?.id })
         ] }),
-        /* @__PURE__ */ jsxs13(Text15, { children: [
+        /* @__PURE__ */ jsxs16(Text17, { children: [
           "Status: ",
-          /* @__PURE__ */ jsx20(Text15, { bold: true, children: request?.status })
+          /* @__PURE__ */ jsx23(Text17, { bold: true, children: request?.status })
         ] }),
-        /* @__PURE__ */ jsxs13(Text15, { children: [
+        /* @__PURE__ */ jsxs16(Text17, { children: [
           "Amount:",
           " ",
-          /* @__PURE__ */ jsx20(Text15, { bold: true, children: request?.amount != null ? `${request.amount} ${request.currency?.toUpperCase() ?? ""}`.trim() : "N/A" })
+          /* @__PURE__ */ jsx23(Text17, { bold: true, children: request?.amount != null ? `${request.amount} ${request.currency?.toUpperCase() ?? ""}`.trim() : "N/A" })
         ] }),
-        /* @__PURE__ */ jsxs13(Text15, { children: [
+        /* @__PURE__ */ jsxs16(Text17, { children: [
           "Merchant: ",
-          /* @__PURE__ */ jsx20(Text15, { bold: true, children: request?.merchant_name })
+          /* @__PURE__ */ jsx23(Text17, { bold: true, children: request?.merchant_name })
         ] }),
-        /* @__PURE__ */ jsxs13(Text15, { children: [
+        /* @__PURE__ */ jsxs16(Text17, { children: [
           "Line Items:",
           " ",
-          /* @__PURE__ */ jsx20(Text15, { bold: true, children: request?.line_items.map((li) => li.name).join(", ") || "N/A" })
+          /* @__PURE__ */ jsx23(Text17, { bold: true, children: request?.line_items.map((li) => li.name).join(", ") || "N/A" })
         ] }),
-        request?.credential_type === "shared_payment_token" && request.shared_payment_token && /* @__PURE__ */ jsxs13(Text15, { children: [
+        request?.credential_type === "shared_payment_token" && request.shared_payment_token && /* @__PURE__ */ jsxs16(Text17, { children: [
           "Token: ",
-          /* @__PURE__ */ jsx20(Text15, { bold: true, children: request.shared_payment_token.id })
+          /* @__PURE__ */ jsx23(Text17, { bold: true, children: request.shared_payment_token.id })
+        ] })
+      ] }),
+      request?.card && !outputFile && /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", marginTop: 1, children: [
+        /* @__PURE__ */ jsx23(Text17, { bold: true, children: "Card Details:" }),
+        /* @__PURE__ */ jsxs16(Text17, { children: [
+          " ",
+          "Number: ",
+          /* @__PURE__ */ jsx23(Text17, { bold: true, children: request.card.number })
+        ] }),
+        /* @__PURE__ */ jsxs16(Text17, { children: [
+          " ",
+          "Brand: ",
+          /* @__PURE__ */ jsx23(Text17, { bold: true, children: request.card.brand })
+        ] }),
+        /* @__PURE__ */ jsxs16(Text17, { children: [
+          " ",
+          "Expiry:",
+          " ",
+          /* @__PURE__ */ jsxs16(Text17, { bold: true, children: [
+            String(request.card.exp_month).padStart(2, "0"),
+            "/",
+            request.card.exp_year
+          ] })
+        ] }),
+        request.card.cvc && /* @__PURE__ */ jsxs16(Text17, { children: [
+          " ",
+          "CVC: ",
+          /* @__PURE__ */ jsx23(Text17, { bold: true, children: request.card.cvc })
+        ] }),
+        request.card.valid_until && /* @__PURE__ */ jsxs16(Text17, { children: [
+          " ",
+          "Valid Until: ",
+          /* @__PURE__ */ jsx23(Text17, { bold: true, children: request.card.valid_until })
+        ] })
+      ] }),
+      request?.card && outputFile && /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", marginTop: 1, children: [
+        outputFilePath && /* @__PURE__ */ jsxs16(Text17, { color: "green", children: [
+          "Card credentials written to ",
+          /* @__PURE__ */ jsx23(Text17, { bold: true, children: outputFilePath })
+        ] }),
+        fileError && /* @__PURE__ */ jsxs16(Text17, { color: "red", children: [
+          "Failed to write card file: ",
+          fileError
         ] })
       ] }),
-      /* @__PURE__ */ jsx20(AppDownloadQrCodes, {})
+      /* @__PURE__ */ jsx23(AppDownloadQrCodes, {})
     ] });
   }
-  return /* @__PURE__ */ jsxs13(Fragment4, { children: [
-    /* @__PURE__ */ jsx20(Box14, { children: /* @__PURE__ */ jsxs13(Text15, { color: "green", children: [
+  return /* @__PURE__ */ jsxs16(Fragment4, { children: [
+    /* @__PURE__ */ jsx23(Box16, { children: /* @__PURE__ */ jsxs16(Text17, { color: "green", children: [
       "\u2713 Spend request created (ID: ",
-      /* @__PURE__ */ jsx20(Text15, { bold: true, children: request?.id }),
+      /* @__PURE__ */ jsx23(Text17, { bold: true, children: request?.id }),
       ")"
     ] }) }),
-    /* @__PURE__ */ jsx20(
+    /* @__PURE__ */ jsx23(
       ApprovalWaitingView,
       {
         status,
@@ -13828,21 +14361,21 @@ var CreateSpendRequest = ({
 };
 
 // src/commands/spend-request/request-approval.tsx
-import { Box as Box15, Text as Text16 } from "ink";
-import Spinner6 from "ink-spinner";
-import { useCallback as useCallback3, useEffect as useEffect11, useState as useState11 } from "react";
-import { jsx as jsx21, jsxs as jsxs14 } from "react/jsx-runtime";
+import { Box as Box17, Text as Text18 } from "ink";
+import Spinner9 from "ink-spinner";
+import { useCallback as useCallback7, useEffect as useEffect10, useState as useState10 } from "react";
+import { jsx as jsx24, jsxs as jsxs17 } from "react/jsx-runtime";
 var RequestApproval = ({
   repository,
   id,
   onComplete
 }) => {
-  const [status, setStatus] = useState11("requesting");
-  const [approvalUrl, setApprovalUrl] = useState11("");
-  const [result, setResult] = useState11(null);
-  const [error, setError] = useState11("");
-  const onSuccess = useCallback3((r) => setResult(r), []);
-  const onError = useCallback3((msg) => setError(msg), []);
+  const [status, setStatus] = useState10("requesting");
+  const [approvalUrl, setApprovalUrl] = useState10("");
+  const [result, setResult] = useState10(null);
+  const [error, setError] = useState10("");
+  const onSuccess = useCallback7((r) => setResult(r), []);
+  const onError = useCallback7((msg) => setError(msg), []);
   useApprovalPolling({
     status,
     setStatus,
@@ -13853,7 +14386,7 @@ var RequestApproval = ({
     onSuccess,
     onError
   });
-  useEffect11(() => {
+  useEffect10(() => {
     const request = async () => {
       try {
         const res = await repository.requestApproval(id);
@@ -13867,46 +14400,46 @@ var RequestApproval = ({
     request();
   }, [repository, id]);
   if (status === "requesting") {
-    return /* @__PURE__ */ jsx21(Box15, { children: /* @__PURE__ */ jsxs14(Text16, { color: "cyan", children: [
-      /* @__PURE__ */ jsx21(Spinner6, { type: "dots" }),
+    return /* @__PURE__ */ jsx24(Box17, { children: /* @__PURE__ */ jsxs17(Text18, { color: "cyan", children: [
+      /* @__PURE__ */ jsx24(Spinner9, { type: "dots" }),
       " Requesting approval..."
     ] }) });
   }
   if (status === "error") {
-    return /* @__PURE__ */ jsxs14(Box15, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx21(Text16, { color: "red", children: "\u2717 Failed to request approval" }),
-      /* @__PURE__ */ jsx21(Text16, { color: "red", children: error })
+    return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx24(Text18, { color: "red", children: "\u2717 Failed to request approval" }),
+      /* @__PURE__ */ jsx24(Text18, { color: "red", children: error })
     ] });
   }
   if (status === "success") {
-    return /* @__PURE__ */ jsxs14(Box15, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx21(Text16, { color: "green", children: "\u2713 Approval completed" }),
-      /* @__PURE__ */ jsxs14(Box15, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-        /* @__PURE__ */ jsxs14(Text16, { children: [
+    return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx24(Text18, { color: "green", children: "\u2713 Approval completed" }),
+      /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+        /* @__PURE__ */ jsxs17(Text18, { children: [
           "ID: ",
-          /* @__PURE__ */ jsx21(Text16, { bold: true, children: result?.id })
+          /* @__PURE__ */ jsx24(Text18, { bold: true, children: result?.id })
         ] }),
-        /* @__PURE__ */ jsxs14(Text16, { children: [
+        /* @__PURE__ */ jsxs17(Text18, { children: [
           "Status: ",
-          /* @__PURE__ */ jsx21(Text16, { bold: true, children: result?.status })
+          /* @__PURE__ */ jsx24(Text18, { bold: true, children: result?.status })
         ] }),
-        /* @__PURE__ */ jsxs14(Text16, { children: [
+        /* @__PURE__ */ jsxs17(Text18, { children: [
           "Amount:",
           " ",
-          /* @__PURE__ */ jsx21(Text16, { bold: true, children: result?.amount != null ? `${result.amount} ${result.currency?.toUpperCase() ?? ""}`.trim() : "N/A" })
+          /* @__PURE__ */ jsx24(Text18, { bold: true, children: result?.amount != null ? `${result.amount} ${result.currency?.toUpperCase() ?? ""}`.trim() : "N/A" })
         ] }),
-        /* @__PURE__ */ jsxs14(Text16, { children: [
+        /* @__PURE__ */ jsxs17(Text18, { children: [
           "Merchant: ",
-          /* @__PURE__ */ jsx21(Text16, { bold: true, children: result?.merchant_name })
+          /* @__PURE__ */ jsx24(Text18, { bold: true, children: result?.merchant_name })
         ] }),
-        result?.credential_type === "shared_payment_token" && result.shared_payment_token && /* @__PURE__ */ jsxs14(Text16, { children: [
+        result?.credential_type === "shared_payment_token" && result.shared_payment_token && /* @__PURE__ */ jsxs17(Text18, { children: [
           "Token: ",
-          /* @__PURE__ */ jsx21(Text16, { bold: true, children: result.shared_payment_token.id })
+          /* @__PURE__ */ jsx24(Text18, { bold: true, children: result.shared_payment_token.id })
         ] })
       ] })
     ] });
   }
-  return /* @__PURE__ */ jsx21(
+  return /* @__PURE__ */ jsx24(
     ApprovalWaitingView,
     {
       status,
@@ -13916,49 +14449,76 @@ var RequestApproval = ({
 };
 
 // src/commands/spend-request/retrieve.tsx
-import { Box as Box16, Text as Text17 } from "ink";
-import Spinner7 from "ink-spinner";
-import { useEffect as useEffect12, useRef as useRef4, useState as useState12 } from "react";
-import { jsx as jsx22, jsxs as jsxs15 } from "react/jsx-runtime";
+import { Box as Box18, Text as Text19 } from "ink";
+import Spinner10 from "ink-spinner";
+import { useEffect as useEffect11, useRef as useRef5, useState as useState11 } from "react";
+import { jsx as jsx25, jsxs as jsxs18 } from "react/jsx-runtime";
+var TERMINAL_STATUSES = /* @__PURE__ */ new Set([
+  "approved",
+  "denied",
+  "expired",
+  "succeeded",
+  "failed",
+  "canceled"
+]);
 var RetrieveSpendRequest = ({
   repository,
   id,
-  timeout = 300,
+  timeout = 600,
   include,
+  outputFile,
+  force,
   onComplete
 }) => {
-  const [phase, setPhase] = useState12("fetching");
-  const [request, setRequest] = useState12(null);
-  const [error, setError] = useState12("");
-  const [elapsed, setElapsed] = useState12(0);
-  const startTimeRef = useRef4(Date.now());
-  const pollRef = useRef4(null);
-  const timerRef = useRef4(null);
-  const requestRef = useRef4(null);
-  useEffect12(() => {
+  const [phase, setPhase] = useState11("fetching");
+  const [request, setRequest] = useState11(null);
+  const [error, setError] = useState11("");
+  const [elapsed, setElapsed] = useState11(0);
+  const [outputFilePath, setOutputFilePath] = useState11(null);
+  const [fileError, setFileError] = useState11("");
+  const startTimeRef = useRef5(Date.now());
+  const pollRef = useRef5(null);
+  const timerRef = useRef5(null);
+  const requestRef = useRef5(null);
+  useEffect11(() => {
     return () => {
       if (pollRef.current) clearInterval(pollRef.current);
       if (timerRef.current) clearInterval(timerRef.current);
     };
   }, []);
-  useEffect12(() => {
+  useEffect11(() => {
+    if (phase !== "success" || !outputFile || !request?.card) return;
+    const fileData = {
+      spend_request_id: request.id,
+      merchant_name: request.merchant_name,
+      merchant_url: request.merchant_url,
+      context: request.context,
+      created_at: request.created_at,
+      card: request.card
+    };
+    writeCredentialFile(outputFile, fileData, force ?? false).then((path7) => setOutputFilePath(path7)).catch((err) => setFileError(err.message));
+  }, [phase, outputFile, force, request]);
+  useEffect11(() => {
     const fetch2 = async () => {
       try {
         const result = await repository.getSpendRequest(id, { include });
         if (!result) {
           setError(`Spend request ${id} not found`);
           setPhase("error");
-          setTimeout(() => onComplete(null), 1500);
+          setTimeout(() => onComplete(null), DISPLAY_DELAY_MS);
           return;
         }
         requestRef.current = result;
         setRequest(result);
         if (result.status === "approved") {
           setPhase("success");
-          setTimeout(() => onComplete(result), 1500);
+          setTimeout(() => onComplete(result), DISPLAY_DELAY_MS);
         } else if (result.status === "denied") {
           setPhase("declined");
-          setTimeout(() => onComplete(result), 1500);
+          setTimeout(() => onComplete(result), DISPLAY_DELAY_MS);
+        } else if (TERMINAL_STATUSES.has(result.status)) {
+          setPhase("finalized");
+          setTimeout(() => onComplete(result), DISPLAY_DELAY_MS);
         } else {
           startTimeRef.current = Date.now();
           setPhase("polling");
@@ -13966,12 +14526,12 @@ var RetrieveSpendRequest = ({
       } catch (err) {
         setError(err.message);
         setPhase("error");
-        setTimeout(() => onComplete(null), 1500);
+        setTimeout(() => onComplete(null), DISPLAY_DELAY_MS);
       }
     };
     fetch2();
   }, [repository, id, include, onComplete]);
-  useEffect12(() => {
+  useEffect11(() => {
     if (phase !== "polling") return;
     timerRef.current = setInterval(() => {
       const secs = Math.floor((Date.now() - startTimeRef.current) / 1e3);
@@ -13983,7 +14543,7 @@ var RetrieveSpendRequest = ({
         if (pollRef.current) clearInterval(pollRef.current);
         if (timerRef.current) clearInterval(timerRef.current);
         setPhase("timeout");
-        setTimeout(() => onComplete(requestRef.current), 1500);
+        setTimeout(() => onComplete(requestRef.current), DISPLAY_DELAY_MS);
         return;
       }
       try {
@@ -13995,12 +14555,17 @@ var RetrieveSpendRequest = ({
           if (pollRef.current) clearInterval(pollRef.current);
           if (timerRef.current) clearInterval(timerRef.current);
           setPhase("success");
-          setTimeout(() => onComplete(result), 1500);
+          setTimeout(() => onComplete(result), DISPLAY_DELAY_MS);
         } else if (result.status === "denied") {
           if (pollRef.current) clearInterval(pollRef.current);
           if (timerRef.current) clearInterval(timerRef.current);
           setPhase("declined");
-          setTimeout(() => onComplete(result), 1500);
+          setTimeout(() => onComplete(result), DISPLAY_DELAY_MS);
+        } else if (TERMINAL_STATUSES.has(result.status)) {
+          if (pollRef.current) clearInterval(pollRef.current);
+          if (timerRef.current) clearInterval(timerRef.current);
+          setPhase("finalized");
+          setTimeout(() => onComplete(result), DISPLAY_DELAY_MS);
         }
       } catch {
       }
@@ -14011,163 +14576,181 @@ var RetrieveSpendRequest = ({
     };
   }, [phase, repository, id, include, timeout, onComplete]);
   if (phase === "fetching") {
-    return /* @__PURE__ */ jsx22(Box16, { children: /* @__PURE__ */ jsxs15(Text17, { color: "cyan", children: [
-      /* @__PURE__ */ jsx22(Spinner7, { type: "dots" }),
+    return /* @__PURE__ */ jsx25(Box18, { children: /* @__PURE__ */ jsxs18(Text19, { color: "cyan", children: [
+      /* @__PURE__ */ jsx25(Spinner10, { type: "dots" }),
       " Retrieving spend request ",
       id,
       "..."
     ] }) });
   }
   if (phase === "error") {
-    return /* @__PURE__ */ jsx22(Box16, { flexDirection: "column", children: /* @__PURE__ */ jsxs15(Text17, { color: "red", children: [
+    return /* @__PURE__ */ jsx25(Box18, { flexDirection: "column", children: /* @__PURE__ */ jsxs18(Text19, { color: "red", children: [
       "\u2717 ",
       error
     ] }) });
   }
   if (phase === "timeout") {
-    return /* @__PURE__ */ jsxs15(Box16, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs15(Text17, { color: "yellow", children: [
+    return /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs18(Text19, { color: "yellow", children: [
         "\u2717 Timed out waiting for approval after ",
         timeout,
         "s"
       ] }),
-      request && /* @__PURE__ */ jsxs15(Box16, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-        /* @__PURE__ */ jsxs15(Text17, { children: [
+      request && /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+        /* @__PURE__ */ jsxs18(Text19, { children: [
           "ID: ",
-          /* @__PURE__ */ jsx22(Text17, { bold: true, children: request.id })
+          /* @__PURE__ */ jsx25(Text19, { bold: true, children: request.id })
         ] }),
-        /* @__PURE__ */ jsxs15(Text17, { children: [
+        /* @__PURE__ */ jsxs18(Text19, { children: [
           "Status: ",
-          /* @__PURE__ */ jsx22(Text17, { bold: true, children: request.status })
+          /* @__PURE__ */ jsx25(Text19, { bold: true, children: request.status })
         ] })
       ] })
     ] });
   }
   if (phase === "polling") {
-    return /* @__PURE__ */ jsxs15(Box16, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx22(Box16, { children: /* @__PURE__ */ jsxs15(Text17, { color: "cyan", children: [
-        /* @__PURE__ */ jsx22(Spinner7, { type: "dots" }),
+    return /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx25(Box18, { children: /* @__PURE__ */ jsxs18(Text19, { color: "cyan", children: [
+        /* @__PURE__ */ jsx25(Spinner10, { type: "dots" }),
         " Awaiting approval... (",
         elapsed,
         "s elapsed)"
       ] }) }),
-      request?.approval_url && /* @__PURE__ */ jsx22(Box16, { marginTop: 1, paddingX: 2, children: /* @__PURE__ */ jsxs15(Text17, { dimColor: true, children: [
+      request?.approval_url && /* @__PURE__ */ jsx25(Box18, { marginTop: 1, paddingX: 2, children: /* @__PURE__ */ jsxs18(Text19, { dimColor: true, children: [
         "Approval URL: ",
-        /* @__PURE__ */ jsx22(Text17, { color: "cyan", children: request.approval_url })
+        /* @__PURE__ */ jsx25(Text19, { color: "cyan", children: request.approval_url })
       ] }) })
     ] });
   }
+  if (phase === "finalized") {
+    return /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs18(Text19, { color: "yellow", children: [
+        "Spend request reached terminal status: ",
+        request?.status
+      ] }),
+      /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+        /* @__PURE__ */ jsxs18(Text19, { children: [
+          "ID: ",
+          /* @__PURE__ */ jsx25(Text19, { bold: true, children: request?.id })
+        ] }),
+        /* @__PURE__ */ jsxs18(Text19, { children: [
+          "Status: ",
+          /* @__PURE__ */ jsx25(Text19, { bold: true, children: request?.status })
+        ] })
+      ] })
+    ] });
+  }
   if (phase === "declined") {
-    return /* @__PURE__ */ jsxs15(Box16, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx22(Text17, { color: "red", children: "\u2717 Spend request declined" }),
-      /* @__PURE__ */ jsxs15(Box16, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-        /* @__PURE__ */ jsxs15(Text17, { children: [
+    return /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx25(Text19, { color: "red", children: "\u2717 Spend request declined" }),
+      /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+        /* @__PURE__ */ jsxs18(Text19, { children: [
           "ID: ",
-          /* @__PURE__ */ jsx22(Text17, { bold: true, children: request?.id })
+          /* @__PURE__ */ jsx25(Text19, { bold: true, children: request?.id })
         ] }),
-        /* @__PURE__ */ jsxs15(Text17, { children: [
+        /* @__PURE__ */ jsxs18(Text19, { children: [
           "Status:",
           " ",
-          /* @__PURE__ */ jsx22(Text17, { bold: true, color: "red", children: request?.status })
+          /* @__PURE__ */ jsx25(Text19, { bold: true, color: "red", children: request?.status })
         ] }),
-        /* @__PURE__ */ jsxs15(Text17, { children: [
+        /* @__PURE__ */ jsxs18(Text19, { children: [
           "Amount:",
           " ",
-          /* @__PURE__ */ jsx22(Text17, { bold: true, children: request?.amount != null ? String(request.amount) : "N/A" })
+          /* @__PURE__ */ jsx25(Text19, { bold: true, children: request?.amount != null ? String(request.amount) : "N/A" })
         ] }),
-        /* @__PURE__ */ jsxs15(Text17, { children: [
+        /* @__PURE__ */ jsxs18(Text19, { children: [
           "Merchant: ",
-          /* @__PURE__ */ jsx22(Text17, { bold: true, children: request?.merchant_name })
+          /* @__PURE__ */ jsx25(Text19, { bold: true, children: request?.merchant_name })
         ] })
       ] })
     ] });
   }
-  return /* @__PURE__ */ jsxs15(Box16, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx22(Text17, { color: "green", children: "\u2713 Spend request approved" }),
-    /* @__PURE__ */ jsxs15(Box16, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-      /* @__PURE__ */ jsxs15(Text17, { children: [
+  return /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx25(Text19, { color: "green", children: "\u2713 Spend request approved" }),
+    /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+      /* @__PURE__ */ jsxs18(Text19, { children: [
         "ID: ",
-        /* @__PURE__ */ jsx22(Text17, { bold: true, children: request?.id })
+        /* @__PURE__ */ jsx25(Text19, { bold: true, children: request?.id })
       ] }),
-      /* @__PURE__ */ jsxs15(Text17, { children: [
+      /* @__PURE__ */ jsxs18(Text19, { children: [
         "Status:",
         " ",
-        /* @__PURE__ */ jsx22(Text17, { bold: true, color: "green", children: request?.status })
+        /* @__PURE__ */ jsx25(Text19, { bold: true, color: "green", children: request?.status })
       ] }),
-      /* @__PURE__ */ jsxs15(Text17, { children: [
+      /* @__PURE__ */ jsxs18(Text19, { children: [
         "Amount:",
         " ",
-        /* @__PURE__ */ jsx22(Text17, { bold: true, children: request?.amount != null ? String(request.amount) : "N/A" })
+        /* @__PURE__ */ jsx25(Text19, { bold: true, children: request?.amount != null ? String(request.amount) : "N/A" })
       ] }),
-      /* @__PURE__ */ jsxs15(Text17, { children: [
+      /* @__PURE__ */ jsxs18(Text19, { children: [
         "Merchant: ",
-        /* @__PURE__ */ jsx22(Text17, { bold: true, children: request?.merchant_name })
+        /* @__PURE__ */ jsx25(Text19, { bold: true, children: request?.merchant_name })
       ] }),
-      /* @__PURE__ */ jsxs15(Text17, { children: [
+      /* @__PURE__ */ jsxs18(Text19, { children: [
         "Line Items:",
         " ",
-        /* @__PURE__ */ jsx22(Text17, { bold: true, children: request?.line_items.map((li) => li.name).join(", ") })
+        /* @__PURE__ */ jsx25(Text19, { bold: true, children: request?.line_items.map((li) => li.name).join(", ") })
       ] }),
-      request?.shared_payment_token && /* @__PURE__ */ jsxs15(Box16, { flexDirection: "column", marginTop: 1, children: [
-        /* @__PURE__ */ jsxs15(Text17, { bold: true, children: [
+      request?.shared_payment_token && /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", marginTop: 1, children: [
+        /* @__PURE__ */ jsxs18(Text19, { bold: true, children: [
           "\x1B]8;;https://docs.stripe.com/agentic-commerce/concepts/shared-payment-tokens\x07",
           "Shared Payment Token",
           "\x1B]8;;\x07",
           ":"
         ] }),
-        /* @__PURE__ */ jsxs15(Text17, { children: [
+        /* @__PURE__ */ jsxs18(Text19, { children: [
           " ",
           "Token: ",
-          /* @__PURE__ */ jsx22(Text17, { bold: true, children: request.shared_payment_token.id })
+          /* @__PURE__ */ jsx25(Text19, { bold: true, children: request.shared_payment_token.id })
         ] })
       ] }),
-      request?.card && /* @__PURE__ */ jsxs15(Box16, { flexDirection: "column", marginTop: 1, children: [
-        /* @__PURE__ */ jsx22(Text17, { bold: true, children: "Card Details:" }),
-        /* @__PURE__ */ jsxs15(Text17, { children: [
+      request?.card && !outputFile && /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", marginTop: 1, children: [
+        /* @__PURE__ */ jsx25(Text19, { bold: true, children: "Card Details:" }),
+        /* @__PURE__ */ jsxs18(Text19, { children: [
           " ",
           "Number: ",
-          /* @__PURE__ */ jsx22(Text17, { bold: true, children: request?.card.number })
+          /* @__PURE__ */ jsx25(Text19, { bold: true, children: request?.card.number })
         ] }),
-        /* @__PURE__ */ jsxs15(Text17, { children: [
+        /* @__PURE__ */ jsxs18(Text19, { children: [
           " ",
           "Brand: ",
-          /* @__PURE__ */ jsx22(Text17, { bold: true, children: request?.card.brand })
+          /* @__PURE__ */ jsx25(Text19, { bold: true, children: request?.card.brand })
         ] }),
-        /* @__PURE__ */ jsxs15(Text17, { children: [
+        /* @__PURE__ */ jsxs18(Text19, { children: [
           " ",
           "Expiry:",
           " ",
-          /* @__PURE__ */ jsxs15(Text17, { bold: true, children: [
+          /* @__PURE__ */ jsxs18(Text19, { bold: true, children: [
             String(request?.card.exp_month).padStart(2, "0"),
             "/",
             request?.card.exp_year
           ] })
         ] }),
-        request?.card.cvc && /* @__PURE__ */ jsxs15(Text17, { children: [
+        request?.card.cvc && /* @__PURE__ */ jsxs18(Text19, { children: [
           " ",
           "CVC: ",
-          /* @__PURE__ */ jsx22(Text17, { bold: true, children: request.card.cvc })
+          /* @__PURE__ */ jsx25(Text19, { bold: true, children: request.card.cvc })
         ] }),
-        request?.card.valid_until && /* @__PURE__ */ jsxs15(Text17, { children: [
+        request?.card.valid_until && /* @__PURE__ */ jsxs18(Text19, { children: [
           " ",
           "Valid Until: ",
-          /* @__PURE__ */ jsx22(Text17, { bold: true, children: request.card.valid_until })
+          /* @__PURE__ */ jsx25(Text19, { bold: true, children: request.card.valid_until })
         ] }),
-        request?.card.billing_address && /* @__PURE__ */ jsxs15(Box16, { flexDirection: "column", marginTop: 1, children: [
-          /* @__PURE__ */ jsx22(Text17, { bold: true, children: " Billing Address:" }),
-          /* @__PURE__ */ jsxs15(Text17, { children: [
+        request?.card.billing_address && /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", marginTop: 1, children: [
+          /* @__PURE__ */ jsx25(Text19, { bold: true, children: " Billing Address:" }),
+          /* @__PURE__ */ jsxs18(Text19, { children: [
             "  ",
             request.card.billing_address.name
           ] }),
-          /* @__PURE__ */ jsxs15(Text17, { children: [
+          /* @__PURE__ */ jsxs18(Text19, { children: [
             "  ",
             request.card.billing_address.line1
           ] }),
-          request.card.billing_address.line2 && /* @__PURE__ */ jsxs15(Text17, { children: [
+          request.card.billing_address.line2 && /* @__PURE__ */ jsxs18(Text19, { children: [
             "  ",
             request.card.billing_address.line2
           ] }),
-          /* @__PURE__ */ jsxs15(Text17, { children: [
+          /* @__PURE__ */ jsxs18(Text19, { children: [
             "  ",
             [
               request.card.billing_address.city,
@@ -14175,11 +14758,21 @@ var RetrieveSpendRequest = ({
               request.card.billing_address.postal_code
             ].filter(Boolean).join(", ")
           ] }),
-          /* @__PURE__ */ jsxs15(Text17, { children: [
+          /* @__PURE__ */ jsxs18(Text19, { children: [
             "  ",
             request.card.billing_address.country
           ] })
         ] })
+      ] }),
+      request?.card && outputFile && /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", marginTop: 1, children: [
+        outputFilePath && /* @__PURE__ */ jsxs18(Text19, { color: "green", children: [
+          "Card credentials written to ",
+          /* @__PURE__ */ jsx25(Text19, { bold: true, children: outputFilePath })
+        ] }),
+        fileError && /* @__PURE__ */ jsxs18(Text19, { color: "red", children: [
+          "Failed to write card file: ",
+          fileError
+        ] })
       ] })
     ] })
   ] });
@@ -14210,16 +14803,20 @@ var createOptions = z6.object({
     'Line item (repeatable, key:value format). Keys: name (required), quantity, unit_amount, description, sku, url, image_url, product_url. Example: "name:Shoes,unit_amount:5000,quantity:2"'
   ),
   total: z6.array(z6.union([z6.string(), z6.record(z6.string(), z6.unknown())])).default([]).describe(
-    'Total (repeatable, key:value format). Keys: type (required), display_text (required), amount (required). Example: "type:total,display_text:Total,amount:5000"'
+    'Total (repeatable, key:value format). Keys: type (required; one of: subtotal, tax, total, items_base_amount, items_discount, discount, fulfillment, shipping, fee, gift_wrap, tip, store_credit), display_text (required), amount (required). Example: "type:total,display_text:Total,amount:5000"'
   ),
   requestApproval: z6.boolean().default(true).describe("Request approval and poll until approved/denied/expired"),
   test: z6.boolean().default(false).describe(
     "Use test mode (creates testmode credentials from test card data)"
-  )
+  ),
+  outputFile: z6.string().optional().describe(
+    "Write full card credentials to this file path; stdout shows redacted card data only"
+  ),
+  force: z6.boolean().default(false).describe("Overwrite output file if it already exists")
 });
 var retrieveOptions = z6.object({
-  timeout: z6.coerce.number().default(300).describe(
-    "Polling timeout in seconds. When reached during active polling, exits non-zero with POLLING_TIMEOUT."
+  timeout: z6.coerce.number().default(600).describe(
+    "Polling timeout in seconds. When reached during active polling, exits non-zero with POLLING_TIMEOUT. Default exceeds the server-side spend-request expiry so polling outlives the request itself."
   ),
   interval: z6.coerce.number().default(0).describe(
     "Poll interval in seconds. When > 0, polls until status is terminal, timeout is reached, or max attempts are exhausted."
@@ -14227,7 +14824,11 @@ var retrieveOptions = z6.object({
   maxAttempts: z6.coerce.number().default(0).describe(
     "Max poll attempts. 0 = unlimited. Exhaustion during active polling exits non-zero with POLLING_TIMEOUT."
   ),
-  include: z6.array(z6.string()).default([]).describe("Include extra data (repeatable, e.g. --include card)")
+  include: z6.array(z6.string()).default([]).describe("Include extra data (repeatable, e.g. --include card)"),
+  outputFile: z6.string().optional().describe(
+    "Write full card credentials to this file path; stdout shows redacted card data only"
+  ),
+  force: z6.boolean().default(false).describe("Overwrite output file if it already exists")
 });
 var updateOptions = z6.object({
   paymentMethodId: z6.string().optional().describe("Payment method ID"),
@@ -14240,91 +14841,93 @@ var updateOptions = z6.object({
     'Line item (repeatable, key:value format). Keys: name (required), quantity, unit_amount, description, sku, url, image_url, product_url. Example: "name:Shoes,unit_amount:5000,quantity:2"'
   ),
   total: z6.array(z6.union([z6.string(), z6.record(z6.string(), z6.unknown())])).default([]).describe(
-    'Total (repeatable, key:value format). Keys: type (required), display_text (required), amount (required). Example: "type:total,display_text:Total,amount:5000"'
+    'Total (repeatable, key:value format). Keys: type (required; one of: subtotal, tax, total, items_base_amount, items_discount, discount, fulfillment, shipping, fee, gift_wrap, tip, store_credit), display_text (required), amount (required). Example: "type:total,display_text:Total,amount:5000"'
   )
 });
 
 // src/commands/spend-request/update.tsx
-import { Box as Box17, Text as Text18 } from "ink";
-import Spinner8 from "ink-spinner";
-import { useEffect as useEffect13, useState as useState13 } from "react";
-import { jsx as jsx23, jsxs as jsxs16 } from "react/jsx-runtime";
+import { Box as Box19, Text as Text20 } from "ink";
+import Spinner11 from "ink-spinner";
+import { useCallback as useCallback8 } from "react";
+import { jsx as jsx26, jsxs as jsxs19 } from "react/jsx-runtime";
 var UpdateSpendRequest = ({
   repository,
   id,
   params,
   onComplete
 }) => {
-  const [status, setStatus] = useState13(
-    "loading"
+  const action = useCallback8(
+    () => repository.updateSpendRequest(id, params),
+    [repository, id, params]
   );
-  const [request, setRequest] = useState13(null);
-  const [error, setError] = useState13("");
-  useEffect13(() => {
-    const update = async () => {
-      try {
-        const result = await repository.updateSpendRequest(id, params);
-        setRequest(result);
-        setStatus("success");
-        setTimeout(() => onComplete(result), 1500);
-      } catch (err) {
-        setError(err.message);
-        setStatus("error");
-        setTimeout(() => onComplete(null), 1500);
-      }
-    };
-    update();
-  }, [repository, id, params, onComplete]);
+  const { status, data: request, error } = useAsyncAction(action, onComplete);
   if (status === "loading") {
-    return /* @__PURE__ */ jsx23(Box17, { children: /* @__PURE__ */ jsxs16(Text18, { color: "cyan", children: [
-      /* @__PURE__ */ jsx23(Spinner8, { type: "dots" }),
+    return /* @__PURE__ */ jsx26(Box19, { children: /* @__PURE__ */ jsxs19(Text20, { color: "cyan", children: [
+      /* @__PURE__ */ jsx26(Spinner11, { type: "dots" }),
       " Updating spend request ",
       id,
       "..."
     ] }) });
   }
   if (status === "error") {
-    return /* @__PURE__ */ jsxs16(Box17, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx23(Text18, { color: "red", children: "\u2717 Failed to update spend request" }),
-      /* @__PURE__ */ jsx23(Text18, { color: "red", children: error })
+    return /* @__PURE__ */ jsxs19(Box19, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx26(Text20, { color: "red", children: "\u2717 Failed to update spend request" }),
+      /* @__PURE__ */ jsx26(Text20, { color: "red", children: error })
     ] });
   }
-  return /* @__PURE__ */ jsxs16(Box17, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx23(Text18, { color: "green", children: "\u2713 Spend request updated" }),
-    /* @__PURE__ */ jsxs16(Box17, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
-      /* @__PURE__ */ jsxs16(Text18, { children: [
+  return /* @__PURE__ */ jsxs19(Box19, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx26(Text20, { color: "green", children: "\u2713 Spend request updated" }),
+    /* @__PURE__ */ jsxs19(Box19, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+      /* @__PURE__ */ jsxs19(Text20, { children: [
         "ID: ",
-        /* @__PURE__ */ jsx23(Text18, { bold: true, children: request?.id })
+        /* @__PURE__ */ jsx26(Text20, { bold: true, children: request?.id })
       ] }),
-      /* @__PURE__ */ jsxs16(Text18, { children: [
+      /* @__PURE__ */ jsxs19(Text20, { children: [
         "Status: ",
-        /* @__PURE__ */ jsx23(Text18, { bold: true, children: request?.status })
+        /* @__PURE__ */ jsx26(Text20, { bold: true, children: request?.status })
       ] }),
-      /* @__PURE__ */ jsxs16(Text18, { children: [
+      /* @__PURE__ */ jsxs19(Text20, { children: [
         "Amount:",
         " ",
-        /* @__PURE__ */ jsx23(Text18, { bold: true, children: (() => {
+        /* @__PURE__ */ jsx26(Text20, { bold: true, children: (() => {
           const t = request?.totals.find((t2) => t2.type === "total");
           return t ? String(t.amount) : "N/A";
         })() })
       ] }),
-      /* @__PURE__ */ jsxs16(Text18, { children: [
+      /* @__PURE__ */ jsxs19(Text20, { children: [
         "Merchant: ",
-        /* @__PURE__ */ jsx23(Text18, { bold: true, children: request?.merchant_name })
+        /* @__PURE__ */ jsx26(Text20, { bold: true, children: request?.merchant_name })
       ] }),
-      /* @__PURE__ */ jsxs16(Text18, { children: [
+      /* @__PURE__ */ jsxs19(Text20, { children: [
         "Line Items:",
         " ",
-        /* @__PURE__ */ jsx23(Text18, { bold: true, children: request?.line_items.map((li) => li.name).join(", ") })
+        /* @__PURE__ */ jsx26(Text20, { bold: true, children: request?.line_items.map((li) => li.name).join(", ") })
       ] })
     ] })
   ] });
 };
 
 // src/commands/spend-request/index.tsx
-import { jsx as jsx24 } from "react/jsx-runtime";
-function createSpendRequestCli(repository) {
-  const cli2 = Cli6.create("spend-request", {
+import { jsx as jsx27 } from "react/jsx-runtime";
+async function applyOutputFile(request, outputFile, force) {
+  if (!outputFile || !request.card) return request;
+  const fileData = {
+    spend_request_id: request.id,
+    merchant_name: request.merchant_name,
+    merchant_url: request.merchant_url,
+    context: request.context,
+    created_at: request.created_at,
+    card: request.card
+  };
+  const resolvedPath = await writeCredentialFile(outputFile, fileData, force);
+  const { card: _, ...withoutCard } = request;
+  return {
+    ...withoutCard,
+    card_output_file: resolvedPath
+  };
+}
+function createSpendRequestCli(repository, authStorage2) {
+  const cli2 = Cli7.create("spend-request", {
     description: "Spend request management commands"
   });
   cli2.command("create", {
@@ -14333,17 +14936,7 @@ function createSpendRequestCli(repository) {
     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" }
-            ]
-          }
-        });
-      }
+      requireAuthGuard(c, authStorage2);
       const opts = c.options;
       const requestApproval = !!opts.requestApproval;
       const credentialType = opts.credentialType;
@@ -14400,37 +14993,49 @@ function createSpendRequestCli(repository) {
         request_approval: requestApproval || void 0,
         test: opts.test ? true : void 0
       };
+      const outputFile = opts.outputFile;
+      const forceOverwrite = opts.force;
       if (!c.agent && !c.formatExplicit) {
-        return new Promise((resolve) => {
-          let capturedResult = null;
-          const { waitUntilExit } = render6(
-            /* @__PURE__ */ jsx24(
-              CreateSpendRequest,
-              {
-                repository,
-                params: createParams,
-                requestApproval,
-                onComplete: (result) => {
-                  capturedResult = result;
-                }
+        let capturedResult = null;
+        return renderInteractive(
+          /* @__PURE__ */ jsx27(
+            CreateSpendRequest,
+            {
+              repository,
+              params: createParams,
+              requestApproval,
+              outputFile,
+              force: forceOverwrite,
+              onComplete: (result) => {
+                capturedResult = result;
               }
-            )
-          );
-          waitUntilExit().then(() => {
-            resolve(capturedResult);
-          });
-        });
+            }
+          ),
+          () => {
+            if (!capturedResult)
+              throw new Error("Component exited without producing a result");
+            return capturedResult;
+          }
+        );
       }
       const created = await repository.createSpendRequest(createParams);
       if (!requestApproval) {
-        yield created;
+        try {
+          yield await applyOutputFile(created, outputFile, forceOverwrite);
+        } catch (err) {
+          const message = err.message;
+          if (message.startsWith("OUTPUT_FILE_EXISTS")) {
+            return c.error({ code: "OUTPUT_FILE_EXISTS", message });
+          }
+          return c.error({ code: "OUTPUT_FILE_WRITE_ERROR", message });
+        }
         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.`,
+        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 300\` 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`,
+          command: `spend-request retrieve ${created.id} --interval 2 --max-attempts 300`,
           until: "status changes from pending_approval"
         }
       };
@@ -14443,18 +15048,8 @@ function createSpendRequestCli(repository) {
     }),
     options: updateOptions,
     outputPolicy: "agent-only",
+    middleware: [requireAuth(authStorage2)],
     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 params = {};
@@ -14475,25 +15070,25 @@ function createSpendRequestCli(repository) {
           (item) => typeof item === "string" ? parseTotalFlag(item) : item
         );
       if (!c.agent && !c.formatExplicit) {
-        return new Promise((resolve) => {
-          let capturedResult = null;
-          const { waitUntilExit } = render6(
-            /* @__PURE__ */ jsx24(
-              UpdateSpendRequest,
-              {
-                repository,
-                id,
-                params,
-                onComplete: (result) => {
-                  capturedResult = result;
-                }
+        let capturedResult = null;
+        return renderInteractive(
+          /* @__PURE__ */ jsx27(
+            UpdateSpendRequest,
+            {
+              repository,
+              id,
+              params,
+              onComplete: (result) => {
+                capturedResult = result;
               }
-            )
-          );
-          waitUntilExit().then(() => {
-            resolve(capturedResult);
-          });
-        });
+            }
+          ),
+          () => {
+            if (!capturedResult)
+              throw new Error("Component exited without producing a result");
+            return capturedResult;
+          }
+        );
       }
       return repository.updateSpendRequest(id, params);
     }
@@ -14505,44 +15100,34 @@ function createSpendRequestCli(repository) {
     }),
     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" }
-            ]
-          }
-        });
-      }
+      requireAuthGuard(c, authStorage2);
       const id = c.args.id;
       if (!c.agent && !c.formatExplicit) {
-        return new Promise((resolve) => {
-          let capturedResult = null;
-          const { waitUntilExit } = render6(
-            /* @__PURE__ */ jsx24(
-              RequestApproval,
-              {
-                repository,
-                id,
-                onComplete: (result) => {
-                  capturedResult = result;
-                }
+        let capturedResult = null;
+        return renderInteractive(
+          /* @__PURE__ */ jsx27(
+            RequestApproval,
+            {
+              repository,
+              id,
+              onComplete: (result) => {
+                capturedResult = result;
               }
-            )
-          );
-          waitUntilExit().then(() => {
-            resolve(capturedResult);
-          });
-        });
+            }
+          ),
+          () => {
+            if (!capturedResult)
+              throw new Error("Component exited without producing a result");
+            return capturedResult;
+          }
+        );
       }
       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.`,
+        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 300\` 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`,
+          command: `spend-request retrieve ${id} --interval 2 --max-attempts 300`,
           until: "status changes from pending_approval"
         }
       };
@@ -14556,17 +15141,7 @@ function createSpendRequestCli(repository) {
     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" }
-            ]
-          }
-        });
-      }
+      requireAuthGuard(c, authStorage2);
       const id = c.args.id;
       const opts = c.options;
       const timeout = opts.timeout;
@@ -14574,74 +15149,183 @@ function createSpendRequestCli(repository) {
       const maxAttempts = opts.maxAttempts;
       const includeArr = opts.include;
       const include = includeArr?.length ? includeArr : void 0;
+      const outputFile = opts.outputFile;
+      const forceOverwrite = opts.force;
       if (!c.agent && !c.formatExplicit) {
-        return new Promise((resolve) => {
-          let capturedResult = null;
-          const { waitUntilExit } = render6(
-            /* @__PURE__ */ jsx24(
-              RetrieveSpendRequest,
-              {
-                repository,
-                id,
-                timeout,
-                include,
-                onComplete: (result) => {
-                  capturedResult = result;
-                }
+        let capturedResult = null;
+        return renderInteractive(
+          /* @__PURE__ */ jsx27(
+            RetrieveSpendRequest,
+            {
+              repository,
+              id,
+              timeout,
+              include,
+              outputFile,
+              force: forceOverwrite,
+              onComplete: (result) => {
+                capturedResult = result;
               }
-            )
-          );
-          waitUntilExit().then(() => {
-            resolve(capturedResult);
-          });
-        });
+            }
+          ),
+          () => {
+            if (!capturedResult)
+              throw new Error("Component exited without producing a result");
+            return capturedResult;
+          }
+        );
       }
       const terminalStatuses = /* @__PURE__ */ new Set([
         "approved",
         "denied",
         "expired",
         "succeeded",
-        "failed"
+        "failed",
+        "canceled"
       ]);
-      const deadline = Date.now() + timeout * 1e3;
-      let attempts = 0;
-      let previousAttemptData;
-      while (true) {
-        const request = await repository.getSpendRequest(id, { include });
-        if (!request) {
+      for await (const result of pollUntil({
+        fn: () => repository.getSpendRequest(id, { include }),
+        isTerminal: (req) => req === null || terminalStatuses.has(req.status),
+        interval,
+        maxAttempts,
+        timeout
+      })) {
+        if (result.value === null) {
           return c.error({
             code: "NOT_FOUND",
             message: `Spend request ${id} not found`
           });
         }
-        if (terminalStatuses.has(request.status)) {
-          yield request;
-          return;
-        }
-        attempts++;
-        if (interval <= 0) {
-          yield request;
-          return;
-        }
-        const maxAttemptsExhausted = maxAttempts > 0 && attempts >= maxAttempts;
-        const timeoutReached = Date.now() >= deadline;
-        if (maxAttemptsExhausted || timeoutReached) {
-          const reason = maxAttemptsExhausted ? `max attempts (${maxAttempts}) exhausted` : `timeout (${timeout}s) reached`;
+        if (result.terminal) {
+          if (terminalStatuses.has(result.value.status) || !result.reason) {
+            try {
+              yield await applyOutputFile(
+                result.value,
+                outputFile,
+                forceOverwrite
+              );
+            } catch (err) {
+              const message = err.message;
+              if (message.startsWith("OUTPUT_FILE_EXISTS")) {
+                return c.error({ code: "OUTPUT_FILE_EXISTS", message });
+              }
+              return c.error({ code: "OUTPUT_FILE_WRITE_ERROR", message });
+            }
+            return;
+          }
+          const reason = result.reason === "max_attempts" ? `max attempts (${maxAttempts}) exhausted` : `timeout (${timeout}s) reached`;
           return c.error({
             code: "POLLING_TIMEOUT",
-            message: `Polling stopped before spend request ${id} reached a terminal status: ${reason}; current status is ${request.status}.`,
+            message: `Polling stopped before spend request ${id} reached a terminal status: ${reason}; current status is ${result.value.status}.`,
             retryable: true
           });
         }
-        const snapshot = JSON.stringify(request);
-        if (snapshot !== previousAttemptData) {
-          previousAttemptData = snapshot;
-          yield request;
-        }
-        await new Promise((resolve) => setTimeout(resolve, interval * 1e3));
+        yield result.value;
       }
     }
   });
+  cli2.command("cancel", {
+    description: "Cancel a spend request",
+    args: z7.object({
+      id: z7.string().describe("Spend request ID")
+    }),
+    outputPolicy: "agent-only",
+    middleware: [requireAuth(authStorage2)],
+    async run(c) {
+      const id = c.args.id;
+      if (!c.agent && !c.formatExplicit) {
+        let capturedResult = null;
+        return renderInteractive(
+          /* @__PURE__ */ jsx27(
+            CancelSpendRequest,
+            {
+              repository,
+              id,
+              onComplete: (result) => {
+                capturedResult = result;
+              }
+            }
+          ),
+          () => {
+            if (!capturedResult)
+              throw new Error("Component exited without producing a result");
+            return capturedResult;
+          }
+        );
+      }
+      return repository.cancelSpendRequest(id);
+    }
+  });
+  return cli2;
+}
+
+// src/commands/user-info/index.tsx
+import { Cli as Cli8 } from "incur";
+
+// src/commands/user-info/retrieve.tsx
+import { Box as Box20, Text as Text21 } from "ink";
+import Spinner12 from "ink-spinner";
+import { useCallback as useCallback9 } from "react";
+import { jsx as jsx28, jsxs as jsxs20 } from "react/jsx-runtime";
+var UserInfoRetrieve = ({
+  resource,
+  onComplete
+}) => {
+  const action = useCallback9(() => resource.retrieve(), [resource]);
+  const { status, data: userInfo, error } = useAsyncAction(action, onComplete);
+  if (status === "loading") {
+    return /* @__PURE__ */ jsx28(Box20, { children: /* @__PURE__ */ jsxs20(Text21, { color: "cyan", children: [
+      /* @__PURE__ */ jsx28(Spinner12, { type: "dots" }),
+      " Loading user info..."
+    ] }) });
+  }
+  if (status === "error") {
+    return /* @__PURE__ */ jsxs20(Box20, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx28(Text21, { color: "red", children: "\u2717 Failed to load user info" }),
+      /* @__PURE__ */ jsx28(Text21, { color: "red", children: error })
+    ] });
+  }
+  return /* @__PURE__ */ jsxs20(Box20, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx28(Text21, { bold: true, children: "User Info" }),
+    /* @__PURE__ */ jsxs20(Box20, { flexDirection: "column", marginTop: 1, paddingX: 2, children: [
+      /* @__PURE__ */ jsxs20(Text21, { children: [
+        /* @__PURE__ */ jsx28(Text21, { dimColor: true, children: "Email: " }),
+        userInfo?.email ?? /* @__PURE__ */ jsx28(Text21, { dimColor: true, children: "Not set" })
+      ] }),
+      /* @__PURE__ */ jsxs20(Text21, { children: [
+        /* @__PURE__ */ jsx28(Text21, { dimColor: true, children: "Name: " }),
+        userInfo?.name ?? /* @__PURE__ */ jsx28(Text21, { dimColor: true, children: "Not set" })
+      ] }),
+      /* @__PURE__ */ jsxs20(Text21, { children: [
+        /* @__PURE__ */ jsx28(Text21, { dimColor: true, children: "Phone: " }),
+        userInfo?.phone ?? /* @__PURE__ */ jsx28(Text21, { dimColor: true, children: "Not set" })
+      ] })
+    ] })
+  ] });
+};
+
+// src/commands/user-info/index.tsx
+import { jsx as jsx29 } from "react/jsx-runtime";
+function createUserInfoCli(createResource, authStorage2) {
+  const cli2 = Cli8.create("user-info", {
+    description: "User information commands"
+  });
+  cli2.command("retrieve", {
+    description: "Retrieve user info (email, name, phone)",
+    outputPolicy: "agent-only",
+    middleware: [requireAuth(authStorage2)],
+    async run(c) {
+      const resource = createResource();
+      if (!c.agent && !c.formatExplicit) {
+        return renderInteractive(
+          /* @__PURE__ */ jsx29(UserInfoRetrieve, { resource, onComplete: () => {
+          } }),
+          () => resource.retrieve()
+        );
+      }
+      return resource.retrieve();
+    }
+  });
   return cli2;
 }
 
@@ -14869,9 +15553,9 @@ ${JSON.stringify(redacted, null, 2)}`
 
 // src/auth/session.ts
 var EXPIRY_BUFFER_MS = 6e4;
-function createAccessTokenProvider(authResource, authStorage = storage) {
+function createAccessTokenProvider(authResource, authStorage2 = storage) {
   return async ({ forceRefresh } = {}) => {
-    const auth = authStorage.getAuth();
+    const auth = authStorage2.getAuth();
     if (!auth) {
       throw new LinkAuthenticationError(
         'Not authenticated. Run "link-cli auth login" first.'
@@ -14882,22 +15566,78 @@ function createAccessTokenProvider(authResource, authStorage = storage) {
       return auth.access_token;
     }
     const refreshed = await authResource.refreshToken(auth.refresh_token);
-    authStorage.setAuth(refreshed);
+    authStorage2.setAuth(refreshed);
     return refreshed.access_token;
   };
 }
 
+// src/utils/sanitize-text.ts
+import stripAnsi from "strip-ansi";
+var CONTROL_CHAR_RE = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f\r]/g;
+var NEEDS_SANITIZE_RE = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f\r\x1b]/;
+function sanitizeText(input) {
+  if (!input) {
+    return "";
+  }
+  if (!NEEDS_SANITIZE_RE.test(input)) {
+    return input;
+  }
+  return stripAnsi(input).replace(CONTROL_CHAR_RE, "");
+}
+function sanitizeDeep(value) {
+  if (value === null || value === void 0) {
+    return value;
+  }
+  if (typeof value === "string") {
+    return sanitizeText(value);
+  }
+  if (Array.isArray(value)) {
+    return value.map(sanitizeDeep);
+  }
+  if (typeof value === "object") {
+    const result = {};
+    const keys = Object.keys(value);
+    for (let i = 0; i < keys.length; i++) {
+      const k = keys[i];
+      result[k] = sanitizeDeep(value[k]);
+    }
+    return result;
+  }
+  return value;
+}
+
 // src/utils/resource-factory.ts
+function sanitizeResource(resource) {
+  return new Proxy(resource, {
+    get(target, prop, receiver) {
+      const value = Reflect.get(target, prop, receiver);
+      if (typeof value !== "function") {
+        return value;
+      }
+      return (...args) => {
+        const result = value.apply(target, args);
+        if (result && typeof result.then === "function") {
+          return result.then(sanitizeDeep);
+        }
+        return result;
+      };
+    }
+  });
+}
 var ResourceFactory = class {
   verbose;
   defaultHeaders;
+  authStorage;
   authResource;
   accessTokenProvider;
   spendRequestResource;
   paymentMethodsResource;
+  shippingAddressResource;
+  userInfoResource;
   constructor(options = {}) {
     this.verbose = options.verbose ?? false;
     this.defaultHeaders = options.defaultHeaders;
+    this.authStorage = options.authStorage;
   }
   createAuthResource() {
     if (this.authResource) {
@@ -14909,12 +15649,16 @@ var ResourceFactory = class {
     });
     return this.authResource;
   }
+  getAuthStorage() {
+    return this.authStorage;
+  }
   createSdkAccessTokenProvider() {
     if (this.accessTokenProvider) {
       return this.accessTokenProvider;
     }
     this.accessTokenProvider = createAccessTokenProvider(
-      this.createAuthResource()
+      this.createAuthResource(),
+      this.authStorage
     );
     return this.accessTokenProvider;
   }
@@ -14923,11 +15667,13 @@ var ResourceFactory = class {
       return this.spendRequestResource;
     }
     const getAccessToken = this.createSdkAccessTokenProvider();
-    this.spendRequestResource = new SpendRequestResource({
-      verbose: this.verbose,
-      defaultHeaders: this.defaultHeaders,
-      getAccessToken
-    });
+    this.spendRequestResource = sanitizeResource(
+      new SpendRequestResource({
+        verbose: this.verbose,
+        defaultHeaders: this.defaultHeaders,
+        getAccessToken
+      })
+    );
     return this.spendRequestResource;
   }
   createPaymentMethodsResource() {
@@ -14935,17 +15681,117 @@ var ResourceFactory = class {
       return this.paymentMethodsResource;
     }
     const getAccessToken = this.createSdkAccessTokenProvider();
-    this.paymentMethodsResource = new PaymentMethodsResource({
-      verbose: this.verbose,
-      defaultHeaders: this.defaultHeaders,
-      getAccessToken
-    });
+    this.paymentMethodsResource = sanitizeResource(
+      new PaymentMethodsResource({
+        verbose: this.verbose,
+        defaultHeaders: this.defaultHeaders,
+        getAccessToken
+      })
+    );
     return this.paymentMethodsResource;
   }
+  createShippingAddressResource() {
+    if (this.shippingAddressResource) {
+      return this.shippingAddressResource;
+    }
+    const getAccessToken = this.createSdkAccessTokenProvider();
+    this.shippingAddressResource = sanitizeResource(
+      new ShippingAddressResource({
+        verbose: this.verbose,
+        defaultHeaders: this.defaultHeaders,
+        getAccessToken
+      })
+    );
+    return this.shippingAddressResource;
+  }
+  createUserInfoResource() {
+    if (this.userInfoResource) {
+      return this.userInfoResource;
+    }
+    const getAccessToken = this.createSdkAccessTokenProvider();
+    this.userInfoResource = sanitizeResource(
+      new UserInfoResource({
+        verbose: this.verbose,
+        defaultHeaders: this.defaultHeaders,
+        getAccessToken
+      })
+    );
+    return this.userInfoResource;
+  }
 };
 
+// src/utils/update-info.ts
+import process8 from "process";
+import updateNotifier from "update-notifier";
+var UPDATE_CACHE_TTL_MS = 60 * 60 * 1e3;
+var FAILURE_CACHE_TTL_MS = 60 * 1e3;
+var cachedUpdateInfo;
+var inflightUpdateInfo;
+function createAgentUpdateInfoProvider(packageName, cliVersion2) {
+  return async ({ polling }) => {
+    if (polling) {
+      return cachedUpdateInfo?.value;
+    }
+    const now = Date.now();
+    if (cachedUpdateInfo && cachedUpdateInfo.expiresAt > now) {
+      return cachedUpdateInfo.value;
+    }
+    if (!inflightUpdateInfo) {
+      inflightUpdateInfo = fetchLatestVersion(packageName, cliVersion2).finally(
+        () => {
+          inflightUpdateInfo = void 0;
+        }
+      );
+    }
+    return inflightUpdateInfo;
+  };
+}
+function createInteractiveUpdateInfoProvider(updateInfo) {
+  return async () => updateInfo;
+}
+function renderInteractiveUpdateNotice(updateInfo) {
+  return [
+    "",
+    `Update available for @stripe/link-cli: ${updateInfo.current} -> ${updateInfo.latest}`,
+    "Run: npm install -g @stripe/link-cli",
+    ""
+  ].join("\n");
+}
+async function fetchLatestVersion(packageName, cliVersion2) {
+  const previousDisableFlag = process8.env.NO_UPDATE_NOTIFIER;
+  try {
+    process8.env.NO_UPDATE_NOTIFIER = "1";
+    const notifier = updateNotifier({
+      pkg: {
+        name: packageName,
+        version: cliVersion2
+      }
+    });
+    const payload = await notifier.fetchInfo();
+    const latest = payload.latest?.trim();
+    const value = latest && latest.length > 0 && latest !== cliVersion2 ? { current: cliVersion2, latest } : void 0;
+    cacheUpdateInfo(value);
+    return value;
+  } catch {
+    cacheUpdateInfo(void 0, FAILURE_CACHE_TTL_MS);
+    return void 0;
+  } finally {
+    if (previousDisableFlag === void 0) {
+      process8.env.NO_UPDATE_NOTIFIER = void 0;
+    } else {
+      process8.env.NO_UPDATE_NOTIFIER = previousDisableFlag;
+    }
+  }
+}
+function cacheUpdateInfo(value, ttlMs = UPDATE_CACHE_TTL_MS) {
+  cachedUpdateInfo = {
+    expiresAt: Date.now() + ttlMs,
+    value
+  };
+}
+
 // src/cli.tsx
-var cliVersion = "0.4.2";
+var cliVersion = "0.5.0";
 var buildNumber = "1";
 var cliName = "@stripe/link-cli";
 var defaultHeaders = {
@@ -14953,40 +15799,66 @@ var defaultHeaders = {
   "X-Build-Number": buildNumber
 };
 var verbose = process.argv.includes("--verbose");
-var factory = new ResourceFactory({ verbose, defaultHeaders });
+var authFileIndex = process.argv.indexOf("--auth");
+var credentialFilePath = authFileIndex !== -1 ? process.argv[authFileIndex + 1] : process.env.LINK_AUTH_FILE;
+if (authFileIndex !== -1) {
+  process.argv.splice(authFileIndex, 2);
+}
+var authStorage = credentialFilePath ? new Storage({ configPath: credentialFilePath }) : storage;
+var factory = new ResourceFactory({ verbose, defaultHeaders, authStorage });
 var authRepo = factory.createAuthResource();
 var spendRequestRepo = factory.createSpendRequestResource();
-var notifier = updateNotifier({
-  pkg: { name: cliName, version: cliVersion }
-});
-var cli = Cli7.create("link-cli", {
+var cli = Cli9.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, notifier.update));
-cli.command(createSpendRequestCli(spendRequestRepo));
+var isAgent = process.argv.includes("--format") || process.argv.includes("--mcp");
+var agentUpdateInfoProvider = createAgentUpdateInfoProvider(
+  cliName,
+  cliVersion
+);
+var getUpdateInfo = agentUpdateInfoProvider;
+if (!isAgent && process.stdout.isTTY) {
+  const updateInfo = await agentUpdateInfoProvider({ polling: false });
+  getUpdateInfo = createInteractiveUpdateInfoProvider(updateInfo);
+  if (updateInfo) {
+    process.stderr.write(renderInteractiveUpdateNotice(updateInfo));
+  }
+}
+cli.command(createAuthCli(authRepo, getUpdateInfo, authStorage));
+cli.command(createSpendRequestCli(spendRequestRepo, authStorage));
 cli.command(
-  createPaymentMethodsCli(() => factory.createPaymentMethodsResource())
+  createPaymentMethodsCli(
+    () => factory.createPaymentMethodsResource(),
+    authStorage
+  )
 );
-cli.command(createMppCli(spendRequestRepo));
+cli.command(
+  createShippingAddressCli(
+    () => factory.createShippingAddressResource(),
+    authStorage
+  )
+);
+cli.command(
+  createUserInfoCli(() => factory.createUserInfoResource(), authStorage)
+);
+cli.command(createMppCli(spendRequestRepo, authStorage));
 cli.command(
   createDemoCli(
     authRepo,
     spendRequestRepo,
-    () => factory.createPaymentMethodsResource()
+    () => factory.createPaymentMethodsResource(),
+    authStorage
   )
 );
 cli.command(
   createOnboardCli(
     authRepo,
     spendRequestRepo,
-    () => factory.createPaymentMethodsResource()
+    () => factory.createPaymentMethodsResource(),
+    authStorage
   )
 );
-var isAgent = process.argv.includes("--format") || process.argv.includes("--mcp");
-if (!isAgent) {
-  notifier.notify({ defer: false });
-}
 cli.serve();
 var cli_default = cli;
 export {