@agentwonderland/mcp 0.1.32 → 0.1.33

package/dist/tools/run.js

@@ -10,25 +10,52 @@ import { storeFeedbackToken } from "./_token-cache.js";
 import { getOrCreatePendingCardSetup, formatCardSetupBlocks } from "../core/card-setup.js";
 import { formatPaymentLabel, formatRunConfirmationCommand, resolveConfirmationMethod, } from "./_payment-confirmation.js";
 const POLL_INTERVAL_MS = 3000;
-const POLL_MAX_MS = 120000;
+const POLL_MAX_MS = 300000;
+// Collects every wallet address the consumer has configured so the poll below
+// works regardless of which chain the job's `callerAddress` was stored on.
+// `run_agent` runs can land as the MPP payer address, the MPP caller address,
+// or (for credit-pack runs) the consumer principal — any of these may differ
+// from `getWalletAddress(paymentMethod)`, which only returns one chain.
+async function collectWalletAddresses(paymentMethod) {
+    const addresses = new Set();
+    const primary = await getWalletAddress(paymentMethod);
+    if (primary)
+        addresses.add(primary);
+    for (const chain of ["tempo", "base", "solana"]) {
+        const addr = await getWalletAddress(chain);
+        if (addr)
+            addresses.add(addr);
+    }
+    return [...addresses];
+}
 async function pollJobUntilDone(jobId, paymentMethod) {
     const deadline = Date.now() + POLL_MAX_MS;
-    const walletAddress = await getWalletAddress(paymentMethod);
-    const walletParam = walletAddress ? `?wallet=${walletAddress}` : "";
+    const walletAddresses = await collectWalletAddresses(paymentMethod);
+    const walletParams = walletAddresses.length > 0
+        ? walletAddresses.map((a) => `?wallet=${encodeURIComponent(a)}`)
+        : [""];
     while (Date.now() < deadline) {
         await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
-        try {
-            const job = await apiGet(`/jobs/${jobId}${walletParam}`);
-            if (job.status === "completed") {
-                return { status: "completed", output: job.output };
+        for (const walletParam of walletParams) {
+            try {
+                const job = await apiGet(`/jobs/${jobId}${walletParam}`);
+                if (job.status === "completed") {
+                    return { status: "completed", output: job.output };
+                }
+                if (job.status === "failed") {
+                    return { status: "failed", output: job.output, error_code: job.error_code };
+                }
+                // status === "processing" — break out to next poll interval.
+                break;
             }
-            if (job.status === "failed") {
-                return { status: "failed", output: job.output, error_code: job.error_code };
+            catch (err) {
+                const status = err?.status;
+                // 404 means wrong wallet for this job — try the next address.
+                // Any other error: give up for this interval and retry after the sleep.
+                if (status !== 404)
+                    break;
             }
         }
-        catch {
-            // Ignore poll errors until timeout.
-        }
     }
     return { status: "failed", error_code: "POLL_TIMEOUT" };
 }

package/dist/tools/solve.js

@@ -10,25 +10,44 @@ 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;
+const POLL_MAX_MS = 300000;
+async function collectWalletAddresses(paymentMethod) {
+    const addresses = new Set();
+    const primary = await getWalletAddress(paymentMethod);
+    if (primary)
+        addresses.add(primary);
+    for (const chain of ["tempo", "base", "solana"]) {
+        const addr = await getWalletAddress(chain);
+        if (addr)
+            addresses.add(addr);
+    }
+    return [...addresses];
+}
 async function pollSolveJob(jobId, paymentMethod) {
     const deadline = Date.now() + POLL_MAX_MS;
-    const walletAddress = await getWalletAddress(paymentMethod);
-    const walletParam = walletAddress ? `?wallet=${walletAddress}` : "";
+    const walletAddresses = await collectWalletAddresses(paymentMethod);
+    const walletParams = walletAddresses.length > 0
+        ? walletAddresses.map((a) => `?wallet=${encodeURIComponent(a)}`)
+        : [""];
     while (Date.now() < deadline) {
         await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
-        try {
-            const job = await apiGet(`/jobs/${jobId}${walletParam}`);
-            if (job.status === "completed") {
-                return { status: "completed", output: job.output };
+        for (const walletParam of walletParams) {
+            try {
+                const job = await apiGet(`/jobs/${jobId}${walletParam}`);
+                if (job.status === "completed") {
+                    return { status: "completed", output: job.output };
+                }
+                if (job.status === "failed") {
+                    return { status: "failed", output: job.output, error_code: job.error_code };
+                }
+                break;
             }
-            if (job.status === "failed") {
-                return { status: "failed", output: job.output, error_code: job.error_code };
+            catch (err) {
+                const status = err?.status;
+                if (status !== 404)
+                    break;
             }
         }
-        catch {
-            // Ignore poll errors and keep trying.
-        }
     }
     return { status: "failed", error_code: "POLL_TIMEOUT" };
 }

package/package.json

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

package/src/tools/run.ts

@@ -29,33 +29,58 @@ import {
 import type { AgentRecord } from "../core/types.js";
 
 const POLL_INTERVAL_MS = 3000;
-const POLL_MAX_MS = 120000;
+const POLL_MAX_MS = 300000;
+
+// Collects every wallet address the consumer has configured so the poll below
+// works regardless of which chain the job's `callerAddress` was stored on.
+// `run_agent` runs can land as the MPP payer address, the MPP caller address,
+// or (for credit-pack runs) the consumer principal — any of these may differ
+// from `getWalletAddress(paymentMethod)`, which only returns one chain.
+async function collectWalletAddresses(paymentMethod?: string): Promise<string[]> {
+  const addresses = new Set<string>();
+  const primary = await getWalletAddress(paymentMethod);
+  if (primary) addresses.add(primary);
+  for (const chain of ["tempo", "base", "solana"]) {
+    const addr = await getWalletAddress(chain);
+    if (addr) addresses.add(addr);
+  }
+  return [...addresses];
+}
 
 async function pollJobUntilDone(
   jobId: string,
   paymentMethod?: string,
 ): Promise<{ status: string; output?: unknown; error_code?: string }> {
   const deadline = Date.now() + POLL_MAX_MS;
-  const walletAddress = await getWalletAddress(paymentMethod);
-  const walletParam = walletAddress ? `?wallet=${walletAddress}` : "";
+  const walletAddresses = await collectWalletAddresses(paymentMethod);
+  const walletParams = walletAddresses.length > 0
+    ? walletAddresses.map((a) => `?wallet=${encodeURIComponent(a)}`)
+    : [""];
 
   while (Date.now() < deadline) {
     await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
-    try {
-      const job = await apiGet<{
-        status: string;
-        output?: unknown;
-        error_code?: string;
-      }>(`/jobs/${jobId}${walletParam}`);
-
-      if (job.status === "completed") {
-        return { status: "completed", output: job.output };
-      }
-      if (job.status === "failed") {
-        return { status: "failed", output: job.output, error_code: job.error_code };
+    for (const walletParam of walletParams) {
+      try {
+        const job = await apiGet<{
+          status: string;
+          output?: unknown;
+          error_code?: string;
+        }>(`/jobs/${jobId}${walletParam}`);
+
+        if (job.status === "completed") {
+          return { status: "completed", output: job.output };
+        }
+        if (job.status === "failed") {
+          return { status: "failed", output: job.output, error_code: job.error_code };
+        }
+        // status === "processing" — break out to next poll interval.
+        break;
+      } catch (err) {
+        const status = (err as { status?: number })?.status;
+        // 404 means wrong wallet for this job — try the next address.
+        // Any other error: give up for this interval and retry after the sleep.
+        if (status !== 404) break;
       }
-    } catch {
-      // Ignore poll errors until timeout.
     }
   }
 

package/src/tools/solve.ts

@@ -27,33 +27,50 @@ import {
 import { getActiveCreditPack, getCreditPackInventory, getCreditPackProgram } from "../core/passes.js";
 
 const POLL_INTERVAL_MS = 3000;
-const POLL_MAX_MS = 120000;
+const POLL_MAX_MS = 300000;
+
+async function collectWalletAddresses(paymentMethod?: string): Promise<string[]> {
+  const addresses = new Set<string>();
+  const primary = await getWalletAddress(paymentMethod);
+  if (primary) addresses.add(primary);
+  for (const chain of ["tempo", "base", "solana"]) {
+    const addr = await getWalletAddress(chain);
+    if (addr) addresses.add(addr);
+  }
+  return [...addresses];
+}
 
 async function pollSolveJob(
   jobId: string,
   paymentMethod?: string,
 ): Promise<{ status: string; output?: unknown; error_code?: string }> {
   const deadline = Date.now() + POLL_MAX_MS;
-  const walletAddress = await getWalletAddress(paymentMethod);
-  const walletParam = walletAddress ? `?wallet=${walletAddress}` : "";
+  const walletAddresses = await collectWalletAddresses(paymentMethod);
+  const walletParams = walletAddresses.length > 0
+    ? walletAddresses.map((a) => `?wallet=${encodeURIComponent(a)}`)
+    : [""];
 
   while (Date.now() < deadline) {
     await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
-    try {
-      const job = await apiGet<{
-        status: string;
-        output?: unknown;
-        error_code?: string;
-      }>(`/jobs/${jobId}${walletParam}`);
-
-      if (job.status === "completed") {
-        return { status: "completed", output: job.output };
-      }
-      if (job.status === "failed") {
-        return { status: "failed", output: job.output, error_code: job.error_code };
+    for (const walletParam of walletParams) {
+      try {
+        const job = await apiGet<{
+          status: string;
+          output?: unknown;
+          error_code?: string;
+        }>(`/jobs/${jobId}${walletParam}`);
+
+        if (job.status === "completed") {
+          return { status: "completed", output: job.output };
+        }
+        if (job.status === "failed") {
+          return { status: "failed", output: job.output, error_code: job.error_code };
+        }
+        break;
+      } catch (err) {
+        const status = (err as { status?: number })?.status;
+        if (status !== 404) break;
       }
-    } catch {
-      // Ignore poll errors and keep trying.
     }
   }
 

package/test-x402-flow.mjs

@@ -0,0 +1,58 @@
+// End-to-end x402 client test against prod Agent Wonderland on Base mainnet.
+//
+// 1. POST /x402/agents/:id/run (no PAYMENT header) → 402 with Stripe-issued payTo
+// 2. Sign the payment authorization on Base mainnet with user's OWS-managed wallet
+// 3. Retry with PAYMENT header → agent runs, USDC transferred to Stripe
+//
+// Then we inspect the resulting payment_attempt + transfer rows to confirm the
+// Connect transfer is funded via source_transaction (same path MPP uses).
+
+import { owsAccountFromWalletId } from "./src/core/ows-adapter.ts";
+import { x402Client } from "@x402/core/client";
+import { registerExactEvmScheme } from "@x402/evm/exact/client";
+import { encodePaymentSignatureHeader } from "@x402/core/http";
+
+const API = "https://api.agentwonderland.com";
+const AGENT_SLUG = "diagram-renderer-qyf0";
+const INPUT = { code: "graph TD; A-->B;", format: "png" };
+const OWS_WALLET_ID = "9558b02c-93bf-480f-8708-5fe135bf53d9"; // from ~/.agentwonderland/config.json
+
+// 1. Get the account
+const account = await owsAccountFromWalletId(OWS_WALLET_ID);
+console.log(`signer: ${account.address}`);
+
+// 2. Fetch the 402 challenge
+const first = await fetch(`${API}/x402/agents/${AGENT_SLUG}/run`, {
+  method: "POST",
+  headers: { "Content-Type": "application/json" },
+  body: JSON.stringify({ input: INPUT }),
+});
+console.log(`first response: ${first.status}`);
+const paymentRequired = await first.json();
+console.log("accepts[0].payTo:", paymentRequired.accepts?.[0]?.payTo);
+console.log("payment_attempt_id:", paymentRequired.payment_attempt_id);
+
+// 3. Build + sign the payment
+const client = new x402Client();
+registerExactEvmScheme(client, {
+  signer: account,
+  networks: ["eip155:8453"],
+});
+const paymentPayload = await client.createPaymentPayload(paymentRequired);
+console.log("FULL payment payload:", JSON.stringify(paymentPayload, null, 2));
+
+const paymentHeader = encodePaymentSignatureHeader(paymentPayload);
+console.log("PAYMENT header length:", paymentHeader.length);
+
+// 4. Retry with PAYMENT header
+const second = await fetch(`${API}/x402/agents/${AGENT_SLUG}/run`, {
+  method: "POST",
+  headers: {
+    "Content-Type": "application/json",
+    PAYMENT: paymentHeader,
+  },
+  body: JSON.stringify({ input: INPUT }),
+});
+console.log(`second response: ${second.status}`);
+const body = await second.text();
+console.log("body preview:", body.slice(0, 400));