From 5bddf40fd19f8a9d402aec8c941e257266aa03c8 Mon Sep 17 00:00:00 2001
From: Taylor Mullen <ntaylormullen@google.com>
Date: Sat, 17 May 2025 22:36:33 -0700
Subject: [PATCH] fix: Ensure CWD and auto-accept indicator are always visible

- This commit addresses an issue where the Current Working Directory (CWD) and the auto-accept indicator were not consistently visible, especially when tool confirmations were displayed.
- Previously, the CWD could be hidden during tool confirmation prompts, potentially leading to confusion about the context in which Gemini CLI was operating.

Fixes https://b.corp.google.com/issues/414289185
---
 packages/cli/src/ui/App.tsx | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/packages/cli/src/ui/App.tsx b/packages/cli/src/ui/App.tsx
index de1f0bf9..bd009e77 100644
--- a/packages/cli/src/ui/App.tsx
+++ b/packages/cli/src/ui/App.tsx
@@ -334,24 +334,22 @@ export const App = ({
                 showAutoAcceptIndicator ? <AutoAcceptIndicator /> : undefined
               }
             />
-            {isInputActive && (
-              <Box
-                marginTop={1}
-                display="flex"
-                justifyContent="space-between"
-                width="100%"
-              >
-                <Box>
-                  <>
-                    <Text color={Colors.SubtleComment}>cwd: </Text>
-                    <Text color={Colors.LightBlue}>
-                      {shortenPath(config.getTargetDir(), 70)}
-                    </Text>
-                  </>
-                </Box>
-                {showAutoAcceptIndicator && <AutoAcceptIndicator />}
+            <Box
+              marginTop={1}
+              display="flex"
+              justifyContent="space-between"
+              width="100%"
+            >
+              <Box>
+                <>
+                  <Text color={Colors.SubtleComment}>cwd: </Text>
+                  <Text color={Colors.LightBlue}>
+                    {shortenPath(config.getTargetDir(), 70)}
+                  </Text>
+                </>
               </Box>
-            )}
+              {showAutoAcceptIndicator && <AutoAcceptIndicator />}
+            </Box>
             {isInputActive && (
               <>
                 <InputPrompt