@oh-my-pi/exa 0.5.1 → 0.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oh-my-pi/exa",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "Exa AI web search and websets tools for pi",
   "keywords": [
     "omp-plugin",

package/tools/exa/shared.ts

@@ -28,6 +28,29 @@ interface MCPToolsResponse {
   };
 }
 
+function normalizeInputSchema(schema: unknown): Record<string, unknown> {
+  if (!schema || typeof schema !== "object") {
+    return { type: "object", properties: {}, required: [] };
+  }
+
+  const normalized = { ...(schema as Record<string, unknown>) };
+
+  if (!("type" in normalized)) {
+    normalized.type = "object";
+  }
+
+  if (!("properties" in normalized)) {
+    normalized.properties = {};
+  }
+
+  const required = (normalized as { required?: unknown }).required;
+  if (!Array.isArray(required)) {
+    normalized.required = [];
+  }
+
+  return normalized;
+}
+
 /**
  * Parse a .env file and return key-value pairs
  */
@@ -142,7 +165,7 @@ export async function fetchExaTools(
   apiKey: string,
   toolNames: string[],
 ): Promise<MCPTool[]> {
-  const url = `${EXA_MCP_URL}?exaApiKey=${apiKey}&tools=${toolNames.join(",")}`;
+  const url = `${EXA_MCP_URL}?exaApiKey=${encodeURIComponent(apiKey)}&tools=${encodeURIComponent(toolNames.join(","))}`;
 
   try {
     const response = (await callMCP(url, "tools/list")) as MCPToolsResponse;
@@ -160,7 +183,7 @@ export async function fetchExaTools(
  * Fetch available tools from Websets MCP server
  */
 export async function fetchWebsetsTools(apiKey: string): Promise<MCPTool[]> {
-  const url = `${WEBSETS_MCP_URL}?exaApiKey=${apiKey}`;
+  const url = `${WEBSETS_MCP_URL}?exaApiKey=${encodeURIComponent(apiKey)}`;
 
   try {
     const response = (await callMCP(url, "tools/list")) as MCPToolsResponse;
@@ -183,7 +206,7 @@ export async function callExaTool(
   toolName: string,
   args: Record<string, unknown>,
 ): Promise<unknown> {
-  const url = `${EXA_MCP_URL}?exaApiKey=${apiKey}&tools=${toolNames.join(",")}`;
+  const url = `${EXA_MCP_URL}?exaApiKey=${encodeURIComponent(apiKey)}&tools=${encodeURIComponent(toolNames.join(","))}`;
   return callMCPTool(url, toolName, args);
 }
 
@@ -195,7 +218,7 @@ export async function callWebsetsTool(
   toolName: string,
   args: Record<string, unknown>,
 ): Promise<unknown> {
-  const url = `${WEBSETS_MCP_URL}?exaApiKey=${apiKey}`;
+  const url = `${WEBSETS_MCP_URL}?exaApiKey=${encodeURIComponent(apiKey)}`;
   return callMCPTool(url, toolName, args);
 }
 
@@ -247,10 +270,32 @@ export function createToolWrapper(
 ): CustomAgentTool<TSchema, unknown> {
   return {
     name: renamedName,
+    label: renamedName.replace(/_/g, " ").replace(/\b\w/g, (c) => c.toUpperCase()),
     description: mcpTool.description,
-    parameters: mcpTool.inputSchema,
-    async execute(args) {
-      return callFn(mcpTool.name, args as Record<string, unknown>);
+    parameters: normalizeInputSchema(mcpTool.inputSchema) as TSchema,
+    async execute(_toolCallId, params) {
+      try {
+        const result = await callFn(
+          mcpTool.name,
+          (params ?? {}) as Record<string, unknown>,
+        );
+        const text =
+          typeof result === "string"
+            ? result
+            : result == null
+              ? "null"
+              : JSON.stringify(result, null, 2) ?? String(result);
+        return {
+          content: [{ type: "text" as const, text }],
+          details: result,
+        };
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        return {
+          content: [{ type: "text" as const, text: `Error: ${message}` }],
+          details: { error: message },
+        };
+      }
     },
   };
 }