From f43f0667414c86793590e7ee9542ff04edd96fb1 Mon Sep 17 00:00:00 2001
From: Dax Raad <d@ironbay.co>
Date: Sat, 27 Jun 2026 13:17:21 -0400
Subject: [PATCH] fix(tui): stop bash spinner when tool errors before command
 received

---
 packages/tui/src/routes/session/index.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/tui/src/routes/session/index.tsx b/packages/tui/src/routes/session/index.tsx
index 517027cc155..b689f8ac3bb 100644
--- a/packages/tui/src/routes/session/index.tsx
+++ b/packages/tui/src/routes/session/index.tsx
@@ -1870,7 +1870,16 @@ function Shell(props: ToolProps) {
   return (
     <BlockTool part={props.part} onClick={collapsed().overflow ? () => setExpanded((prev) => !prev) : undefined}>
       <box gap={1}>
-        <Show when={command()} fallback={<Spinner color={color()}>Writing command...</Spinner>}>
+        <Show
+          when={command()}
+          fallback={
+            isRunning() || props.part.state.status === "pending" ? (
+              <Spinner color={color()}>Writing command...</Spinner>
+            ) : (
+              <text fg={theme.textMuted}>Writing command...</text>
+            )
+          }
+        >
           <Show
             when={isRunning()}
             fallback={