From e3f1208b31a6641b9ff22db9bec909d64e09c792 Mon Sep 17 00:00:00 2001
From: Taylor Ho <taylorkmho@gmail.com>
Date: Thu, 21 May 2026 23:00:16 -0700
Subject: [PATCH] fix(terminal): always render h-7 bar for consistent bottom
 spacing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reverts the conditional rendering — the h-7 bar must always be present
to match the thread panel's baseline spacing and keep bottom edges aligned.
---
 .../src/features/channels/ui/ChannelPane.tsx  | 50 +++++++++----------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/desktop/src/features/channels/ui/ChannelPane.tsx b/desktop/src/features/channels/ui/ChannelPane.tsx
index f57761bac4..bb7e5e557c 100644
--- a/desktop/src/features/channels/ui/ChannelPane.tsx
+++ b/desktop/src/features/channels/ui/ChannelPane.tsx
@@ -417,35 +417,33 @@ export const ChannelPane = React.memo(function ChannelPane({
                   isOpen={isTerminalOpen}
                 />
               ) : null}
-              {hasComposerBotActivity || hasTypingActivity ? (
-                <div className="h-7 bg-background px-4 pb-1 pt-0 sm:px-6">
-                  <div className="flex h-full w-full items-center gap-2">
-                    {hasComposerBotActivity ? (
-                      <div className="shrink-0">
-                        <BotActivityComposerAction
-                          agents={activityAgents}
-                          channelId={activeChannel?.id ?? null}
-                          onOpenAgentSession={onOpenAgentSession}
-                          openAgentSessionPubkey={openAgentSessionPubkey}
-                          profiles={profiles}
-                          typingBotPubkeys={composerBotTypingPubkeys}
-                          variant="inline"
-                        />
-                      </div>
-                    ) : null}
-                    {hasTypingActivity ? (
-                      <TypingIndicatorRow
-                        channel={activeChannel}
-                        className="min-w-0 flex-1 px-0 py-0"
-                        currentPubkey={currentPubkey}
+              <div className="h-7 bg-background px-4 pb-1 pt-0 sm:px-6">
+                <div className="flex h-full w-full items-center gap-2">
+                  {hasComposerBotActivity ? (
+                    <div className="shrink-0">
+                      <BotActivityComposerAction
+                        agents={activityAgents}
+                        channelId={activeChannel?.id ?? null}
+                        onOpenAgentSession={onOpenAgentSession}
+                        openAgentSessionPubkey={openAgentSessionPubkey}
                         profiles={profiles}
-                        typingPubkeys={typingPubkeys}
-                        variant="activity"
+                        typingBotPubkeys={composerBotTypingPubkeys}
+                        variant="inline"
                       />
-                    ) : null}
-                  </div>
+                    </div>
+                  ) : null}
+                  {hasTypingActivity ? (
+                    <TypingIndicatorRow
+                      channel={activeChannel}
+                      className="min-w-0 flex-1 px-0 py-0"
+                      currentPubkey={currentPubkey}
+                      profiles={profiles}
+                      typingPubkeys={typingPubkeys}
+                      variant="activity"
+                    />
+                  ) : null}
                 </div>
-              ) : null}
+              </div>
             </div>
           </div>
         )}