From cf2d1dd3e90acbbb25071ea15eef79cc8c7496a3 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Fri, 12 Jun 2026 17:18:05 -0500
Subject: [PATCH] fix(tui): restore subtask invocation spacing (#32109)

---
 packages/tui/src/routes/session/index.tsx     |  5 ++-
 .../inline-tool-wrap-snapshot.test.tsx.snap   | 16 +++++++++
 .../tui/inline-tool-wrap-snapshot.test.tsx    | 36 +++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/packages/tui/src/routes/session/index.tsx b/packages/tui/src/routes/session/index.tsx
index 922272f0e..fde5a367e 100644
--- a/packages/tui/src/routes/session/index.tsx
+++ b/packages/tui/src/routes/session/index.tsx
@@ -1527,6 +1527,7 @@ function AssistantMessage(props: { message: AssistantMessage; parts: Part[]; las
       </Show>
       <Show when={props.message.error && props.message.error.name !== "MessageAbortedError"}>
         <box
+          id={`assistant-error-${props.message.id}`}
           border={["left"]}
           paddingTop={1}
           paddingBottom={1}
@@ -1541,7 +1542,7 @@ function AssistantMessage(props: { message: AssistantMessage; parts: Part[]; las
       </Show>
       <Switch>
         <Match when={props.last || final() || props.message.error?.name === "MessageAbortedError"}>
-          <box paddingLeft={3}>
+          <box id={`assistant-summary-${props.message.id}`} paddingLeft={3}>
             <text marginTop={1}>
               <span
                 style={{
@@ -1939,6 +1940,8 @@ export function InlineToolRow(props: {
           const previousSubagent = previous?.id.startsWith("tool-inline-subagent-") ?? false
           return previous?.id.startsWith("text-") ||
             previous?.id.startsWith("tool-block-") ||
+            previous?.id.startsWith("assistant-error-") ||
+            previous?.id.startsWith("assistant-summary-") ||
             (previousInline && previousSubagent !== Boolean(props.subagent)) ||
             props.separateAfter?.(previous?.id)
             ? 1
diff --git a/packages/tui/test/cli/tui/__snapshots__/inline-tool-wrap-snapshot.test.tsx.snap b/packages/tui/test/cli/tui/__snapshots__/inline-tool-wrap-snapshot.test.tsx.snap
index 348035dca..36b6b5c56 100644
--- a/packages/tui/test/cli/tui/__snapshots__/inline-tool-wrap-snapshot.test.tsx.snap
+++ b/packages/tui/test/cli/tui/__snapshots__/inline-tool-wrap-snapshot.test.tsx.snap
@@ -70,3 +70,19 @@ exports[`TUI inline tool wrapping separates a subagent group after an expanded r
    ✓ Explore Task — Inspect active task spacing
      ↳ 1 toolcall · 501ms"
 `;
+
+exports[`TUI inline tool wrapping separates a subagent from the previous assistant summary 1`] = `
+"   ▣ Build · Little Frank · 53.1s
+
+   ✓ Build Task — Review changes
+     ↳ 48 toolcalls · 1m 40s"
+`;
+
+exports[`TUI inline tool wrapping separates a subagent from the previous assistant error 1`] = `
+"│
+│  Managed inference requires an active Member plan
+│
+
+   ✓ Build Task — Review changes
+     ↳ 48 toolcalls · 1m 40s"
+`;
diff --git a/packages/tui/test/cli/tui/inline-tool-wrap-snapshot.test.tsx b/packages/tui/test/cli/tui/inline-tool-wrap-snapshot.test.tsx
index 880dc0271..93ae89d61 100644
--- a/packages/tui/test/cli/tui/inline-tool-wrap-snapshot.test.tsx
+++ b/packages/tui/test/cli/tui/inline-tool-wrap-snapshot.test.tsx
@@ -134,6 +134,32 @@ function LoadedReadBeforeSubagentFixture() {
   )
 }
 
+function AssistantSummaryBeforeSubagentFixture() {
+  return (
+    <box flexDirection="column" width={72}>
+      <box id="assistant-summary-message-one" paddingLeft={3}>
+        <text>▣ Build · Little Frank · 53.1s</text>
+      </box>
+      <InlineToolRow id="tool-inline-subagent-one" icon="✓" complete={true} pending="" subagent={true}>
+        {"Build Task — Review changes\n↳ 48 toolcalls · 1m 40s"}
+      </InlineToolRow>
+    </box>
+  )
+}
+
+function AssistantErrorBeforeSubagentFixture() {
+  return (
+    <box flexDirection="column" width={72}>
+      <box id="assistant-error-message-one" border={["left"]} paddingTop={1} paddingBottom={1} paddingLeft={2}>
+        <text>Managed inference requires an active Member plan</text>
+      </box>
+      <InlineToolRow id="tool-inline-subagent-one" icon="✓" complete={true} pending="" subagent={true}>
+        {"Build Task — Review changes\n↳ 48 toolcalls · 1m 40s"}
+      </InlineToolRow>
+    </box>
+  )
+}
+
 function StickyScrollFixture(props: { separated: boolean; scroll: (scroll: ScrollBoxRenderable) => void }) {
   return (
     <scrollbox ref={props.scroll} stickyScroll={true} stickyStart="bottom" height={3} width={72}>
@@ -276,6 +302,16 @@ describe("TUI inline tool wrapping", () => {
     expect(await renderFrame(() => <LoadedReadBeforeSubagentFixture />, { width: 72, height: 8 })).toMatchSnapshot()
   })
 
+  test("separates a subagent from the previous assistant summary", async () => {
+    expect(
+      await renderFrame(() => <AssistantSummaryBeforeSubagentFixture />, { width: 72, height: 5 }),
+    ).toMatchSnapshot()
+  })
+
+  test("separates a subagent from the previous assistant error", async () => {
+    expect(await renderFrame(() => <AssistantErrorBeforeSubagentFixture />, { width: 72, height: 7 })).toMatchSnapshot()
+  })
+
   test("updates sticky-bottom geometry when a text separator mounts and unmounts", async () => {
     const [separated, setSeparated] = createSignal(false)
     let scroll: ScrollBoxRenderable | undefined