@agentwonderland/mcp 0.1.46 → 0.1.47

package/src/tools/__tests__/wallet.test.ts

@@ -18,6 +18,17 @@ type CardConfig = {
   brand: string;
 } | null;
 
+type LinkConfig = {
+  paymentMethodId: string;
+  label?: string;
+} | null;
+
+type PendingLinkSetup = {
+  verificationUrl: string;
+  phrase: string;
+  createdAt: string;
+} | null;
+
 type WalletToolResult = {
   content: Array<{ type: "text"; text: string }>;
 };
@@ -26,8 +37,11 @@ const state = vi.hoisted(() => ({
   wallets: [] as WalletEntry[],
   addedWallets: [] as WalletEntry[],
   card: null as CardConfig,
+  link: null as LinkConfig,
+  pendingLinkSetup: null as PendingLinkSetup,
   pendingCardSetupToken: null as string | null,
   spendPolicies: {} as Record<string, unknown>,
+  defaultPaymentMethod: undefined as string | undefined,
   consumerPrincipal: "did:pkh:eip155:8453:0xabc",
   owsAvailable: true,
   owsWallets: [] as Array<{ id: string; name: string; address: string }>,
@@ -59,6 +73,12 @@ const state = vi.hoisted(() => ({
     }
     | null,
   setCardConfigCalls: [] as CardConfig[],
+  setLinkConfigCalls: [] as LinkConfig[],
+  setPendingLinkSetupCalls: [] as PendingLinkSetup[],
+  linkAuthenticated: false,
+  linkPaymentMethods: [] as Array<{ id: string; label?: string; searchText?: string }>,
+  linkLoginCalls: 0,
+  linkPaymentMethodAddCalls: 0,
 }));
 
 vi.mock("../../core/config.js", () => ({
@@ -72,6 +92,8 @@ vi.mock("../../core/config.js", () => ({
     }
   },
   getCardConfig: () => state.card,
+  getLinkConfig: () => state.link,
+  getPendingLinkSetup: () => state.pendingLinkSetup,
   getPendingCardSetupToken: () => state.pendingCardSetupToken,
   getSpendPolicy: (walletId: string) => state.spendPolicies[walletId] ?? null,
   getWallets: () => state.wallets,
@@ -79,6 +101,17 @@ vi.mock("../../core/config.js", () => ({
     state.card = card;
     state.setCardConfigCalls.push(card);
   },
+  setDefaultPaymentMethod: (method: string | undefined) => {
+    state.defaultPaymentMethod = method;
+  },
+  setLinkConfig: (link: LinkConfig) => {
+    state.link = link;
+    state.setLinkConfigCalls.push(link);
+  },
+  setPendingLinkSetup: (pending: PendingLinkSetup) => {
+    state.pendingLinkSetup = pending;
+    state.setPendingLinkSetupCalls.push(pending);
+  },
   setSpendPolicy: (walletId: string, policy: unknown) => {
     state.spendPolicies[walletId] = policy;
   },
@@ -101,6 +134,23 @@ vi.mock("../../core/card-setup.js", () => ({
   },
 }));
 
+vi.mock("../../core/link-cli.js", () => ({
+  getLinkCliAuthStatus: async () => ({
+    authenticated: state.linkAuthenticated,
+  }),
+  listLinkPaymentMethods: async () => state.linkPaymentMethods,
+  openLinkPaymentMethodAdd: async () => {
+    state.linkPaymentMethodAddCalls++;
+  },
+  startLinkCliLogin: async () => {
+    state.linkLoginCalls++;
+    return {
+      verificationUrl: "https://app.link.com/device/setup?code=test-link-code",
+      phrase: "test-link-code",
+    };
+  },
+}));
+
 vi.mock("../../core/ows-adapter.js", () => ({
   createOwsWallet: async (name: string, chain: "evm" | "solana") => {
     state.createdWalletCalls.push({ name, chain });
@@ -124,8 +174,11 @@ function resetState(): void {
   state.wallets = [];
   state.addedWallets = [];
   state.card = null;
+  state.link = null;
+  state.pendingLinkSetup = null;
   state.pendingCardSetupToken = null;
   state.spendPolicies = {};
+  state.defaultPaymentMethod = undefined;
   state.consumerPrincipal = "did:pkh:eip155:8453:0xabc";
   state.owsAvailable = true;
   state.owsWallets = [];
@@ -151,6 +204,12 @@ function resetState(): void {
   state.pollCardSetupCalls = [];
   state.pollCardSetupResult = null;
   state.setCardConfigCalls = [];
+  state.setLinkConfigCalls = [];
+  state.setPendingLinkSetupCalls = [];
+  state.linkAuthenticated = false;
+  state.linkPaymentMethods = [];
+  state.linkLoginCalls = 0;
+  state.linkPaymentMethodAddCalls = 0;
 }
 
 async function getWalletSetupTool(): Promise<(args: Record<string, unknown>) => Promise<WalletToolResult>> {
@@ -205,12 +264,52 @@ describe("wallet_setup tool", () => {
         label: "launch-wallet",
       },
     ]);
+    expect(state.defaultPaymentMethod).toBe("base");
     expect(text).toContain("Wallet created [encrypted]:");
     expect(text).toContain("Address: 0x1111111111111111111111111111111111111111");
     expect(text).toContain("Chains: tempo, base");
     expect(text).toContain("Consumer principal: did:pkh:eip155:8453:0xabc");
   });
 
+  it("shows a guided payment setup menu", async () => {
+    const walletSetup = await getWalletSetupTool();
+
+    const result = await walletSetup({ action: "start" });
+    const text = flattenText(result);
+
+    expect(text).toContain("Set up a payment method:");
+    expect(text).toContain("Link card/bank (recommended)");
+    expect(text).toContain('wallet_setup({ action: "add-link" })');
+    expect(text).toContain('wallet_setup({ action: "create", chain: "tempo" })');
+    expect(text).toContain('wallet_setup({ action: "create", chain: "base" })');
+    expect(text).toContain('wallet_setup({ action: "create", chain: "solana" })');
+  });
+
+  it("shows the setup menu when no payment methods are configured", async () => {
+    const tools = new Map<string, (args: Record<string, unknown>) => Promise<WalletToolResult>>();
+    const server = {
+      tool: (
+        name: string,
+        _description: string,
+        _schema: unknown,
+        handler: (args: Record<string, unknown>) => Promise<WalletToolResult>,
+      ) => {
+        tools.set(name, handler);
+      },
+    } as unknown as McpServer;
+
+    const { registerWalletTools } = await import("../wallet.js");
+    registerWalletTools(server);
+    const walletStatus = tools.get("wallet_status");
+    if (!walletStatus) throw new Error("wallet_status tool was not registered");
+
+    const result = await walletStatus({});
+    const text = flattenText(result);
+
+    expect(text).toContain("No payment methods configured.");
+    expect(text).toContain("Link card/bank (recommended)");
+  });
+
   it("imports a wallet into OWS encrypted storage with Base as the default chain", async () => {
     const walletSetup = await getWalletSetupTool();
 
@@ -235,6 +334,7 @@ describe("wallet_setup tool", () => {
         label: "imported-wallet",
       },
     ]);
+    expect(state.defaultPaymentMethod).toBe("base");
     expect(text).toContain("Key imported to OWS [encrypted]:");
     expect(text).toContain("Address: 0x2222222222222222222222222222222222222222");
     expect(text).toContain("Consumer principal: did:pkh:eip155:8453:0xabc");
@@ -287,4 +387,94 @@ describe("wallet_setup tool", () => {
     expect(text).toContain("Removed Visa ****4242.");
     expect(text).toContain("Card disconnected from Agent Wonderland.");
   });
+
+  it("starts Link device auth from wallet_setup", async () => {
+    const walletSetup = await getWalletSetupTool();
+    const result = await walletSetup({ action: "add-link" });
+    const text = flattenText(result);
+
+    expect(state.linkLoginCalls).toBe(1);
+    expect(state.setPendingLinkSetupCalls[0]).toMatchObject({
+      verificationUrl: "https://app.link.com/device/setup?code=test-link-code",
+      phrase: "test-link-code",
+    });
+    expect(text).toContain("Approve Agent Wonderland in Link:");
+    expect(text).toContain("https://app.link.com/device/setup?code=test-link-code");
+    expect(text).toContain("Verification phrase: test-link-code");
+  });
+
+  it("continues a pending Link auth without starting a new login", async () => {
+    state.pendingLinkSetup = {
+      verificationUrl: "https://app.link.com/device/setup?code=existing",
+      phrase: "existing",
+      createdAt: new Date().toISOString(),
+    };
+
+    const walletSetup = await getWalletSetupTool();
+    const result = await walletSetup({ action: "add-link" });
+    const text = flattenText(result);
+
+    expect(state.linkLoginCalls).toBe(0);
+    expect(text).toContain("https://app.link.com/device/setup?code=existing");
+    expect(text).toContain("Verification phrase: existing");
+  });
+
+  it("connects the only Link payment method after auth", async () => {
+    state.linkAuthenticated = true;
+    state.pendingLinkSetup = {
+      verificationUrl: "https://app.link.com/device/setup?code=existing",
+      phrase: "existing",
+      createdAt: new Date().toISOString(),
+    };
+    state.linkPaymentMethods = [
+      { id: "csmrpd_123", label: "Barclays Mastercard ****3688" },
+    ];
+
+    const walletSetup = await getWalletSetupTool();
+    const result = await walletSetup({ action: "add-link" });
+    const text = flattenText(result);
+
+    expect(state.setPendingLinkSetupCalls).toEqual([null]);
+    expect(state.setLinkConfigCalls).toEqual([
+      { paymentMethodId: "csmrpd_123", label: "Barclays Mastercard ****3688" },
+    ]);
+    expect(text).toContain("Link payment method connected.");
+    expect(text).toContain("Barclays Mastercard ****3688");
+  });
+
+  it("shows friendly names when multiple Link payment methods exist", async () => {
+    state.linkAuthenticated = true;
+    state.linkPaymentMethods = [
+      { id: "csmrpd_1", label: "Barclays Arrival Mastercard ****3688" },
+      { id: "csmrpd_2", label: "Total Checking bank ****2889" },
+    ];
+
+    const walletSetup = await getWalletSetupTool();
+    const result = await walletSetup({ action: "add-link" });
+    const text = flattenText(result);
+
+    expect(text).toContain("Barclays Arrival Mastercard ****3688 (csmrpd_1)");
+    expect(text).toContain("Total Checking bank ****2889 (csmrpd_2)");
+    expect(text).toContain('link_payment_method: "<name or last4>"');
+  });
+
+  it("resolves a friendly Link payment method selector", async () => {
+    state.linkAuthenticated = true;
+    state.linkPaymentMethods = [
+      { id: "csmrpd_1", label: "Barclays Arrival Mastercard ****3688", searchText: "csmrpd_1 barclays arrival mastercard 3688" },
+      { id: "csmrpd_2", label: "Total Checking bank ****2889", searchText: "csmrpd_2 total checking bank 2889" },
+    ];
+
+    const walletSetup = await getWalletSetupTool();
+    const result = await walletSetup({
+      action: "add-link",
+      link_payment_method: "3688",
+    });
+    const text = flattenText(result);
+
+    expect(state.setLinkConfigCalls).toEqual([
+      { paymentMethodId: "csmrpd_1", label: "Barclays Arrival Mastercard ****3688" },
+    ]);
+    expect(text).toContain("Barclays Arrival Mastercard ****3688 (csmrpd_1)");
+  });
 });

package/src/tools/passes.ts

@@ -67,7 +67,7 @@ export function registerPassTools(server: McpServer): void {
     {
       agent_id: z.string().describe("Agent ID (UUID, slug, or name)"),
       pack_id: z.string().optional().describe("Specific pack key to buy, like 'starter' or 'growth'. If omitted and only one pack exists, it is selected automatically."),
-      pay_with: z.string().optional().describe("Payment method — wallet ID, chain name, or 'card'. Auto-detected if omitted."),
+      pay_with: z.string().optional().describe("Payment method — wallet ID, chain name, 'link', or 'card'. Auto-detected if omitted."),
       confirmed: z.boolean().optional().describe("Set to true to confirm the purchase after seeing the quote."),
     },
     async ({ agent_id, pack_id, pay_with, confirmed }) => {

package/src/tools/run.ts

@@ -127,7 +127,7 @@ export function registerRunTools(server: McpServer): void {
     {
       agent_id: z.string().describe("Agent ID (UUID, slug, or name)"),
       input: z.record(z.string(), z.unknown()).describe("Input payload for the agent"),
-      pay_with: z.string().trim().min(1).optional().describe("Payment method — wallet ID, chain name (tempo, base, etc.), or 'card'. Auto-detected if omitted."),
+      pay_with: z.string().trim().min(1).optional().describe("Payment method — wallet ID, chain name (tempo, base, solana), 'link', or 'card'. Auto-detected if omitted."),
       confirmed: z.boolean().optional().describe("Set to true to confirm spending after seeing the price quote."),
     },
     async ({ agent_id, input, pay_with, confirmed }) => {

package/src/tools/solve.ts

@@ -159,7 +159,7 @@ export function registerSolveTools(server: McpServer): void {
         .trim()
         .min(1)
         .optional()
-        .describe("Payment method — wallet ID, chain name (tempo, base, etc.), or 'card'. Auto-detected if omitted."),
+        .describe("Payment method — wallet ID, chain name (tempo, base, solana), 'link', or 'card'. Auto-detected if omitted."),
       confirmed: z
         .boolean()
         .optional()

package/src/tools/wallet.ts

@@ -3,10 +3,15 @@ import { z } from "zod";
 import {
   getWallets,
   getCardConfig,
+  getLinkConfig,
+  getPendingLinkSetup,
+  setPendingLinkSetup,
+  setLinkConfig,
   setCardConfig,
   addWallet,
   getPendingCardSetupToken,
   getSpendPolicy,
+  setDefaultPaymentMethod,
   setSpendPolicy,
 } from "../core/config.js";
 import { getWalletAddress, isCardPaymentEnabled } from "../core/payments.js";
@@ -18,6 +23,12 @@ import {
   getCardCapabilities,
   pollCardSetup,
 } from "../core/card-setup.js";
+import {
+  getLinkCliAuthStatus,
+  listLinkPaymentMethods,
+  openLinkPaymentMethodAdd,
+  startLinkCliLogin,
+} from "../core/link-cli.js";
 import {
   isOwsAvailable,
   createOwsWallet,
@@ -34,6 +45,49 @@ function text(t: string) {
   return { content: [{ type: "text" as const, text: t }] };
 }
 
+function formatLinkApprovalPrompt(pending: { verificationUrl: string; phrase: string }): string {
+  return [
+    "Approve Agent Wonderland in Link:",
+    "",
+    pending.verificationUrl,
+    "",
+    `Verification phrase: ${pending.phrase}`,
+    "",
+    "After approving, run wallet_setup({ action: \"add-link\" }) again and I will finish connecting the payment method.",
+  ].join("\n");
+}
+
+function isFreshLinkSetup(pending: { createdAt: string }): boolean {
+  const createdAt = Date.parse(pending.createdAt);
+  if (!Number.isFinite(createdAt)) return false;
+  return Date.now() - createdAt < 10 * 60 * 1000;
+}
+
+function formatPaymentSetupMenu(): string {
+  return [
+    "Set up a payment method:",
+    "",
+    "1. Link card/bank (recommended)",
+    "   wallet_setup({ action: \"add-link\" })",
+    "",
+    "2. Tempo USDC",
+    "   wallet_setup({ action: \"create\", chain: \"tempo\" })",
+    "",
+    "3. Base USDC",
+    "   wallet_setup({ action: \"create\", chain: \"base\" })",
+    "",
+    "4. Solana USDC",
+    "   wallet_setup({ action: \"create\", chain: \"solana\" })",
+    "",
+    "5. Import an existing wallet",
+    "   wallet_setup({ action: \"import\", chain: \"base\", key: \"<private key>\" })",
+  ].join("\n");
+}
+
+function setDefaultCryptoPaymentMethod(chain: string): void {
+  setDefaultPaymentMethod(chain === "solana" ? "solana" : chain === "base" ? "base" : "tempo");
+}
+
 export function registerWalletTools(server: McpServer): void {
   // ── wallet_status (extracted from check_wallet) ─────────────────
   server.tool(
@@ -43,12 +97,13 @@ export function registerWalletTools(server: McpServer): void {
     async () => {
       const wallets = getWallets();
       const card = getCardConfig();
+      const link = getLinkConfig();
       const pendingCardSetupToken = getPendingCardSetupToken();
       const consumerPrincipal = await getConsumerPrincipal();
 
-      if (wallets.length === 0 && !card && !pendingCardSetupToken) {
+      if (wallets.length === 0 && !card && !link && !pendingCardSetupToken) {
         return text(
-          "No payment methods configured.\nUse wallet_setup to create or import a wallet.",
+          `No payment methods configured.\n\n${formatPaymentSetupMenu()}`,
         );
       }
 
@@ -95,6 +150,15 @@ export function registerWalletTools(server: McpServer): void {
         }
       }
 
+      if (link) {
+        const auth = await getLinkCliAuthStatus();
+        const label = link.label ? ` (${link.label})` : "";
+        lines.push(`  Link${label}: ${link.paymentMethodId}`);
+        lines.push(auth.authenticated
+          ? "  Link CLI: authenticated"
+          : "  Link CLI: not authenticated — run npx @stripe/link-cli auth login");
+      }
+
       if (pendingCardSetupToken) {
         lines.push("  Card setup: pending confirmation");
       }
@@ -121,11 +185,11 @@ export function registerWalletTools(server: McpServer): void {
   // ── wallet_setup ────────────────────────────────────────────────
   server.tool(
     "wallet_setup",
-    "Set up or manage a payment wallet. 'create' makes a new crypto wallet (encrypted via OWS if available, otherwise plaintext — run 'enable-ows' to upgrade). 'import' takes an existing private key. 'enable-ows' installs the Open Wallet Standard native module for encrypted at-rest storage. Tempo/Base share one EVM key; Solana uses a separate ed25519 key. NEVER delete or rotate keys programmatically; direct users to edit ~/.agentwonderland/config.json or ~/.ows/ manually.",
+    "Set up or manage an Agent Wonderland payment method. Use 'start' for a guided setup menu. Link card/bank is recommended for most users. 'create' makes a new crypto wallet (encrypted via OWS if available, otherwise plaintext — run 'enable-ows' to upgrade). 'import' takes an existing private key. 'enable-ows' installs the Open Wallet Standard native module for encrypted at-rest storage. Tempo/Base share one EVM key; Solana uses a separate ed25519 key. NEVER delete or rotate keys programmatically; direct users to edit ~/.agentwonderland/config.json or ~/.ows/ manually.",
     {
       action: z
-        .enum(["create", "import", "add-card", "remove-card", "enable-ows"])
-        .describe("'create' a wallet, 'import' an existing key, 'enable-ows' to install encrypted key storage, 'add-card'/'remove-card' for credit card (may be disabled depending on Stripe SPT availability)"),
+        .enum(["start", "create", "import", "add-card", "remove-card", "add-link", "remove-link", "enable-ows"])
+        .describe("'start' shows the guided payment setup menu, 'add-link' connects Link card/bank, 'create' makes a crypto wallet, 'import' imports an existing key, 'enable-ows' installs encrypted key storage"),
       name: z
         .string()
         .optional()
@@ -138,8 +202,160 @@ export function registerWalletTools(server: McpServer): void {
         ),
       chain: z.enum(["tempo", "base", "solana"]).optional()
         .describe("Primary chain (default: tempo). Tempo/Base use a shared EVM wallet; Solana uses a separate OWS wallet."),
+      link_payment_method_id: z.string().optional()
+        .describe("Link payment method ID from `npx @stripe/link-cli payment-methods list`; used with action 'add-link'."),
+      link_payment_method: z.string().optional()
+        .describe("Friendly Link payment method selector, such as a card/bank name or last4; used with action 'add-link'."),
     },
-    async ({ action, name, key, chain }) => {
+    async ({ action, name, key, chain, link_payment_method_id, link_payment_method }) => {
+      if (action === "start") {
+        return text(formatPaymentSetupMenu());
+      }
+
+      // ── Link setup flow ──────────────────────────────────────
+      if (action === "add-link") {
+        let auth = await getLinkCliAuthStatus();
+        if (!auth.authenticated) {
+          const pending = getPendingLinkSetup();
+          if (pending && isFreshLinkSetup(pending)) {
+            return text(formatLinkApprovalPrompt(pending));
+          }
+          if (pending) {
+            setPendingLinkSetup(null);
+          }
+
+          try {
+            const login = await startLinkCliLogin();
+            setPendingLinkSetup({
+              verificationUrl: login.verificationUrl,
+              phrase: login.phrase,
+              createdAt: new Date().toISOString(),
+            });
+            auth = await getLinkCliAuthStatus();
+            if (!auth.authenticated) {
+              return text(formatLinkApprovalPrompt({
+                verificationUrl: login.verificationUrl,
+                phrase: login.phrase,
+              }));
+            }
+          } catch (err) {
+            return text(
+              [
+                "Link authentication could not start from the MCP session.",
+                `Reason: ${err instanceof Error ? err.message : String(err)}`,
+                "",
+                "Run wallet_setup({ action: \"add-link\" }) again to retry.",
+              ].join("\n"),
+            );
+          }
+        }
+        setPendingLinkSetup(null);
+
+        const explicitLinkSelector = link_payment_method_id ?? link_payment_method;
+        if (explicitLinkSelector) {
+          const methods = await listLinkPaymentMethods();
+          const normalizedSelector = explicitLinkSelector.toLowerCase().trim();
+          const exact = methods.find((method) => method.id === explicitLinkSelector);
+          const matches = exact
+            ? [exact]
+            : methods.filter((method) => method.searchText?.includes(normalizedSelector));
+          if (matches.length === 0 && !link_payment_method_id) {
+            return text(
+              [
+                `No Link payment method matched "${explicitLinkSelector}".`,
+                "",
+                "Available methods:",
+                ...methods.map((method) => `  ${method.label ?? method.id}${method.label ? ` (${method.id})` : ""}`),
+              ].join("\n"),
+            );
+          }
+          if (matches.length > 1) {
+            return text(
+              [
+                `Multiple Link payment methods matched "${explicitLinkSelector}". Choose one:`,
+                ...matches.map((method) => `  ${method.label ?? method.id}${method.label ? ` (${method.id})` : ""}`),
+                "",
+                "Then run:",
+                "  wallet_setup({ action: \"add-link\", link_payment_method: \"<name or last4>\" })",
+              ].join("\n"),
+            );
+          }
+          const selected = matches[0] ?? { id: link_payment_method_id!, label: name };
+          setLinkConfig({
+            paymentMethodId: selected.id,
+            label: name ?? selected.label,
+          });
+          const principal = await ensureConsumerPrincipal();
+          return text(
+            [
+              "Link payment method connected.",
+              `  Payment method: ${selected.label ?? selected.id}${selected.label ? ` (${selected.id})` : ""}`,
+              `  Consumer principal: ${principal}`,
+              "",
+              "Use pay_with: \"link\" for agent runs.",
+            ].join("\n"),
+          );
+        }
+
+        let methods = await listLinkPaymentMethods();
+        if (methods.length === 0) {
+          try {
+            await openLinkPaymentMethodAdd();
+            methods = await listLinkPaymentMethods();
+          } catch (err) {
+            return text(
+              [
+                "No Link payment methods are available yet.",
+                `Reason: ${err instanceof Error ? err.message : String(err)}`,
+                "",
+                "Run wallet_setup({ action: \"add-link\" }) again after adding a payment method in Link.",
+              ].join("\n"),
+            );
+          }
+          if (methods.length === 0) {
+            return text("Link payment-method setup was started. Run wallet_setup({ action: \"add-link\" }) again after adding a payment method in Link.");
+          }
+        }
+
+        if (methods.length === 1) {
+          const method = methods[0];
+          setLinkConfig({
+            paymentMethodId: method.id,
+            label: method.label,
+          });
+          const principal = await ensureConsumerPrincipal();
+          return text(
+            [
+              "Link payment method connected.",
+              `  Payment method: ${method.id}${method.label ? ` (${method.label})` : ""}`,
+              `  Consumer principal: ${principal}`,
+              "",
+              "Use pay_with: \"link\" for agent runs.",
+            ].join("\n"),
+          );
+        }
+
+        return text(
+          [
+            "Multiple Link payment methods found. Choose one:",
+            ...methods.map((method) => `  ${method.label ?? method.id}${method.label ? ` (${method.id})` : ""}`),
+            "",
+            "Then run:",
+            "  wallet_setup({ action: \"add-link\", link_payment_method: \"<name or last4>\" })",
+          ].join("\n"),
+        );
+      }
+
+      if (action === "remove-link") {
+        const existing = getLinkConfig();
+        if (!existing) {
+          return text("No Link payment method is currently connected.");
+        }
+
+        setLinkConfig(null);
+        return text(`Removed Link payment method ${existing.paymentMethodId}.`);
+      }
+
       // ── Card setup flow ──────────────────────────────────────
       if (action === "add-card") {
         if (!isCardPaymentEnabled()) {
@@ -273,6 +489,7 @@ export function registerWalletTools(server: McpServer): void {
                 chainStatus = "Already linked to Agent Wonderland.";
               }
             }
+            setDefaultCryptoPaymentMethod(defaultCh);
             const principal = await ensureConsumerPrincipal();
             return text([
               "Found existing OWS wallet:",
@@ -307,6 +524,7 @@ export function registerWalletTools(server: McpServer): void {
               defaultChain: "solana",
               label: walletName,
             });
+            setDefaultCryptoPaymentMethod("solana");
             const principal = await ensureConsumerPrincipal();
             const owsNudge = platformSupportsOws()
               ? "\n\n⚠ Key stored in plaintext at ~/.agentwonderland/config.json. Run wallet_setup({ action: \"enable-ows\" }) to install encrypted at-rest storage — takes ~30s."
@@ -336,6 +554,7 @@ export function registerWalletTools(server: McpServer): void {
             defaultChain: defaultCh === "solana" ? "tempo" : defaultCh,
             label: walletName,
           });
+          setDefaultCryptoPaymentMethod(defaultCh);
           const principal = await ensureConsumerPrincipal();
           const owsNudge = platformSupportsOws()
             ? "\n\n⚠ Key stored in plaintext at ~/.agentwonderland/config.json. Run wallet_setup({ action: \"enable-ows\" }) to install encrypted at-rest storage — takes ~30s."
@@ -367,6 +586,7 @@ export function registerWalletTools(server: McpServer): void {
           defaultChain: defaultCh,
           label: walletName,
         });
+        setDefaultCryptoPaymentMethod(defaultCh);
         const principal = await ensureConsumerPrincipal();
 
         return text(
@@ -400,6 +620,7 @@ export function registerWalletTools(server: McpServer): void {
           defaultChain: defaultCh,
           label: walletName,
         });
+        setDefaultCryptoPaymentMethod(defaultCh);
         const principal = await ensureConsumerPrincipal();
 
         return text(
@@ -432,6 +653,7 @@ export function registerWalletTools(server: McpServer): void {
             defaultChain: "solana",
             label: walletName,
           });
+          setDefaultCryptoPaymentMethod("solana");
           const principal = await ensureConsumerPrincipal();
           const owsNudge = platformSupportsOws()
             ? "\n\n⚠ Key stored in plaintext at ~/.agentwonderland/config.json. Run wallet_setup({ action: \"enable-ows\" }) to install encrypted at-rest storage — takes ~30s."
@@ -472,6 +694,7 @@ export function registerWalletTools(server: McpServer): void {
           defaultChain: defaultCh,
           label: walletName,
         });
+        setDefaultCryptoPaymentMethod(defaultCh);
         const principal = await ensureConsumerPrincipal();
 
         const owsNudge = platformSupportsOws()