@agentwonderland/mcp 0.1.54 → 0.1.55

package/dist/tools/playbooks.js

@@ -1,11 +1,11 @@
 import { z } from "zod";
-import { apiGet, apiPost, apiPostWithPayment } from "../core/api-client.js";
+import { apiGet, apiPost, apiPostWithApprovedLinkSpendRequest, apiPostWithPayment } from "../core/api-client.js";
 import { uploadLocalFiles } from "../core/file-upload.js";
 import { hasWalletConfigured, getConfiguredMethods, getWalletAddress } from "../core/payments.js";
-import { requiresSpendConfirmation } from "../core/config.js";
+import { getLinkConfig, setPendingLinkSpendRequest, requiresSpendConfirmation } from "../core/config.js";
 import { canSpend, recordSpend, requiresPolicyConfirmation } from "../core/spend-policy.js";
 import { formatRunResult } from "../core/formatters.js";
-import { storeFeedbackToken } from "./_token-cache.js";
+import { decodeMppNetworkId, ensureApprovedLinkSpendRequest, LinkApprovalRequiredError, } from "../core/link-cli.js";
 import { formatPaymentLabel, resolveConfirmationMethod, } from "./_payment-confirmation.js";
 const POLL_INTERVAL_MS = 3000;
 const POLL_MAX_MS = 300000;
@@ -19,6 +19,25 @@ function multiText(...blocks) {
 function money(value) {
     return `$${value.toFixed(value < 1 ? 4 : 2)}`;
 }
+function cents(valueUsd) {
+    return String(Math.max(1, Math.ceil(valueUsd * 100)));
+}
+function nonEmptyLimits(limits) {
+    return limits && Object.keys(limits).length > 0 ? limits : undefined;
+}
+function appliedPlaybookLimits(playbook) {
+    return nonEmptyLimits(playbook.current_quote.applied_limits ?? playbook.applied_limits ?? playbook.default_limits);
+}
+function fanoutControls(playbook) {
+    return playbook.current_quote.fanout_controls ?? playbook.fanout_controls ?? [];
+}
+function buildPlaybookLinkApprovalContext(params) {
+    return [
+        `Approve up to ${money(params.budget)} for the Agent Wonderland "${params.playbook.name}" playbook.`,
+        `This playbook run ${params.runId} has ${params.stepCount} child-agent steps and will stop before exceeding the approved budget.`,
+        "Each child agent is still charged at its exact quoted price, unused budget is not spent, and failed child runs keep the existing Agent Wonderland refund behavior.",
+    ].join(" ");
+}
 async function collectWalletAddresses(paymentMethod) {
     const addresses = new Set();
     const primary = await getWalletAddress(paymentMethod);
@@ -65,10 +84,12 @@ function formatPlaybookList(playbooks, query) {
     }
     const lines = playbooks.map((playbook) => {
         const support = playbook.support_status === "supported" ? "supported" : `catalog-only: ${playbook.support_note ?? "not launch executable"}`;
+        const limits = appliedPlaybookLimits(playbook);
+        const fanout = limits ? ` · default limits ${JSON.stringify(limits)}` : "";
         return [
             `  ${playbook.name} (${playbook.slug})`,
             `    ${playbook.outcome}`,
-            `    ${playbook.current_quote.step_count} step${playbook.current_quote.step_count === 1 ? "" : "s"} · ${money(playbook.current_quote.estimated_cost_usd)} est. · ${support}`,
+            `    ${playbook.current_quote.step_count} step${playbook.current_quote.step_count === 1 ? "" : "s"} · ${money(playbook.current_quote.estimated_cost_usd)} est. · ${support}${fanout}`,
             `    Favorites: ${playbook.stats?.favorite_count ?? 0} · Rating: ${playbook.stats?.average_rating ? `${playbook.stats.average_rating}/5` : "unrated"} (${playbook.stats?.rating_count ?? 0})`,
             `    Inspect: get_playbook({ slug: "${playbook.slug}" })`,
         ].join("\n");
@@ -108,9 +129,21 @@ function formatPlaybook(playbook) {
     }
     if (playbook.budget_notes.length)
         lines.push("", "Budget notes:", ...playbook.budget_notes.map((note) => `  - ${note}`));
+    const limits = appliedPlaybookLimits(playbook);
+    const controls = fanoutControls(playbook);
+    if (controls.length) {
+        lines.push("", "Fanout controls:");
+        for (const control of controls) {
+            const current = limits?.[control.key] ?? control.default;
+            lines.push(`  - ${control.key}: default ${control.default}, current ${current}, max ${control.max} — ${control.description}`);
+        }
+        if (limits)
+            lines.push(`  Override by passing limits, for example limits: ${JSON.stringify(limits)}`);
+    }
     if (playbook.risks.length)
         lines.push("", "Risks:", ...playbook.risks.map((risk) => `  - ${risk}`));
-    lines.push("", "Sample input:", JSON.stringify(playbook.sample_input, null, 2), "", `Run quote: run_playbook({ slug: "${playbook.slug}", input: <input>, budget: ${Math.max(1, Math.ceil(q.estimated_cost_usd + 1))} })`);
+    const runLimits = formatLimitsField(limits);
+    lines.push("", "Sample input:", JSON.stringify(playbook.sample_input, null, 2), "", `Run quote: run_playbook({ slug: "${playbook.slug}", input: <input>, budget: ${Math.max(1, Math.ceil(q.estimated_cost_usd + 1))}${runLimits ? `, ${runLimits}` : ""} })`);
     return lines.join("\n");
 }
 function formatLimitsField(limits) {
@@ -131,6 +164,18 @@ function formatRunConfirmationCommand(slug, method, budget, limits) {
 }
 function formatQuoteNotes(playbook) {
     const lines = [];
+    const controls = fanoutControls(playbook);
+    if (controls.length > 0) {
+        const limits = appliedPlaybookLimits(playbook) ?? {};
+        lines.push("", "Fanout controls:");
+        for (const control of controls) {
+            const current = limits[control.key] ?? control.default;
+            lines.push(`  - ${control.key}: current ${current}, default ${control.default}, max ${control.max}`);
+        }
+        if (Object.keys(limits).length > 0) {
+            lines.push(`  Override by editing limits in the confirmation call: ${JSON.stringify(limits)}`);
+        }
+    }
     if (playbook.budget_notes.length > 0) {
         lines.push("", "Budget and fanout notes:", ...playbook.budget_notes.map((note) => `  - ${note}`));
     }
@@ -223,6 +268,39 @@ function stepInput(baseInput, step, iteration) {
     if (step.agent_slug === "scan-contract-for-risks" && !("file" in input) && input.contract) {
         input.file = input.contract;
     }
+    if (step.agent_slug === "marketing-copy-council" && !("brief" in input)) {
+        input.brief = input.product ?? input.context ?? input.text;
+    }
+    if (step.agent_slug === "write-landing-page-copy") {
+        const previousOutputs = Array.isArray(input.previous_outputs) ? input.previous_outputs : [];
+        const councilOutput = previousOutputs.find((item) => {
+            const record = item && typeof item === "object" ? item : null;
+            return record?.step === "council" || record?.step === "marketing-copy-council";
+        }) ?? previousOutputs[previousOutputs.length - 1];
+        const context = {
+            brief: input.brief,
+            product_slug: input.product_slug,
+            council_output: councilOutput,
+            previous_outputs: previousOutputs,
+        };
+        input.product = input.product ?? input.product_name ?? input.product_slug ?? "Landing page";
+        input.context = input.context ?? JSON.stringify(context);
+    }
+    if (step.agent_slug === "publish-html-to-a-public-url") {
+        const previousOutputs = Array.isArray(input.previous_outputs) ? input.previous_outputs : [];
+        const writerOutput = previousOutputs[previousOutputs.length - 1];
+        const outputRecord = writerOutput && typeof writerOutput === "object"
+            ? writerOutput
+            : null;
+        const output = outputRecord?.output && typeof outputRecord.output === "object"
+            ? outputRecord.output
+            : outputRecord?.output;
+        input.html = input.html
+            ?? (output && typeof output === "object" ? output.html : undefined)
+            ?? (typeof output === "string" ? output : undefined)
+            ?? JSON.stringify(output ?? writerOutput ?? {});
+        input.slug = input.slug ?? input.product_slug;
+    }
     if (step.agent_slug === "place-search") {
         input.location = input.location ?? input.zip;
     }
@@ -499,7 +577,9 @@ export function registerPlaybookTools(server) {
                     budget: effectiveBudget,
                     limits: effectiveLimits,
                 });
-                playbook = quoted.playbook;
+                if (quoted?.playbook) {
+                    playbook = quoted.playbook;
+                }
             }
             catch {
                 // Quote analytics should not block the user-facing quote.
@@ -511,12 +591,13 @@ export function registerPlaybookTools(server) {
         if (playbook.current_quote.blocking_issues.length > 0) {
             return text(`Cannot run ${playbook.slug}; child-agent issues must be fixed first:\n${playbook.current_quote.blocking_issues.map((issue) => `- ${issue}`).join("\n")}`);
         }
+        const runLimits = appliedPlaybookLimits(playbook) ?? effectiveLimits;
         const estimatedCost = playbook.current_quote.estimated_cost_usd;
         const spendCheck = canSpend({ method: spendMethod, amountUsd: Math.min(effectiveBudget, estimatedCost) });
         if (!spendCheck.ok)
             return text(spendCheck.message);
         if (estimatedCost > effectiveBudget) {
-            pendingPlaybookRuns.set(playbook.slug, { playbook, input: effectiveInput, budget: effectiveBudget, method, limits: effectiveLimits });
+            pendingPlaybookRuns.set(playbook.slug, { playbook, input: effectiveInput, budget: effectiveBudget, method, limits: runLimits });
             const cheaperAlternatives = await formatCheaperAlternatives(playbook.slug, effectiveBudget);
             return text([
                 `${playbook.name} quote exceeds the budget.`,
@@ -528,11 +609,11 @@ export function registerPlaybookTools(server) {
                 ...(cheaperAlternatives ? ["", cheaperAlternatives] : []),
                 "",
                 `Try a higher budget or reduced limits, then call:`,
-                formatRunConfirmationCommand(playbook.slug, method, Math.ceil(estimatedCost + 1), effectiveLimits),
+                formatRunConfirmationCommand(playbook.slug, method, Math.ceil(estimatedCost + 1), runLimits),
             ].join("\n"));
         }
         if ((requiresSpendConfirmation() || requiresPolicyConfirmation(spendMethod, estimatedCost)) && !confirmed) {
-            pendingPlaybookRuns.set(playbook.slug, { playbook, input: effectiveInput, budget: effectiveBudget, method, limits: effectiveLimits });
+            pendingPlaybookRuns.set(playbook.slug, { playbook, input: effectiveInput, budget: effectiveBudget, method, limits: runLimits });
             return text([
                 `Ready to run ${playbook.name}`,
                 "",
@@ -548,7 +629,7 @@ export function registerPlaybookTools(server) {
                 ...formatQuoteNotes(playbook),
                 "",
                 "To proceed, call:",
-                formatRunConfirmationCommand(playbook.slug, method, effectiveBudget, effectiveLimits),
+                formatRunConfirmationCommand(playbook.slug, method, effectiveBudget, runLimits),
                 "",
                 "To cancel, do nothing.",
             ].join("\n"));
@@ -594,7 +675,7 @@ export function registerPlaybookTools(server) {
                     slug: playbook.slug,
                     input: processedInput,
                     budget: effectiveBudget,
-                    limits: effectiveLimits,
+                    limits: runLimits,
                 }),
                 completedStepIds: new Set(),
                 existingOutputs: [],
@@ -603,6 +684,14 @@ export function registerPlaybookTools(server) {
         await apiPost(`/playbook-runs/${runState.run_id}/status`, { status: "running" });
         let charged = runState.chargedUsd;
         const childOutputs = [...runState.existingOutputs];
+        let linkSpendRequestId;
+        let linkNetworkId;
+        const linkApprovalContext = buildPlaybookLinkApprovalContext({
+            playbook,
+            budget: effectiveBudget,
+            stepCount: playbook.current_quote.step_count,
+            runId: runState.run_id,
+        });
         for (const [iteration, step] of runState.steps.entries()) {
             if (runState.completedStepIds.has(step.id)) {
                 continue;
@@ -650,24 +739,62 @@ export function registerPlaybookTools(server) {
             let schemaError;
             let usedPaidMethod = false;
             const executeChild = async (childInput) => {
+                const body = { input: childInput, playbook_context: playbookContext };
                 try {
-                    return await apiPost(`/agents/${step.agent_id}/run`, { input: childInput, playbook_context: playbookContext }, { ensureConsumerPrincipal: true });
+                    return await apiPost(`/agents/${step.agent_id}/run`, body, { ensureConsumerPrincipal: true });
                 }
                 catch (err) {
                     const status = err?.status;
                     if (status !== 402)
                         throw err;
                     usedPaidMethod = true;
-                    return await apiPostWithPayment(`/agents/${step.agent_id}/run`, { input: childInput, playbook_context: playbookContext }, method);
+                    if ((method ?? spendMethod) === "link") {
+                        const linkConfig = getLinkConfig();
+                        if (!linkConfig) {
+                            throw new Error('Payment method "link" is not configured. Run wallet_setup({ action: "add-link" }).');
+                        }
+                        const challenge = err?.headers?.get("www-authenticate");
+                        if (!challenge && !linkNetworkId) {
+                            throw new Error("Link payment challenge did not include a WWW-Authenticate header.");
+                        }
+                        linkNetworkId = linkNetworkId ?? await decodeMppNetworkId(challenge);
+                        linkSpendRequestId = linkSpendRequestId ?? await ensureApprovedLinkSpendRequest({
+                            amount: cents(effectiveBudget),
+                            currency: "usd",
+                            context: linkApprovalContext,
+                            expiresAt: Math.floor(Date.now() / 1000) + 3600,
+                            networkId: linkNetworkId,
+                            paymentMethodId: linkConfig.paymentMethodId,
+                        });
+                        return await apiPostWithApprovedLinkSpendRequest(`/agents/${step.agent_id}/run`, body, linkSpendRequestId);
+                    }
+                    return await apiPostWithPayment(`/agents/${step.agent_id}/run`, body, method);
                 }
             };
             try {
                 result = await executeChild(payload);
             }
             catch (err) {
+                if (err instanceof LinkApprovalRequiredError) {
+                    await recordStep(runState.run_id, step.id, {
+                        status: "pending",
+                        agent_id: step.agent_id,
+                        provider_id: step.provider_id,
+                        consumption_mode: "not_charged",
+                        error_code: null,
+                        failure_message: null,
+                    });
+                    await updateRun(runState.run_id, {
+                        status: "paused",
+                        error_code: "LINK_APPROVAL_REQUIRED",
+                        failure_message: "Approve the Link spend request, then resume the playbook run.",
+                    });
+                    const receipt = await apiGet(`/playbook-runs/${runState.run_id}`);
+                    return text(`${formatReceipt(receipt)}\n\n${err.message}`);
+                }
                 const apiErr = err;
-                const validationFailed = apiErr?.status === 400
-                    && /missing required field|validation failed|invalid input|schema/i.test(apiErr.message ?? "");
+                const validationFailed = (apiErr?.status === 400 || apiErr?.status === 422)
+                    && /missing required field|validation failed|invalid input|schema|provide at least one/i.test(apiErr.message ?? "");
                 if (validationFailed) {
                     try {
                         const agent = await apiGet(`/agents/${step.agent_id}`);
@@ -729,13 +856,9 @@ export function registerPlaybookTools(server) {
                 return text(`${formatReceipt(receipt)}\n\nTried the live child schema but could not safely repair the input. Use get_agent({ agent_id: "${step.agent_id}" }) to inspect the child agent schema before retrying.`);
             }
             const jobId = result.job_id ?? "";
-            const resultAgentId = result.agent_id ?? step.agent_id;
             const status = result.status;
             let output = result.output;
             let errorCode = result.error_code;
-            if (result.feedback_token && jobId) {
-                storeFeedbackToken(jobId, result.feedback_token, resultAgentId);
-            }
             if (status === "processing" && jobId) {
                 const pollResult = await pollJobUntilDone(jobId, method);
                 output = pollResult.output;
@@ -834,10 +957,13 @@ export function registerPlaybookTools(server) {
         });
         const receipt = await apiGet(`/playbook-runs/${runState.run_id}`);
         pendingPlaybookRuns.delete(playbook.slug);
+        if ((method ?? spendMethod) === "link" && linkSpendRequestId) {
+            setPendingLinkSpendRequest(null);
+        }
         const runBlocks = childOutputs.length > 0
             ? childOutputs.map((item) => item.output ? formatRunResult({ status: "success", job_id: item.job_id, output: item.output }, { paymentMethod: method }) : "").filter(Boolean)
             : [];
-        return multiText(uploadSummary ? `${uploadSummary}\n\n${formatReceipt(receipt)}` : formatReceipt(receipt), ...runBlocks, `IMPORTANT: After presenting the result above, you MUST ask the user: "Paid ${money(receipt.charged_usd)} across ${receipt.steps.filter((s) => s.status === "succeeded").length} steps. Was this playbook useful? I can save it with favorite_playbook({ slug: "${playbook.slug}" }) or record feedback with rate_playbook({ slug: "${playbook.slug}", run_id: "${receipt.run_id}", rating: <1-5>, useful: true, comment: "..." })."`);
+        return multiText(uploadSummary ? `${uploadSummary}\n\n${formatReceipt(receipt)}` : formatReceipt(receipt), ...runBlocks);
     });
     server.tool("favorite_playbook", "Save an Agent Wonderland Playbook for later. Favorites are associated with the configured consumer principal when available.", {
         playbook_id: z.string().optional(),
@@ -849,28 +975,6 @@ export function registerPlaybookTools(server) {
         const result = await apiPost(`/playbooks/${encodeURIComponent(id)}/favorite`, {}, { ensureConsumerPrincipal: true });
         return text(`Saved ${result.playbook_slug} to favorites.`);
     });
-    server.tool("rate_playbook", "Record feedback on an Agent Wonderland Playbook after a run. Provide a rating, useful flag, comment, or any combination.", {
-        playbook_id: z.string().optional(),
-        slug: z.string().optional(),
-        run_id: z.string().optional(),
-        rating: z.number().int().min(1).max(5).optional(),
-        useful: z.boolean().optional(),
-        comment: z.string().max(2000).optional(),
-    }, async ({ playbook_id, slug, run_id, rating, useful, comment }) => {
-        const id = slug ?? playbook_id;
-        if (!id)
-            return text("Provide slug or playbook_id.");
-        if (rating == null && useful == null && !comment?.trim()) {
-            return text("Provide rating, useful, or comment.");
-        }
-        const result = await apiPost(`/playbooks/${encodeURIComponent(id)}/feedback`, {
-            run_id,
-            rating,
-            useful,
-            comment,
-        }, { ensureConsumerPrincipal: true });
-        return text(`Recorded feedback for ${result.playbook_slug}.`);
-    });
     server.tool("get_playbook_run", "Inspect current or historical Agent Wonderland Playbook run state, including completed steps, charged/refunded amount, partial output, and resume command when paused.", {
         run_id: z.string(),
     }, async ({ run_id }) => {

package/package.json

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

package/src/core/__tests__/api-client.test.ts

@@ -10,6 +10,7 @@ const {
   mockGetConsumerPrincipalForMethod,
   mockGetBaseRebatePrincipal,
   mockPaymentFetch,
+  mockPayMppWithApprovedLinkSpendRequest,
 } = vi.hoisted(() => ({
   mockGetApiUrl: vi.fn(),
   mockGetApiKey: vi.fn(),
@@ -19,6 +20,7 @@ const {
   mockGetConsumerPrincipalForMethod: vi.fn(),
   mockGetBaseRebatePrincipal: vi.fn(),
   mockPaymentFetch: vi.fn(),
+  mockPayMppWithApprovedLinkSpendRequest: vi.fn(),
 }));
 
 vi.mock("../config.js", () => ({
@@ -39,6 +41,10 @@ vi.mock("../principal.js", () => ({
   getBaseRebatePrincipal: (...args: unknown[]) => mockGetBaseRebatePrincipal(...args),
 }));
 
+vi.mock("../link-cli.js", () => ({
+  payMppWithApprovedLinkSpendRequest: (...args: unknown[]) => mockPayMppWithApprovedLinkSpendRequest(...args),
+}));
+
 describe("api-client headers", () => {
   beforeEach(() => {
     vi.clearAllMocks();
@@ -61,6 +67,7 @@ describe("api-client headers", () => {
       status: 200,
       headers: { "content-type": "application/json" },
     }));
+    mockPayMppWithApprovedLinkSpendRequest.mockResolvedValue({ ok: true });
   });
 
   it("includes the Base rebate principal alongside the method-specific consumer principal", async () => {
@@ -130,4 +137,30 @@ describe("api-client headers", () => {
     expect(calls[8]).toMatchObject({ url: "/playbook-runs/run-1", headers: { "X-AW-MCP-Tool": "run_playbook", "X-AW-MCP-Action": "poll" } });
     expect(calls[9]).toMatchObject({ url: "/playbook-runs/run-1/steps/ads", headers: { "X-AW-MCP-Tool": "run_playbook", "X-AW-MCP-Action": "execute" } });
   });
+
+  it("uses Link MPP pay with run-agent headers for an approved spend request", async () => {
+    const { apiPostWithApprovedLinkSpendRequest } = await import("../api-client.js");
+
+    await apiPostWithApprovedLinkSpendRequest(
+      "/agents/agent-1/run",
+      { input: { text: "hello" } },
+      "lsrq_test_123",
+    );
+
+    expect(mockPayMppWithApprovedLinkSpendRequest).toHaveBeenCalledWith(expect.objectContaining({
+      url: "https://api.agentwonderland.test/agents/agent-1/run",
+      method: "POST",
+      body: { input: { text: "hello" } },
+      spendRequestId: "lsrq_test_123",
+      headers: expect.objectContaining({
+        "Content-Type": "application/json",
+        Accept: "application/json",
+        "X-AW-Surface": "mcp",
+        "X-AW-MCP-Version": MCP_PACKAGE_VERSION,
+        "X-AW-MCP-Tool": "run_agent",
+        "X-AW-MCP-Action": "execute",
+      }),
+    }));
+    expect(mockEnsureConsumerPrincipalForMethod).toHaveBeenCalledWith("link");
+  });
 });

package/src/core/__tests__/link-cli.test.ts

@@ -122,4 +122,114 @@ describe("Link CLI spend requests", () => {
     expect(execCalls[0]?.args).toEqual(expect.arrayContaining(["spend-request", "retrieve", "lsrq_test_123"]));
     expect(state.pendingWrites).toEqual([null]);
   });
+
+  it("reuses an approved spend request id for playbook MPP payments", async () => {
+    const expiresAt = Math.floor(Date.now() / 1000) + 300;
+    state.pending = {
+      id: "lsrq_test_123",
+      approvalUrl: "https://link.example/approve/lsrq_test_123",
+      amount: "500",
+      currency: "usd",
+      context: "Agent Wonderland playbook test context that is long enough for Link",
+      expiresAt,
+      networkId: "profile_test",
+      paymentMethodId: "csmrpd_test_123",
+      createdAt: new Date().toISOString(),
+    };
+    outputs.push({ id: "lsrq_test_123", status: "approved" });
+
+    const { ensureApprovedLinkSpendRequest } = await import("../link-cli.js");
+
+    await expect(ensureApprovedLinkSpendRequest({
+      amount: "500",
+      currency: "usd",
+      context: "Agent Wonderland playbook test context that is long enough for Link",
+      expiresAt,
+      networkId: "profile_test",
+      paymentMethodId: "csmrpd_test_123",
+    })).resolves.toBe("lsrq_test_123");
+
+    expect(execCalls).toHaveLength(1);
+    expect(execCalls[0]?.args).toEqual(expect.arrayContaining(["spend-request", "retrieve", "lsrq_test_123"]));
+    expect(state.pendingWrites).toEqual([]);
+  });
+
+  it("pauses when the reusable Link spend request is still pending approval", async () => {
+    const expiresAt = Math.floor(Date.now() / 1000) + 300;
+    state.pending = {
+      id: "lsrq_test_123",
+      approvalUrl: "https://link.example/approve/lsrq_test_123",
+      amount: "500",
+      currency: "usd",
+      context: "Agent Wonderland playbook test context that is long enough for Link",
+      expiresAt,
+      networkId: "profile_test",
+      paymentMethodId: "csmrpd_test_123",
+      createdAt: new Date().toISOString(),
+    };
+    outputs.push({ id: "lsrq_test_123", status: "pending_approval" });
+
+    const { ensureApprovedLinkSpendRequest, LinkApprovalRequiredError } = await import("../link-cli.js");
+
+    await expect(ensureApprovedLinkSpendRequest({
+      amount: "500",
+      currency: "usd",
+      context: "Agent Wonderland playbook test context that is long enough for Link",
+      expiresAt,
+      networkId: "profile_test",
+      paymentMethodId: "csmrpd_test_123",
+    })).rejects.toBeInstanceOf(LinkApprovalRequiredError);
+
+    expect(execCalls).toHaveLength(1);
+    expect(state.pendingWrites).toEqual([]);
+  });
+
+  it("runs Link MPP pay with an approved spend request and returns the response body", async () => {
+    outputs.push({
+      response: {
+        body: {
+          status: "success",
+          job_id: "job_123",
+        },
+      },
+    });
+
+    const { payMppWithApprovedLinkSpendRequest } = await import("../link-cli.js");
+
+    await expect(payMppWithApprovedLinkSpendRequest({
+      url: "https://api.agentwonderland.test/agents/agent-1/run",
+      method: "POST",
+      headers: {
+        Accept: "application/json",
+        "Content-Type": "application/json",
+      },
+      body: { input: { text: "hello" } },
+      spendRequestId: "lsrq_test_123",
+    })).resolves.toEqual({
+      status: "success",
+      job_id: "job_123",
+    });
+
+    expect(execCalls[0]?.args).toEqual(expect.arrayContaining([
+      "mpp",
+      "pay",
+      "https://api.agentwonderland.test/agents/agent-1/run",
+      "--spend-request-id",
+      "lsrq_test_123",
+      "--method",
+      "POST",
+      "--data",
+      JSON.stringify({ input: { text: "hello" } }),
+    ]));
+    expect(execCalls[0]?.args).toContain("Accept: application/json");
+  });
+
+  it("decodes the MPP network id from a payment challenge", async () => {
+    outputs.push({ accepts: [{ network_id: "profile_test" }] });
+
+    const { decodeMppNetworkId } = await import("../link-cli.js");
+
+    await expect(decodeMppNetworkId("Payment challenge")).resolves.toBe("profile_test");
+    expect(execCalls[0]?.args).toEqual(expect.arrayContaining(["mpp", "decode", "--challenge", "Payment challenge"]));
+  });
 });

package/src/core/api-client.ts

@@ -8,6 +8,7 @@ import {
   getConsumerPrincipalForMethod,
 } from "./principal.js";
 import { MCP_PACKAGE_VERSION } from "./version.js";
+import { payMppWithApprovedLinkSpendRequest } from "./link-cli.js";
 
 // ── Error class ────────────────────────────────────────────────────
 
@@ -16,6 +17,7 @@ export class ApiError extends Error {
     public readonly status: number,
     message: string,
     public readonly body?: unknown,
+    public readonly headers?: Headers,
   ) {
     super(message);
     this.name = "ApiError";
@@ -121,7 +123,7 @@ async function handleResponse<T>(response: Response): Promise<T> {
         : typeof body === "string"
           ? body
           : `Request failed with status ${response.status}`;
-    throw new ApiError(response.status, message, body);
+    throw new ApiError(response.status, message, body, response.headers);
   }
 
   return body as T;
@@ -205,6 +207,28 @@ export async function apiPostWithPayment<T>(
   return attachResponseMetadata(result, response);
 }
 
+export async function apiPostWithApprovedLinkSpendRequest<T>(
+  path: string,
+  body: unknown,
+  spendRequestId: string,
+  options?: RequestOptions,
+): Promise<T> {
+  const url = `${getApiUrl()}${path}`;
+  const headers = await buildHeaders(path, "POST", {
+    ensureConsumerPrincipal: true,
+    principalMethod: "link",
+    ...options,
+  });
+  const result = await payMppWithApprovedLinkSpendRequest({
+    url,
+    method: "POST",
+    headers,
+    body,
+    spendRequestId,
+  });
+  return result as T;
+}
+
 export async function apiPut<T>(path: string, body: unknown, options?: RequestOptions): Promise<T> {
   const url = `${getApiUrl()}${path}`;
   const response = await fetch(url, {