@hasna/oldpal 0.3.4 → 0.3.6

package/dist/index.js

@@ -31353,12 +31353,20 @@ function Messages4({
   const endIndex = messages.length - scrollOffset;
   const startIndex = Math.max(0, endIndex - maxVisible);
   const visibleMessages = messages.slice(startIndex, endIndex);
+  const groupedMessages = groupConsecutiveToolMessages(visibleMessages);
   return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
     flexDirection: "column",
     children: [
-      visibleMessages.map((message) => /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(MessageBubble, {
-        message
-      }, message.id, false, undefined, this)),
+      groupedMessages.map((group) => {
+        if (group.type === "single") {
+          return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(MessageBubble, {
+            message: group.message
+          }, group.message.id, false, undefined, this);
+        }
+        return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(CombinedToolMessage, {
+          messages: group.messages
+        }, group.messages[0].id, false, undefined, this);
+      }),
       activityLog.map((entry) => {
         if (entry.type === "text" && entry.content) {
           return /* @__PURE__ */ jsx_dev_runtime3.jsxDEV(Box_default, {
@@ -31397,6 +31405,56 @@ function Messages4({
     ]
   }, undefined, true, undefined, this);
 }
+function groupConsecutiveToolMessages(messages) {
+  const groups = [];
+  let currentToolGroup = [];
+  for (const msg of messages) {
+    const isToolOnlyAssistant = msg.role === "assistant" && (!msg.content || !msg.content.trim()) && msg.toolCalls && msg.toolCalls.length > 0;
+    if (isToolOnlyAssistant) {
+      currentToolGroup.push(msg);
+    } else {
+      if (currentToolGroup.length > 0) {
+        if (currentToolGroup.length === 1) {
+          groups.push({ type: "single", message: currentToolGroup[0] });
+        } else {
+          groups.push({ type: "grouped", messages: currentToolGroup });
+        }
+        currentToolGroup = [];
+      }
+      groups.push({ type: "single", message: msg });
+    }
+  }
+  if (currentToolGroup.length > 0) {
+    if (currentToolGroup.length === 1) {
+      groups.push({ type: "single", message: currentToolGroup[0] });
+    } else {
+      groups.push({ type: "grouped", messages: currentToolGroup });
+    }
+  }
+  return groups;
+}
+function CombinedToolMessage({ messages }) {
+  const allToolCalls = [];
+  for (const msg of messages) {
+    if (msg.toolCalls) {
+      allToolCalls.push(...msg.toolCalls);
+    }
+  }
+  const summary = getToolSummary(allToolCalls);
+  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: summary
+      }, undefined, false, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+}
 function MessageBubble({ message }) {
   const isUser = message.role === "user";
   const isSystem = message.role === "system";
@@ -31591,41 +31649,17 @@ function Status({ isProcessing, cwd: cwd2, queueLength = 0, tokenUsage }) {
   }
   return /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
     marginTop: 1,
-    borderStyle: "single",
-    borderColor: "gray",
-    paddingX: 1,
-    justifyContent: "space-between",
-    children: [
-      /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
-        dimColor: true,
-        children: displayCwd
-      }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Box_default, {
-        children: [
-          /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
-            dimColor: !isProcessing,
-            children: isProcessing ? "\u25CF processing" : "\u25CF ready"
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
-            dimColor: true,
-            children: tokenInfo
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
-            dimColor: true,
-            children: queueInfo
-          }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
-            dimColor: true,
-            children: [
-              " | ",
-              isProcessing ? "Esc to stop" : "Ctrl+C to exit",
-              " | /help"
-            ]
-          }, undefined, true, undefined, this)
-        ]
-      }, undefined, true, undefined, this)
-    ]
-  }, undefined, true, undefined, this);
+    children: /* @__PURE__ */ jsx_dev_runtime4.jsxDEV(Text, {
+      dimColor: true,
+      children: [
+        displayCwd,
+        tokenInfo,
+        queueInfo,
+        isProcessing && " | Esc to stop",
+        " | Ctrl+C to exit | /help"
+      ]
+    }, undefined, true, undefined, this)
+  }, undefined, false, undefined, this);
 }
 
 // node_modules/.pnpm/ink-spinner@5.0.0_ink@5.2.1_@types+react@18.3.27_react-devtools-core@4.28.5_react@18.3.1__react@18.3.1/node_modules/ink-spinner/build/index.js
@@ -32252,7 +32286,7 @@ var options = {
   help: args.includes("--help") || args.includes("-h")
 };
 if (options.version) {
-  console.log("oldpal v0.3.4");
+  console.log("oldpal v0.3.6");
   process.exit(0);
 }
 if (options.help) {
@@ -32283,4 +32317,4 @@ waitUntilExit().then(() => {
   process.exit(0);
 });
 
-//# debugId=61F669D73881A2A464756E2164756E21
+//# debugId=883DD49707B1DC4164756E2164756E21