@agentwonderland/mcp 0.1.4 → 0.1.6

package/dist/core/config.d.ts

@@ -21,6 +21,10 @@ export interface Config {
     defaultWallet: string | null;
     card: CardConfig | null;
     favorites: string[];
+    /** Require user confirmation before spending. Default: true. Set false for headless/automated use. */
+    confirmBeforeSpend: boolean;
+    /** Auto-tip amount in USD for successful runs. Default: 0 (no auto-tip). */
+    defaultTipAmount: number;
 }
 /** All supported chain identifiers. */
 export declare const SUPPORTED_CHAINS: readonly ["tempo", "base", "solana"];
@@ -35,6 +39,8 @@ export declare function saveConfig(updates: Partial<Config>): void;
 export declare function getApiUrl(): string;
 export declare function getApiKey(): string | null;
 export declare function isAuthenticated(): boolean;
+export declare function requiresSpendConfirmation(): boolean;
+export declare function getDefaultTipAmount(): number;
 /**
  * Get all wallets from config + env var synthetic wallets.
  */

package/dist/core/config.js

@@ -27,6 +27,7 @@ function ensureConfigDir() {
 function migrateIfNeeded(raw) {
     // If wallets array already exists, treat as new format
     if (Array.isArray(raw.wallets)) {
+        const r = raw;
         return {
             apiUrl: raw.apiUrl ?? DEFAULT_API_URL,
             apiKey: raw.apiKey ?? null,
@@ -34,7 +35,9 @@ function migrateIfNeeded(raw) {
             wallets: raw.wallets,
             defaultWallet: raw.defaultWallet ?? null,
             card: raw.card ?? null,
-            favorites: raw.favorites ?? [],
+            favorites: r.favorites ?? [],
+            confirmBeforeSpend: r.confirmBeforeSpend !== false,
+            defaultTipAmount: typeof r.defaultTipAmount === "number" ? r.defaultTipAmount : 0,
         };
     }
     // Build wallets from legacy flat fields
@@ -102,6 +105,8 @@ function migrateIfNeeded(raw) {
         defaultWallet,
         card,
         favorites: [],
+        confirmBeforeSpend: true,
+        defaultTipAmount: 0,
     };
     // Write migrated config (only if there was something to migrate)
     if (raw.tempoPrivateKey || raw.evmPrivateKey || raw.stripeConsumerToken) {
@@ -120,6 +125,8 @@ export function getConfig() {
         defaultWallet: null,
         card: null,
         favorites: [],
+        confirmBeforeSpend: true,
+        defaultTipAmount: 0,
     };
     if (!existsSync(CONFIG_FILE)) {
         return defaults;
@@ -154,6 +161,12 @@ export function getApiKey() {
 export function isAuthenticated() {
     return getApiKey() !== null;
 }
+export function requiresSpendConfirmation() {
+    return getConfig().confirmBeforeSpend;
+}
+export function getDefaultTipAmount() {
+    return getConfig().defaultTipAmount;
+}
 // ── Wallet helpers ─────────────────────────────────────────────────
 /**
  * Get all wallets from config + env var synthetic wallets.

package/dist/core/formatters.js

@@ -115,15 +115,12 @@ export function formatRunResult(result, opts) {
     const costStr = cost != null ? `$${cost.toFixed(cost < 0.01 ? 6 : 2)}` : "";
     const latency = result.latency_ms != null ? `${result.latency_ms}ms` : "";
     const method = opts?.paymentMethod ?? "";
-    const parts = [
-        `${status} ${agent}`,
-        costStr ? `cost: ${costStr}` : "",
-        method ? `via ${method}` : "",
-        latency ? `latency: ${latency}` : "",
-    ].filter(Boolean);
-    lines.push(parts.join(" • "));
+    lines.push(`${status} ${agent}${latency ? ` (${latency})` : ""}`);
+    if (costStr) {
+        lines.push(`Paid: ${costStr}${method ? ` via ${method}` : ""}`);
+    }
     if (result.job_id) {
-        lines.push(`job: ${result.job_id}`);
+        lines.push(`Job ID: ${result.job_id}`);
     }
     return lines.join("\n");
 }

package/dist/tools/run.js

@@ -1,40 +1,64 @@
 import { z } from "zod";
-import { apiGet, apiPostWithPayment } from "../core/api-client.js";
+import { apiGet, apiPost, apiPostWithPayment } from "../core/api-client.js";
 import { uploadLocalFiles } from "../core/file-upload.js";
 import { getConfiguredMethods, hasWalletConfigured } from "../core/payments.js";
+import { requiresSpendConfirmation, getDefaultTipAmount } from "../core/config.js";
 import { formatRunResult } from "../core/formatters.js";
 import { storeFeedbackToken } from "./_token-cache.js";
 function text(t) {
     return { content: [{ type: "text", text: t }] };
 }
+function multiText(...blocks) {
+    return { content: blocks.map((t) => ({ type: "text", text: t })) };
+}
+// Pending confirmations: agent_id → { agent, input, method }
+const pendingRuns = new Map();
 export function registerRunTools(server) {
-    server.tool("run_agent", "Run an AI agent from the marketplace. Pays automatically via configured wallet. Returns the agent's output, cost, and job ID for tracking.", {
-        agent_id: z.string().describe("Agent ID (UUID or slug)"),
+    server.tool("run_agent", "Run an AI agent from the marketplace. Pays automatically via configured wallet. Returns the agent's output, cost, and job ID for tracking. If spending confirmation is enabled, first call returns a price quote — call again with confirmed: true to execute.", {
+        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().optional().describe("Payment method — wallet ID, chain name (tempo, base, etc.), or 'card'. Auto-detected if omitted."),
-    }, async ({ agent_id, input, pay_with }) => {
+        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.");
         }
-        // Resolve slug to UUID if needed (slugs don't contain hyphens in UUID positions)
-        let resolvedId = agent_id;
-        const isUuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(agent_id);
-        if (!isUuid) {
-            try {
-                const agent = await apiGet(`/agents/${agent_id}`);
-                resolvedId = agent.id;
-            }
-            catch {
-                return text(`Agent "${agent_id}" not found. Use search_agents to find available agents.`);
-            }
+        // Resolve agent and fetch details
+        let agent;
+        try {
+            agent = await apiGet(`/agents/${agent_id}`);
+        }
+        catch {
+            return text(`Agent "${agent_id}" not found. Use search_agents to find available agents.`);
+        }
+        const price = parseFloat(agent.pricePer1kTokens ?? "0.01");
+        const agentName = agent.name ?? agent_id;
+        // Confirmation step: show price and wait for confirmed: true
+        if (requiresSpendConfirmation() && !confirmed) {
+            pendingRuns.set(agent.id, {
+                agent: { id: agent.id, name: agentName, price },
+                input,
+                method: pay_with,
+            });
+            return text([
+                `Ready to run ${agentName}`,
+                "",
+                `  Cost: $${price.toFixed(2)}`,
+                `  Payment: ${pay_with ?? getConfiguredMethods()[0] ?? "auto"}`,
+                "",
+                "To proceed, call:",
+                `  run_agent({ agent_id: "${agent.id}", input: <same>, confirmed: true })`,
+                "",
+                "To cancel, do nothing.",
+            ].join("\n"));
         }
         const method = pay_with;
         const processedInput = await uploadLocalFiles(input);
         let result;
         try {
-            result = await apiPostWithPayment(`/agents/${resolvedId}/run`, { input: processedInput }, method);
+            result = await apiPostWithPayment(`/agents/${agent.id}/run`, { input: processedInput }, method);
         }
         catch (err) {
             const apiErr = err;
@@ -49,34 +73,53 @@ export function registerRunTools(server) {
             }
             return text(`Error: ${msg}`);
         }
+        // Clean up pending confirmation
+        pendingRuns.delete(agent.id);
         const formatted = formatRunResult(result, {
             paymentMethod: method ?? getConfiguredMethods()[0],
         });
         const jobId = result.job_id ?? "";
-        const agentId = result.agent_id ?? agent_id;
+        const resultAgentId = result.agent_id ?? agent.id;
         if (result.feedback_token) {
-            storeFeedbackToken(jobId, result.feedback_token, agentId);
+            storeFeedbackToken(jobId, result.feedback_token, resultAgentId);
         }
+        const actualCost = result.cost;
         const status = result.status;
-        let prompt;
-        if (status === "success") {
-            prompt = [
-                "",
-                "---",
-                "How was this result? You can:",
-                `  • rate_agent with job_id "${jobId}" and a score (1-5) — within 1 hour`,
-                "  • tip_agent to show appreciation — within 1 hour",
-                "  • favorite_agent to save this agent for later",
-            ].join("\n");
+        // Auto-tip if configured and run succeeded
+        const defaultTip = getDefaultTipAmount();
+        let tipLine = "";
+        if (status === "success" && defaultTip > 0 && result.feedback_token) {
+            try {
+                await apiPost("/tips", {
+                    job_id: jobId,
+                    agent_id: resultAgentId,
+                    amount: defaultTip,
+                    feedback_token: result.feedback_token,
+                });
+                tipLine = `Auto-tipped $${defaultTip.toFixed(2)} to ${agentName}.`;
+            }
+            catch {
+                tipLine = `Auto-tip of $${defaultTip.toFixed(2)} failed.`;
+            }
         }
-        else {
-            prompt = [
-                "",
-                "---",
-                "The agent execution failed. A refund has been initiated automatically",
-                "and will be returned to your wallet.",
-            ].join("\n");
+        if (status !== "success") {
+            return multiText(formatted, "The agent execution failed. A refund has been initiated automatically.");
         }
-        return text(formatted + prompt);
+        const costLine = actualCost != null ? `Paid $${actualCost.toFixed(actualCost < 0.01 ? 4 : 2)}.` : "";
+        // Separate the feedback ask into its own content block so the LLM
+        // surfaces it to the user as a distinct follow-up question, rather than
+        // burying it inside a collapsed tool output.
+        const feedbackAsk = [
+            `IMPORTANT: After presenting the result above, you MUST ask the user:`,
+            `"${costLine} Was this result helpful? I can rate it (1-5 stars) or tip the builder for you."`,
+            tipLine,
+            "",
+            `If the user wants to rate: rate_agent({ job_id: "${jobId}", rating: <1-5>, comment: "..." })`,
+            ...(defaultTip <= 0 ? [
+                `If the user wants to tip: tip_agent({ job_id: "${jobId}", agent_id: "${resultAgentId}", amount: 0.25 })`,
+            ] : []),
+            `To save for later: favorite_agent({ agent_id: "${resultAgentId}" })`,
+        ].join("\n");
+        return multiText(formatted, feedbackAsk);
     });
 }

package/dist/tools/solve.js

@@ -1,24 +1,50 @@
 import { z } from "zod";
 import { apiGet, apiPost, apiPostWithPayment } from "../core/api-client.js";
 import { hasWalletConfigured, getConfiguredMethods, getAcceptedPaymentMethods, } from "../core/payments.js";
+import { requiresSpendConfirmation, getDefaultTipAmount } from "../core/config.js";
 import { agentList, formatRunResult } from "../core/formatters.js";
 import { uploadLocalFiles } from "../core/file-upload.js";
 import { storeFeedbackToken } from "./_token-cache.js";
 function text(t) {
     return { content: [{ type: "text", text: t }] };
 }
-function ratingPrompt(jobId) {
+function multiText(...blocks) {
+    return { content: blocks.map((t) => ({ type: "text", text: t })) };
+}
+function feedbackAsk(jobId, agentId, cost, tipSent) {
+    const defaultTip = getDefaultTipAmount();
+    const costLine = cost != null ? `Paid $${cost.toFixed(cost < 0.01 ? 4 : 2)}.` : "";
     return [
+        `IMPORTANT: After presenting the result above, you MUST ask the user:`,
+        `"${costLine} Was this result helpful? I can rate it (1-5 stars) or tip the builder for you."`,
+        tipSent ?? "",
         "",
-        "---",
-        "How was this result? You can:",
-        `  • rate_agent with job_id "${jobId}" and a score (1-5) — within 1 hour`,
-        "  • tip_agent to show appreciation — within 1 hour",
-        "  • favorite_agent to save this agent for later",
+        `If the user wants to rate: rate_agent({ job_id: "${jobId}", rating: <1-5>, comment: "..." })`,
+        ...(defaultTip <= 0 ? [
+            `If the user wants to tip: tip_agent({ job_id: "${jobId}", agent_id: "${agentId}", amount: 0.25 })`,
+        ] : []),
+        `To save for later: favorite_agent({ agent_id: "${agentId}" })`,
     ].join("\n");
 }
+async function autoTip(jobId, agentId, agentName, feedbackToken) {
+    const defaultTip = getDefaultTipAmount();
+    if (defaultTip <= 0)
+        return "";
+    try {
+        await apiPost("/tips", {
+            job_id: jobId,
+            agent_id: agentId,
+            amount: defaultTip,
+            feedback_token: feedbackToken,
+        });
+        return `Auto-tipped $${defaultTip.toFixed(2)} to ${agentName}.`;
+    }
+    catch {
+        return `Auto-tip of $${defaultTip.toFixed(2)} failed.`;
+    }
+}
 export function registerSolveTools(server) {
-    server.tool("solve", "Solve a task by finding the best agent, paying, and executing. The primary way to use the marketplace — describe what you need and the system handles discovery, selection, payment, and execution.", {
+    server.tool("solve", "Solve a task by finding the best agent, paying, and executing. The primary way to use the marketplace. If spending confirmation is enabled, returns a price quote first — call again with confirmed: true to execute.", {
         intent: z
             .string()
             .describe("What you want to accomplish (natural language)"),
@@ -38,7 +64,11 @@ export function registerSolveTools(server) {
             .string()
             .optional()
             .describe("Payment method — wallet ID, chain name (tempo, base, etc.), or 'card'. Auto-detected if omitted."),
-    }, async ({ intent, input, budget, pay_with }) => {
+        confirmed: z
+            .boolean()
+            .optional()
+            .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' +
@@ -55,10 +85,13 @@ export function registerSolveTools(server) {
             });
             const jobId = result.job_id ?? "";
             const agentId = result.agent_id ?? "";
+            const agentName = result.agent_name ?? "";
             if (result.feedback_token) {
                 storeFeedbackToken(jobId, result.feedback_token, agentId);
             }
-            return text(formatRunResult(result) + ratingPrompt(jobId));
+            const cost = result.cost;
+            const tipMsg = result.feedback_token ? await autoTip(jobId, agentId, agentName, result.feedback_token) : "";
+            return multiText(formatRunResult(result), feedbackAsk(jobId, agentId, cost, tipMsg));
         }
         catch (err) {
             const isAuthError = err instanceof Error &&
@@ -87,11 +120,25 @@ export function registerSolveTools(server) {
             return cost <= budget;
         });
         const selected = affordable[0] ?? agents[0];
-        // Estimate cost for the selected agent
         const selectedPrice = parseFloat(selected.pricePer1kTokens ?? "0.01");
         const estimatedCost = selected.pricingModel === "fixed"
             ? selectedPrice
             : (inputTokens / 1000) * selectedPrice;
+        // Confirmation step: show discovery + price, wait for confirmed: true
+        if (requiresSpendConfirmation() && !confirmed) {
+            return text([
+                discovery,
+                "",
+                `Best match: ${selected.name}`,
+                `Cost: $${estimatedCost.toFixed(2)}`,
+                `Payment: ${method}`,
+                "",
+                "To proceed, call:",
+                `  solve({ intent: "${intent}", input: <same>, budget: ${budget}, confirmed: true })`,
+                "",
+                "To cancel, do nothing.",
+            ].join("\n"));
+        }
         let result;
         const processedInput2 = await uploadLocalFiles(input);
         try {
@@ -106,13 +153,13 @@ export function registerSolveTools(server) {
             }
             return text(`Error: ${apiErr?.message ?? "Failed to run agent"}`);
         }
-        // Cache feedback token if present
         const jobId = result.job_id ?? "";
         const agentId2 = result.agent_id ?? selected.id;
         if (result.feedback_token) {
             storeFeedbackToken(jobId, result.feedback_token, agentId2);
         }
-        // Combine discovery + result
+        const actualCost = result.cost;
+        const tipMsg = result.feedback_token ? await autoTip(jobId, agentId2, selected.name ?? "", result.feedback_token) : "";
         const output = [
             discovery,
             "",
@@ -120,8 +167,7 @@ export function registerSolveTools(server) {
             `Estimated cost: $${estimatedCost.toFixed(4)}`,
             "",
             formatRunResult(result, { paymentMethod: method }),
-            ratingPrompt(jobId),
         ].join("\n");
-        return text(output);
+        return multiText(output, feedbackAsk(jobId, agentId2, actualCost, tipMsg));
     });
 }

package/package.json

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

package/src/core/config.ts

@@ -29,6 +29,10 @@ export interface Config {
   defaultWallet: string | null;
   card: CardConfig | null;
   favorites: string[];
+  /** Require user confirmation before spending. Default: true. Set false for headless/automated use. */
+  confirmBeforeSpend: boolean;
+  /** Auto-tip amount in USD for successful runs. Default: 0 (no auto-tip). */
+  defaultTipAmount: number;
 }
 
 /** All supported chain identifiers. */
@@ -84,6 +88,7 @@ interface LegacyConfig {
 function migrateIfNeeded(raw: LegacyConfig): Config {
   // If wallets array already exists, treat as new format
   if (Array.isArray(raw.wallets)) {
+    const r = raw as Record<string, unknown>;
     return {
       apiUrl: raw.apiUrl ?? DEFAULT_API_URL,
       apiKey: raw.apiKey ?? null,
@@ -91,7 +96,9 @@ function migrateIfNeeded(raw: LegacyConfig): Config {
       wallets: raw.wallets,
       defaultWallet: raw.defaultWallet ?? null,
       card: raw.card ?? null,
-      favorites: (raw as Record<string, unknown>).favorites as string[] ?? [],
+      favorites: r.favorites as string[] ?? [],
+      confirmBeforeSpend: r.confirmBeforeSpend !== false,
+      defaultTipAmount: typeof r.defaultTipAmount === "number" ? r.defaultTipAmount : 0,
     };
   }
 
@@ -162,6 +169,8 @@ function migrateIfNeeded(raw: LegacyConfig): Config {
     defaultWallet,
     card,
     favorites: [],
+    confirmBeforeSpend: true,
+    defaultTipAmount: 0,
   };
 
   // Write migrated config (only if there was something to migrate)
@@ -184,6 +193,8 @@ export function getConfig(): Config {
     defaultWallet: null,
     card: null,
     favorites: [],
+    confirmBeforeSpend: true,
+    defaultTipAmount: 0,
   };
 
   if (!existsSync(CONFIG_FILE)) {
@@ -222,6 +233,14 @@ export function isAuthenticated(): boolean {
   return getApiKey() !== null;
 }
 
+export function requiresSpendConfirmation(): boolean {
+  return getConfig().confirmBeforeSpend;
+}
+
+export function getDefaultTipAmount(): number {
+  return getConfig().defaultTipAmount;
+}
+
 // ── Wallet helpers ─────────────────────────────────────────────────
 
 /**

package/src/core/formatters.ts

@@ -152,17 +152,12 @@ export function formatRunResult(result: RunResultLike, opts?: { paymentMethod?:
   const latency = result.latency_ms != null ? `${result.latency_ms}ms` : "";
   const method = opts?.paymentMethod ?? "";
 
-  const parts = [
-    `${status} ${agent}`,
-    costStr ? `cost: ${costStr}` : "",
-    method ? `via ${method}` : "",
-    latency ? `latency: ${latency}` : "",
-  ].filter(Boolean);
-
-  lines.push(parts.join(" • "));
-
+  lines.push(`${status} ${agent}${latency ? ` (${latency})` : ""}`);
+  if (costStr) {
+    lines.push(`Paid: ${costStr}${method ? ` via ${method}` : ""}`);
+  }
   if (result.job_id) {
-    lines.push(`job: ${result.job_id}`);
+    lines.push(`Job ID: ${result.job_id}`);
   }
 
   return lines.join("\n");

package/src/tools/run.ts

@@ -1,25 +1,38 @@
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z } from "zod";
-import { apiGet, apiPostWithPayment } from "../core/api-client.js";
+import { apiGet, apiPost, apiPostWithPayment } from "../core/api-client.js";
 import { uploadLocalFiles } from "../core/file-upload.js";
 import { getConfiguredMethods, hasWalletConfigured } from "../core/payments.js";
+import { requiresSpendConfirmation, getDefaultTipAmount } from "../core/config.js";
 import { formatRunResult } from "../core/formatters.js";
-import { storeFeedbackToken } from "./_token-cache.js";
+import { storeFeedbackToken, getFeedbackToken } from "./_token-cache.js";
 
 function text(t: string) {
   return { content: [{ type: "text" as const, text: t }] };
 }
 
+function multiText(...blocks: string[]) {
+  return { content: blocks.map((t) => ({ type: "text" as const, text: t })) };
+}
+
+// Pending confirmations: agent_id → { agent, input, method }
+const pendingRuns = new Map<string, {
+  agent: { id: string; name: string; price: number };
+  input: Record<string, unknown>;
+  method?: string;
+}>();
+
 export function registerRunTools(server: McpServer): void {
   server.tool(
     "run_agent",
-    "Run an AI agent from the marketplace. Pays automatically via configured wallet. Returns the agent's output, cost, and job ID for tracking.",
+    "Run an AI agent from the marketplace. Pays automatically via configured wallet. Returns the agent's output, cost, and job ID for tracking. If spending confirmation is enabled, first call returns a price quote — call again with confirmed: true to execute.",
     {
-      agent_id: z.string().describe("Agent ID (UUID or slug)"),
+      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().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 }) => {
+    async ({ agent_id, input, pay_with, confirmed }) => {
       if (!hasWalletConfigured()) {
         return text(
           "No wallet configured. Set one up first:\n\n" +
@@ -28,16 +41,36 @@ export function registerRunTools(server: McpServer): void {
         );
       }
 
-      // Resolve slug to UUID if needed (slugs don't contain hyphens in UUID positions)
-      let resolvedId = agent_id;
-      const isUuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(agent_id);
-      if (!isUuid) {
-        try {
-          const agent = await apiGet<{ id: string }>(`/agents/${agent_id}`);
-          resolvedId = agent.id;
-        } catch {
-          return text(`Agent "${agent_id}" not found. Use search_agents to find available agents.`);
-        }
+      // Resolve agent and fetch details
+      let agent: { id: string; name?: string; pricePer1kTokens?: string; successRate?: number };
+      try {
+        agent = await apiGet<typeof agent>(`/agents/${agent_id}`);
+      } catch {
+        return text(`Agent "${agent_id}" not found. Use search_agents to find available agents.`);
+      }
+
+      const price = parseFloat(agent.pricePer1kTokens ?? "0.01");
+      const agentName = agent.name ?? agent_id;
+
+      // Confirmation step: show price and wait for confirmed: true
+      if (requiresSpendConfirmation() && !confirmed) {
+        pendingRuns.set(agent.id, {
+          agent: { id: agent.id, name: agentName, price },
+          input,
+          method: pay_with,
+        });
+
+        return text([
+          `Ready to run ${agentName}`,
+          "",
+          `  Cost: $${price.toFixed(2)}`,
+          `  Payment: ${pay_with ?? getConfiguredMethods()[0] ?? "auto"}`,
+          "",
+          "To proceed, call:",
+          `  run_agent({ agent_id: "${agent.id}", input: <same>, confirmed: true })`,
+          "",
+          "To cancel, do nothing.",
+        ].join("\n"));
       }
 
       const method = pay_with;
@@ -45,7 +78,7 @@ export function registerRunTools(server: McpServer): void {
       let result: Record<string, unknown>;
       try {
         result = await apiPostWithPayment<Record<string, unknown>>(
-          `/agents/${resolvedId}/run`,
+          `/agents/${agent.id}/run`,
           { input: processedInput },
           method,
         );
@@ -64,36 +97,65 @@ export function registerRunTools(server: McpServer): void {
         }
         return text(`Error: ${msg}`);
       }
+
+      // Clean up pending confirmation
+      pendingRuns.delete(agent.id);
+
       const formatted = formatRunResult(result, {
         paymentMethod: method ?? getConfiguredMethods()[0],
       });
       const jobId = (result.job_id as string) ?? "";
-      const agentId = (result.agent_id as string) ?? agent_id;
+      const resultAgentId = (result.agent_id as string) ?? agent.id;
 
       if (result.feedback_token) {
-        storeFeedbackToken(jobId, result.feedback_token as string, agentId);
+        storeFeedbackToken(jobId, result.feedback_token as string, resultAgentId);
       }
 
+      const actualCost = result.cost as number | undefined;
       const status = result.status as string;
-      let prompt: string;
-      if (status === "success") {
-        prompt = [
-          "",
-          "---",
-          "How was this result? You can:",
-          `  • rate_agent with job_id "${jobId}" and a score (1-5) — within 1 hour`,
-          "  • tip_agent to show appreciation — within 1 hour",
-          "  • favorite_agent to save this agent for later",
-        ].join("\n");
-      } else {
-        prompt = [
-          "",
-          "---",
-          "The agent execution failed. A refund has been initiated automatically",
-          "and will be returned to your wallet.",
-        ].join("\n");
+
+      // Auto-tip if configured and run succeeded
+      const defaultTip = getDefaultTipAmount();
+      let tipLine = "";
+      if (status === "success" && defaultTip > 0 && result.feedback_token) {
+        try {
+          await apiPost("/tips", {
+            job_id: jobId,
+            agent_id: resultAgentId,
+            amount: defaultTip,
+            feedback_token: result.feedback_token,
+          });
+          tipLine = `Auto-tipped $${defaultTip.toFixed(2)} to ${agentName}.`;
+        } catch {
+          tipLine = `Auto-tip of $${defaultTip.toFixed(2)} failed.`;
+        }
+      }
+
+      if (status !== "success") {
+        return multiText(
+          formatted,
+          "The agent execution failed. A refund has been initiated automatically.",
+        );
       }
-      return text(formatted + prompt);
+
+      const costLine = actualCost != null ? `Paid $${actualCost.toFixed(actualCost < 0.01 ? 4 : 2)}.` : "";
+
+      // Separate the feedback ask into its own content block so the LLM
+      // surfaces it to the user as a distinct follow-up question, rather than
+      // burying it inside a collapsed tool output.
+      const feedbackAsk = [
+        `IMPORTANT: After presenting the result above, you MUST ask the user:`,
+        `"${costLine} Was this result helpful? I can rate it (1-5 stars) or tip the builder for you."`,
+        tipLine,
+        "",
+        `If the user wants to rate: rate_agent({ job_id: "${jobId}", rating: <1-5>, comment: "..." })`,
+        ...(defaultTip <= 0 ? [
+          `If the user wants to tip: tip_agent({ job_id: "${jobId}", agent_id: "${resultAgentId}", amount: 0.25 })`,
+        ] : []),
+        `To save for later: favorite_agent({ agent_id: "${resultAgentId}" })`,
+      ].join("\n");
+
+      return multiText(formatted, feedbackAsk);
     },
   );
 }

package/src/tools/solve.ts

@@ -6,6 +6,7 @@ import {
   getConfiguredMethods,
   getAcceptedPaymentMethods,
 } from "../core/payments.js";
+import { requiresSpendConfirmation, getDefaultTipAmount } from "../core/config.js";
 import { agentList, formatRunResult } from "../core/formatters.js";
 import { uploadLocalFiles } from "../core/file-upload.js";
 import type { AgentRecord } from "../core/types.js";
@@ -15,21 +16,46 @@ function text(t: string) {
   return { content: [{ type: "text" as const, text: t }] };
 }
 
-function ratingPrompt(jobId: string): string {
+function multiText(...blocks: string[]) {
+  return { content: blocks.map((t) => ({ type: "text" as const, text: t })) };
+}
+
+function feedbackAsk(jobId: string, agentId: string, cost?: number, tipSent?: string): string {
+  const defaultTip = getDefaultTipAmount();
+  const costLine = cost != null ? `Paid $${cost.toFixed(cost < 0.01 ? 4 : 2)}.` : "";
   return [
+    `IMPORTANT: After presenting the result above, you MUST ask the user:`,
+    `"${costLine} Was this result helpful? I can rate it (1-5 stars) or tip the builder for you."`,
+    tipSent ?? "",
     "",
-    "---",
-    "How was this result? You can:",
-    `  • rate_agent with job_id "${jobId}" and a score (1-5) — within 1 hour`,
-    "  • tip_agent to show appreciation — within 1 hour",
-    "  • favorite_agent to save this agent for later",
+    `If the user wants to rate: rate_agent({ job_id: "${jobId}", rating: <1-5>, comment: "..." })`,
+    ...(defaultTip <= 0 ? [
+      `If the user wants to tip: tip_agent({ job_id: "${jobId}", agent_id: "${agentId}", amount: 0.25 })`,
+    ] : []),
+    `To save for later: favorite_agent({ agent_id: "${agentId}" })`,
   ].join("\n");
 }
 
+async function autoTip(jobId: string, agentId: string, agentName: string, feedbackToken: string): Promise<string> {
+  const defaultTip = getDefaultTipAmount();
+  if (defaultTip <= 0) return "";
+  try {
+    await apiPost("/tips", {
+      job_id: jobId,
+      agent_id: agentId,
+      amount: defaultTip,
+      feedback_token: feedbackToken,
+    });
+    return `Auto-tipped $${defaultTip.toFixed(2)} to ${agentName}.`;
+  } catch {
+    return `Auto-tip of $${defaultTip.toFixed(2)} failed.`;
+  }
+}
+
 export function registerSolveTools(server: McpServer): void {
   server.tool(
     "solve",
-    "Solve a task by finding the best agent, paying, and executing. The primary way to use the marketplace — describe what you need and the system handles discovery, selection, payment, and execution.",
+    "Solve a task by finding the best agent, paying, and executing. The primary way to use the marketplace. If spending confirmation is enabled, returns a price quote first — call again with confirmed: true to execute.",
     {
       intent: z
         .string()
@@ -52,8 +78,12 @@ export function registerSolveTools(server: McpServer): void {
         .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 ({ intent, input, budget, pay_with }) => {
+    async ({ intent, input, budget, pay_with, confirmed }) => {
       if (!hasWalletConfigured()) {
         return text(
           "No wallet configured. Set one up first:\n\n" +
@@ -74,12 +104,15 @@ export function registerSolveTools(server: McpServer): void {
         });
         const jobId = (result as Record<string, unknown>).job_id as string ?? "";
         const agentId = (result as Record<string, unknown>).agent_id as string ?? "";
+        const agentName = (result as Record<string, unknown>).agent_name as string ?? "";
 
         if (result.feedback_token) {
           storeFeedbackToken(jobId, result.feedback_token as string, agentId);
         }
 
-        return text(formatRunResult(result) + ratingPrompt(jobId));
+        const cost = (result as Record<string, unknown>).cost as number | undefined;
+        const tipMsg = result.feedback_token ? await autoTip(jobId, agentId, agentName, result.feedback_token as string) : "";
+        return multiText(formatRunResult(result), feedbackAsk(jobId, agentId, cost, tipMsg));
       } catch (err: unknown) {
         const isAuthError =
           err instanceof Error &&
@@ -113,13 +146,28 @@ export function registerSolveTools(server: McpServer): void {
       });
       const selected = affordable[0] ?? agents[0];
 
-      // Estimate cost for the selected agent
       const selectedPrice = parseFloat(selected.pricePer1kTokens ?? "0.01");
       const estimatedCost =
         selected.pricingModel === "fixed"
           ? selectedPrice
           : (inputTokens / 1000) * selectedPrice;
 
+      // Confirmation step: show discovery + price, wait for confirmed: true
+      if (requiresSpendConfirmation() && !confirmed) {
+        return text([
+          discovery,
+          "",
+          `Best match: ${selected.name}`,
+          `Cost: $${estimatedCost.toFixed(2)}`,
+          `Payment: ${method}`,
+          "",
+          "To proceed, call:",
+          `  solve({ intent: "${intent}", input: <same>, budget: ${budget}, confirmed: true })`,
+          "",
+          "To cancel, do nothing.",
+        ].join("\n"));
+      }
+
       let result: Record<string, unknown>;
       const processedInput2 = await uploadLocalFiles(input);
       try {
@@ -140,7 +188,6 @@ export function registerSolveTools(server: McpServer): void {
         return text(`Error: ${apiErr?.message ?? "Failed to run agent"}`);
       }
 
-      // Cache feedback token if present
       const jobId = (result as Record<string, unknown>).job_id as string ?? "";
       const agentId2 = (result as Record<string, unknown>).agent_id as string ?? selected.id;
 
@@ -148,7 +195,9 @@ export function registerSolveTools(server: McpServer): void {
         storeFeedbackToken(jobId, result.feedback_token as string, agentId2);
       }
 
-      // Combine discovery + result
+      const actualCost = (result as Record<string, unknown>).cost as number | undefined;
+      const tipMsg = result.feedback_token ? await autoTip(jobId, agentId2, selected.name ?? "", result.feedback_token as string) : "";
+
       const output = [
         discovery,
         "",
@@ -156,10 +205,9 @@ export function registerSolveTools(server: McpServer): void {
         `Estimated cost: $${estimatedCost.toFixed(4)}`,
         "",
         formatRunResult(result, { paymentMethod: method }),
-        ratingPrompt(jobId),
       ].join("\n");
 
-      return text(output);
+      return multiText(output, feedbackAsk(jobId, agentId2, actualCost, tipMsg));
     },
   );
 }