@@ -250,9 +250,9 @@ describe("ui/conversation", () => {
250250
251251 // Assert
252252 expect(text).toContain("Working...");
253- expect(text.filter((line) => line === "[shell ->]")).toHaveLength(1);
253+ expect(text.filter((line) => line === "shell ->")).toHaveLength(1);
254254 expect(text).toContain("echo hi");
255- expect(text).toContain("[shell <-]");
255+ expect(text).toContain("shell <-");
256256 expect(text).toContain("partial output");
257257 expect(text).not.toContain("Exit code: 0");
258258 });
@@ -301,7 +301,7 @@ describe("ui/conversation", () => {
301301 });
302302
303303 // Assert
304- expect(text).toContain("[edit <-]");
304+ expect(text).toContain("edit <-");
305305 expect(text).toContain("~ src/app.ts");
306306 expect(text).not.toContain("before");
307307 expect(text).not.toContain("after");
@@ -513,7 +513,7 @@ describe("ui/conversation", () => {
513513 expect(text).toContain("Thinking... 1 line.");
514514 });
515515
516- test("renderAssistantMessage for a shell tool call shows the command under the new header pill", () => {
516+ test("renderAssistantMessage for a shell tool call renders an unbracketed header inside the pill", () => {
517517 // Arrange
518518 const assistant = {
519519 content: [
@@ -522,12 +522,47 @@ describe("ui/conversation", () => {
522522 };
523523
524524 // Act
525- const text = collectText(renderAssistantMessage(assistant, RENDER_OPTS));
525+ const node = renderAssistantMessage(assistant, RENDER_OPTS);
526+ const text = collectText(node);
526527
527528 // Assert
528- expect(text).toContain("[shell ->]");
529+ expect(text).toContain("shell ->");
530+ expect(text).not.toContain("[shell ->]");
529531 expect(text).toContain("echo hi");
530532 expect(text).not.toContain('"command": "echo hi"');
533+
534+ expect(node?.type).toBe("vstack");
535+ if (!node || node.type !== "vstack") {
536+ throw new Error("Expected the assistant node to be a vstack");
537+ }
538+
539+ const toolBlock = node.children[0];
540+ expect(toolBlock?.type).toBe("hstack");
541+ if (!toolBlock || toolBlock.type !== "hstack") {
542+ throw new Error("Expected the tool block to be an hstack");
543+ }
544+
545+ const contentColumn = toolBlock.children[1];
546+ expect(contentColumn?.type).toBe("vstack");
547+ if (!contentColumn || contentColumn.type !== "vstack") {
548+ throw new Error("Expected the tool content column to be a vstack");
549+ }
550+
551+ const headerRow = contentColumn.children[0];
552+ expect(headerRow?.type).toBe("hstack");
553+ if (!headerRow || headerRow.type !== "hstack") {
554+ throw new Error("Expected the tool header row to be an hstack");
555+ }
556+
557+ const headerPill = headerRow.children[0];
558+ expect(headerPill?.type).toBe("hstack");
559+ if (!headerPill || headerPill.type !== "hstack") {
560+ throw new Error("Expected the tool header pill to be an hstack");
561+ }
562+
563+ expect(headerPill.props.bgColor).toBe(DEFAULT_THEME.toolBorder);
564+ expect(headerPill.props.padding).toEqual({ x: 1 });
565+ expect(collectText(headerPill)).toEqual(["shell ->"]);
531566 });
532567
533568 test("renderAssistantMessage for a shell tool call syntax-highlights bash tokens", async () => {
@@ -795,7 +830,7 @@ describe("ui/conversation", () => {
795830 const text = collectText(renderAssistantMessage(assistant, RENDER_OPTS));
796831
797832 // Assert
798- expect(text).toContain("[read image ->]");
833+ expect(text).toContain("read image ->");
799834 expect(text).toContain("assets/preview.png");
800835 expect(text).not.toContain("{");
801836 });
@@ -820,7 +855,7 @@ describe("ui/conversation", () => {
820855 const text = collectText(renderAssistantMessage(assistant, RENDER_OPTS));
821856
822857 // Assert
823- expect(text).toContain("[edit ->]");
858+ expect(text).toContain("edit ->");
824859 expect(text).toContain("src/file.ts");
825860 expect(text).toContain("old line");
826861 expect(text).toContain("new line");
@@ -883,7 +918,7 @@ describe("ui/conversation", () => {
883918 );
884919
885920 // Assert
886- expect(text).toContain("[shell <-]");
921+ expect(text).toContain("shell <-");
887922 expect(text).toContain("line 18");
888923 expect(text).toContain("line 25");
889924 expect(text).toContain("And 17 lines more");
@@ -927,7 +962,7 @@ describe("ui/conversation", () => {
927962 );
928963
929964 // Assert
930- expect(text).toContain("[shell <-]");
965+ expect(text).toContain("shell <-");
931966 expect(text).toContain("exit 42");
932967 expect(text).toContain("boom");
933968 expect(text).not.toContain("Exit code: 42");
@@ -944,7 +979,7 @@ describe("ui/conversation", () => {
944979 );
945980
946981 // Assert
947- expect(text).toContain("[read image <-]");
982+ expect(text).toContain("read image <-");
948983 expect(text).toContain("diagram.png");
949984 expect(text).not.toContain("Read image.");
950985 });
@@ -993,7 +1028,7 @@ describe("ui/conversation", () => {
9931028 );
9941029
9951030 // Assert
996- expect(previewText).toContain("[edit <-]");
1031+ expect(previewText).toContain("edit <-");
9971032 expect(previewText).toContain("~ src/file.ts");
9981033 expect(previewText).not.toContain("before");
9991034 expect(previewText).not.toContain("after");
@@ -1026,7 +1061,7 @@ describe("ui/conversation", () => {
10261061 );
10271062
10281063 // Assert
1029- expect(text).toContain("[edit <-]");
1064+ expect(text).toContain("edit <-");
10301065 expect(text).toContain("error 18");
10311066 expect(text).toContain("error 25");
10321067 expect(text).toContain("And 17 lines more");
@@ -1049,7 +1084,7 @@ describe("ui/conversation", () => {
10491084 );
10501085
10511086 // Assert
1052- expect(text).toContain("[mcp/search <-]");
1087+ expect(text).toContain("mcp/search <-");
10531088 expect(text).toContain("session persistence sqlite turn numbering");
10541089 expect(text).not.toContain('"query"');
10551090 });