@agentwonderland/mcp 0.1.25 → 0.1.27

package/src/tools/run.ts

@@ -14,6 +14,7 @@ import {
   hasWalletConfigured,
   getWalletAddress,
   normalizePaymentMethod,
+  isCardPaymentEnabled,
 } from "../core/payments.js";
 import { requiresSpendConfirmation, getDefaultTipAmount } from "../core/config.js";
 import { formatRunResult } from "../core/formatters.js";
@@ -32,9 +33,10 @@ const POLL_MAX_MS = 120000;
 
 async function pollJobUntilDone(
   jobId: string,
+  paymentMethod?: string,
 ): Promise<{ status: string; output?: unknown; error_code?: string }> {
   const deadline = Date.now() + POLL_MAX_MS;
-  const walletAddress = await getWalletAddress();
+  const walletAddress = await getWalletAddress(paymentMethod);
   const walletParam = walletAddress ? `?wallet=${walletAddress}` : "";
 
   while (Date.now() < deadline) {
@@ -100,21 +102,30 @@ export function registerRunTools(server: McpServer): void {
     {
       agent_id: z.string().describe("Agent ID (UUID, slug, or name)"),
       input: z.record(z.unknown()).describe("Input payload for the agent"),
-      pay_with: z.string().trim().min(1).describe("Required payment method — wallet ID, chain name (tempo, base, etc.), or 'card'. Use wallet_status to see configured options."),
+      pay_with: z.string().trim().min(1).optional().describe("Payment method — wallet ID, chain name (tempo, base, etc.), 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 }) => {
       if (!hasWalletConfigured()) {
-        try {
-          const { url } = await getOrCreatePendingCardSetup();
-          return multiText(...formatCardSetupBlocks(url));
-        } 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\" })",
-          );
+        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.",
+          "",
+          "Supported rails: Tempo USDC, Base USDC, Solana USDC.",
+          "Run wallet_setup({ action: \"create\" }) to create a crypto wallet,",
+          "or wallet_setup({ action: \"import\" }) with an existing key.",
+        ];
+        if (isCardPaymentEnabled()) {
+          setupLines.push("", "Or wallet_setup({ action: \"add-card\" }) to connect a credit card.");
         }
+        return text(setupLines.join("\n"));
       }
 
       let agent: AgentRecord;
@@ -126,21 +137,21 @@ export function registerRunTools(server: McpServer): void {
 
       const price = parseFloat(agent.pricePerRunUsd ?? "0.01");
       const agentName = agent.name ?? agent_id;
-      const creditPackInventory = await getCreditPackInventory(agent.id);
-      const activeCreditPack = getActiveCreditPack(creditPackInventory);
       const compatibleMethods = getCompatiblePaymentMethods(agent, getConfiguredMethods());
       const pending = pendingRuns.get(agent.id);
-      const requestedMethod = pay_with;
-      const normalizedRequestedMethod = normalizePaymentMethod(requestedMethod);
+      const requestedMethod = pay_with ?? pending?.method;
+      const normalizedRequestedMethod = requestedMethod ? normalizePaymentMethod(requestedMethod) : null;
+      const creditPackInventory = await getCreditPackInventory(agent.id, requestedMethod);
+      const activeCreditPack = getActiveCreditPack(creditPackInventory);
 
-      if (!normalizedRequestedMethod) {
+      if (requestedMethod && !normalizedRequestedMethod) {
         return text(
           `Payment method "${requestedMethod}" is not configured.\n\n` +
           "Use wallet_status to review your current payment methods.",
         );
       }
 
-      if (!compatibleMethods.includes(normalizedRequestedMethod)) {
+      if (normalizedRequestedMethod && !compatibleMethods.includes(normalizedRequestedMethod)) {
         return text(
           `This agent cannot be paid with "${requestedMethod}".\n\n` +
           `Available payment methods for this agent: ${compatibleMethods.join(", ") || "none"}.\n` +
@@ -148,8 +159,15 @@ export function registerRunTools(server: McpServer): void {
         );
       }
 
-      const method = resolveConfirmationMethod(pay_with, pending?.method, compatibleMethods);
-      const spendCheckMethod = method ?? normalizedRequestedMethod;
+      if (!activeCreditPack && compatibleMethods.length === 0) {
+        return text(
+          `No compatible payment methods are configured for ${agentName}.\n\n` +
+          "Use wallet_status to review your current payment methods.",
+        );
+      }
+
+      const method = resolveConfirmationMethod(requestedMethod, pending?.method, compatibleMethods);
+      const spendCheckMethod = method ?? normalizedRequestedMethod ?? compatibleMethods[0];
 
       if (!activeCreditPack) {
         const spendCheck = canSpend({
@@ -278,7 +296,7 @@ export function registerRunTools(server: McpServer): void {
       const usedCreditPack = result.consumption_mode === "credit_pack";
 
       if (status === "processing") {
-        const pollResult = await pollJobUntilDone(jobId);
+        const pollResult = await pollJobUntilDone(jobId, method);
         if (pollResult.status === "completed") {
           const asyncFormatted = formatRunResult({
             ...result,

package/src/tools/search.ts

@@ -24,13 +24,14 @@ export function registerSearchTools(server: McpServer): void {
         .describe("Sort results by: relevance (default), price, rating, popularity, or newest"),
     },
     async ({ query, tag, limit, max_price, min_rating, sort }) => {
-      const requestedLimit = limit ?? 10;
+      const requestedLimit = Math.max(1, Math.min(50, limit ?? 10));
       const params = new URLSearchParams();
       if (query) params.set("q", query);
       if (tag) params.set("tag", tag);
 
-      // When filtering by min_rating client-side, request more results
-      const apiLimit = min_rating ? requestedLimit * 3 : requestedLimit;
+      // min_rating is filtered client-side on avgRating. Request extra candidates
+      // so the post-filter result still has a chance of meeting requestedLimit.
+      const apiLimit = min_rating ? Math.min(100, requestedLimit * 3) : requestedLimit;
       params.set("limit", String(apiLimit));
 
       if (max_price) params.set("price_max", String(max_price));
@@ -56,13 +57,13 @@ export function registerSearchTools(server: McpServer): void {
 
       let agents = await apiGet<AgentRecord[]>(`/agents?${params}`);
 
-      // Client-side min_rating filter
+      // Client-side min_rating filter — avgRating is the 1-5 user-facing score.
+      // Agents with no ratings yet (avgRating == null) are excluded when a
+      // minimum is requested, matching user expectation of "at least N stars".
       if (min_rating) {
-        agents = agents.filter((a: any) => {
-          const rating = a.reputationScore ?? a.avgRating ?? 0;
-          // Convert 0-1 reputation to 1-5 scale if needed
-          const stars = rating <= 1 ? rating * 5 : rating;
-          return stars >= min_rating;
+        agents = agents.filter((a) => {
+          const avg = a.avgRating ?? (a.stats as { avgRating?: number | null } | undefined)?.avgRating;
+          return typeof avg === "number" && avg >= min_rating;
         });
       }
 

package/src/tools/solve.ts

@@ -10,6 +10,7 @@ import {
   getWalletAddress,
   normalizePaymentMethod,
   toRegistryPaymentMethod,
+  isCardPaymentEnabled,
 } from "../core/payments.js";
 import { requiresSpendConfirmation, getDefaultTipAmount } from "../core/config.js";
 import { agentList, formatRunResult } from "../core/formatters.js";
@@ -30,9 +31,10 @@ const POLL_MAX_MS = 120000;
 
 async function pollSolveJob(
   jobId: string,
+  paymentMethod?: string,
 ): Promise<{ status: string; output?: unknown; error_code?: string }> {
   const deadline = Date.now() + POLL_MAX_MS;
-  const walletAddress = await getWalletAddress();
+  const walletAddress = await getWalletAddress(paymentMethod);
   const walletParam = walletAddress ? `?wallet=${walletAddress}` : "";
 
   while (Date.now() < deadline) {
@@ -139,7 +141,8 @@ export function registerSolveTools(server: McpServer): void {
         .string()
         .trim()
         .min(1)
-        .describe("Required payment method — wallet ID, chain name (tempo, base, etc.), or 'card'. Use wallet_status to see configured options."),
+        .optional()
+        .describe("Payment method — wallet ID, chain name (tempo, base, etc.), or 'card'. Auto-detected if omitted."),
       confirmed: z
         .boolean()
         .optional()
@@ -147,25 +150,34 @@ export function registerSolveTools(server: McpServer): void {
     },
     async ({ intent, input, budget, pay_with, confirmed }) => {
       if (!hasWalletConfigured()) {
-        try {
-          const { url } = await getOrCreatePendingCardSetup();
-          return multiText(...formatCardSetupBlocks(url));
-        } 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\" })",
-          );
+        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.",
+          "",
+          "Supported rails: Tempo USDC, Base USDC, Solana USDC.",
+          "Run wallet_setup({ action: \"create\" }) to create a crypto wallet,",
+          "or wallet_setup({ action: \"import\" }) with an existing key.",
+        ];
+        if (isCardPaymentEnabled()) {
+          setupLines.push("", "Or wallet_setup({ action: \"add-card\" }) to connect a credit card.");
         }
+        return text(setupLines.join("\n"));
       }
 
       const pendingKey = makeSolvePendingKey(intent, input, budget);
       const pending = pendingSolves.get(pendingKey);
       const configuredMethods = getConfiguredMethods();
-      const requestedMethod = pay_with;
-      const normalizedRequestedMethod = normalizePaymentMethod(requestedMethod);
+      const requestedMethod = pay_with ?? pending?.method;
+      const normalizedRequestedMethod = requestedMethod ? normalizePaymentMethod(requestedMethod) : null;
 
-      if (!normalizedRequestedMethod) {
+      if (requestedMethod && !normalizedRequestedMethod) {
         return text(
           `Payment method "${requestedMethod}" is not configured.\n\n` +
           "Use wallet_status to review your current payment methods.",
@@ -198,13 +210,16 @@ export function registerSolveTools(server: McpServer): void {
         const cost = (result as Record<string, unknown>).cost as number | undefined;
         const usedCreditPack = (result as Record<string, unknown>).consumption_mode === "credit_pack";
         const tipMsg = result.feedback_token ? await autoTip(jobId, agentId, agentName, result.feedback_token as string) : "";
-        return multiText(formatRunResult(result), feedbackAsk(jobId, agentId, usedCreditPack ? undefined : cost, tipMsg));
+        const header = agentName ? [`Matched agent: ${agentName}`, ""].join("\n") : "";
+        return multiText(header + formatRunResult(result), feedbackAsk(jobId, agentId, usedCreditPack ? undefined : cost, tipMsg));
       } catch (err: unknown) {
-        const isAuthError =
+        const status =
           err instanceof Error &&
-          "status" in err &&
-          (err as { status: number }).status === 401;
-        if (!isAuthError || !hasWalletConfigured()) throw err;
+          "status" in err
+            ? (err as { status: number }).status
+            : undefined;
+        const isRecoverableDirectSolveError = status === 401 || status === 402;
+        if (!isRecoverableDirectSolveError || !hasWalletConfigured()) throw err;
       }
 
       const params = new URLSearchParams({ q: intent, limit: "5" });
@@ -226,10 +241,10 @@ export function registerSolveTools(server: McpServer): void {
         return price <= budget;
       });
       const selected = affordable[0] ?? agents[0];
-      const activeCreditPack = await getCreditPackInventory(selected.id).then(getActiveCreditPack);
+      const activeCreditPack = await getCreditPackInventory(selected.id, requestedMethod).then(getActiveCreditPack);
       const compatibleMethods = getCompatiblePaymentMethods(selected, configuredMethods);
 
-      if (!compatibleMethods.includes(normalizedRequestedMethod)) {
+      if (normalizedRequestedMethod && !compatibleMethods.includes(normalizedRequestedMethod)) {
         return text(
           `The best matching agent cannot be paid with "${requestedMethod}".\n\n` +
           `Available payment methods for ${selected.name}: ${compatibleMethods.join(", ") || "none"}.\n` +
@@ -237,8 +252,15 @@ export function registerSolveTools(server: McpServer): void {
         );
       }
 
-      const method = resolveConfirmationMethod(pay_with, pending?.method, compatibleMethods);
-      const spendCheckMethod = method ?? normalizedRequestedMethod;
+      if (!activeCreditPack && compatibleMethods.length === 0) {
+        return text(
+          `No compatible payment methods are configured for ${selected.name}.\n\n` +
+          "Use wallet_status to review your current payment methods.",
+        );
+      }
+
+      const method = resolveConfirmationMethod(requestedMethod, pending?.method, compatibleMethods);
+      const spendCheckMethod = method ?? normalizedRequestedMethod ?? compatibleMethods[0];
 
       const selectedPrice = parseFloat(selected.pricePerRunUsd ?? "0.01");
       const estimatedCost = selectedPrice;
@@ -307,9 +329,10 @@ export function registerSolveTools(server: McpServer): void {
       } catch (err: unknown) {
         const apiErr = err as { status?: number; message?: string };
         if (apiErr?.status === 402) {
+          const reason = apiErr.message ? `Payment failed: ${apiErr.message}` : "Payment failed — wallet may not have enough funds or the selected method was rejected.";
           return text(
             [
-              "Payment failed — your wallet may not have enough funds or the selected method was rejected.",
+              reason,
               "",
               "Check your balance and try again.",
               "Use wallet_status to check your current payment methods.",
@@ -334,7 +357,7 @@ export function registerSolveTools(server: McpServer): void {
       }
 
       if (status === "processing") {
-        const pollResult = await pollSolveJob(jobId);
+        const pollResult = await pollSolveJob(jobId, method);
         if (pollResult.status === "completed") {
           const asyncFormatted = formatRunResult({
             ...result,

package/src/tools/wallet.ts

@@ -9,7 +9,9 @@ import {
   getSpendPolicy,
   setSpendPolicy,
 } from "../core/config.js";
-import { getWalletAddress } from "../core/payments.js";
+import { getWalletAddress, isCardPaymentEnabled } from "../core/payments.js";
+import { fetchUsdcBalance } from "../core/balances.js";
+import { getSettings } from "../core/settings.js";
 import {
   getOrCreatePendingCardSetup,
   formatCardSetupBlocks,
@@ -47,25 +49,36 @@ export function registerWalletTools(server: McpServer): void {
         );
       }
 
-      const lines = ["Payment methods:"];
+      const settings = await getSettings();
+      const networkLabel = settings ? ` (${settings.network})` : "";
+      const lines = [`Payment methods${networkLabel}:`];
 
       for (const w of wallets) {
         const label = w.label ? ` (${w.label})` : "";
         const storage =
           w.keyType === "ows" ? " [encrypted]" : " [plaintext]";
-        const chainAddresses = await Promise.all(
+        const chainLines = await Promise.all(
           w.chains.map(async (chainName) => {
             const addr = await getWalletAddress(chainName);
-            return `${chainName}: ${addr ?? "unknown"}`;
+            if (!addr) return `${chainName}: unknown`;
+            let balanceStr = "";
+            if (chainName === "tempo" || chainName === "base" || chainName === "solana") {
+              const balance = await fetchUsdcBalance(chainName, addr);
+              if (balance !== null) {
+                const num = Number(balance);
+                balanceStr = `   ${Number.isFinite(num) ? num.toFixed(4).replace(/\.?0+$/, "") : balance} USDC`;
+              }
+            }
+            return `${chainName}: ${addr}${balanceStr}`;
           }),
         );
-        lines.push(
-          `  ${w.id}${label}${storage}: ${chainAddresses.join(" | ")}`,
-        );
+        lines.push(`  ${w.id}${label}${storage}:`);
+        for (const line of chainLines) lines.push(`    ${line}`);
       }
 
-      if (card) {
-        lines.push(`  Card: ${card.brand} ****${card.last4}`);
+      if (card && isCardPaymentEnabled()) {
+        const stripeMode = settings?.stripe.mode === "test" ? " [Stripe test mode]" : "";
+        lines.push(`  Card: ${card.brand} ****${card.last4}${stripeMode}`);
         const capabilities = await getCardCapabilities();
         if (capabilities.spt_status === "enabled") {
           lines.push("  Card MPP: ready");
@@ -88,14 +101,14 @@ export function registerWalletTools(server: McpServer): void {
     },
   );
 
-  // ── wallet_setup (NEW) ──────────────────────────────────────────
+  // ── wallet_setup ────────────────────────────────────────────────
   server.tool(
     "wallet_setup",
-    "Set up or manage payment methods. Options: 'add-card' to connect a credit/debit card (recommended), 'remove-card' to disconnect a card, 'create' a crypto wallet, or 'import' an existing key. For crypto wallet changes (removal, key rotation), direct users to edit their config files manually — never handle private keys programmatically.",
+    "Set up or manage a payment wallet. 'create' makes a new encrypted crypto wallet (OWS); 'import' takes an existing private key. Tempo/Base share one EVM key — a single wallet covers both. Solana uses a separate ed25519 key. For crypto wallet deletion or key rotation, direct users to edit ~/.agentwonderland/config.json or ~/.ows/ manually; never handle key material programmatically.",
     {
       action: z
         .enum(["create", "import", "add-card", "remove-card"])
-        .describe("'add-card' to connect a card, 'remove-card' to disconnect it, 'create' a crypto wallet, or 'import' an existing key"),
+        .describe("'create' a crypto wallet (recommended), 'import' an existing key, 'add-card'/'remove-card' for credit card (card-backed MPP availability depends on Stripe SPT)"),
       name: z
         .string()
         .optional()
@@ -107,11 +120,14 @@ export function registerWalletTools(server: McpServer): void {
           "Private key hex string (required for 'import', ignored for 'create')",
         ),
       chain: z.enum(["tempo", "base", "solana"]).optional()
-        .describe("Primary chain (default: tempo). Solana uses an OWS wallet plus Stripe deposit-mode USDC."),
+        .describe("Primary chain (default: tempo). Tempo/Base use a shared EVM wallet; Solana uses a separate OWS wallet."),
     },
     async ({ action, name, key, chain }) => {
       // ── Card setup flow ──────────────────────────────────────
       if (action === "add-card") {
+        if (!isCardPaymentEnabled()) {
+          return text("Card payments are temporarily unavailable. Use wallet_setup({ action: \"create\" }) for a crypto wallet instead.");
+        }
         const existing = getCardConfig();
         if (existing) {
           return text(`Card already connected: ${existing.brand} ****${existing.last4}\n\nTo replace it, remove the current card first.`);
@@ -341,9 +357,9 @@ export function registerWalletTools(server: McpServer): void {
   // ── wallet_set_policy (NEW) ─────────────────────────────────────
   server.tool(
     "wallet_set_policy",
-    "Set spending limits on a wallet to control agent costs. Limits reset daily.",
+    "Set client-side spending limits on a wallet to control agent costs in this MCP client. Limits reset daily.",
     {
-      wallet_id: z.string().describe("Wallet ID to set policy on"),
+      wallet_id: z.string().describe("Wallet ID to set local policy on"),
       max_per_tx: z
         .number()
         .positive()
@@ -403,10 +419,10 @@ export function registerWalletTools(server: McpServer): void {
       }
       return text(
         [
-          `Spending policy set for wallet "${wallet_id}":`,
+          `Local spending policy set for wallet "${wallet_id}":`,
           ...policies.map((p) => `  ${p}`),
           "",
-          "Policy will be enforced on all future transactions from this wallet.",
+          "Policy is stored in this MCP client's local config and enforced on future transactions from this wallet on this client.",
         ].join("\n"),
       );
     },

package/src/tools/observability.ts

@@ -1,43 +0,0 @@
-import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { apiPost } from "../core/api-client.js";
-
-function text(t: string) {
-  return { content: [{ type: "text" as const, text: t }] };
-}
-
-export function registerObservabilityTools(server: McpServer): void {
-  server.tool(
-    "open_observability_dashboard",
-    "Generate a secure one-click sign-in URL for the Agent Wonderland web observability dashboard. The dashboard shows your agent runs, spend, rebates, and recent activity.",
-    {},
-    async () => {
-      const result = await apiPost<{
-        url: string;
-        expires_at: string;
-        consumer_principal?: string;
-      }>(
-        "/observability/link",
-        {},
-        { ensureConsumerPrincipal: true },
-      );
-
-      const lines = [
-        "Your secure observability link is ready:",
-        result.url,
-        "",
-        `Expires: ${result.expires_at}`,
-      ];
-
-      if (result.consumer_principal) {
-        lines.push(`Consumer principal: ${result.consumer_principal}`);
-      }
-
-      lines.push(
-        "",
-        "Open the link in your browser to view usage metrics, spend, rebates, and recent runs.",
-      );
-
-      return text(lines.join("\n"));
-    },
-  );
-}