@agentwonderland/mcp 0.1.23 → 0.1.25

package/src/tools/solve.ts

@@ -1,18 +1,29 @@
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z } from "zod";
 import { apiGet, apiPost, apiPostWithPayment } from "../core/api-client.js";
-import { initiateCardSetup, formatCardSetupBlocks } from "../core/card-setup.js";
+import { getOrCreatePendingCardSetup, formatCardSetupBlocks } from "../core/card-setup.js";
 import {
+  getCompatiblePaymentMethods,
   hasWalletConfigured,
   getConfiguredMethods,
   getAcceptedPaymentMethods,
   getWalletAddress,
+  normalizePaymentMethod,
+  toRegistryPaymentMethod,
 } 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";
 import { uploadLocalFiles } from "../core/file-upload.js";
 import type { AgentRecord } from "../core/types.js";
 import { storeFeedbackToken } from "./_token-cache.js";
+import {
+  formatPaymentLabel,
+  formatSolveConfirmationCommand,
+  makeSolvePendingKey,
+  resolveConfirmationMethod,
+} from "./_payment-confirmation.js";
+import { getActiveCreditPack, getCreditPackInventory, getCreditPackProgram } from "../core/passes.js";
 
 const POLL_INTERVAL_MS = 3000;
 const POLL_MAX_MS = 120000;
@@ -40,7 +51,7 @@ async function pollSolveJob(
         return { status: "failed", output: job.output, error_code: job.error_code };
       }
     } catch {
-      // Ignore poll errors, keep trying
+      // Ignore poll errors and keep trying.
     }
   }
 
@@ -55,11 +66,13 @@ function multiText(...blocks: string[]) {
   return { content: blocks.map((t) => ({ type: "text" as const, text: t })) };
 }
 
+const pendingSolves = new Map<string, { method?: string }>();
+
 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)}.` : "";
+  const costLine = cost != null ? `Paid $${cost.toFixed(cost < 0.01 ? 4 : 2)}.` : "This run used your available credit pack.";
   return [
-    `IMPORTANT: After presenting the result above, you MUST ask the user:`,
+    "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 ?? "",
     "",
@@ -87,10 +100,25 @@ async function autoTip(jobId: string, agentId: string, agentName: string, feedba
   }
 }
 
+function buildCreditPackSummary(agent: AgentRecord): string[] {
+  const creditPacks = getCreditPackProgram(agent);
+  if (!creditPacks?.packs?.length) return [];
+
+  return [
+    "Discounted credit packs available:",
+    ...creditPacks.packs.map((pack) => {
+      const price = Number(pack.price_usd ?? "0");
+      const units = pack.included_units ?? 0;
+      const unitPrice = units > 0 ? ` ($${(price / units).toFixed(2)}/unit)` : "";
+      return `  ${pack.name ?? pack.key}: ${units} units for $${(pack.price_usd ?? "0.00")}${unitPrice}`;
+    }),
+  ];
+}
+
 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. If spending confirmation is enabled, returns a price quote first — call again with confirmed: true to execute. Local file paths in the input (e.g. /Users/.../photo.jpg) are automatically uploaded to temporary storage and replaced with download URLs — just pass the path directly, no base64 encoding needed.",
+    "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. Local file paths in the input are auto-uploaded before execution.",
     {
       intent: z
         .string()
@@ -109,10 +137,9 @@ export function registerSolveTools(server: McpServer): void {
         .describe("Maximum budget in USD"),
       pay_with: z
         .string()
-        .optional()
-        .describe(
-          "Payment method — wallet ID, chain name (tempo, base, etc.), or 'card'. Auto-detected if omitted.",
-        ),
+        .trim()
+        .min(1)
+        .describe("Required payment method — wallet ID, chain name (tempo, base, etc.), or 'card'. Use wallet_status to see configured options."),
       confirmed: z
         .boolean()
         .optional()
@@ -121,21 +148,30 @@ export function registerSolveTools(server: McpServer): void {
     async ({ intent, input, budget, pay_with, confirmed }) => {
       if (!hasWalletConfigured()) {
         try {
-          const { qr, url } = await initiateCardSetup();
-          const blocks = formatCardSetupBlocks(qr, url);
-          return { content: blocks.map((t) => ({ type: "text" as const, text: t })) };
+          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\" })"
+            "To use crypto: wallet_setup({ action: \"create\" })",
           );
         }
       }
 
-      const method = pay_with ?? getConfiguredMethods()[0];
+      const pendingKey = makeSolvePendingKey(intent, input, budget);
+      const pending = pendingSolves.get(pendingKey);
+      const configuredMethods = getConfiguredMethods();
+      const requestedMethod = pay_with;
+      const normalizedRequestedMethod = normalizePaymentMethod(requestedMethod);
+
+      if (!normalizedRequestedMethod) {
+        return text(
+          `Payment method "${requestedMethod}" is not configured.\n\n` +
+          "Use wallet_status to review your current payment methods.",
+        );
+      }
 
-      // Path 1: If authenticated, use the platform /solve route
       let processedInput: Record<string, unknown>;
       try {
         const uploadResult = await uploadLocalFiles(input);
@@ -144,6 +180,7 @@ export function registerSolveTools(server: McpServer): void {
         const msg = err instanceof Error ? err.message : "File upload failed";
         return text(`Error: ${msg}`);
       }
+
       try {
         const result = await apiPost<Record<string, unknown>>("/solve", {
           intent,
@@ -159,8 +196,9 @@ 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, cost, tipMsg));
+        return multiText(formatRunResult(result), feedbackAsk(jobId, agentId, usedCreditPack ? undefined : cost, tipMsg));
       } catch (err: unknown) {
         const isAuthError =
           err instanceof Error &&
@@ -169,9 +207,10 @@ export function registerSolveTools(server: McpServer): void {
         if (!isAuthError || !hasWalletConfigured()) throw err;
       }
 
-      // Path 2: Wallet-only discovery — find agents, pick best, pay via MPP
       const params = new URLSearchParams({ q: intent, limit: "5" });
-      const acceptedMethods = getAcceptedPaymentMethods();
+      const acceptedMethods = requestedMethod
+        ? [toRegistryPaymentMethod(requestedMethod)].filter((value): value is string => !!value)
+        : getAcceptedPaymentMethods();
       if (acceptedMethods.length > 0) {
         params.set("accepted_payment_methods", acceptedMethods.join(","));
       }
@@ -181,77 +220,119 @@ export function registerSolveTools(server: McpServer): void {
         return text(`No agents found matching "${intent}".`);
       }
 
-      // Show discovery results
       const discovery = agentList(agents, intent);
-
-      // Pick cheapest agent within budget
-      const inputTokens = Math.ceil(JSON.stringify(input).length / 4);
-      const affordable = agents.filter((a) => {
-        const price = parseFloat(a.pricePer1kTokens ?? "0.01");
-        const cost =
-          a.pricingModel === "fixed" ? price : (inputTokens / 1000) * price;
-        return cost <= budget;
+      const affordable = agents.filter((agent) => {
+        const price = parseFloat(agent.pricePerRunUsd ?? "0.01");
+        return price <= budget;
       });
       const selected = affordable[0] ?? agents[0];
+      const activeCreditPack = await getCreditPackInventory(selected.id).then(getActiveCreditPack);
+      const compatibleMethods = getCompatiblePaymentMethods(selected, configuredMethods);
+
+      if (!compatibleMethods.includes(normalizedRequestedMethod)) {
+        return text(
+          `The best matching agent cannot be paid with "${requestedMethod}".\n\n` +
+          `Available payment methods for ${selected.name}: ${compatibleMethods.join(", ") || "none"}.\n` +
+          "Choose another payment method or refine your search.",
+        );
+      }
 
-      const selectedPrice = parseFloat(selected.pricePer1kTokens ?? "0.01");
-      const estimatedCost =
-        selected.pricingModel === "fixed"
-          ? selectedPrice
-          : (inputTokens / 1000) * selectedPrice;
+      const method = resolveConfirmationMethod(pay_with, pending?.method, compatibleMethods);
+      const spendCheckMethod = method ?? normalizedRequestedMethod;
 
-      // Confirmation step: show discovery + price, wait for confirmed: true
-      if (requiresSpendConfirmation() && !confirmed) {
+      const selectedPrice = parseFloat(selected.pricePerRunUsd ?? "0.01");
+      const estimatedCost = selectedPrice;
+
+      const needsPolicyConfirmation = !activeCreditPack && requiresPolicyConfirmation(spendCheckMethod, estimatedCost);
+      if (!activeCreditPack && (requiresSpendConfirmation() || needsPolicyConfirmation) && !confirmed) {
+        pendingSolves.set(pendingKey, { method });
         return text([
           discovery,
           "",
           `Best match: ${selected.name}`,
           `Cost: $${estimatedCost.toFixed(2)}`,
-          `Payment: ${method}`,
+          `Payment: ${formatPaymentLabel(method)}`,
+          ...(() => {
+            const summary = buildCreditPackSummary(selected);
+            return summary.length > 0 ? ["", ...summary] : [];
+          })(),
           "",
           "To proceed, call:",
-          `  solve({ intent: "${intent}", input: <same>, budget: ${budget}, confirmed: true })`,
+          formatSolveConfirmationCommand(intent, budget, method),
           "",
           "To cancel, do nothing.",
         ].join("\n"));
       }
 
       let result: Record<string, unknown>;
-      let processedInput2: Record<string, unknown>;
-      try {
-        const uploadResult2 = await uploadLocalFiles(input);
-        processedInput2 = uploadResult2.input;
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : "File upload failed";
-        return text(`Error: ${msg}`);
+      if (!activeCreditPack) {
+        const spendCheck = canSpend({
+          method: spendCheckMethod,
+          amountUsd: estimatedCost,
+        });
+        if (!spendCheck.ok) {
+          return text(spendCheck.message);
+        }
       }
+
       try {
-        result = await apiPostWithPayment<Record<string, unknown>>(
-          `/agents/${selected.id}/run`,
-          { input: processedInput2 },
-          method,
-        );
+        let usedPaidMethod = !activeCreditPack;
+        if (activeCreditPack) {
+          try {
+            result = await apiPost<Record<string, unknown>>(
+              `/agents/${selected.id}/run`,
+              { input: processedInput },
+              { ensureConsumerPrincipal: true },
+            );
+          } catch (packErr) {
+            const packApiErr = packErr as { status?: number };
+            if (packApiErr?.status !== 402) throw packErr;
+            result = await apiPostWithPayment<Record<string, unknown>>(
+              `/agents/${selected.id}/run`,
+              { input: processedInput },
+              method,
+            );
+            usedPaidMethod = true;
+          }
+        } else {
+          result = await apiPostWithPayment<Record<string, unknown>>(
+            `/agents/${selected.id}/run`,
+            { input: processedInput },
+            method,
+          );
+        }
+        if (usedPaidMethod) {
+          recordSpend(spendCheckMethod, estimatedCost);
+        }
       } catch (err: unknown) {
         const apiErr = err as { status?: number; message?: string };
         if (apiErr?.status === 402) {
           return text(
-            "Payment failed — your wallet may not have enough USDC.\n\n" +
-            "Check your balance and fund your wallet, then try again.\n" +
-            "Use wallet_status to check your current payment methods."
+            [
+              "Payment failed — your wallet may not have enough funds or the selected method was rejected.",
+              "",
+              "Check your balance and try again.",
+              "Use wallet_status to check your current payment methods.",
+              ...(() => {
+                const summary = buildCreditPackSummary(selected);
+                return summary.length > 0 ? ["", ...summary] : [];
+              })(),
+            ].join("\n"),
           );
         }
         return text(`Error: ${apiErr?.message ?? "Failed to run agent"}`);
       }
 
+      pendingSolves.delete(pendingKey);
+
       const jobId = (result as Record<string, unknown>).job_id as string ?? "";
-      const agentId2 = (result as Record<string, unknown>).agent_id as string ?? selected.id;
+      const agentId = (result as Record<string, unknown>).agent_id as string ?? selected.id;
       const status = result.status as string;
 
       if (result.feedback_token) {
-        storeFeedbackToken(jobId, result.feedback_token as string, agentId2);
+        storeFeedbackToken(jobId, result.feedback_token as string, agentId);
       }
 
-      // Async agent — poll until complete
       if (status === "processing") {
         const pollResult = await pollSolveJob(jobId);
         if (pollResult.status === "completed") {
@@ -271,10 +352,10 @@ export function registerSolveTools(server: McpServer): void {
           ].join("\n");
 
           const asyncCost = (result as Record<string, unknown>).cost as number | undefined;
-          return multiText(asyncOutput, feedbackAsk(jobId, agentId2, asyncCost, ""));
+          const usedCreditPack = (result as Record<string, unknown>).consumption_mode === "credit_pack";
+          return multiText(asyncOutput, feedbackAsk(jobId, agentId, usedCreditPack ? undefined : asyncCost, ""));
         }
 
-        // Async agent failed
         const failedFormatted = formatRunResult({
           ...result,
           status: "failed",
@@ -290,11 +371,18 @@ export function registerSolveTools(server: McpServer): void {
           failedFormatted,
         ].join("\n");
 
-        return multiText(failedOutput, "The agent execution failed. A refund has been initiated automatically.");
+        const usedCreditPack = (result as Record<string, unknown>).consumption_mode === "credit_pack";
+        return multiText(
+          failedOutput,
+          usedCreditPack
+            ? "The agent execution failed and the reserved credit-pack unit was released automatically."
+            : "The agent execution failed. A refund has been initiated automatically.",
+        );
       }
 
       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 usedCreditPack = (result as Record<string, unknown>).consumption_mode === "credit_pack";
+      const tipMsg = result.feedback_token ? await autoTip(jobId, agentId, selected.name ?? "", result.feedback_token as string) : "";
 
       const output = [
         discovery,
@@ -305,7 +393,7 @@ export function registerSolveTools(server: McpServer): void {
         formatRunResult(result, { paymentMethod: method }),
       ].join("\n");
 
-      return multiText(output, feedbackAsk(jobId, agentId2, actualCost, tipMsg));
+      return multiText(output, feedbackAsk(jobId, agentId, usedCreditPack ? undefined : actualCost, tipMsg));
     },
   );
 }