@agentwonderland/mcp 0.1.52 → 0.1.54

package/src/tools/run.ts

@@ -14,13 +14,11 @@ import {
   hasWalletConfigured,
   getWalletAddress,
   normalizePaymentMethod,
-  isCardPaymentEnabled,
 } from "../core/payments.js";
 import { requiresSpendConfirmation, getDefaultTipAmount } from "../core/config.js";
 import { formatRunResult } from "../core/formatters.js";
 import { canSpend, recordSpend, requiresPolicyConfirmation } from "../core/spend-policy.js";
 import { storeFeedbackToken } from "./_token-cache.js";
-import { getOrCreatePendingCardSetup, formatCardSetupBlocks } from "../core/card-setup.js";
 import {
   formatPaymentLabel,
   formatRunConfirmationCommand,
@@ -127,30 +125,18 @@ 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, solana), 'link', or 'card'. Auto-detected if omitted."),
+      pay_with: z.string().trim().min(1).optional().describe("Launch payment method — wallet ID or chain name (tempo, base, solana). 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 }) => {
       if (!hasWalletConfigured()) {
-        if (isCardPaymentEnabled()) {
-          try {
-            const { url } = await getOrCreatePendingCardSetup();
-            return multiText(...formatCardSetupBlocks(url));
-          } catch {
-            // Fall through to the setup message below.
-          }
-        }
         const setupLines = [
           "No payment method configured.",
           "",
-          "Recommended: wallet_setup({ action: \"add-link\" }) to connect a Link card or bank account.",
-          "You can also run wallet_setup({ action: \"start\" }) to see all payment options.",
+          "Run wallet_setup({ action: \"start\" }) to configure a launch USDC payment method.",
           "",
-          "USDC options: Tempo, Base, or Solana.",
+          "Launch options: Tempo USDC, Base USDC, or Solana USDC.",
         ];
-        if (isCardPaymentEnabled()) {
-          setupLines.push("", "Or wallet_setup({ action: \"add-card\" }) to connect a credit card.");
-        }
         return text(setupLines.join("\n"));
       }
 
@@ -220,6 +206,10 @@ export function registerRunTools(server: McpServer): void {
           `  Payment: ${formatPaymentLabel(method)}`,
         ];
 
+        if (method === "link") {
+          quoteLines.push("  Link: after confirming here, approve the Link spend request and rerun the confirmed call.");
+        }
+
         const creditPackLines = buildCreditPackOfferLines(agent);
         if (creditPackLines.length > 0) {
           quoteLines.push("", ...creditPackLines);
@@ -299,6 +289,9 @@ export function registerRunTools(server: McpServer): void {
           );
         }
         const msg = apiErr?.message ?? "Failed to run agent";
+        if (msg.includes("Link approval required.")) {
+          return text(msg);
+        }
         if (msg.includes("Missing required field") || msg.includes("validation failed")) {
           return text(`Error: ${msg}\n\nUse get_agent("${agent_id}") to see the required input fields.`);
         }

package/src/tools/solve.ts

@@ -1,7 +1,6 @@
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z } from "zod";
 import { apiGet, apiPost, apiPostWithPayment } from "../core/api-client.js";
-import { getOrCreatePendingCardSetup, formatCardSetupBlocks } from "../core/card-setup.js";
 import {
   getCompatiblePaymentMethods,
   hasWalletConfigured,
@@ -10,7 +9,6 @@ import {
   getWalletAddress,
   normalizePaymentMethod,
   toRegistryPaymentMethod,
-  isCardPaymentEnabled,
 } from "../core/payments.js";
 import { requiresSpendConfirmation, getDefaultTipAmount } from "../core/config.js";
 import { agentList, formatRunResult } from "../core/formatters.js";
@@ -159,7 +157,7 @@ export function registerSolveTools(server: McpServer): void {
         .trim()
         .min(1)
         .optional()
-        .describe("Payment method — wallet ID, chain name (tempo, base, solana), 'link', or 'card'. Auto-detected if omitted."),
+        .describe("Launch payment method — wallet ID or chain name (tempo, base, solana). Auto-detected if omitted."),
       confirmed: z
         .boolean()
         .optional()
@@ -167,25 +165,13 @@ export function registerSolveTools(server: McpServer): void {
     },
     async ({ intent, input, budget, pay_with, confirmed }) => {
       if (!hasWalletConfigured()) {
-        if (isCardPaymentEnabled()) {
-          try {
-            const { url } = await getOrCreatePendingCardSetup();
-            return multiText(...formatCardSetupBlocks(url));
-          } catch {
-            // Fall through to the setup message below.
-          }
-        }
         const setupLines = [
           "No payment method configured.",
           "",
-          "Recommended: wallet_setup({ action: \"add-link\" }) to connect a Link card or bank account.",
-          "You can also run wallet_setup({ action: \"start\" }) to see all payment options.",
+          "Run wallet_setup({ action: \"start\" }) to configure a launch USDC payment method.",
           "",
-          "USDC options: Tempo, Base, or Solana.",
+          "Launch options: Tempo USDC, Base USDC, or Solana USDC.",
         ];
-        if (isCardPaymentEnabled()) {
-          setupLines.push("", "Or wallet_setup({ action: \"add-card\" }) to connect a credit card.");
-        }
         return text(setupLines.join("\n"));
       }
 
@@ -292,6 +278,9 @@ export function registerSolveTools(server: McpServer): void {
           `Best match: ${selected.name}`,
           `Cost: $${estimatedCost.toFixed(2)}`,
           `Payment: ${formatPaymentLabel(method)}`,
+          ...(method === "link"
+            ? ["Link: after confirming here, approve the Link spend request and rerun the confirmed call."]
+            : []),
           ...(() => {
             const summary = buildCreditPackSummary(selected);
             return summary.length > 0 ? ["", ...summary] : [];
@@ -361,7 +350,11 @@ export function registerSolveTools(server: McpServer): void {
             ].join("\n"),
           );
         }
-        return text(`Error: ${apiErr?.message ?? "Failed to run agent"}`);
+        const msg = apiErr?.message ?? "Failed to run agent";
+        if (msg.includes("Link approval required.")) {
+          return text(msg);
+        }
+        return text(`Error: ${msg}`);
       }
 
       pendingSolves.delete(pendingKey);

package/src/tools/wallet.ts

@@ -66,21 +66,18 @@ function isFreshLinkSetup(pending: { createdAt: string }): boolean {
 
 function formatPaymentSetupMenu(): string {
   return [
-    "Choose a payment method to set up:",
+    "Choose a launch payment method to set up:",
     "",
-    "1. Link card or bank account (recommended)",
-    "   wallet_setup({ action: \"add-link\" })",
-    "",
-    "2. Tempo USDC",
+    "1. Tempo USDC",
     "   wallet_setup({ action: \"create\", chain: \"tempo\" })",
     "",
-    "3. Base USDC",
+    "2. Base USDC",
     "   wallet_setup({ action: \"create\", chain: \"base\" })",
     "",
-    "4. Solana USDC",
+    "3. Solana USDC",
     "   wallet_setup({ action: \"create\", chain: \"solana\" })",
     "",
-    "5. Import an existing wallet",
+    "4. Import an existing wallet",
     "   wallet_setup({ action: \"import\", chain: \"base\", key: \"<private key>\" })",
   ].join("\n");
 }
@@ -93,7 +90,7 @@ export function registerWalletTools(server: McpServer): void {
   // ── wallet_status (extracted from check_wallet) ─────────────────
   server.tool(
     "wallet_status",
-    "Check payment readiness. Shows all configured wallets, their chains, addresses, and card status.",
+    "Check launch payment readiness. Shows configured wallets, chains, addresses, and USDC balances.",
     {},
     async () => {
       const wallets = getWallets();
@@ -192,11 +189,11 @@ export function registerWalletTools(server: McpServer): void {
   // ── wallet_setup ────────────────────────────────────────────────
   server.tool(
     "wallet_setup",
-    "Set up or manage an Agent Wonderland payment method. Use 'start' for a guided setup menu. Link card/bank is recommended for most users. 'add-link' connects a Link card or bank account for agent payments. '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 launch payment method. Use 'start' for a guided USDC setup menu. '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. Card and Link actions are present for non-launch compatibility only and should not be recommended for launch runs. NEVER delete or rotate keys programmatically; direct users to edit ~/.agentwonderland/config.json or ~/.ows/ manually.",
     {
       action: z
         .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"),
+        .describe("'start' shows the guided launch USDC setup menu, 'create' makes a crypto wallet, 'import' imports an existing key, 'enable-ows' installs encrypted key storage; add-card/add-link are non-launch compatibility actions"),
       name: z
         .string()
         .optional()
@@ -212,7 +209,7 @@ export function registerWalletTools(server: McpServer): void {
       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'."),
+        .describe("Friendly Link payment method selector, such as a saved payment method label or last4; used with action 'add-link'."),
     },
     async ({ action, name, key, chain, link_payment_method_id, link_payment_method }) => {
       if (action === "start") {