@hasna/oldpal 0.1.9 → 0.2.0

package/dist/index.js

@@ -29368,10 +29368,101 @@ function parseDuckDuckGoResults(html, maxResults) {
   return results;
 }
 
+class CurlTool {
+  static tool = {
+    name: "curl",
+    description: "Fetch content from a URL (like curl). Returns text content from web pages, JSON from APIs, etc.",
+    parameters: {
+      type: "object",
+      properties: {
+        url: {
+          type: "string",
+          description: "The URL to fetch"
+        },
+        method: {
+          type: "string",
+          description: "HTTP method (GET, POST, PUT, DELETE). Defaults to GET.",
+          enum: ["GET", "POST", "PUT", "DELETE"],
+          default: "GET"
+        },
+        headers: {
+          type: "object",
+          description: "Optional headers to send with the request"
+        },
+        body: {
+          type: "string",
+          description: "Request body for POST/PUT requests"
+        }
+      },
+      required: ["url"]
+    }
+  };
+  static executor = async (input) => {
+    const url = input.url;
+    const method = input.method || "GET";
+    const headers = input.headers || {};
+    const body = input.body;
+    const timeout = 30000;
+    try {
+      const parsedUrl = new URL(url);
+      const hostname = parsedUrl.hostname;
+      if (hostname === "localhost" || hostname === "127.0.0.1" || hostname.startsWith("192.168.") || hostname.startsWith("10.") || hostname.startsWith("172.")) {
+        return "Error: Cannot fetch from local/private network addresses for security reasons";
+      }
+      const controller = new AbortController;
+      const timeoutId = setTimeout(() => controller.abort(), timeout);
+      const response = await fetch(url, {
+        method,
+        signal: controller.signal,
+        headers: {
+          "User-Agent": "oldpal/1.0 (AI Assistant)",
+          ...headers
+        },
+        body: body && ["POST", "PUT"].includes(method) ? body : undefined
+      });
+      clearTimeout(timeoutId);
+      const contentType = response.headers.get("content-type") || "";
+      let responseBody;
+      if (contentType.includes("application/json")) {
+        try {
+          const json = await response.json();
+          responseBody = JSON.stringify(json, null, 2);
+        } catch {
+          responseBody = await response.text();
+        }
+      } else {
+        responseBody = await response.text();
+        if (contentType.includes("text/html")) {
+          responseBody = extractReadableText(responseBody);
+        }
+      }
+      const maxLength = 30000;
+      if (responseBody.length > maxLength) {
+        responseBody = responseBody.slice(0, maxLength) + `
+
+[Content truncated...]`;
+      }
+      const statusLine = `HTTP ${response.status} ${response.statusText}`;
+      return `${statusLine}
+
+${responseBody || "(empty response)"}`;
+    } catch (error) {
+      if (error instanceof Error) {
+        if (error.name === "AbortError") {
+          return `Error: Request timed out after ${timeout}ms`;
+        }
+        return `Error: ${error.message}`;
+      }
+      return `Error: ${String(error)}`;
+    }
+  };
+}
+
 class WebTools {
   static registerAll(registry) {
     registry.register(WebFetchTool.tool, WebFetchTool.executor);
     registry.register(WebSearchTool.tool, WebSearchTool.executor);
+    registry.register(CurlTool.tool, CurlTool.executor);
   }
 }
 
@@ -31028,7 +31119,7 @@ function parseMarkdown(text) {
 // packages/terminal/src/components/Messages.tsx
 var jsx_dev_runtime3 = __toESM(require_jsx_dev_runtime(), 1);
 function Messages4({ messages, currentResponse, currentToolCall, lastToolResult, activityLog = [] }) {
-  const visibleMessages = messages.slice(-15);
+  const visibleMessages = messages.slice(-10);
   return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
@@ -31036,59 +31127,49 @@ function Messages4({ messages, currentResponse, currentToolCall, lastToolResult,
         message
       }, message.id, false, undefined, this)),
       activityLog.map((entry) => {
-        if (entry.type === "tool_call" && entry.toolCall) {
+        if (entry.type === "text" && entry.content) {
           return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
             marginY: 1,
             children: [
               /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
                 dimColor: true,
-                children: "\u25D0 "
+                children: "\u25CF "
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
-                dimColor: true,
-                children: formatToolCall(entry.toolCall)
+              /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+                flexGrow: 1,
+                children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Markdown, {
+                  content: entry.content
+                }, undefined, false, undefined, this)
               }, undefined, false, undefined, this)
             ]
           }, entry.id, true, undefined, this);
         }
+        if (entry.type === "tool_call" && entry.toolCall) {
+          return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+            marginTop: 1,
+            children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+              dimColor: true,
+              children: [
+                "  \u25D0 ",
+                formatToolCall(entry.toolCall)
+              ]
+            }, undefined, true, undefined, this)
+          }, entry.id, false, undefined, this);
+        }
         if (entry.type === "tool_result" && entry.toolResult) {
           return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
-            marginLeft: 2,
+            marginBottom: 1,
             children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
               dimColor: true,
               children: [
-                "\u2192 ",
-                truncate(entry.toolResult.content, 100)
+                "  \u2192 ",
+                truncate(entry.toolResult.content, 80)
               ]
             }, undefined, true, undefined, this)
           }, entry.id, false, undefined, this);
         }
         return null;
       }),
-      currentToolCall && !activityLog.some((e) => e.toolCall?.id === currentToolCall.id) && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
-        marginY: 1,
-        children: [
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
-            dimColor: true,
-            children: "\u25D0 "
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
-            dimColor: true,
-            children: formatToolCall(currentToolCall)
-          }, undefined, false, undefined, this)
-        ]
-      }, undefined, true, undefined, this),
-      lastToolResult && !activityLog.some((e) => e.toolResult?.toolCallId === lastToolResult.toolCallId) && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
-        marginY: 1,
-        marginLeft: 2,
-        children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
-          dimColor: true,
-          children: [
-            "\u2192 ",
-            truncate(lastToolResult.content, 100)
-          ]
-        }, undefined, true, undefined, this)
-      }, undefined, false, undefined, this),
       currentResponse && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
         marginY: 1,
         children: [
@@ -31103,7 +31184,17 @@ function Messages4({ messages, currentResponse, currentToolCall, lastToolResult,
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this)
         ]
-      }, undefined, true, undefined, this)
+      }, undefined, true, undefined, this),
+      currentToolCall && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+        marginTop: 1,
+        children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          dimColor: true,
+          children: [
+            "  \u25D0 ",
+            formatToolCall(currentToolCall)
+          ]
+        }, undefined, true, undefined, this)
+      }, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
 }
@@ -31164,6 +31255,12 @@ function formatToolCall(toolCall) {
   switch (name) {
     case "bash":
       return `Running: ${truncate(String(input.command || ""), 60)}`;
+    case "curl":
+      return `Fetching: ${truncate(String(input.url || ""), 60)}`;
+    case "web_fetch":
+      return `Fetching: ${truncate(String(input.url || ""), 60)}`;
+    case "web_search":
+      return `Searching: ${truncate(String(input.query || ""), 60)}`;
     case "read":
       return `Reading: ${truncate(String(input.path || input.file_path || ""), 60)}`;
     case "write":
@@ -31341,6 +31438,19 @@ function App2({ cwd: cwd2 }) {
             responseRef.current += chunk.content;
             setCurrentResponse(responseRef.current);
           } else if (chunk.type === "tool_use" && chunk.toolCall) {
+            if (responseRef.current.trim()) {
+              setActivityLog((prev) => [
+                ...prev,
+                {
+                  id: generateId(),
+                  type: "text",
+                  content: responseRef.current,
+                  timestamp: now()
+                }
+              ]);
+              setCurrentResponse("");
+              responseRef.current = "";
+            }
             toolCallsRef.current.push(chunk.toolCall);
             setActivityLog((prev) => [
               ...prev,
@@ -31352,7 +31462,6 @@ function App2({ cwd: cwd2 }) {
               }
             ]);
             setCurrentToolCall(chunk.toolCall);
-            setLastToolResult(undefined);
           } else if (chunk.type === "tool_result" && chunk.toolResult) {
             toolResultsRef.current.push(chunk.toolResult);
             setActivityLog((prev) => [
@@ -31364,7 +31473,6 @@ function App2({ cwd: cwd2 }) {
                 timestamp: now()
               }
             ]);
-            setLastToolResult(chunk.toolResult);
             setCurrentToolCall(undefined);
           } else if (chunk.type === "error" && chunk.error) {
             setError(chunk.error);
@@ -31372,25 +31480,39 @@ function App2({ cwd: cwd2 }) {
           } else if (chunk.type === "usage" && chunk.usage) {
             setTokenUsage(chunk.usage);
           } else if (chunk.type === "done") {
-            if (responseRef.current || toolCallsRef.current.length > 0) {
+            if (responseRef.current.trim()) {
+              setActivityLog((prev) => [
+                ...prev,
+                {
+                  id: generateId(),
+                  type: "text",
+                  content: responseRef.current,
+                  timestamp: now()
+                }
+              ]);
+            }
+            const fullContent = activityLog.filter((e) => e.type === "text").map((e) => e.content).join(`
+`) + (responseRef.current ? `
+` + responseRef.current : "");
+            if (fullContent.trim() || toolCallsRef.current.length > 0) {
               setMessages((prev) => [
                 ...prev,
                 {
                   id: generateId(),
                   role: "assistant",
-                  content: responseRef.current,
+                  content: fullContent.trim(),
                   timestamp: now(),
                   toolCalls: toolCallsRef.current.length > 0 ? [...toolCallsRef.current] : undefined,
                   toolResults: toolResultsRef.current.length > 0 ? [...toolResultsRef.current] : undefined
                 }
               ]);
-              setCurrentResponse("");
-              responseRef.current = "";
-              toolCallsRef.current = [];
-              toolResultsRef.current = [];
             }
+            setCurrentResponse("");
+            responseRef.current = "";
+            toolCallsRef.current = [];
+            toolResultsRef.current = [];
             setCurrentToolCall(undefined);
-            setLastToolResult(undefined);
+            setActivityLog([]);
             setIsProcessing(false);
             if (newClient) {
               setTokenUsage(newClient.getTokenUsage());
@@ -31578,7 +31700,7 @@ var options = {
   help: args.includes("--help") || args.includes("-h")
 };
 if (options.version) {
-  console.log("oldpal v0.1.9");
+  console.log("oldpal v0.2.0");
   process.exit(0);
 }
 if (options.help) {
@@ -31609,4 +31731,4 @@ waitUntilExit().then(() => {
   process.exit(0);
 });
 
-//# debugId=307434E7D5151E5864756E2164756E21
+//# debugId=21C263FACC119E6E64756E2164756E21