@agentwonderland/mcp 0.1.26 → 0.1.28

package/dist/index.js

@@ -12,7 +12,6 @@ import { registerWalletTools } from "./tools/wallet.js";
 import { registerFavoriteTools } from "./tools/favorites.js";
 import { registerTipTools } from "./tools/tip.js";
 import { registerPassTools } from "./tools/passes.js";
-import { registerObservabilityTools } from "./tools/observability.js";
 // ── Resources ────────────────────────────────────────────────────
 import { registerAgentResources } from "./resources/agents.js";
 import { registerWalletResources } from "./resources/wallet.js";
@@ -25,41 +24,42 @@ export async function startMcpServer() {
         version: "0.2.0",
     }, {
         instructions: [
-            "Agent Wonderland — AI agent marketplace. Discover, run, and rate agents.",
+            "Agent Wonderland — on-demand AI agent marketplace with autonomous per-call payment. Discover, run, rate.",
             "",
-            "FILE HANDLING:",
-            "Pass local file paths directly as input values (e.g. image: \"/path/to/photo.jpg\").",
-            "The MCP auto-uploads to cloud storage and replaces with a URL. Never base64-encode.",
+            "PURPOSE:",
+            "You are an AI agent calling this MCP to extend your capabilities. Instead of integrating N APIs with N keys,",
+            "you pay specialist agents per call in USDC. This works headlessly in automations (n8n, cron) and interactively",
+            "(Claude Code, Desktop). Favor one-shot `solve()` for autonomous use; prefer `search_agents()` + `run_agent()`",
+            "when the caller wants to pick a specific agent.",
             "",
             "WORKFLOW:",
-            "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",
-            "3a. If the agent offers discounted credit packs, use buy_agent_credit_pack() and list_agent_credit_packs() when helpful",
-            "4. If no payment method is set up, run_agent returns a setup page to connect a credit card — present it to the user",
-            "5. Ask user to rate or tip after a successful run",
+            "1. solve(intent, input, budget) — one call: find best agent + pay + run. Use when the task is clear.",
+            "   OR: search_agents() → get_agent() to inspect schema → run_agent() with required fields.",
+            "2. If the agent returns status 'processing', poll with get_job(). Async runs resolve automatically.",
+            "3. After a successful run, rate_agent() and optionally tip_agent() if the result was useful.",
+            "4. Use list_jobs() to recover state across sessions (it checks every configured wallet).",
             "",
-            "PAYMENT:",
-            "- Crypto wallets (Tempo USDC, Base USDC, Solana USDC) are the core supported rails.",
-            "- Saved cards can also be used, but card-backed MPP depends on Stripe Shared Payment Token availability in the current environment.",
-            "- Card and crypto are SEPARATE payment methods. Card charges a credit card; crypto sends USDC on-chain.",
-            "- When a card is configured, it becomes the default payment method. Use wallet_status to confirm whether `Card MPP: ready` before relying on it.",
-            "- run_agent() and solve() auto-detect the default compatible payment method when pay_with is omitted.",
-            "- Include pay_with explicitly when you need a specific rail or want deterministic control over the payment method used.",
-            "- Use wallet_status to see the exact payment methods the user has configured before calling a paid tool.",
-            "- Use open_observability_dashboard() to open a secure web usage dashboard for runs/spend/rebates.",
-            "- 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.",
-            "- If a specific payment method fails, report the error clearly. Do NOT silently fall back to a different method.",
-            "- When payment fails, suggest alternatives using wallet_status.",
+            "PAYMENT (crypto-only right now):",
+            "- Supported rails: Tempo USDC, Base USDC, Solana USDC. Card is temporarily disabled pending Stripe SPT approval.",
+            "- Tempo and Base share one EVM wallet key. Solana uses a separate ed25519 key. One OWS wallet can manage both.",
+            "- If pay_with is omitted, the MCP auto-selects a compatible configured rail. Pass pay_with explicitly",
+            "  (tempo | base | solana | wallet-id) for deterministic behavior.",
+            "- Payment is automatic: on a 402 challenge the MCP signs on-chain, submits, then retries. Failed runs are refunded.",
+            "- If a specific rail fails, surface the real reason — do NOT silently retry with a different method.",
+            "- Headless/automation: set wallet_set_policy() to cap max_per_tx and max_per_day so a runaway loop can't drain funds.",
             "",
-            "MANAGING PAYMENT METHODS:",
-            "- To remove a card: wallet_setup({ action: \"remove-card\" })",
-            "- To remove or modify a crypto wallet: NEVER do this programmatically. Direct users to edit their config files manually (~/.agentwonderland/config.json or ~/.ows/). We do not handle private key deletion or modification to avoid any risk of key loss.",
+            "FILE HANDLING:",
+            "Pass local file paths directly as input values (e.g. image: \"/path/to/photo.jpg\"). The MCP auto-uploads to",
+            "cloud storage and replaces with a URL before sending to the agent. Never base64-encode.",
             "",
             "REQUIRED FIELDS:",
-            "Always check the agent's input schema (via get_agent) before calling run_agent.",
-            "Include ALL required fields in the first attempt to avoid validation errors.",
+            "Always inspect the agent's input schema via get_agent() before calling run_agent(). Include ALL required",
+            "fields in the first attempt — validation errors cost a round trip.",
+            "",
+            "WALLET HYGIENE:",
+            "- wallet_status shows per-chain USDC balance and the active network (mainnet vs testnet).",
+            "- To create or import a crypto wallet: wallet_setup({ action: \"create\" }) or { action: \"import\", key }.",
+            "- NEVER delete or rotate keys programmatically. Direct users to edit ~/.agentwonderland/config.json or ~/.ows/ manually.",
         ].join("\n"),
     });
     // Register tools
@@ -73,7 +73,6 @@ export async function startMcpServer() {
     registerFavoriteTools(server);
     registerTipTools(server);
     registerPassTools(server);
-    registerObservabilityTools(server);
     // Register resources
     registerAgentResources(server);
     registerWalletResources(server);

package/dist/prompts/index.js

@@ -44,7 +44,7 @@ export function registerPrompts(server) {
                         "",
                         "Steps:",
                         "1. Use search_agents to find relevant agents",
-                        "2. Use compare_agents on the top 2-3 candidates",
+                        "2. Use get_agent to inspect the top candidate (schema, pricing, rating)",
                         "3. Recommend the best one based on price, rating, and success rate",
                         "4. Ask if I want to run it",
                     ].join("\n"),

package/dist/tools/agent-info.js

@@ -14,14 +14,26 @@ export function registerAgentInfoTools(server) {
         const payment = (a.payment ?? {});
         const _pricing = (payment.pricing ?? {});
         const creditPacks = payment.credit_packs;
+        const totalJobs = (s.completedJobs ?? a.totalExecutions ?? 0);
+        const acceptedPayments = payment.accepted_payments ?? [];
+        const paymentLabelMap = {
+            tempo_usdc: "tempo",
+            base_usdc: "base",
+            solana_usdc: "solana",
+            stripe_card: "card",
+        };
+        const paymentLabels = acceptedPayments.map((m) => paymentLabelMap[m] ?? m);
         const lines = [
             `${a.name}`,
-            `${stars(a.avgRating ?? s.avgRating)} (${s.ratingCount ?? 0} reviews) • ${compactNumber((s.completedJobs ?? a.totalExecutions ?? 0))} jobs`,
+            `${stars(a.avgRating ?? s.avgRating)} (${s.ratingCount ?? 0} reviews) • ${compactNumber(totalJobs)} jobs`,
             "",
             a.description ?? "",
             "",
             `Pricing: ${formatPrice(a.pricePerRunUsd)}`,
-            `Reliability: ${a.successRate != null ? (Number(a.successRate) * 100).toFixed(0) + "%" : "N/A"}`,
+            ...(paymentLabels.length > 0 ? [`Accepted payments: ${paymentLabels.join(", ")}`] : []),
+            ...(totalJobs > 0 && a.successRate != null
+                ? [`Reliability: ${(Number(a.successRate) * 100).toFixed(0)}% (${compactNumber(totalJobs)} runs)`]
+                : []),
             `Avg latency: ${a.avgResponseTimeMs != null ? a.avgResponseTimeMs + "ms" : "N/A"}`,
             ...(() => {
                 const lastActive = formatLastActive(a.lastActiveAt);
@@ -82,30 +94,4 @@ export function registerAgentInfoTools(server) {
         lines.push("", `ID: ${a.id}`, `View: ${agentWebUrl(a.id)}`);
         return text(lines.join("\n"));
     });
-    // ── compare_agents ──────────────────────────────────────────────
-    server.tool("compare_agents", "Compare multiple agents side-by-side on rating, price, success rate, and job count.", {
-        agent_ids: z
-            .array(z.string())
-            .min(2)
-            .max(5)
-            .describe("Agent IDs to compare (2-5)"),
-    }, async ({ agent_ids }) => {
-        const agents = await Promise.all(agent_ids.map((id) => apiGet(`/agents/${id}`)));
-        const header = "Agent Comparison:\n";
-        const lines = agents.map((a) => {
-            const s = (a.stats ?? {});
-            const rating = a.avgRating ?? s.avgRating;
-            const jobs = (s.completedJobs ?? a.totalExecutions ?? 0);
-            const tipCount = (s.tipCount ?? 0);
-            return [
-                `  ${a.name}`,
-                `  ${stars(rating)} (${s.ratingCount ?? 0} reviews)${tipCount > 0 ? ` • ${tipCount} tips` : ""}`,
-                `  ${compactNumber(jobs)} jobs • ${formatPrice(a.pricePerRunUsd)}`,
-                `  Success: ${a.successRate != null ? (Number(a.successRate) * 100).toFixed(0) + "%" : "N/A"}`,
-                `  ${agentWebUrl(a.id)}`,
-                "",
-            ].join("\n");
-        });
-        return text(header + lines.join("\n"));
-    });
 }

package/dist/tools/jobs.js

@@ -6,39 +6,93 @@ import { formatRunResult } from "../core/formatters.js";
 function text(t) {
     return { content: [{ type: "text", text: t }] };
 }
+async function getConsumerWalletAddresses() {
+    const addresses = new Set();
+    for (const chain of ["tempo", "base", "solana"]) {
+        const addr = await getWalletAddress(chain);
+        if (addr)
+            addresses.add(addr);
+    }
+    return [...addresses];
+}
+function formatRelativeTime(iso) {
+    if (!iso)
+        return "";
+    const t = new Date(iso).getTime();
+    if (!Number.isFinite(t))
+        return "";
+    const diffSec = Math.max(0, Math.floor((Date.now() - t) / 1000));
+    if (diffSec < 60)
+        return `${diffSec}s ago`;
+    if (diffSec < 3600)
+        return `${Math.floor(diffSec / 60)}m ago`;
+    if (diffSec < 86400)
+        return `${Math.floor(diffSec / 3600)}h ago`;
+    return `${Math.floor(diffSec / 86400)}d ago`;
+}
 export function registerJobTools(server) {
     // ── get_job ─────────────────────────────────────────────────────
     server.tool("get_job", "Get the status and output of a job by ID. Use to poll async jobs until they complete.", {
         job_id: z.string().describe("Job ID (UUID)"),
     }, async ({ job_id }) => {
-        let url = `/jobs/${job_id}`;
-        if (!isAuthenticated() && hasWalletConfigured()) {
-            const address = await getWalletAddress();
-            if (address) {
-                url += `?wallet=${encodeURIComponent(address)}`;
+        const walletLookup = !isAuthenticated() && hasWalletConfigured();
+        const addresses = walletLookup ? await getConsumerWalletAddresses() : [""];
+        let result = null;
+        for (const addr of addresses) {
+            const url = addr ? `/jobs/${job_id}?wallet=${encodeURIComponent(addr)}` : `/jobs/${job_id}`;
+            try {
+                result = await apiGet(url);
+                break;
+            }
+            catch (err) {
+                const status = err.status;
+                if (status !== 404)
+                    throw err;
             }
         }
-        const result = await apiGet(url);
+        if (!result) {
+            return text(`Job ${job_id} not found. Either the job ID is wrong or it was paid with a wallet not configured here.`);
+        }
         if (result.status === "processing") {
             return text(`Job ${job_id} is still processing...`);
         }
         return text(formatRunResult(result));
     });
-    // ── list_jobs (renamed from list_my_jobs) ───────────────────────
-    server.tool("list_jobs", "List your recent jobs with status, cost, and agent info.", {
-        limit: z.coerce.number().optional().default(10).describe("Max results (1-50)"),
+    // ── list_jobs ───────────────────────────────────────────────────
+    server.tool("list_jobs", "List your recent jobs across all configured payment wallets, with status, cost, agent, method, and age.", {
+        limit: z.coerce.number().int().min(1).max(50).optional().default(10).describe("Max results (1-50)"),
     }, async ({ limit }) => {
-        let url = `/jobs?limit=${limit ?? 10}`;
-        // If not authenticated via API key, use wallet address for lookup
-        if (!isAuthenticated() && hasWalletConfigured()) {
-            const address = await getWalletAddress();
-            if (address) {
-                url += `&wallet=${encodeURIComponent(address)}`;
+        const requestedLimit = limit ?? 10;
+        const walletLookup = !isAuthenticated() && hasWalletConfigured();
+        const addresses = walletLookup ? await getConsumerWalletAddresses() : [""];
+        const seen = new Set();
+        const collected = [];
+        for (const addr of addresses) {
+            const url = addr
+                ? `/jobs?wallet=${encodeURIComponent(addr)}&limit=${requestedLimit}`
+                : `/jobs?limit=${requestedLimit}`;
+            try {
+                const jobs = await apiGet(url);
+                for (const j of jobs) {
+                    const id = j.job_id;
+                    if (!seen.has(id)) {
+                        seen.add(id);
+                        collected.push(j);
+                    }
+                }
+            }
+            catch {
+                // Skip address that errored; continue with others.
             }
         }
-        const jobs = await apiGet(url);
-        if (jobs.length === 0)
+        if (collected.length === 0)
             return text("No jobs found.");
+        collected.sort((a, b) => {
+            const aTime = new Date(a.created_at ?? 0).getTime();
+            const bTime = new Date(b.created_at ?? 0).getTime();
+            return bTime - aTime;
+        });
+        const jobs = collected.slice(0, requestedLimit);
         const lines = [`Recent jobs (${jobs.length}):`];
         for (const j of jobs) {
             const status = j.status === "completed"
@@ -46,10 +100,15 @@ export function registerJobTools(server) {
                 : j.status === "processing"
                     ? "\u2026"
                     : "\u2717";
-            const cost = j.estimated_cost != null
-                ? `$${Number(j.estimated_cost).toFixed(4)}`
-                : "";
-            lines.push(`  ${status} ${j.job_id?.slice(0, 8)}\u2026 ${j.agent_id ? String(j.agent_id).slice(0, 8) + "\u2026" : ""} ${cost}`);
+            const amount = (j.settled_amount ?? j.estimated_cost);
+            const cost = amount != null ? `$${Number(amount).toFixed(4)}` : "";
+            const method = j.settlement_trace
+                ?.payment_attempt?.payment_method;
+            const methodLabel = method ? `[${method.replace(/_usdc$/, "").replace("stripe_", "")}]` : "";
+            const shortId = j.job_id?.slice(0, 8);
+            const shortAgent = j.agent_id ? String(j.agent_id).slice(0, 8) : "?";
+            const when = formatRelativeTime(j.created_at);
+            lines.push(`  ${status} ${shortId} agent=${shortAgent} ${cost} ${methodLabel} ${when}`.trimEnd());
         }
         return text(lines.join("\n"));
     });

package/dist/tools/passes.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { apiGet, apiPostWithPayment } from "../core/api-client.js";
 import { formatCreditPack, formatCreditPackOffer, getCreditPackInventory, getCreditPackProgram, } from "../core/passes.js";
-import { getCompatiblePaymentMethods, getConfiguredMethods, hasWalletConfigured, normalizePaymentMethod, } from "../core/payments.js";
+import { getCompatiblePaymentMethods, getConfiguredMethods, hasWalletConfigured, normalizePaymentMethod, isCardPaymentEnabled, } from "../core/payments.js";
 import { requiresSpendConfirmation } from "../core/config.js";
 import { ensureConsumerPrincipalForMethod } from "../core/principal.js";
 import { getOrCreatePendingCardSetup, formatCardSetupBlocks } from "../core/card-setup.js";
@@ -39,15 +39,26 @@ export function registerPassTools(server) {
         confirmed: z.boolean().optional().describe("Set to true to confirm the purchase after seeing the quote."),
     }, async ({ agent_id, pack_id, pay_with, confirmed }) => {
         if (!hasWalletConfigured()) {
-            try {
-                const { url } = await getOrCreatePendingCardSetup();
-                return multiText(...formatCardSetupBlocks(url));
+            if (isCardPaymentEnabled()) {
+                try {
+                    const { url } = await getOrCreatePendingCardSetup();
+                    return multiText(...formatCardSetupBlocks(url));
+                }
+                catch {
+                    // Fall through to the setup message below.
+                }
             }
-            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 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 agent = await getAgent(agent_id);
         const agentName = agent.name ?? agent_id;

package/dist/tools/run.js

@@ -2,7 +2,7 @@ import { z } from "zod";
 import { apiGet, apiPost, apiPostWithPayment } from "../core/api-client.js";
 import { uploadLocalFiles } from "../core/file-upload.js";
 import { formatCreditPackOffer, getActiveCreditPack, getCreditPackInventory, getCreditPackProgram, } from "../core/passes.js";
-import { getCompatiblePaymentMethods, getConfiguredMethods, hasWalletConfigured, getWalletAddress, normalizePaymentMethod, } from "../core/payments.js";
+import { getCompatiblePaymentMethods, getConfiguredMethods, 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";
@@ -65,15 +65,26 @@ 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()) {
-            try {
-                const { url } = await getOrCreatePendingCardSetup();
-                return multiText(...formatCardSetupBlocks(url));
+            if (isCardPaymentEnabled()) {
+                try {
+                    const { url } = await getOrCreatePendingCardSetup();
+                    return multiText(...formatCardSetupBlocks(url));
+                }
+                catch {
+                    // Fall through to the setup message below.
+                }
             }
-            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 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;
         try {

package/dist/tools/search.js

@@ -16,14 +16,15 @@ export function registerSearchTools(server) {
         sort: z.enum(["relevance", "price", "rating", "popularity", "newest"]).optional()
             .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));
@@ -45,13 +46,13 @@ export function registerSearchTools(server) {
             params.set("accepted_payment_methods", acceptedMethods.join(","));
         }
         let agents = await apiGet(`/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) => {
-                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;
+                const avg = a.avgRating ?? a.stats?.avgRating;
+                return typeof avg === "number" && avg >= min_rating;
             });
         }
         // Trim to requested limit after filtering

package/dist/tools/solve.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { apiGet, apiPost, apiPostWithPayment } from "../core/api-client.js";
 import { getOrCreatePendingCardSetup, formatCardSetupBlocks } from "../core/card-setup.js";
-import { getCompatiblePaymentMethods, hasWalletConfigured, getConfiguredMethods, getAcceptedPaymentMethods, getWalletAddress, normalizePaymentMethod, toRegistryPaymentMethod, } from "../core/payments.js";
+import { getCompatiblePaymentMethods, hasWalletConfigured, getConfiguredMethods, getAcceptedPaymentMethods, getWalletAddress, normalizePaymentMethod, toRegistryPaymentMethod, isCardPaymentEnabled, } from "../core/payments.js";
 import { requiresSpendConfirmation, getDefaultTipAmount } from "../core/config.js";
 import { agentList, formatRunResult } from "../core/formatters.js";
 import { canSpend, recordSpend, requiresPolicyConfirmation } from "../core/spend-policy.js";
@@ -114,15 +114,26 @@ 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()) {
-            try {
-                const { url } = await getOrCreatePendingCardSetup();
-                return multiText(...formatCardSetupBlocks(url));
+            if (isCardPaymentEnabled()) {
+                try {
+                    const { url } = await getOrCreatePendingCardSetup();
+                    return multiText(...formatCardSetupBlocks(url));
+                }
+                catch {
+                    // Fall through to the setup message below.
+                }
             }
-            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 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);
@@ -157,7 +168,8 @@ export function registerSolveTools(server) {
             const cost = result.cost;
             const usedCreditPack = result.consumption_mode === "credit_pack";
             const tipMsg = result.feedback_token ? await autoTip(jobId, agentId, agentName, result.feedback_token) : "";
-            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) {
             const status = err instanceof Error &&
@@ -254,8 +266,9 @@ export function registerSolveTools(server) {
         catch (err) {
             const apiErr = err;
             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.",

package/dist/tools/wallet.js

@@ -65,11 +65,11 @@ export function registerWalletTools(server) {
         }
         return text(lines.join("\n"));
     });
-    // ── wallet_setup (NEW) ──────────────────────────────────────────
-    server.tool("wallet_setup", "Set up or manage payment methods. Options: 'add-card' to connect a credit/debit card, 'remove-card' to disconnect a card, 'create' a crypto wallet, or 'import' an existing key. After card setup, use wallet_status to confirm whether card-backed MPP is ready. For crypto wallet changes (removal, key rotation), direct users to edit their config files manually — never handle private keys programmatically.", {
+    // ── wallet_setup ────────────────────────────────────────────────
+    server.tool("wallet_setup", "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()
@@ -79,7 +79,7 @@ export function registerWalletTools(server) {
             .optional()
             .describe("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") {

package/package.json

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

package/src/index.ts

@@ -14,7 +14,6 @@ import { registerWalletTools } from "./tools/wallet.js";
 import { registerFavoriteTools } from "./tools/favorites.js";
 import { registerTipTools } from "./tools/tip.js";
 import { registerPassTools } from "./tools/passes.js";
-import { registerObservabilityTools } from "./tools/observability.js";
 
 // ── Resources ────────────────────────────────────────────────────
 import { registerAgentResources } from "./resources/agents.js";
@@ -32,41 +31,42 @@ export async function startMcpServer(): Promise<void> {
     },
     {
       instructions: [
-        "Agent Wonderland — AI agent marketplace. Discover, run, and rate agents.",
+        "Agent Wonderland — on-demand AI agent marketplace with autonomous per-call payment. Discover, run, rate.",
         "",
-        "FILE HANDLING:",
-        "Pass local file paths directly as input values (e.g. image: \"/path/to/photo.jpg\").",
-        "The MCP auto-uploads to cloud storage and replaces with a URL. Never base64-encode.",
+        "PURPOSE:",
+        "You are an AI agent calling this MCP to extend your capabilities. Instead of integrating N APIs with N keys,",
+        "you pay specialist agents per call in USDC. This works headlessly in automations (n8n, cron) and interactively",
+        "(Claude Code, Desktop). Favor one-shot `solve()` for autonomous use; prefer `search_agents()` + `run_agent()`",
+        "when the caller wants to pick a specific agent.",
         "",
         "WORKFLOW:",
-        "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",
-        "3a. If the agent offers discounted credit packs, use buy_agent_credit_pack() and list_agent_credit_packs() when helpful",
-        "4. If no payment method is set up, run_agent returns a setup page to connect a credit card — present it to the user",
-        "5. Ask user to rate or tip after a successful run",
+        "1. solve(intent, input, budget) — one call: find best agent + pay + run. Use when the task is clear.",
+        "   OR: search_agents() → get_agent() to inspect schema → run_agent() with required fields.",
+        "2. If the agent returns status 'processing', poll with get_job(). Async runs resolve automatically.",
+        "3. After a successful run, rate_agent() and optionally tip_agent() if the result was useful.",
+        "4. Use list_jobs() to recover state across sessions (it checks every configured wallet).",
         "",
-        "PAYMENT:",
-        "- Crypto wallets (Tempo USDC, Base USDC, Solana USDC) are the core supported rails.",
-        "- Saved cards can also be used, but card-backed MPP depends on Stripe Shared Payment Token availability in the current environment.",
-        "- Card and crypto are SEPARATE payment methods. Card charges a credit card; crypto sends USDC on-chain.",
-        "- When a card is configured, it becomes the default payment method. Use wallet_status to confirm whether `Card MPP: ready` before relying on it.",
-        "- run_agent() and solve() auto-detect the default compatible payment method when pay_with is omitted.",
-        "- Include pay_with explicitly when you need a specific rail or want deterministic control over the payment method used.",
-        "- Use wallet_status to see the exact payment methods the user has configured before calling a paid tool.",
-        "- Use open_observability_dashboard() to open a secure web usage dashboard for runs/spend/rebates.",
-        "- 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.",
-        "- If a specific payment method fails, report the error clearly. Do NOT silently fall back to a different method.",
-        "- When payment fails, suggest alternatives using wallet_status.",
+        "PAYMENT (crypto-only right now):",
+        "- Supported rails: Tempo USDC, Base USDC, Solana USDC. Card is temporarily disabled pending Stripe SPT approval.",
+        "- Tempo and Base share one EVM wallet key. Solana uses a separate ed25519 key. One OWS wallet can manage both.",
+        "- If pay_with is omitted, the MCP auto-selects a compatible configured rail. Pass pay_with explicitly",
+        "  (tempo | base | solana | wallet-id) for deterministic behavior.",
+        "- Payment is automatic: on a 402 challenge the MCP signs on-chain, submits, then retries. Failed runs are refunded.",
+        "- If a specific rail fails, surface the real reason — do NOT silently retry with a different method.",
+        "- Headless/automation: set wallet_set_policy() to cap max_per_tx and max_per_day so a runaway loop can't drain funds.",
         "",
-        "MANAGING PAYMENT METHODS:",
-        "- To remove a card: wallet_setup({ action: \"remove-card\" })",
-        "- To remove or modify a crypto wallet: NEVER do this programmatically. Direct users to edit their config files manually (~/.agentwonderland/config.json or ~/.ows/). We do not handle private key deletion or modification to avoid any risk of key loss.",
+        "FILE HANDLING:",
+        "Pass local file paths directly as input values (e.g. image: \"/path/to/photo.jpg\"). The MCP auto-uploads to",
+        "cloud storage and replaces with a URL before sending to the agent. Never base64-encode.",
         "",
         "REQUIRED FIELDS:",
-        "Always check the agent's input schema (via get_agent) before calling run_agent.",
-        "Include ALL required fields in the first attempt to avoid validation errors.",
+        "Always inspect the agent's input schema via get_agent() before calling run_agent(). Include ALL required",
+        "fields in the first attempt — validation errors cost a round trip.",
+        "",
+        "WALLET HYGIENE:",
+        "- wallet_status shows per-chain USDC balance and the active network (mainnet vs testnet).",
+        "- To create or import a crypto wallet: wallet_setup({ action: \"create\" }) or { action: \"import\", key }.",
+        "- NEVER delete or rotate keys programmatically. Direct users to edit ~/.agentwonderland/config.json or ~/.ows/ manually.",
       ].join("\n"),
     },
   );
@@ -82,7 +82,6 @@ export async function startMcpServer(): Promise<void> {
   registerFavoriteTools(server);
   registerTipTools(server);
   registerPassTools(server);
-  registerObservabilityTools(server);
 
   // Register resources
   registerAgentResources(server);

package/src/prompts/index.ts

@@ -62,7 +62,7 @@ export function registerPrompts(server: McpServer) {
             "",
             "Steps:",
             "1. Use search_agents to find relevant agents",
-            "2. Use compare_agents on the top 2-3 candidates",
+            "2. Use get_agent to inspect the top candidate (schema, pricing, rating)",
             "3. Recommend the best one based on price, rating, and success rate",
             "4. Ask if I want to run it",
           ].join("\n"),

package/src/tools/agent-info.ts

@@ -31,14 +31,27 @@ export function registerAgentInfoTools(server: McpServer): void {
         }>;
       } | null | undefined;
 
+      const totalJobs = (s.completedJobs ?? a.totalExecutions ?? 0) as number;
+      const acceptedPayments = (payment.accepted_payments as string[] | undefined) ?? [];
+      const paymentLabelMap: Record<string, string> = {
+        tempo_usdc: "tempo",
+        base_usdc: "base",
+        solana_usdc: "solana",
+        stripe_card: "card",
+      };
+      const paymentLabels = acceptedPayments.map((m) => paymentLabelMap[m] ?? m);
+
       const lines = [
         `${a.name}`,
-        `${stars(a.avgRating ?? (s.avgRating as number))} (${s.ratingCount ?? 0} reviews) • ${compactNumber((s.completedJobs ?? a.totalExecutions ?? 0) as number)} jobs`,
+        `${stars(a.avgRating ?? (s.avgRating as number))} (${s.ratingCount ?? 0} reviews) • ${compactNumber(totalJobs)} jobs`,
         "",
         (a.description as string) ?? "",
         "",
         `Pricing: ${formatPrice(a.pricePerRunUsd)}`,
-        `Reliability: ${a.successRate != null ? (Number(a.successRate) * 100).toFixed(0) + "%" : "N/A"}`,
+        ...(paymentLabels.length > 0 ? [`Accepted payments: ${paymentLabels.join(", ")}`] : []),
+        ...(totalJobs > 0 && a.successRate != null
+          ? [`Reliability: ${(Number(a.successRate) * 100).toFixed(0)}% (${compactNumber(totalJobs)} runs)`]
+          : []),
         `Avg latency: ${(a.avgResponseTimeMs as number) != null ? a.avgResponseTimeMs + "ms" : "N/A"}`,
         ...(() => {
           const lastActive = formatLastActive(a.lastActiveAt as string | null);
@@ -104,40 +117,4 @@ export function registerAgentInfoTools(server: McpServer): void {
       return text(lines.join("\n"));
     },
   );
-
-  // ── compare_agents ──────────────────────────────────────────────
-  server.tool(
-    "compare_agents",
-    "Compare multiple agents side-by-side on rating, price, success rate, and job count.",
-    {
-      agent_ids: z
-        .array(z.string())
-        .min(2)
-        .max(5)
-        .describe("Agent IDs to compare (2-5)"),
-    },
-    async ({ agent_ids }) => {
-      const agents = await Promise.all(
-        agent_ids.map((id) => apiGet<AgentRecord>(`/agents/${id}`)),
-      );
-
-      const header = "Agent Comparison:\n";
-      const lines = agents.map((a) => {
-        const s = (a.stats ?? {}) as Record<string, unknown>;
-        const rating = a.avgRating ?? (s.avgRating as number);
-        const jobs = (s.completedJobs ?? a.totalExecutions ?? 0) as number;
-        const tipCount = (s.tipCount ?? 0) as number;
-        return [
-          `  ${a.name}`,
-          `  ${stars(rating)} (${s.ratingCount ?? 0} reviews)${tipCount > 0 ? ` • ${tipCount} tips` : ""}`,
-          `  ${compactNumber(jobs)} jobs • ${formatPrice(a.pricePerRunUsd)}`,
-          `  Success: ${a.successRate != null ? (Number(a.successRate) * 100).toFixed(0) + "%" : "N/A"}`,
-          `  ${agentWebUrl(a.id)}`,
-          "",
-        ].join("\n");
-      });
-
-      return text(header + lines.join("\n"));
-    },
-  );
 }

package/src/tools/jobs.ts

@@ -9,6 +9,26 @@ function text(t: string) {
   return { content: [{ type: "text" as const, text: t }] };
 }
 
+async function getConsumerWalletAddresses(): Promise<string[]> {
+  const addresses = new Set<string>();
+  for (const chain of ["tempo", "base", "solana"]) {
+    const addr = await getWalletAddress(chain);
+    if (addr) addresses.add(addr);
+  }
+  return [...addresses];
+}
+
+function formatRelativeTime(iso: string | null | undefined): string {
+  if (!iso) return "";
+  const t = new Date(iso).getTime();
+  if (!Number.isFinite(t)) return "";
+  const diffSec = Math.max(0, Math.floor((Date.now() - t) / 1000));
+  if (diffSec < 60) return `${diffSec}s ago`;
+  if (diffSec < 3600) return `${Math.floor(diffSec / 60)}m ago`;
+  if (diffSec < 86400) return `${Math.floor(diffSec / 3600)}h ago`;
+  return `${Math.floor(diffSec / 86400)}d ago`;
+}
+
 export function registerJobTools(server: McpServer): void {
   // ── get_job ─────────────────────────────────────────────────────
   server.tool(
@@ -18,16 +38,25 @@ export function registerJobTools(server: McpServer): void {
       job_id: z.string().describe("Job ID (UUID)"),
     },
     async ({ job_id }) => {
-      let url = `/jobs/${job_id}`;
+      const walletLookup = !isAuthenticated() && hasWalletConfigured();
+      const addresses = walletLookup ? await getConsumerWalletAddresses() : [""];
 
-      if (!isAuthenticated() && hasWalletConfigured()) {
-        const address = await getWalletAddress();
-        if (address) {
-          url += `?wallet=${encodeURIComponent(address)}`;
+      let result: Record<string, unknown> | null = null;
+      for (const addr of addresses) {
+        const url = addr ? `/jobs/${job_id}?wallet=${encodeURIComponent(addr)}` : `/jobs/${job_id}`;
+        try {
+          result = await apiGet<Record<string, unknown>>(url);
+          break;
+        } catch (err) {
+          const status = (err as { status?: number }).status;
+          if (status !== 404) throw err;
         }
       }
 
-      const result = await apiGet<Record<string, unknown>>(url);
+      if (!result) {
+        return text(`Job ${job_id} not found. Either the job ID is wrong or it was paid with a wallet not configured here.`);
+      }
+
       if (result.status === "processing") {
         return text(`Job ${job_id} is still processing...`);
       }
@@ -35,26 +64,46 @@ export function registerJobTools(server: McpServer): void {
     },
   );
 
-  // ── list_jobs (renamed from list_my_jobs) ───────────────────────
+  // ── list_jobs ───────────────────────────────────────────────────
   server.tool(
     "list_jobs",
-    "List your recent jobs with status, cost, and agent info.",
+    "List your recent jobs across all configured payment wallets, with status, cost, agent, method, and age.",
     {
-      limit: z.coerce.number().optional().default(10).describe("Max results (1-50)"),
+      limit: z.coerce.number().int().min(1).max(50).optional().default(10).describe("Max results (1-50)"),
     },
     async ({ limit }) => {
-      let url = `/jobs?limit=${limit ?? 10}`;
+      const requestedLimit = limit ?? 10;
+      const walletLookup = !isAuthenticated() && hasWalletConfigured();
+      const addresses = walletLookup ? await getConsumerWalletAddresses() : [""];
 
-      // If not authenticated via API key, use wallet address for lookup
-      if (!isAuthenticated() && hasWalletConfigured()) {
-        const address = await getWalletAddress();
-        if (address) {
-          url += `&wallet=${encodeURIComponent(address)}`;
+      const seen = new Set<string>();
+      const collected: Array<Record<string, unknown>> = [];
+      for (const addr of addresses) {
+        const url = addr
+          ? `/jobs?wallet=${encodeURIComponent(addr)}&limit=${requestedLimit}`
+          : `/jobs?limit=${requestedLimit}`;
+        try {
+          const jobs = await apiGet<Array<Record<string, unknown>>>(url);
+          for (const j of jobs) {
+            const id = j.job_id as string;
+            if (!seen.has(id)) {
+              seen.add(id);
+              collected.push(j);
+            }
+          }
+        } catch {
+          // Skip address that errored; continue with others.
         }
       }
 
-      const jobs = await apiGet<Array<Record<string, unknown>>>(url);
-      if (jobs.length === 0) return text("No jobs found.");
+      if (collected.length === 0) return text("No jobs found.");
+
+      collected.sort((a, b) => {
+        const aTime = new Date((a.created_at as string) ?? 0).getTime();
+        const bTime = new Date((b.created_at as string) ?? 0).getTime();
+        return bTime - aTime;
+      });
+      const jobs = collected.slice(0, requestedLimit);
 
       const lines = [`Recent jobs (${jobs.length}):`];
       for (const j of jobs) {
@@ -64,12 +113,16 @@ export function registerJobTools(server: McpServer): void {
             : j.status === "processing"
               ? "\u2026"
               : "\u2717";
-        const cost =
-          j.estimated_cost != null
-            ? `$${Number(j.estimated_cost).toFixed(4)}`
-            : "";
+        const amount = (j.settled_amount ?? j.estimated_cost) as string | number | undefined;
+        const cost = amount != null ? `$${Number(amount).toFixed(4)}` : "";
+        const method = ((j.settlement_trace as Record<string, unknown> | undefined)
+          ?.payment_attempt as { payment_method?: string } | undefined)?.payment_method;
+        const methodLabel = method ? `[${method.replace(/_usdc$/, "").replace("stripe_", "")}]` : "";
+        const shortId = (j.job_id as string)?.slice(0, 8);
+        const shortAgent = j.agent_id ? String(j.agent_id).slice(0, 8) : "?";
+        const when = formatRelativeTime(j.created_at as string | null);
         lines.push(
-          `  ${status} ${(j.job_id as string)?.slice(0, 8)}\u2026 ${j.agent_id ? String(j.agent_id).slice(0, 8) + "\u2026" : ""} ${cost}`,
+          `  ${status} ${shortId} agent=${shortAgent} ${cost} ${methodLabel} ${when}`.trimEnd(),
         );
       }
       return text(lines.join("\n"));

package/src/tools/passes.ts

@@ -12,6 +12,7 @@ import {
   getConfiguredMethods,
   hasWalletConfigured,
   normalizePaymentMethod,
+  isCardPaymentEnabled,
 } from "../core/payments.js";
 import { requiresSpendConfirmation } from "../core/config.js";
 import { ensureConsumerPrincipalForMethod } from "../core/principal.js";
@@ -71,16 +72,25 @@ export function registerPassTools(server: McpServer): void {
     },
     async ({ agent_id, pack_id, 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 agent = await getAgent(agent_id);

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";
@@ -106,16 +107,25 @@ export function registerRunTools(server: McpServer): void {
     },
     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;

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";
@@ -149,16 +150,25 @@ 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);
@@ -200,7 +210,8 @@ 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 status =
           err instanceof Error &&
@@ -318,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.",

package/src/tools/wallet.ts

@@ -101,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, 'remove-card' to disconnect a card, 'create' a crypto wallet, or 'import' an existing key. After card setup, use wallet_status to confirm whether card-backed MPP is ready. 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()
@@ -120,7 +120,7 @@ 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 ──────────────────────────────────────

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"));
-    },
-  );
-}