@hasna/oldpal 0.3.2 → 0.3.4

package/dist/index.js

@@ -31417,41 +31417,164 @@ function MessageBubble({ message }) {
       ]
     }, undefined, true, undefined, this);
   }
-  const toolCount = message.toolCalls?.length || 0;
+  const toolSummary = message.toolCalls ? getToolSummary(message.toolCalls) : "";
+  const hasContent = message.content && message.content.trim();
+  if (!hasContent && toolSummary) {
+    return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+      marginY: 1,
+      children: [
+        /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          dimColor: true,
+          children: "\u25CF "
+        }, undefined, false, undefined, this),
+        /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+          dimColor: true,
+          children: toolSummary
+        }, undefined, false, undefined, this)
+      ]
+    }, undefined, true, undefined, this);
+  }
   return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
     marginY: 1,
-    flexDirection: "column",
     children: [
+      /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+        dimColor: true,
+        children: "\u25CF "
+      }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
+        flexGrow: 1,
         children: [
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
-            dimColor: true,
-            children: "\u25CF "
+          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Markdown, {
+            content: message.content
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
-            flexGrow: 1,
-            children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Markdown, {
-              content: message.content
-            }, undefined, false, undefined, this)
-          }, undefined, false, undefined, this)
+          toolSummary && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
+            dimColor: true,
+            children: [
+              " ",
+              toolSummary
+            ]
+          }, undefined, true, undefined, this)
         ]
-      }, undefined, true, undefined, this),
-      toolCount > 0 && /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
-        marginLeft: 2,
-        children: /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Text, {
-          dimColor: true,
-          children: [
-            "[",
-            toolCount,
-            " tool",
-            toolCount > 1 ? "s" : "",
-            " used]"
-          ]
-        }, undefined, true, undefined, this)
-      }, undefined, false, undefined, this)
+      }, undefined, true, undefined, this)
     ]
   }, undefined, true, undefined, this);
 }
+function getToolSummary(toolCalls) {
+  if (toolCalls.length === 0)
+    return "";
+  if (toolCalls.length === 1) {
+    return `[${formatToolCall(toolCalls[0])}]`;
+  }
+  const toolGroups = {};
+  for (const tc of toolCalls) {
+    const name = getToolDisplayName(tc);
+    if (!toolGroups[name]) {
+      toolGroups[name] = { count: 1, firstCall: tc };
+    } else {
+      toolGroups[name].count++;
+    }
+  }
+  const parts = [];
+  for (const [name, { count, firstCall }] of Object.entries(toolGroups)) {
+    if (count > 1) {
+      const context = getToolContext(firstCall);
+      parts.push(context ? `${name} \xD7${count} (${context}, ...)` : `${name} \xD7${count}`);
+    } else {
+      parts.push(formatToolCall(firstCall));
+    }
+  }
+  return `[${parts.join(", ")}]`;
+}
+function getToolContext(toolCall) {
+  const { name, input } = toolCall;
+  switch (name) {
+    case "bash":
+      return truncate(String(input.command || ""), 20);
+    case "read":
+      const path = String(input.path || input.file_path || "");
+      return path.split("/").pop() || "";
+    case "write":
+      const writePath = String(input.path || input.file_path || "");
+      return writePath.split("/").pop() || "";
+    case "glob":
+      return truncate(String(input.pattern || ""), 20);
+    case "grep":
+      return truncate(String(input.pattern || ""), 20);
+    default:
+      return "";
+  }
+}
+function getToolDisplayName(toolCall) {
+  const { name, input } = toolCall;
+  switch (name) {
+    case "bash":
+      return "bash";
+    case "curl":
+    case "web_fetch":
+      return "fetch";
+    case "web_search":
+      return "search";
+    case "read":
+      return "read";
+    case "write":
+      return "write";
+    case "glob":
+      return "glob";
+    case "grep":
+      return "grep";
+    case "display_image":
+      return "image";
+    case "notion":
+    case "gmail":
+    case "googledrive":
+    case "googlecalendar":
+    case "linear":
+    case "slack":
+      return name;
+    default:
+      return name;
+  }
+}
+function formatToolCall(toolCall) {
+  const { name, input } = 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":
+      return `Writing: ${truncate(String(input.path || input.file_path || ""), 60)}`;
+    case "glob":
+      return `Finding: ${truncate(String(input.pattern || ""), 60)}`;
+    case "grep":
+      return `Searching: ${truncate(String(input.pattern || ""), 60)}`;
+    case "notion":
+      return `Notion: ${truncate(String(input.command || input.action || ""), 60)}`;
+    case "gmail":
+      return `Gmail: ${truncate(String(input.command || input.action || ""), 60)}`;
+    case "googledrive":
+      return `Drive: ${truncate(String(input.command || input.action || ""), 60)}`;
+    case "googlecalendar":
+      return `Calendar: ${truncate(String(input.command || input.action || ""), 60)}`;
+    case "linear":
+      return `Linear: ${truncate(String(input.command || input.action || ""), 60)}`;
+    case "slack":
+      return `Slack: ${truncate(String(input.command || input.action || ""), 60)}`;
+    default:
+      return `${name}: ${truncate(JSON.stringify(input), 50)}`;
+  }
+}
+function truncate(text, maxLength) {
+  if (text.length <= maxLength)
+    return text;
+  return text.slice(0, maxLength - 3) + "...";
+}
 
 // packages/terminal/src/components/Status.tsx
 var jsx_dev_runtime4 = __toESM(require_jsx_dev_runtime(), 1);
@@ -31695,46 +31818,46 @@ function ToolCallRow({ entry }) {
       }, undefined, true, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime7.jsxDEV(Text, {
         dimColor: true,
-        children: formatToolCall(toolCall)
+        children: formatToolCall2(toolCall)
       }, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
 }
-function formatToolCall(toolCall) {
+function formatToolCall2(toolCall) {
   const { name, input } = toolCall;
   switch (name) {
     case "bash":
-      return `bash: ${truncate(String(input.command || ""), 50)}`;
+      return `bash: ${truncate2(String(input.command || ""), 50)}`;
     case "curl":
     case "web_fetch":
-      return `fetch: ${truncate(String(input.url || ""), 50)}`;
+      return `fetch: ${truncate2(String(input.url || ""), 50)}`;
     case "web_search":
-      return `search: ${truncate(String(input.query || ""), 50)}`;
+      return `search: ${truncate2(String(input.query || ""), 50)}`;
     case "read":
-      return `read: ${truncate(String(input.path || input.file_path || ""), 50)}`;
+      return `read: ${truncate2(String(input.path || input.file_path || ""), 50)}`;
     case "write":
-      return `write: ${truncate(String(input.path || input.file_path || ""), 50)}`;
+      return `write: ${truncate2(String(input.path || input.file_path || ""), 50)}`;
     case "glob":
-      return `glob: ${truncate(String(input.pattern || ""), 50)}`;
+      return `glob: ${truncate2(String(input.pattern || ""), 50)}`;
     case "grep":
-      return `grep: ${truncate(String(input.pattern || ""), 50)}`;
+      return `grep: ${truncate2(String(input.pattern || ""), 50)}`;
     case "notion":
-      return `notion: ${truncate(String(input.command || input.action || ""), 50)}`;
+      return `notion: ${truncate2(String(input.command || input.action || ""), 50)}`;
     case "gmail":
-      return `gmail: ${truncate(String(input.command || input.action || ""), 50)}`;
+      return `gmail: ${truncate2(String(input.command || input.action || ""), 50)}`;
     case "googledrive":
-      return `drive: ${truncate(String(input.command || input.action || ""), 50)}`;
+      return `drive: ${truncate2(String(input.command || input.action || ""), 50)}`;
     case "googlecalendar":
-      return `calendar: ${truncate(String(input.command || input.action || ""), 50)}`;
+      return `calendar: ${truncate2(String(input.command || input.action || ""), 50)}`;
     case "linear":
-      return `linear: ${truncate(String(input.command || input.action || ""), 50)}`;
+      return `linear: ${truncate2(String(input.command || input.action || ""), 50)}`;
     case "slack":
-      return `slack: ${truncate(String(input.command || input.action || ""), 50)}`;
+      return `slack: ${truncate2(String(input.command || input.action || ""), 50)}`;
     default:
-      return `${name}: ${truncate(JSON.stringify(input), 40)}`;
+      return `${name}: ${truncate2(JSON.stringify(input), 40)}`;
   }
 }
-function truncate(text, maxLength) {
+function truncate2(text, maxLength) {
   if (text.length <= maxLength)
     return text;
   return text.slice(0, maxLength - 3) + "...";
@@ -32129,7 +32252,7 @@ var options = {
   help: args.includes("--help") || args.includes("-h")
 };
 if (options.version) {
-  console.log("oldpal v0.3.2");
+  console.log("oldpal v0.3.4");
   process.exit(0);
 }
 if (options.help) {
@@ -32160,4 +32283,4 @@ waitUntilExit().then(() => {
   process.exit(0);
 });
 
-//# debugId=4FD9F80940C6F3E164756E2164756E21
+//# debugId=61F669D73881A2A464756E2164756E21