@caravo/mcp 0.1.24 → 0.1.26

package/dist/index.js

@@ -169,7 +169,17 @@ function baseHeaders() {
 }
 async function apiGet(path) {
     const r = await fetch(`${API_BASE}${path}`, { headers: baseHeaders() });
-    return r.json();
+    return safeParseJson(r);
+}
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+async function safeParseJson(r) {
+    try {
+        return await r.json();
+    }
+    catch {
+        const text = await r.text().catch(() => "");
+        return { error: `Non-JSON response (${r.status}): ${text.slice(0, 200)}` };
+    }
 }
 async function apiPost(path, body) {
     const url = `${API_BASE}${path}`;
@@ -179,18 +189,18 @@ async function apiPost(path, body) {
         body: JSON.stringify(body),
     };
     if (!API_KEY)
-        return (await fetchWithX402(url, opts, wallet)).json();
+        return safeParseJson(await fetchWithX402(url, opts, wallet));
     const r = await fetch(url, opts);
     if (r.status === 401 || r.status === 403 || r.status === 402) {
         process.stderr.write(`[caravo] API key request failed (${r.status}), falling back to x402\n`);
         const x402Opts = {
             method: "POST",
-            headers: { "Content-Type": "application/json" },
+            headers: baseHeaders(), // Keep Authorization for user attribution on x402 fallback
             body: JSON.stringify(body),
         };
-        return (await fetchWithX402(url, x402Opts, wallet)).json();
+        return safeParseJson(await fetchWithX402(url, x402Opts, wallet));
     }
-    return r.json();
+    return safeParseJson(r);
 }
 async function apiDelete(path, body) {
     const url = `${API_BASE}${path}`;
@@ -199,7 +209,15 @@ async function apiDelete(path, body) {
         headers: baseHeaders(),
         body: JSON.stringify(body),
     });
-    return r.json();
+    return safeParseJson(r);
+}
+const MAX_JSON_OUTPUT_CHARS = 20_000;
+function safeJsonText(data, indent = true) {
+    const json = indent ? JSON.stringify(data, null, 2) : JSON.stringify(data);
+    if (json.length > MAX_JSON_OUTPUT_CHARS) {
+        return json.slice(0, MAX_JSON_OUTPUT_CHARS) + `\n... (truncated, ${json.length} chars total)`;
+    }
+    return json;
 }
 // ─── Input validation helpers ─────────────────────────────────────────────────
 /** Validate tool_id format: only allow safe chars, no path traversal. */
@@ -271,9 +289,7 @@ function formatOutput(output) {
     }
     // JSON
     if (output.json !== undefined) {
-        const jsonStr = JSON.stringify(output.json, null, 2);
-        // Truncate large JSON to avoid context overload
-        lines.push(jsonStr.length > 4000 ? jsonStr.slice(0, 4000) + "\n... (truncated)" : jsonStr);
+        lines.push(safeJsonText(output.json));
     }
     return lines;
 }
@@ -354,7 +370,7 @@ function makeFavToolHandler(tool) {
             }
             return {
                 content: [
-                    { type: "text", text: `Error: ${JSON.stringify(result)}` },
+                    { type: "text", text: `Error: ${safeJsonText(result, false)}` },
                 ],
                 isError: true,
             };
@@ -495,26 +511,34 @@ function registerAllTools(server) {
         if (per_page > 100) {
             return { content: [{ type: "text", text: "Error: per_page must be at most 100" }], isError: true };
         }
-        const params = new URLSearchParams();
-        if (query)
-            params.set("query", query);
-        if (tag)
-            params.set("tag", tag);
-        if (provider)
-            params.set("provider", provider);
-        if (pricing_type)
-            params.set("pricing_type", pricing_type);
-        params.set("page", String(page));
-        params.set("per_page", String(per_page));
-        params.set("view", "agent");
-        const data = await apiGet(`/api/tools?${params}`);
-        let text = JSON.stringify(data, null, 2);
-        if (pendingUpdate) {
-            text += `\n\n[Update available: @caravo/mcp ${pendingUpdate.current} → ${pendingUpdate.latest}. Will auto-update on next MCP restart.]`;
+        try {
+            const params = new URLSearchParams();
+            if (query)
+                params.set("query", query);
+            if (tag)
+                params.set("tag", tag);
+            if (provider)
+                params.set("provider", provider);
+            if (pricing_type)
+                params.set("pricing_type", pricing_type);
+            params.set("page", String(page));
+            params.set("per_page", String(per_page));
+            params.set("view", "agent");
+            const data = await apiGet(`/api/tools?${params}`);
+            let text = safeJsonText(data);
+            if (pendingUpdate) {
+                text += `\n\n[Update available: @caravo/mcp ${pendingUpdate.current} → ${pendingUpdate.latest}. Will auto-update on next MCP restart.]`;
+            }
+            return {
+                content: [{ type: "text", text }],
+            };
+        }
+        catch (err) {
+            return {
+                content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }],
+                isError: true,
+            };
         }
-        return {
-            content: [{ type: "text", text }],
-        };
     });
     // ── Get tool info ────────────────────────────────────────────────────────────
     server.registerTool("get_tool_info", {
@@ -530,10 +554,18 @@ function registerAllTools(server) {
                 isError: true,
             };
         }
-        const data = await apiGet(`/api/tools/${tool_id.trim()}`);
-        return {
-            content: [{ type: "text", text: JSON.stringify(data, null, 2) }],
-        };
+        try {
+            const data = await apiGet(`/api/tools/${tool_id.trim()}`);
+            return {
+                content: [{ type: "text", text: safeJsonText(data) }],
+            };
+        }
+        catch (err) {
+            return {
+                content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }],
+                isError: true,
+            };
+        }
     });
     // ── use_tool (meta-tool) ─────────────────────────────────────────────────────
     server.registerTool("use_tool", {
@@ -586,7 +618,7 @@ function registerAllTools(server) {
             }
             return {
                 content: [
-                    { type: "text", text: `Error: ${JSON.stringify(result)}` },
+                    { type: "text", text: `Error: ${safeJsonText(result, false)}` },
                 ],
                 isError: true,
             };
@@ -628,82 +660,90 @@ function registerAllTools(server) {
                 isError: true,
             };
         }
-        // Upvote mode
-        if (upvote_review_id) {
-            if (!execution_id) {
+        try {
+            // Upvote mode
+            if (upvote_review_id) {
+                if (!execution_id) {
+                    return {
+                        content: [{ type: "text", text: "Error: execution_id is required for upvoting. Each upvote consumes one tool execution." }],
+                        isError: true,
+                    };
+                }
+                const result = await apiPost(`/api/reviews/upvote`, {
+                    review_id: upvote_review_id,
+                    execution_id,
+                });
+                if (result.success) {
+                    const action = result.action === "already_upvoted" ? "Already upvoted" : "Upvoted";
+                    const upvotedToolId = result.tool_id || "";
+                    const lines = [`✓ ${action} review ${upvote_review_id}`];
+                    // Suggest favorite only when upvoting a 5-star review
+                    if (result.rating === 5 && upvotedToolId) {
+                        if (API_KEY && !registeredFavTools.has(upvotedToolId)) {
+                            lines.push(`This was a 5/5 review — consider favorite_tool(tool_id="${upvotedToolId}") if you plan to reuse it.`);
+                        }
+                        else if (!API_KEY) {
+                            lines.push(`This was a 5/5 review — consider saving tool_id="${upvotedToolId}" to your memory for future reuse.`);
+                        }
+                    }
+                    return { content: [{ type: "text", text: lines.join("\n") }] };
+                }
+                return {
+                    content: [{ type: "text", text: result.error ? `Error: ${result.error}` : safeJsonText(result) }],
+                    isError: true,
+                };
+            }
+            // New review mode
+            if (rating == null || !comment) {
+                return {
+                    content: [
+                        {
+                            type: "text",
+                            text: "Error: rating and comment are required for new reviews. To upvote an existing review, use upvote_review_id instead.",
+                        },
+                    ],
+                    isError: true,
+                };
+            }
+            if (rating < 1 || rating > 5) {
                 return {
-                    content: [{ type: "text", text: "Error: execution_id is required for upvoting. Each upvote consumes one tool execution." }],
+                    content: [{ type: "text", text: "Error: rating must be between 1 and 5" }],
                     isError: true,
                 };
             }
-            const result = await apiPost(`/api/reviews/upvote`, {
-                review_id: upvote_review_id,
+            const result = await apiPost(`/api/reviews`, {
                 execution_id,
+                rating,
+                comment,
+                agent_id,
             });
-            if (result.success) {
-                const action = result.action === "already_upvoted" ? "Already upvoted" : "Upvoted";
-                const upvotedToolId = result.tool_id || "";
-                const lines = [`✓ ${action} review ${upvote_review_id}`];
-                // Suggest favorite only when upvoting a 5-star review
-                if (result.rating === 5 && upvotedToolId) {
-                    if (API_KEY && !registeredFavTools.has(upvotedToolId)) {
-                        lines.push(`This was a 5/5 review — consider favorite_tool(tool_id="${upvotedToolId}") if you plan to reuse it.`);
-                    }
-                    else if (!API_KEY) {
-                        lines.push(`This was a 5/5 review — consider saving tool_id="${upvotedToolId}" to your memory for future reuse.`);
-                    }
+            if (result.error) {
+                return {
+                    content: [{ type: "text", text: `Error: ${result.error}` }],
+                    isError: true,
+                };
+            }
+            // The API returns the review record with tool_id derived from execution
+            const reviewToolId = result.tool_id || "unknown";
+            const lines = [
+                `✓ Review submitted for ${reviewToolId} (${rating}/5)`,
+            ];
+            if (rating === 5) {
+                if (API_KEY && !registeredFavTools.has(reviewToolId)) {
+                    lines.push(`This tool scored 5/5 — consider favorite_tool(tool_id="${reviewToolId}") if you plan to reuse it.`);
+                }
+                else if (!API_KEY) {
+                    lines.push(`This tool scored 5/5 — consider saving tool_id="${reviewToolId}" to your memory for future reuse.`);
                 }
-                return { content: [{ type: "text", text: lines.join("\n") }] };
             }
-            return {
-                content: [{ type: "text", text: result.error ? `Error: ${result.error}` : JSON.stringify(result, null, 2) }],
-                isError: true,
-            };
+            return { content: [{ type: "text", text: lines.join("\n") }] };
         }
-        // New review mode
-        if (rating == null || !comment) {
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: "Error: rating and comment are required for new reviews. To upvote an existing review, use upvote_review_id instead.",
-                    },
-                ],
-                isError: true,
-            };
-        }
-        if (rating < 1 || rating > 5) {
-            return {
-                content: [{ type: "text", text: "Error: rating must be between 1 and 5" }],
-                isError: true,
-            };
-        }
-        const result = await apiPost(`/api/reviews`, {
-            execution_id,
-            rating,
-            comment,
-            agent_id,
-        });
-        if (result.error) {
+        catch (err) {
             return {
-                content: [{ type: "text", text: `Error: ${result.error}` }],
+                content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }],
                 isError: true,
             };
         }
-        // The API returns the review record with tool_id derived from execution
-        const reviewToolId = result.tool_id || "unknown";
-        const lines = [
-            `✓ Review submitted for ${reviewToolId} (${rating}/5)`,
-        ];
-        if (rating === 5) {
-            if (API_KEY && !registeredFavTools.has(reviewToolId)) {
-                lines.push(`This tool scored 5/5 — consider favorite_tool(tool_id="${reviewToolId}") if you plan to reuse it.`);
-            }
-            else if (!API_KEY) {
-                lines.push(`This tool scored 5/5 — consider saving tool_id="${reviewToolId}" to your memory for future reuse.`);
-            }
-        }
-        return { content: [{ type: "text", text: lines.join("\n") }] };
     });
     // ── Wallet info ──────────────────────────────────────────────────────────────
     server.registerTool("get_wallet_info", {
@@ -897,20 +937,36 @@ function registerAllTools(server) {
         description: "List all available tags/categories in the marketplace. Returns tag names, slugs, and tool counts.",
         inputSchema: {},
     }, async () => {
-        const data = await apiGet("/api/tags");
-        return {
-            content: [{ type: "text", text: JSON.stringify(data, null, 2) }],
-        };
+        try {
+            const data = await apiGet("/api/tags");
+            return {
+                content: [{ type: "text", text: safeJsonText(data) }],
+            };
+        }
+        catch (err) {
+            return {
+                content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }],
+                isError: true,
+            };
+        }
     });
     // ── List providers ───────────────────────────────────────────────────────────
     server.registerTool("list_providers", {
         description: "List all providers/vendors in the marketplace. Returns provider names, slugs, and tool counts.",
         inputSchema: {},
     }, async () => {
-        const data = await apiGet("/api/providers");
-        return {
-            content: [{ type: "text", text: JSON.stringify(data, null, 2) }],
-        };
+        try {
+            const data = await apiGet("/api/providers");
+            return {
+                content: [{ type: "text", text: safeJsonText(data) }],
+            };
+        }
+        catch (err) {
+            return {
+                content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }],
+                isError: true,
+            };
+        }
     });
     // ── Tool Requests ───────────────────────────────────────────────────────────
     server.registerTool("list_tool_requests", {
@@ -930,14 +986,22 @@ function registerAllTools(server) {
         if (per_page > 100) {
             return { content: [{ type: "text", text: "Error: per_page must be at most 100" }], isError: true };
         }
-        const params = new URLSearchParams();
-        params.set("status", status);
-        params.set("page", String(page));
-        params.set("per_page", String(per_page));
-        const data = await apiGet(`/api/tool-requests?${params}`);
-        return {
-            content: [{ type: "text", text: JSON.stringify(data, null, 2) }],
-        };
+        try {
+            const params = new URLSearchParams();
+            params.set("status", status);
+            params.set("page", String(page));
+            params.set("per_page", String(per_page));
+            const data = await apiGet(`/api/tool-requests?${params}`);
+            return {
+                content: [{ type: "text", text: safeJsonText(data) }],
+            };
+        }
+        catch (err) {
+            return {
+                content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }],
+                isError: true,
+            };
+        }
     });
     server.registerTool("request_tool", {
         description: "Submit a request for a tool that doesn't exist in the marketplace yet. " +
@@ -951,33 +1015,41 @@ function registerAllTools(server) {
             agent_id: z.string().optional().describe("Optional agent identifier"),
         },
     }, async ({ title, description, use_case, execution_id, agent_id }) => {
-        const result = await apiPost("/api/tool-requests", {
-            title,
-            description,
-            use_case,
-            execution_id,
-            agent_id,
-        });
-        if (result.error) {
+        try {
+            const result = await apiPost("/api/tool-requests", {
+                title,
+                description,
+                use_case,
+                execution_id,
+                agent_id,
+            });
+            if (result.error) {
+                return {
+                    content: [{ type: "text", text: `Error: ${result.error}` }],
+                    isError: true,
+                };
+            }
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: [
+                            `✓ Tool request submitted: "${result.title}"`,
+                            `  Request ID: ${result.id}`,
+                            `  Status: ${result.status}`,
+                            ``,
+                            `Other agents can upvote this request to signal demand.`,
+                        ].join("\n"),
+                    },
+                ],
+            };
+        }
+        catch (err) {
             return {
-                content: [{ type: "text", text: `Error: ${result.error}` }],
+                content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }],
                 isError: true,
             };
         }
-        return {
-            content: [
-                {
-                    type: "text",
-                    text: [
-                        `✓ Tool request submitted: "${result.title}"`,
-                        `  Request ID: ${result.id}`,
-                        `  Status: ${result.status}`,
-                        ``,
-                        `Other agents can upvote this request to signal demand.`,
-                    ].join("\n"),
-                },
-            ],
-        };
     });
     server.registerTool("upvote_tool_request", {
         description: "Upvote an existing tool request to signal demand. " +
@@ -987,19 +1059,27 @@ function registerAllTools(server) {
             execution_id: z.string().optional().describe("Execution ID from a previous tool use (required if no API key)"),
         },
     }, async ({ request_id, execution_id }) => {
-        const result = await apiPost(`/api/tool-requests/${request_id}`, {
-            execution_id,
-        });
-        if (result.error) {
+        try {
+            const result = await apiPost(`/api/tool-requests/${request_id}`, {
+                execution_id,
+            });
+            if (result.error) {
+                return {
+                    content: [{ type: "text", text: `Error: ${result.error}` }],
+                    isError: true,
+                };
+            }
+            const action = result.action === "already_upvoted" ? "Already upvoted" : "Upvoted";
+            return {
+                content: [{ type: "text", text: `✓ ${action} tool request ${request_id}` }],
+            };
+        }
+        catch (err) {
             return {
-                content: [{ type: "text", text: `Error: ${result.error}` }],
+                content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }],
                 isError: true,
             };
         }
-        const action = result.action === "already_upvoted" ? "Already upvoted" : "Upvoted";
-        return {
-            content: [{ type: "text", text: `✓ ${action} tool request ${request_id}` }],
-        };
     });
     // ── Favorites management ─────────────────────────────────────────────────────
     server.registerTool("list_favorites", {
@@ -1017,31 +1097,39 @@ function registerAllTools(server) {
                 isError: true,
             };
         }
-        const result = await apiGet("/api/favorites");
-        if (result.error) {
+        try {
+            const result = await apiGet("/api/favorites");
+            if (result.error) {
+                return {
+                    content: [{ type: "text", text: `Error: ${result.error}` }],
+                    isError: true,
+                };
+            }
+            const tools = result.data ?? [];
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: safeJsonText({
+                            total: tools.length,
+                            favorites: tools.map((t) => ({
+                                tool_id: t.id,
+                                name: t.name,
+                                mcp_tool_name: `fav:${t.id}`,
+                                price_per_call: t.pricing.price_per_call,
+                            })),
+                            hint: "Favorited tools are registered as direct MCP tools named fav:<tool_id>.",
+                        }),
+                    },
+                ],
+            };
+        }
+        catch (err) {
             return {
-                content: [{ type: "text", text: `Error: ${result.error}` }],
+                content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }],
                 isError: true,
             };
         }
-        const tools = result.data ?? [];
-        return {
-            content: [
-                {
-                    type: "text",
-                    text: JSON.stringify({
-                        total: tools.length,
-                        favorites: tools.map((t) => ({
-                            tool_id: t.id,
-                            name: t.name,
-                            mcp_tool_name: `fav:${t.id}`,
-                            price_per_call: t.pricing.price_per_call,
-                        })),
-                        hint: "Favorited tools are registered as direct MCP tools named fav:<tool_id>.",
-                    }, null, 2),
-                },
-            ],
-        };
     });
     server.registerTool("favorite_tool", {
         description: "Bookmark a tool you plan to reuse frequently — it appears as a direct fav:<tool_id> MCP tool. " +
@@ -1064,31 +1152,39 @@ function registerAllTools(server) {
                 isError: true,
             };
         }
-        const result = await apiPost("/api/favorites", { tool_id });
-        if (result.error) {
+        try {
+            const result = await apiPost("/api/favorites", { tool_id });
+            if (result.error) {
+                return {
+                    content: [{ type: "text", text: `Error: ${result.error}` }],
+                    isError: true,
+                };
+            }
+            // Dynamically register the new fav tool in this session
+            const tool = result.tool;
+            if (tool) {
+                registerFavTool(server, tool);
+            }
             return {
-                content: [{ type: "text", text: `Error: ${result.error}` }],
-                isError: true,
+                content: [
+                    {
+                        type: "text",
+                        text: [
+                            `★ Added "${tool?.name ?? tool_id}" to favorites!`,
+                            ``,
+                            `It is now registered as a direct MCP tool: fav:${tool_id}`,
+                            `Call it directly with its input parameters — no need for use_tool.`,
+                        ].join("\n"),
+                    },
+                ],
             };
         }
-        // Dynamically register the new fav tool in this session
-        const tool = result.tool;
-        if (tool) {
-            registerFavTool(server, tool);
+        catch (err) {
+            return {
+                content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }],
+                isError: true,
+            };
         }
-        return {
-            content: [
-                {
-                    type: "text",
-                    text: [
-                        `★ Added "${tool?.name ?? tool_id}" to favorites!`,
-                        ``,
-                        `It is now registered as a direct MCP tool: fav:${tool_id}`,
-                        `Call it directly with its input parameters — no need for use_tool.`,
-                    ].join("\n"),
-                },
-            ],
-        };
     });
     server.registerTool("unfavorite_tool", {
         description: "Remove a tool from your favorites. The fav:<tool_id> direct tool will be unregistered. " +
@@ -1108,29 +1204,37 @@ function registerAllTools(server) {
                 isError: true,
             };
         }
-        const result = await apiDelete("/api/favorites", { tool_id });
-        if (result.error) {
+        try {
+            const result = await apiDelete("/api/favorites", { tool_id });
+            if (result.error) {
+                return {
+                    content: [{ type: "text", text: `Error: ${result.error}` }],
+                    isError: true,
+                };
+            }
+            // Dynamically unregister the fav tool from this session
+            const registered = registeredFavTools.get(tool_id);
+            if (registered) {
+                registered.remove();
+                registeredFavTools.delete(tool_id);
+            }
             return {
-                content: [{ type: "text", text: `Error: ${result.error}` }],
-                isError: true,
+                content: [
+                    {
+                        type: "text",
+                        text: result.removed
+                            ? `Removed "fav:${tool_id}" from favorites and unregistered it.`
+                            : `"${tool_id}" was not in your favorites.`,
+                    },
+                ],
             };
         }
-        // Dynamically unregister the fav tool from this session
-        const registered = registeredFavTools.get(tool_id);
-        if (registered) {
-            registered.remove();
-            registeredFavTools.delete(tool_id);
+        catch (err) {
+            return {
+                content: [{ type: "text", text: `Error: ${err instanceof Error ? err.message : String(err)}` }],
+                isError: true,
+            };
         }
-        return {
-            content: [
-                {
-                    type: "text",
-                    text: result.removed
-                        ? `Removed "fav:${tool_id}" from favorites and unregistered it.`
-                        : `"${tool_id}" was not in your favorites.`,
-                },
-            ],
-        };
     });
 }
 // ─── Main ─────────────────────────────────────────────────────────────────────

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caravo/mcp",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "description": "The API marketplace built for autonomous AI agents. Search, execute, and pay for 200+ tools at $0.001–0.05 per call.",
   "type": "module",
   "bin": {