@agentwonderland/mcp 0.1.16 → 0.1.18

package/dist/core/card-setup.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Initiate card setup — creates a Stripe Checkout session and returns
+ * QR code + short URL for the user to scan.
+ */
+export declare function initiateCardSetup(): Promise<{
+    qr: string;
+    url: string;
+    token: string;
+}>;
+/**
+ * Format the card setup prompt as multiple content blocks.
+ * Block 1: QR code (may be collapsed in some clients)
+ * Block 2: URL + instructions (short, always visible)
+ */
+export declare function formatCardSetupBlocks(qr: string, url: string): string[];
+/**
+ * Poll for card setup completion. Returns the card details or null on timeout.
+ */
+export declare function pollCardSetup(token: string, timeoutMs?: number): Promise<{
+    last4: string;
+    brand: string;
+    consumerToken: string;
+} | null>;

package/dist/core/card-setup.js

@@ -0,0 +1,68 @@
+import QRCode from "qrcode";
+import { apiPost, apiGet } from "./api-client.js";
+import { getApiUrl, setCardConfig } from "./config.js";
+/**
+ * Initiate card setup — creates a Stripe Checkout session and returns
+ * QR code + short URL for the user to scan.
+ */
+export async function initiateCardSetup() {
+    const { url: _checkoutUrl, token } = await apiPost("/card/setup", {});
+    // Short redirect URL keeps the QR code small and scannable
+    const apiUrl = getApiUrl();
+    const shortUrl = `${apiUrl}/card/link/${token}`;
+    const qr = await QRCode.toString(shortUrl, {
+        type: "utf8",
+        errorCorrectionLevel: "L",
+        margin: 2,
+    });
+    return { qr, url: shortUrl, token };
+}
+/**
+ * Format the card setup prompt as multiple content blocks.
+ * Block 1: QR code (may be collapsed in some clients)
+ * Block 2: URL + instructions (short, always visible)
+ */
+export function formatCardSetupBlocks(qr, url) {
+    return [
+        qr.trim(),
+        [
+            `IMPORTANT: You MUST present this link to the user so they can connect a payment card:`,
+            "",
+            url,
+            "",
+            `Tell the user: "Scan the QR code above or open this link to connect your card. Let me know when you're done."`,
+            `After they confirm, call wallet_setup({ action: "add-card" }) to complete setup.`,
+            `Crypto wallets (Base/Tempo USDC) are also available via wallet_setup({ action: "create" }).`,
+        ].join("\n"),
+    ];
+}
+/**
+ * Poll for card setup completion. Returns the card details or null on timeout.
+ */
+export async function pollCardSetup(token, timeoutMs = 120_000) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        await new Promise((r) => setTimeout(r, 3000));
+        try {
+            const status = await apiGet(`/card/status?token=${token}`);
+            if (status.status === "complete" && status.consumer_token) {
+                const card = {
+                    last4: status.card_last4 ?? "????",
+                    brand: status.card_brand ?? "card",
+                    consumerToken: status.consumer_token,
+                };
+                // Persist to config
+                setCardConfig({
+                    consumerToken: card.consumerToken,
+                    last4: card.last4,
+                    brand: card.brand,
+                });
+                return card;
+            }
+        }
+        catch {
+            // Keep polling
+        }
+    }
+    return null;
+}

package/dist/index.js

@@ -30,17 +30,17 @@ export async function startMcpServer() {
             "The MCP auto-uploads to cloud storage and replaces with a URL. Never base64-encode.",
             "",
             "WORKFLOW:",
-            "1. wallet_status() — check payment is configured (Tempo USDC, Base USDC, or Card)",
-            "2. search_agents() or solve() — find agents for the task",
-            "3. get_agent() — check required input fields before running",
-            "4. run_agent() or solve() with ALL required fields",
+            "1. search_agents() or solve() — find agents for the task",
+            "2. get_agent() — check required input fields before running",
+            "3. run_agent() or solve() with ALL required fields",
+            "4. If no payment method is set up, run_agent returns a QR code to connect a credit card — present it to the user",
             "5. Ask user to rate or tip after a successful run",
             "",
             "PAYMENT:",
-            "- Automatic via configured wallet. User does nothing.",
-            "- Supports Tempo USDC, Base USDC, and Stripe Card.",
-            "- Input validation runs before payment — invalid input is never charged.",
-            "- Failed agent executions trigger automatic refunds to the consumer's wallet.",
+            "- Credit/debit card is the easiest way to pay — just scan a QR code to connect, no funding needed.",
+            "- Crypto wallets (Tempo USDC, Base USDC) are also supported for advanced users.",
+            "- Payment is automatic once configured. Users are never charged for failed runs.",
+            "- Do NOT ask the user to set up payment before they try to run an agent. Let them explore freely — payment setup is handled inline when they're ready to pay.",
             "",
             "REQUIRED FIELDS:",
             "Always check the agent's input schema (via get_agent) before calling run_agent.",

package/dist/tools/run.js

@@ -5,6 +5,7 @@ import { getConfiguredMethods, hasWalletConfigured, getWalletAddress } from "../
 import { requiresSpendConfirmation, getDefaultTipAmount } from "../core/config.js";
 import { formatRunResult } from "../core/formatters.js";
 import { storeFeedbackToken } from "./_token-cache.js";
+import { initiateCardSetup, formatCardSetupBlocks } from "../core/card-setup.js";
 const POLL_INTERVAL_MS = 3000;
 const POLL_MAX_MS = 120000; // 2 minutes
 async function pollJobUntilDone(jobId, agentName) {
@@ -45,9 +46,16 @@ export function registerRunTools(server) {
         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()) {
-            return text("No wallet configured. Set one up first:\n\n" +
-                '  wallet_setup({ action: "create", name: "my-wallet" })\n\n' +
-                "Then fund it with USDC on Tempo and try again.");
+            try {
+                const { qr, url } = await initiateCardSetup();
+                const blocks = formatCardSetupBlocks(qr, url);
+                return multiText(...blocks);
+            }
+            catch {
+                return text("No payment method configured.\n\n" +
+                    "To add a credit card: wallet_setup({ action: \"add-card\" })\n" +
+                    "To use crypto: wallet_setup({ action: \"create\" })");
+            }
         }
         // Resolve agent and fetch details
         let agent;

package/dist/tools/solve.js

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { apiGet, apiPost, apiPostWithPayment } from "../core/api-client.js";
+import { initiateCardSetup, formatCardSetupBlocks } from "../core/card-setup.js";
 import { hasWalletConfigured, getConfiguredMethods, getAcceptedPaymentMethods, getWalletAddress, } from "../core/payments.js";
 import { requiresSpendConfirmation, getDefaultTipAmount } from "../core/config.js";
 import { agentList, formatRunResult } from "../core/formatters.js";
@@ -93,9 +94,16 @@ export function registerSolveTools(server) {
             .describe("Set to true to confirm spending after seeing the price quote."),
     }, async ({ intent, input, budget, pay_with, confirmed }) => {
         if (!hasWalletConfigured()) {
-            return text("No wallet configured. Set one up first:\n\n" +
-                '  wallet_setup({ action: "create", name: "my-wallet" })\n\n' +
-                "Then fund it with USDC on Tempo and try again.");
+            try {
+                const { qr, url } = await initiateCardSetup();
+                const blocks = formatCardSetupBlocks(qr, url);
+                return { content: blocks.map((t) => ({ type: "text", text: t })) };
+            }
+            catch {
+                return text("No payment method configured.\n\n" +
+                    "To add a credit card: wallet_setup({ action: \"add-card\" })\n" +
+                    "To use crypto: wallet_setup({ action: \"create\" })");
+            }
         }
         const method = pay_with ?? getConfiguredMethods()[0];
         // Path 1: If authenticated, use the platform /solve route

package/dist/tools/wallet.js

@@ -1,9 +1,7 @@
 import { z } from "zod";
-import QRCode from "qrcode";
-import { getWallets, getCardConfig, setCardConfig, addWallet } from "../core/config.js";
-import { getApiUrl } from "../core/config.js";
+import { getWallets, getCardConfig, addWallet } from "../core/config.js";
 import { getWalletAddress } from "../core/payments.js";
-import { apiPost, apiGet } from "../core/api-client.js";
+import { initiateCardSetup, pollCardSetup } from "../core/card-setup.js";
 import { isOwsAvailable, createOwsWallet, importKeyToOws, listOwsWallets, } from "../core/ows-adapter.js";
 function text(t) {
     return { content: [{ type: "text", text: t }] };
@@ -52,64 +50,37 @@ export function registerWalletTools(server) {
             if (existing) {
                 return text(`Card already connected: ${existing.brand} ****${existing.last4}\n\nTo replace it, remove the current card first.`);
             }
-            // Check if there's a pending setup to complete
+            // Check if there's a pending setup to complete (user said they're done)
             if (pendingCardSetup) {
                 const pendingToken = pendingCardSetup.token;
-                // Poll for completion (up to 2 minutes)
-                const deadline = Date.now() + 120_000;
-                while (Date.now() < deadline) {
-                    await new Promise((r) => setTimeout(r, 3000));
-                    try {
-                        const status = await apiGet(`/card/status?token=${pendingToken}`);
-                        if (status.status === "complete" && status.consumer_token) {
-                            setCardConfig({
-                                consumerToken: status.consumer_token,
-                                last4: status.card_last4 ?? "????",
-                                brand: status.card_brand ?? "card",
-                            });
-                            pendingCardSetup = null;
-                            return text(`Connected! ${status.card_brand ?? "Card"} ****${status.card_last4} is ready for payments.`);
-                        }
-                    }
-                    catch {
-                        // Keep polling
-                    }
-                }
+                const result = await pollCardSetup(pendingToken);
                 pendingCardSetup = null;
+                if (result) {
+                    return text(`Connected! ${result.brand} ****${result.last4} is ready for payments.`);
+                }
                 return text("Card setup timed out. Run wallet_setup({ action: \"add-card\" }) to try again.");
             }
-            // Create new card setup session
-            let setupResult;
+            // Create new card setup session with QR code
             try {
-                setupResult = await apiPost("/card/setup", {});
+                const { qr, url, token } = await initiateCardSetup();
+                pendingCardSetup = { token };
+                return {
+                    content: [
+                        { type: "text", text: qr.trim() },
+                        { type: "text", text: [
+                                `IMPORTANT: You MUST present this link to the user so they can connect a payment card:`,
+                                "",
+                                url,
+                                "",
+                                `Tell the user: "Scan the QR code above or open this link to connect your card. Let me know when you're done."`,
+                                `After they confirm, call wallet_setup({ action: "add-card" }) to complete setup.`,
+                            ].join("\n") },
+                    ],
+                };
             }
             catch {
                 return text("Error: Could not create card setup session. Try again later.");
             }
-            // Store for the follow-up poll call
-            pendingCardSetup = { token: setupResult.token };
-            // Build a short link URL for a compact QR code
-            const apiUrl = getApiUrl();
-            const shortUrl = `${apiUrl}/card/link/${setupResult.token}`;
-            // Generate QR code
-            let qr;
-            try {
-                qr = await QRCode.toString(shortUrl, {
-                    type: "utf8",
-                    errorCorrectionLevel: "L",
-                    margin: 2,
-                });
-            }
-            catch {
-                qr = "";
-            }
-            return text([
-                "Scan to connect a payment card:\n",
-                qr,
-                `Or open: ${shortUrl}`,
-                "",
-                "After entering your card, tell me and I'll confirm the connection.",
-            ].join("\n"));
         }
         // ── Crypto wallet setup ──────────────────────────────────
         if (action === "import" && !key) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentwonderland/mcp",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "type": "module",
   "description": "MCP server for the Agent Wonderland AI agent marketplace",
   "bin": {

package/src/core/card-setup.ts

@@ -0,0 +1,90 @@
+import QRCode from "qrcode";
+import { apiPost, apiGet } from "./api-client.js";
+import { getApiUrl, getCardConfig, setCardConfig } from "./config.js";
+
+/**
+ * Initiate card setup — creates a Stripe Checkout session and returns
+ * QR code + short URL for the user to scan.
+ */
+export async function initiateCardSetup(): Promise<{
+  qr: string;
+  url: string;
+  token: string;
+}> {
+  const { url: _checkoutUrl, token } = await apiPost<{ url: string; token: string }>("/card/setup", {});
+
+  // Short redirect URL keeps the QR code small and scannable
+  const apiUrl = getApiUrl();
+  const shortUrl = `${apiUrl}/card/link/${token}`;
+
+  const qr = await QRCode.toString(shortUrl, {
+    type: "utf8",
+    errorCorrectionLevel: "L",
+    margin: 2,
+  });
+
+  return { qr, url: shortUrl, token };
+}
+
+/**
+ * Format the card setup prompt as multiple content blocks.
+ * Block 1: QR code (may be collapsed in some clients)
+ * Block 2: URL + instructions (short, always visible)
+ */
+export function formatCardSetupBlocks(qr: string, url: string): string[] {
+  return [
+    qr.trim(),
+    [
+      `IMPORTANT: You MUST present this link to the user so they can connect a payment card:`,
+      "",
+      url,
+      "",
+      `Tell the user: "Scan the QR code above or open this link to connect your card. Let me know when you're done."`,
+      `After they confirm, call wallet_setup({ action: "add-card" }) to complete setup.`,
+      `Crypto wallets (Base/Tempo USDC) are also available via wallet_setup({ action: "create" }).`,
+    ].join("\n"),
+  ];
+}
+
+/**
+ * Poll for card setup completion. Returns the card details or null on timeout.
+ */
+export async function pollCardSetup(
+  token: string,
+  timeoutMs = 120_000,
+): Promise<{ last4: string; brand: string; consumerToken: string } | null> {
+  const deadline = Date.now() + timeoutMs;
+
+  while (Date.now() < deadline) {
+    await new Promise((r) => setTimeout(r, 3000));
+    try {
+      const status = await apiGet<{
+        status: string;
+        card_last4?: string;
+        card_brand?: string;
+        consumer_token?: string;
+      }>(`/card/status?token=${token}`);
+
+      if (status.status === "complete" && status.consumer_token) {
+        const card = {
+          last4: status.card_last4 ?? "????",
+          brand: status.card_brand ?? "card",
+          consumerToken: status.consumer_token,
+        };
+
+        // Persist to config
+        setCardConfig({
+          consumerToken: card.consumerToken,
+          last4: card.last4,
+          brand: card.brand,
+        });
+
+        return card;
+      }
+    } catch {
+      // Keep polling
+    }
+  }
+
+  return null;
+}

package/src/index.ts

@@ -37,17 +37,17 @@ export async function startMcpServer(): Promise<void> {
         "The MCP auto-uploads to cloud storage and replaces with a URL. Never base64-encode.",
         "",
         "WORKFLOW:",
-        "1. wallet_status() — check payment is configured (Tempo USDC, Base USDC, or Card)",
-        "2. search_agents() or solve() — find agents for the task",
-        "3. get_agent() — check required input fields before running",
-        "4. run_agent() or solve() with ALL required fields",
+        "1. search_agents() or solve() — find agents for the task",
+        "2. get_agent() — check required input fields before running",
+        "3. run_agent() or solve() with ALL required fields",
+        "4. If no payment method is set up, run_agent returns a QR code to connect a credit card — present it to the user",
         "5. Ask user to rate or tip after a successful run",
         "",
         "PAYMENT:",
-        "- Automatic via configured wallet. User does nothing.",
-        "- Supports Tempo USDC, Base USDC, and Stripe Card.",
-        "- Input validation runs before payment — invalid input is never charged.",
-        "- Failed agent executions trigger automatic refunds to the consumer's wallet.",
+        "- Credit/debit card is the easiest way to pay — just scan a QR code to connect, no funding needed.",
+        "- Crypto wallets (Tempo USDC, Base USDC) are also supported for advanced users.",
+        "- Payment is automatic once configured. Users are never charged for failed runs.",
+        "- Do NOT ask the user to set up payment before they try to run an agent. Let them explore freely — payment setup is handled inline when they're ready to pay.",
         "",
         "REQUIRED FIELDS:",
         "Always check the agent's input schema (via get_agent) before calling run_agent.",

package/src/tools/run.ts

@@ -6,6 +6,7 @@ import { getConfiguredMethods, hasWalletConfigured, getWalletAddress } from "../
 import { requiresSpendConfirmation, getDefaultTipAmount } from "../core/config.js";
 import { formatRunResult } from "../core/formatters.js";
 import { storeFeedbackToken, getFeedbackToken } from "./_token-cache.js";
+import { initiateCardSetup, formatCardSetupBlocks } from "../core/card-setup.js";
 
 const POLL_INTERVAL_MS = 3000;
 const POLL_MAX_MS = 120000; // 2 minutes
@@ -69,11 +70,17 @@ export function registerRunTools(server: McpServer): void {
     },
     async ({ agent_id, input, pay_with, confirmed }) => {
       if (!hasWalletConfigured()) {
-        return text(
-          "No wallet configured. Set one up first:\n\n" +
-          '  wallet_setup({ action: "create", name: "my-wallet" })\n\n' +
-          "Then fund it with USDC on Tempo and try again."
-        );
+        try {
+          const { qr, url } = await initiateCardSetup();
+          const blocks = formatCardSetupBlocks(qr, url);
+          return multiText(...blocks);
+        } catch {
+          return text(
+            "No payment method configured.\n\n" +
+            "To add a credit card: wallet_setup({ action: \"add-card\" })\n" +
+            "To use crypto: wallet_setup({ action: \"create\" })"
+          );
+        }
       }
 
       // Resolve agent and fetch details

package/src/tools/solve.ts

@@ -1,6 +1,7 @@
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z } from "zod";
 import { apiGet, apiPost, apiPostWithPayment } from "../core/api-client.js";
+import { initiateCardSetup, formatCardSetupBlocks } from "../core/card-setup.js";
 import {
   hasWalletConfigured,
   getConfiguredMethods,
@@ -119,11 +120,17 @@ export function registerSolveTools(server: McpServer): void {
     },
     async ({ intent, input, budget, pay_with, confirmed }) => {
       if (!hasWalletConfigured()) {
-        return text(
-          "No wallet configured. Set one up first:\n\n" +
-          '  wallet_setup({ action: "create", name: "my-wallet" })\n\n' +
-          "Then fund it with USDC on Tempo and try again."
-        );
+        try {
+          const { qr, url } = await initiateCardSetup();
+          const blocks = formatCardSetupBlocks(qr, url);
+          return { content: blocks.map((t) => ({ type: "text" as const, text: t })) };
+        } catch {
+          return text(
+            "No payment method configured.\n\n" +
+            "To add a credit card: wallet_setup({ action: \"add-card\" })\n" +
+            "To use crypto: wallet_setup({ action: \"create\" })"
+          );
+        }
       }
 
       const method = pay_with ?? getConfiguredMethods()[0];

package/src/tools/wallet.ts

@@ -1,10 +1,8 @@
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z } from "zod";
-import QRCode from "qrcode";
 import { getWallets, getCardConfig, setCardConfig, addWallet } from "../core/config.js";
-import { getApiUrl } from "../core/config.js";
 import { getWalletAddress } from "../core/payments.js";
-import { apiPost, apiGet } from "../core/api-client.js";
+import { initiateCardSetup, pollCardSetup } from "../core/card-setup.js";
 import {
   isOwsAvailable,
   createOwsWallet,
@@ -84,72 +82,39 @@ export function registerWalletTools(server: McpServer): void {
           return text(`Card already connected: ${existing.brand} ****${existing.last4}\n\nTo replace it, remove the current card first.`);
         }
 
-        // Check if there's a pending setup to complete
+        // Check if there's a pending setup to complete (user said they're done)
         if (pendingCardSetup) {
           const pendingToken = pendingCardSetup.token;
-          // Poll for completion (up to 2 minutes)
-          const deadline = Date.now() + 120_000;
-          while (Date.now() < deadline) {
-            await new Promise((r) => setTimeout(r, 3000));
-            try {
-              const status = await apiGet<{
-                status: string;
-                card_last4?: string;
-                card_brand?: string;
-                consumer_token?: string;
-              }>(`/card/status?token=${pendingToken}`);
-
-              if (status.status === "complete" && status.consumer_token) {
-                setCardConfig({
-                  consumerToken: status.consumer_token,
-                  last4: status.card_last4 ?? "????",
-                  brand: status.card_brand ?? "card",
-                });
-                pendingCardSetup = null;
-                return text(`Connected! ${status.card_brand ?? "Card"} ****${status.card_last4} is ready for payments.`);
-              }
-            } catch {
-              // Keep polling
-            }
-          }
+          const result = await pollCardSetup(pendingToken);
           pendingCardSetup = null;
+
+          if (result) {
+            return text(`Connected! ${result.brand} ****${result.last4} is ready for payments.`);
+          }
           return text("Card setup timed out. Run wallet_setup({ action: \"add-card\" }) to try again.");
         }
 
-        // Create new card setup session
-        let setupResult: { url: string; token: string };
+        // Create new card setup session with QR code
         try {
-          setupResult = await apiPost<{ url: string; token: string }>("/card/setup", {});
+          const { qr, url, token } = await initiateCardSetup();
+          pendingCardSetup = { token };
+
+          return {
+            content: [
+              { type: "text" as const, text: qr.trim() },
+              { type: "text" as const, text: [
+                `IMPORTANT: You MUST present this link to the user so they can connect a payment card:`,
+                "",
+                url,
+                "",
+                `Tell the user: "Scan the QR code above or open this link to connect your card. Let me know when you're done."`,
+                `After they confirm, call wallet_setup({ action: "add-card" }) to complete setup.`,
+              ].join("\n") },
+            ],
+          };
         } catch {
           return text("Error: Could not create card setup session. Try again later.");
         }
-
-        // Store for the follow-up poll call
-        pendingCardSetup = { token: setupResult.token };
-
-        // Build a short link URL for a compact QR code
-        const apiUrl = getApiUrl();
-        const shortUrl = `${apiUrl}/card/link/${setupResult.token}`;
-
-        // Generate QR code
-        let qr: string;
-        try {
-          qr = await QRCode.toString(shortUrl, {
-            type: "utf8",
-            errorCorrectionLevel: "L",
-            margin: 2,
-          });
-        } catch {
-          qr = "";
-        }
-
-        return text([
-          "Scan to connect a payment card:\n",
-          qr,
-          `Or open: ${shortUrl}`,
-          "",
-          "After entering your card, tell me and I'll confirm the connection.",
-        ].join("\n"));
       }
 
       // ── Crypto wallet setup ──────────────────────────────────