Group adjacent tool calls uniformly

src/renderer/components/thread/ChatPane/chatPaneSelectors.test.ts

@@ -481,7 +481,7 @@ describe("chatPaneSelectors", () => {
     expect(selectActiveSubAgentParentItemIds(state, "t1")).toEqual(["sub:run-1"]);
   });
 
-  it("groups edits only with edits to the same file", () => {
+  it("groups adjacent edits with the rest of the tool-call run", () => {
     const state = {
       runtimeItemIdsByThread: {
         t1: [
@@ -572,20 +572,18 @@ describe("chatPaneSelectors", () => {
       {
         kind: "tool_call_group",
         id: "tool-call-group:edit-1",
-        itemIds: ["edit-1", "edit-2"],
+        itemIds: ["edit-1", "edit-2", "command-1", "command-2"],
       },
+      { kind: "item", id: "assistant-2" },
       {
         kind: "tool_call_group",
-        id: "tool-call-group:command-1",
-        itemIds: ["command-1", "command-2"],
+        id: "tool-call-group:edit-3",
+        itemIds: ["edit-3", "edit-4"],
       },
-      { kind: "item", id: "assistant-2" },
-      { kind: "item", id: "edit-3" },
-      { kind: "item", id: "edit-4" },
     ]);
   });
 
-  it("applies the same edit grouping rule to generic edit tool calls", () => {
+  it("groups generic edit tool calls with adjacent tools", () => {
     const state = {
       runtimeItemIdsByThread: {
         t1: ["tool-edit-1", "tool-edit-2", "tool-read-1", "tool-edit-3"],
@@ -643,10 +641,8 @@ describe("chatPaneSelectors", () => {
       {
         kind: "tool_call_group",
         id: "tool-call-group:tool-edit-1",
-        itemIds: ["tool-edit-1", "tool-edit-2"],
+        itemIds: ["tool-edit-1", "tool-edit-2", "tool-read-1", "tool-edit-3"],
       },
-      { kind: "item", id: "tool-read-1" },
-      { kind: "item", id: "tool-edit-3" },
     ]);
   });
 });

src/renderer/components/thread/ChatPane/chatPaneSelectors.ts

@@ -4,7 +4,6 @@ import type {
 } from "@/renderer/state/slices/runtimeEventSlice";
 import type { AppStoreState } from "@/renderer/state/slices/shared";
 import type { ToolCallPayload } from "@/shared/contracts";
-import { canShareRuntimeToolGroup } from "@/renderer/state/runtimeToolGrouping";
 import { imageViewRendersInline } from "./parts/items/imageViewSource";
 import {
   isToolGroupItem as isGroupableItemType,
@@ -159,9 +158,6 @@ function buildTimelineEntries(
       if (!next || !isToolGroupItem(next) || childParentIds.has(nextId)) {
         break;
       }
-      if (!canShareRuntimeToolGroup(item, next)) {
-        break;
-      }
       groupIds.push(nextId);
       idx += 1;
     }

src/renderer/state/chatRuntimePersister.test.ts

@@ -97,7 +97,7 @@ describe("prepareRuntimeSnapshotForPersistence", () => {
     ]);
   });
 
-  it("does not compact edits together with other tool calls", () => {
+  it("compacts edits together with the rest of the tool-call run", () => {
     const snapshot = prepareRuntimeSnapshotForPersistence(
       [
         makeItem({ id: "assistant-1", type: "assistant_message" }),
@@ -130,19 +130,13 @@ describe("prepareRuntimeSnapshotForPersistence", () => {
       [makeTurn("edit-1"), makeTurn("edit-2"), makeTurn("command-1"), makeTurn("edit-3")],
     );
 
-    const editSummaryId = "tool-call-summary:edit-1:edit-2:2";
-    const commandSummaryId = "tool-call-summary:command-1:command-2:2";
-    expect(snapshot.items.map((item) => item.id)).toEqual([
-      "assistant-1",
-      editSummaryId,
-      commandSummaryId,
-      "edit-3",
-    ]);
+    const summaryId = "tool-call-summary:edit-1:edit-3:5";
+    expect(snapshot.items.map((item) => item.id)).toEqual(["assistant-1", summaryId]);
     expect(snapshot.turns.map((turn) => turn.anchorItemId)).toEqual([
-      editSummaryId,
-      editSummaryId,
-      commandSummaryId,
-      "edit-3",
+      summaryId,
+      summaryId,
+      summaryId,
+      summaryId,
     ]);
   });
 

src/renderer/state/chatRuntimePersister.ts

@@ -4,7 +4,6 @@ import { imageViewRendersInline } from "../components/thread/ChatPane/parts/item
 import { isSubAgentTool } from "../components/thread/ChatPane/parts/items/toolDisplay";
 import { readBridge } from "../bridge";
 import { useAppStore } from "./appStore";
-import { canShareRuntimeToolGroup } from "./runtimeToolGrouping";
 import {
   subscribeRuntimePersistenceDirtyThreads,
   type CompletedTurnRecord,
@@ -272,7 +271,6 @@ function compactRuntimeItemsForPersistence(
     while (idx < items.length) {
       const next = items[idx]!;
       if (!isToolGroupItem(next) || next.state !== "completed") break;
-      if (!canShareRuntimeToolGroup(run[0]!, next)) break;
       run.push(next);
       idx += 1;
     }