feat(messages): display agent names in collab tool call titles

Author: jacobjmc

src/features/messages/utils/messageRenderUtils.ts

@@ -330,6 +330,14 @@ export function buildToolSummary(
     }
   }
 
+  if (item.toolType === "collabToolCall") {
+    return {
+      label: "",
+      value: item.title,
+      output: item.output || "",
+    };
+  }
+
   return {
     label: "tool",
     value: item.title || "",

src/utils/threadItems.test.ts

@@ -611,14 +611,48 @@ describe("threadItems", () => {
       receiverThreadIds: ["thread-b"],
       newThreadId: "thread-c",
       prompt: "Coordinate work",
-      agentStatus: { "agent-1": { status: "running" } },
+      agentStatus: { explore: { status: "running" } },
     });
     expect(item).not.toBeNull();
     if (item && item.kind === "tool") {
-      expect(item.title).toBe("Collab: handoff");
+      expect(item.title).toBe("Explore Agent");
       expect(item.detail).toContain("From thread-a");
       expect(item.detail).toContain("thread-b, thread-c");
-      expect(item.output).toBe("Coordinate work\n\nagent-1: running");
+      expect(item.output).toBe("Coordinate work\n\nexplore: running");
+    }
+  });
+
+  it("formats collab tool calls with multiple agents", () => {
+    const item = buildConversationItem({
+      type: "collabToolCall",
+      id: "collab-2",
+      tool: "task",
+      status: "ok",
+      senderThreadId: "thread-a",
+      prompt: "Run parallel agents",
+      agentStatus: {
+        explore: { status: "running" },
+        librarian: { status: "completed" },
+      },
+    });
+    expect(item).not.toBeNull();
+    if (item && item.kind === "tool") {
+      expect(item.title).toBe("Explore Agent, Librarian Agent");
+    }
+  });
+
+  it("formats collab tool calls with fallback when no agent status", () => {
+    const item = buildConversationItem({
+      type: "collabToolCall",
+      id: "collab-3",
+      tool: "task",
+      status: "ok",
+      senderThreadId: "thread-a",
+      prompt: "Unknown agent",
+    });
+    expect(item).not.toBeNull();
+    if (item && item.kind === "tool") {
+      expect(item.title).toBe("Subagent");
     }
   });
 

src/utils/threadItems.ts

@@ -84,6 +84,18 @@ function formatCollabAgentStates(value: unknown) {
   return entries.join("\n");
 }
 
+function formatCollabAgentTitle(agentStatus: unknown): string {
+  if (!agentStatus || typeof agentStatus !== "object") {
+    return "Subagent";
+  }
+  const agents = Object.keys(agentStatus as Record<string, unknown>)
+    .map((name) => name.charAt(0).toUpperCase() + name.slice(1) + " Agent")
+    .filter(Boolean);
+
+  if (agents.length === 0) return "Subagent";
+  return agents.join(", ");
+}
+
 export function normalizeItem(item: ConversationItem): ConversationItem {
   if (item.kind === "message") {
     return { ...item, text: truncateText(item.text) };
@@ -743,7 +755,6 @@ export function buildConversationItem(
     };
   }
   if (type === "collabToolCall" || type === "collabAgentToolCall") {
-    const tool = asString(item.tool ?? "");
     const status = asString(item.status ?? "");
     const sender = asString(item.senderThreadId ?? item.sender_thread_id ?? "");
     const receivers = [
@@ -752,9 +763,8 @@ export function buildConversationItem(
       ...normalizeStringList(item.newThreadId ?? item.new_thread_id),
     ];
     const prompt = asString(item.prompt ?? "");
-    const agentsState = formatCollabAgentStates(
-      item.agentStatus ?? item.agentsStates ?? item.agents_states,
-    );
+    const agentStatusObj = item.agentStatus ?? item.agentsStates ?? item.agents_states;
+    const agentsState = formatCollabAgentStates(agentStatusObj);
     const detailParts = [sender ? `From ${sender}` : ""]
       .concat(receivers.length > 0 ? `→ ${receivers.join(", ")}` : "")
       .filter(Boolean);
@@ -763,7 +773,7 @@ export function buildConversationItem(
       id,
       kind: "tool",
       toolType: "collabToolCall",
-      title: tool ? `Collab: ${tool}` : "Collab tool call",
+      title: formatCollabAgentTitle(agentStatusObj),
       detail: detailParts.join(" "),
       status,
       output: outputParts.join("\n\n"),