@agentwonderland/mcp 0.1.45 → 0.1.47

package/src/tools/__tests__/search.test.ts

@@ -0,0 +1,78 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+const mockApiGet = vi.fn();
+const mockGetAcceptedPaymentMethods = vi.fn();
+const mockIsFavorite = vi.fn();
+
+vi.mock("../../core/api-client.js", () => ({
+  apiGet: mockApiGet,
+}));
+
+vi.mock("../../core/payments.js", () => ({
+  getAcceptedPaymentMethods: mockGetAcceptedPaymentMethods,
+}));
+
+vi.mock("../../core/config.js", () => ({
+  isFavorite: mockIsFavorite,
+}));
+
+function flattenToolText(result: unknown): string {
+  const content = (result as { content?: Array<{ type?: string; text?: string }> })?.content ?? [];
+  return content
+    .filter((item) => item?.type === "text")
+    .map((item) => item.text ?? "")
+    .join("\n\n");
+}
+
+function makeServerHarness() {
+  const handlers = new Map<string, (args: Record<string, unknown>) => Promise<unknown>>();
+  return {
+    handlers,
+    server: {
+      tool(name: string, _description: string, _schema: unknown, handler: (args: Record<string, unknown>) => Promise<unknown>) {
+        handlers.set(name, handler);
+      },
+    },
+  };
+}
+
+describe("search_agents MCP tool", () => {
+  beforeEach(() => {
+    vi.resetModules();
+    vi.clearAllMocks();
+    mockGetAcceptedPaymentMethods.mockReturnValue([]);
+    mockIsFavorite.mockReturnValue(false);
+  });
+
+  it("sorts popularity by live completed job stats after API enrichment", async () => {
+    mockApiGet.mockResolvedValueOnce([
+      {
+        id: "agent-low",
+        name: "Low History",
+        slug: "low-history",
+        pricePerRunUsd: "0.100000",
+        stats: { completedJobs: 2, avgRating: null, ratingCount: 0 },
+      },
+      {
+        id: "agent-high",
+        name: "High History",
+        slug: "high-history",
+        pricePerRunUsd: "0.100000",
+        stats: { completedJobs: 6, avgRating: null, ratingCount: 0 },
+      },
+    ]);
+
+    const { registerSearchTools } = await import("../search.js");
+    const harness = makeServerHarness();
+    registerSearchTools(harness.server as never);
+
+    const search = harness.handlers.get("search_agents");
+    expect(search).toBeDefined();
+
+    const result = await search!({ query: "stock research", limit: 2, sort: "popularity" });
+    const output = flattenToolText(result);
+
+    expect(output.indexOf("High History")).toBeLessThan(output.indexOf("Low History"));
+    expect(output).toContain("High History (high-history) ☆☆☆☆☆ 6 jobs");
+  });
+});

package/src/tools/__tests__/wallet.test.ts

@@ -18,6 +18,17 @@ type CardConfig = {
   brand: string;
 } | null;
 
+type LinkConfig = {
+  paymentMethodId: string;
+  label?: string;
+} | null;
+
+type PendingLinkSetup = {
+  verificationUrl: string;
+  phrase: string;
+  createdAt: string;
+} | null;
+
 type WalletToolResult = {
   content: Array<{ type: "text"; text: string }>;
 };
@@ -26,8 +37,11 @@ const state = vi.hoisted(() => ({
   wallets: [] as WalletEntry[],
   addedWallets: [] as WalletEntry[],
   card: null as CardConfig,
+  link: null as LinkConfig,
+  pendingLinkSetup: null as PendingLinkSetup,
   pendingCardSetupToken: null as string | null,
   spendPolicies: {} as Record<string, unknown>,
+  defaultPaymentMethod: undefined as string | undefined,
   consumerPrincipal: "did:pkh:eip155:8453:0xabc",
   owsAvailable: true,
   owsWallets: [] as Array<{ id: string; name: string; address: string }>,
@@ -59,6 +73,12 @@ const state = vi.hoisted(() => ({
     }
     | null,
   setCardConfigCalls: [] as CardConfig[],
+  setLinkConfigCalls: [] as LinkConfig[],
+  setPendingLinkSetupCalls: [] as PendingLinkSetup[],
+  linkAuthenticated: false,
+  linkPaymentMethods: [] as Array<{ id: string; label?: string; searchText?: string }>,
+  linkLoginCalls: 0,
+  linkPaymentMethodAddCalls: 0,
 }));
 
 vi.mock("../../core/config.js", () => ({
@@ -72,6 +92,8 @@ vi.mock("../../core/config.js", () => ({
     }
   },
   getCardConfig: () => state.card,
+  getLinkConfig: () => state.link,
+  getPendingLinkSetup: () => state.pendingLinkSetup,
   getPendingCardSetupToken: () => state.pendingCardSetupToken,
   getSpendPolicy: (walletId: string) => state.spendPolicies[walletId] ?? null,
   getWallets: () => state.wallets,
@@ -79,6 +101,17 @@ vi.mock("../../core/config.js", () => ({
     state.card = card;
     state.setCardConfigCalls.push(card);
   },
+  setDefaultPaymentMethod: (method: string | undefined) => {
+    state.defaultPaymentMethod = method;
+  },
+  setLinkConfig: (link: LinkConfig) => {
+    state.link = link;
+    state.setLinkConfigCalls.push(link);
+  },
+  setPendingLinkSetup: (pending: PendingLinkSetup) => {
+    state.pendingLinkSetup = pending;
+    state.setPendingLinkSetupCalls.push(pending);
+  },
   setSpendPolicy: (walletId: string, policy: unknown) => {
     state.spendPolicies[walletId] = policy;
   },
@@ -101,6 +134,23 @@ vi.mock("../../core/card-setup.js", () => ({
   },
 }));
 
+vi.mock("../../core/link-cli.js", () => ({
+  getLinkCliAuthStatus: async () => ({
+    authenticated: state.linkAuthenticated,
+  }),
+  listLinkPaymentMethods: async () => state.linkPaymentMethods,
+  openLinkPaymentMethodAdd: async () => {
+    state.linkPaymentMethodAddCalls++;
+  },
+  startLinkCliLogin: async () => {
+    state.linkLoginCalls++;
+    return {
+      verificationUrl: "https://app.link.com/device/setup?code=test-link-code",
+      phrase: "test-link-code",
+    };
+  },
+}));
+
 vi.mock("../../core/ows-adapter.js", () => ({
   createOwsWallet: async (name: string, chain: "evm" | "solana") => {
     state.createdWalletCalls.push({ name, chain });
@@ -124,8 +174,11 @@ function resetState(): void {
   state.wallets = [];
   state.addedWallets = [];
   state.card = null;
+  state.link = null;
+  state.pendingLinkSetup = null;
   state.pendingCardSetupToken = null;
   state.spendPolicies = {};
+  state.defaultPaymentMethod = undefined;
   state.consumerPrincipal = "did:pkh:eip155:8453:0xabc";
   state.owsAvailable = true;
   state.owsWallets = [];
@@ -151,6 +204,12 @@ function resetState(): void {
   state.pollCardSetupCalls = [];
   state.pollCardSetupResult = null;
   state.setCardConfigCalls = [];
+  state.setLinkConfigCalls = [];
+  state.setPendingLinkSetupCalls = [];
+  state.linkAuthenticated = false;
+  state.linkPaymentMethods = [];
+  state.linkLoginCalls = 0;
+  state.linkPaymentMethodAddCalls = 0;
 }
 
 async function getWalletSetupTool(): Promise<(args: Record<string, unknown>) => Promise<WalletToolResult>> {
@@ -205,12 +264,52 @@ describe("wallet_setup tool", () => {
         label: "launch-wallet",
       },
     ]);
+    expect(state.defaultPaymentMethod).toBe("base");
     expect(text).toContain("Wallet created [encrypted]:");
     expect(text).toContain("Address: 0x1111111111111111111111111111111111111111");
     expect(text).toContain("Chains: tempo, base");
     expect(text).toContain("Consumer principal: did:pkh:eip155:8453:0xabc");
   });
 
+  it("shows a guided payment setup menu", async () => {
+    const walletSetup = await getWalletSetupTool();
+
+    const result = await walletSetup({ action: "start" });
+    const text = flattenText(result);
+
+    expect(text).toContain("Set up a payment method:");
+    expect(text).toContain("Link card/bank (recommended)");
+    expect(text).toContain('wallet_setup({ action: "add-link" })');
+    expect(text).toContain('wallet_setup({ action: "create", chain: "tempo" })');
+    expect(text).toContain('wallet_setup({ action: "create", chain: "base" })');
+    expect(text).toContain('wallet_setup({ action: "create", chain: "solana" })');
+  });
+
+  it("shows the setup menu when no payment methods are configured", async () => {
+    const tools = new Map<string, (args: Record<string, unknown>) => Promise<WalletToolResult>>();
+    const server = {
+      tool: (
+        name: string,
+        _description: string,
+        _schema: unknown,
+        handler: (args: Record<string, unknown>) => Promise<WalletToolResult>,
+      ) => {
+        tools.set(name, handler);
+      },
+    } as unknown as McpServer;
+
+    const { registerWalletTools } = await import("../wallet.js");
+    registerWalletTools(server);
+    const walletStatus = tools.get("wallet_status");
+    if (!walletStatus) throw new Error("wallet_status tool was not registered");
+
+    const result = await walletStatus({});
+    const text = flattenText(result);
+
+    expect(text).toContain("No payment methods configured.");
+    expect(text).toContain("Link card/bank (recommended)");
+  });
+
   it("imports a wallet into OWS encrypted storage with Base as the default chain", async () => {
     const walletSetup = await getWalletSetupTool();
 
@@ -235,6 +334,7 @@ describe("wallet_setup tool", () => {
         label: "imported-wallet",
       },
     ]);
+    expect(state.defaultPaymentMethod).toBe("base");
     expect(text).toContain("Key imported to OWS [encrypted]:");
     expect(text).toContain("Address: 0x2222222222222222222222222222222222222222");
     expect(text).toContain("Consumer principal: did:pkh:eip155:8453:0xabc");
@@ -287,4 +387,94 @@ describe("wallet_setup tool", () => {
     expect(text).toContain("Removed Visa ****4242.");
     expect(text).toContain("Card disconnected from Agent Wonderland.");
   });
+
+  it("starts Link device auth from wallet_setup", async () => {
+    const walletSetup = await getWalletSetupTool();
+    const result = await walletSetup({ action: "add-link" });
+    const text = flattenText(result);
+
+    expect(state.linkLoginCalls).toBe(1);
+    expect(state.setPendingLinkSetupCalls[0]).toMatchObject({
+      verificationUrl: "https://app.link.com/device/setup?code=test-link-code",
+      phrase: "test-link-code",
+    });
+    expect(text).toContain("Approve Agent Wonderland in Link:");
+    expect(text).toContain("https://app.link.com/device/setup?code=test-link-code");
+    expect(text).toContain("Verification phrase: test-link-code");
+  });
+
+  it("continues a pending Link auth without starting a new login", async () => {
+    state.pendingLinkSetup = {
+      verificationUrl: "https://app.link.com/device/setup?code=existing",
+      phrase: "existing",
+      createdAt: new Date().toISOString(),
+    };
+
+    const walletSetup = await getWalletSetupTool();
+    const result = await walletSetup({ action: "add-link" });
+    const text = flattenText(result);
+
+    expect(state.linkLoginCalls).toBe(0);
+    expect(text).toContain("https://app.link.com/device/setup?code=existing");
+    expect(text).toContain("Verification phrase: existing");
+  });
+
+  it("connects the only Link payment method after auth", async () => {
+    state.linkAuthenticated = true;
+    state.pendingLinkSetup = {
+      verificationUrl: "https://app.link.com/device/setup?code=existing",
+      phrase: "existing",
+      createdAt: new Date().toISOString(),
+    };
+    state.linkPaymentMethods = [
+      { id: "csmrpd_123", label: "Barclays Mastercard ****3688" },
+    ];
+
+    const walletSetup = await getWalletSetupTool();
+    const result = await walletSetup({ action: "add-link" });
+    const text = flattenText(result);
+
+    expect(state.setPendingLinkSetupCalls).toEqual([null]);
+    expect(state.setLinkConfigCalls).toEqual([
+      { paymentMethodId: "csmrpd_123", label: "Barclays Mastercard ****3688" },
+    ]);
+    expect(text).toContain("Link payment method connected.");
+    expect(text).toContain("Barclays Mastercard ****3688");
+  });
+
+  it("shows friendly names when multiple Link payment methods exist", async () => {
+    state.linkAuthenticated = true;
+    state.linkPaymentMethods = [
+      { id: "csmrpd_1", label: "Barclays Arrival Mastercard ****3688" },
+      { id: "csmrpd_2", label: "Total Checking bank ****2889" },
+    ];
+
+    const walletSetup = await getWalletSetupTool();
+    const result = await walletSetup({ action: "add-link" });
+    const text = flattenText(result);
+
+    expect(text).toContain("Barclays Arrival Mastercard ****3688 (csmrpd_1)");
+    expect(text).toContain("Total Checking bank ****2889 (csmrpd_2)");
+    expect(text).toContain('link_payment_method: "<name or last4>"');
+  });
+
+  it("resolves a friendly Link payment method selector", async () => {
+    state.linkAuthenticated = true;
+    state.linkPaymentMethods = [
+      { id: "csmrpd_1", label: "Barclays Arrival Mastercard ****3688", searchText: "csmrpd_1 barclays arrival mastercard 3688" },
+      { id: "csmrpd_2", label: "Total Checking bank ****2889", searchText: "csmrpd_2 total checking bank 2889" },
+    ];
+
+    const walletSetup = await getWalletSetupTool();
+    const result = await walletSetup({
+      action: "add-link",
+      link_payment_method: "3688",
+    });
+    const text = flattenText(result);
+
+    expect(state.setLinkConfigCalls).toEqual([
+      { paymentMethodId: "csmrpd_1", label: "Barclays Arrival Mastercard ****3688" },
+    ]);
+    expect(text).toContain("Barclays Arrival Mastercard ****3688 (csmrpd_1)");
+  });
 });

package/src/tools/passes.ts

@@ -67,7 +67,7 @@ export function registerPassTools(server: McpServer): void {
     {
       agent_id: z.string().describe("Agent ID (UUID, slug, or name)"),
       pack_id: z.string().optional().describe("Specific pack key to buy, like 'starter' or 'growth'. If omitted and only one pack exists, it is selected automatically."),
-      pay_with: z.string().optional().describe("Payment method — wallet ID, chain name, or 'card'. Auto-detected if omitted."),
+      pay_with: z.string().optional().describe("Payment method — wallet ID, chain name, 'link', or 'card'. Auto-detected if omitted."),
       confirmed: z.boolean().optional().describe("Set to true to confirm the purchase after seeing the quote."),
     },
     async ({ agent_id, pack_id, pay_with, confirmed }) => {

package/src/tools/run.ts

@@ -127,7 +127,7 @@ export function registerRunTools(server: McpServer): void {
     {
       agent_id: z.string().describe("Agent ID (UUID, slug, or name)"),
       input: z.record(z.string(), z.unknown()).describe("Input payload for the agent"),
-      pay_with: z.string().trim().min(1).optional().describe("Payment method — wallet ID, chain name (tempo, base, etc.), or 'card'. Auto-detected if omitted."),
+      pay_with: z.string().trim().min(1).optional().describe("Payment method — wallet ID, chain name (tempo, base, solana), 'link', or 'card'. Auto-detected if omitted."),
       confirmed: z.boolean().optional().describe("Set to true to confirm spending after seeing the price quote."),
     },
     async ({ agent_id, input, pay_with, confirmed }) => {

package/src/tools/search.ts

@@ -10,6 +10,27 @@ function text(t: string) {
   return { content: [{ type: "text" as const, text: t }] };
 }
 
+function completedJobs(agent: AgentRecord): number {
+  const stats = agent.stats as { completedJobs?: number } | undefined;
+  return stats?.completedJobs ?? agent.totalExecutions ?? 0;
+}
+
+function averageRating(agent: AgentRecord): number {
+  const stats = agent.stats as { avgRating?: number | null } | undefined;
+  return agent.avgRating ?? stats?.avgRating ?? 0;
+}
+
+function ratingCount(agent: AgentRecord): number {
+  const stats = agent.stats as { ratingCount?: number } | undefined;
+  const topLevel = typeof agent.ratingCount === "number" ? agent.ratingCount : undefined;
+  return topLevel ?? stats?.ratingCount ?? 0;
+}
+
+function price(agent: AgentRecord): number {
+  const parsed = Number.parseFloat(agent.pricePerRunUsd ?? "0");
+  return Number.isFinite(parsed) ? parsed : 0;
+}
+
 export function registerSearchTools(server: McpServer): void {
   server.tool(
     "search_agents",
@@ -71,6 +92,25 @@ export function registerSearchTools(server: McpServer): void {
         });
       }
 
+      // The API enriches list rows with live stats after registry search. Do a
+      // final local sort for stat-based MCP views so displayed jobs/ratings and
+      // result order cannot disagree while registry aggregates catch up.
+      if (sort === "popularity") {
+        agents = [...agents].sort((a, b) =>
+          completedJobs(b) - completedJobs(a) ||
+          ratingCount(b) - ratingCount(a) ||
+          averageRating(b) - averageRating(a),
+        );
+      } else if (sort === "rating") {
+        agents = [...agents].sort((a, b) =>
+          averageRating(b) - averageRating(a) ||
+          ratingCount(b) - ratingCount(a) ||
+          completedJobs(b) - completedJobs(a),
+        );
+      } else if (sort === "price") {
+        agents = [...agents].sort((a, b) => price(a) - price(b));
+      }
+
       // Trim to requested limit after filtering
       agents = agents.slice(0, requestedLimit);
 

package/src/tools/solve.ts

@@ -159,7 +159,7 @@ export function registerSolveTools(server: McpServer): void {
         .trim()
         .min(1)
         .optional()
-        .describe("Payment method — wallet ID, chain name (tempo, base, etc.), or 'card'. Auto-detected if omitted."),
+        .describe("Payment method — wallet ID, chain name (tempo, base, solana), 'link', or 'card'. Auto-detected if omitted."),
       confirmed: z
         .boolean()
         .optional()