From 0a36530dba3586fcec34f03ad11467f5b5cd2f0e Mon Sep 17 00:00:00 2001
From: Keith Lyons <lyonk71@gmail.com>
Date: Mon, 8 Sep 2025 23:09:03 -0400
Subject: [PATCH 1/9] fix: Restore footer configuration settings (#8041)

The footer configuration settings (hideCWD, hideSandboxStatus, hideModelInfo)
were lost during the AppContainer refactor. This commit reconnects the existing
settings to the Footer component to restore the ability to hide individual
footer elements.
---
 packages/cli/src/ui/components/Composer.tsx |   3 +
 packages/cli/src/ui/components/Footer.tsx   | 176 +++++++++++---------
 2 files changed, 100 insertions(+), 79 deletions(-)

diff --git a/packages/cli/src/ui/components/Composer.tsx b/packages/cli/src/ui/components/Composer.tsx
index fa5322e4ae9..986c79d9ff9 100644
--- a/packages/cli/src/ui/components/Composer.tsx
+++ b/packages/cli/src/ui/components/Composer.tsx
@@ -54,6 +54,9 @@ export const Composer = () => {
     promptTokenCount: uiState.sessionStats.lastPromptTokenCount,
     nightly: uiState.nightly,
     isTrustedFolder: uiState.isTrustedFolder,
+    hideCWD: settings.merged.ui?.footer?.hideCWD || false,
+    hideSandboxStatus: settings.merged.ui?.footer?.hideSandboxStatus || false,
+    hideModelInfo: settings.merged.ui?.footer?.hideModelInfo || false,
   };
 
   return (
diff --git a/packages/cli/src/ui/components/Footer.tsx b/packages/cli/src/ui/components/Footer.tsx
index f1cb7445fcb..e2d4c6335bd 100644
--- a/packages/cli/src/ui/components/Footer.tsx
+++ b/packages/cli/src/ui/components/Footer.tsx
@@ -33,6 +33,9 @@ export interface FooterProps {
   nightly: boolean;
   vimMode?: string;
   isTrustedFolder?: boolean;
+  hideCWD?: boolean;
+  hideSandboxStatus?: boolean;
+  hideModelInfo?: boolean;
 }
 
 export const Footer: React.FC<FooterProps> = ({
@@ -49,6 +52,9 @@ export const Footer: React.FC<FooterProps> = ({
   nightly,
   vimMode,
   isTrustedFolder,
+  hideCWD = false,
+  hideSandboxStatus = false,
+  hideModelInfo = false,
 }) => {
   const { columns: terminalWidth } = useTerminalSize();
 
@@ -60,100 +66,112 @@ export const Footer: React.FC<FooterProps> = ({
     ? path.basename(tildeifyPath(targetDir))
     : shortenPath(tildeifyPath(targetDir), pathLength);
 
+  const justifyContent = hideCWD && hideModelInfo ? 'center' : 'space-between';
+
   return (
     <Box
-      justifyContent="space-between"
+      justifyContent={justifyContent}
       width="100%"
       flexDirection={isNarrow ? 'column' : 'row'}
       alignItems={isNarrow ? 'flex-start' : 'center'}
     >
-      <Box>
-        {debugMode && <DebugProfiler />}
-        {vimMode && <Text color={theme.text.secondary}>[{vimMode}] </Text>}
-        {nightly ? (
-          <Gradient colors={theme.ui.gradient}>
-            <Text>
-              {displayPath}
-              {branchName && <Text> ({branchName}*)</Text>}
+      {(debugMode || vimMode || !hideCWD) && (
+        <Box>
+          {debugMode && <DebugProfiler />}
+          {vimMode && <Text color={theme.text.secondary}>[{vimMode}] </Text>}
+          {!hideCWD && (
+            nightly ? (
+              <Gradient colors={theme.ui.gradient}>
+                <Text>
+                  {displayPath}
+                  {branchName && <Text> ({branchName}*)</Text>}
+                </Text>
+              </Gradient>
+            ) : (
+              <Text color={theme.text.link}>
+                {displayPath}
+                {branchName && (
+                  <Text color={theme.text.secondary}> ({branchName}*)</Text>
+                )}
+              </Text>
+            )
+          )}
+          {debugMode && (
+            <Text color={theme.status.error}>
+              {' ' + (debugMessage || '--debug')}
             </Text>
-          </Gradient>
-        ) : (
-          <Text color={theme.text.link}>
-            {displayPath}
-            {branchName && (
-              <Text color={theme.text.secondary}> ({branchName}*)</Text>
-            )}
-          </Text>
-        )}
-        {debugMode && (
-          <Text color={theme.status.error}>
-            {' ' + (debugMessage || '--debug')}
-          </Text>
-        )}
-      </Box>
+          )}
+        </Box>
+      )}
 
       {/* Middle Section: Centered Trust/Sandbox Info */}
-      <Box
-        flexGrow={isNarrow ? 0 : 1}
-        alignItems="center"
-        justifyContent={isNarrow ? 'flex-start' : 'center'}
-        display="flex"
-        paddingX={isNarrow ? 0 : 1}
-        paddingTop={isNarrow ? 1 : 0}
-      >
-        {isTrustedFolder === false ? (
-          <Text color={theme.status.warning}>untrusted</Text>
-        ) : process.env['SANDBOX'] &&
-          process.env['SANDBOX'] !== 'sandbox-exec' ? (
-          <Text color="green">
-            {process.env['SANDBOX'].replace(/^gemini-(?:cli-)?/, '')}
-          </Text>
-        ) : process.env['SANDBOX'] === 'sandbox-exec' ? (
-          <Text color={theme.status.warning}>
-            macOS Seatbelt{' '}
-            <Text color={theme.text.secondary}>
-              ({process.env['SEATBELT_PROFILE']})
+      {!hideSandboxStatus && (
+        <Box
+          flexGrow={isNarrow || hideCWD || hideModelInfo ? 0 : 1}
+          alignItems="center"
+          justifyContent={isNarrow || hideCWD ? 'flex-start' : 'center'}
+          display="flex"
+          paddingX={isNarrow ? 0 : 1}
+          paddingTop={isNarrow ? 1 : 0}
+        >
+          {isTrustedFolder === false ? (
+            <Text color={theme.status.warning}>untrusted</Text>
+          ) : process.env['SANDBOX'] &&
+            process.env['SANDBOX'] !== 'sandbox-exec' ? (
+            <Text color="green">
+              {process.env['SANDBOX'].replace(/^gemini-(?:cli-)?/, '')}
             </Text>
-          </Text>
-        ) : (
-          <Text color={theme.status.error}>
-            no sandbox <Text color={theme.text.secondary}>(see /docs)</Text>
-          </Text>
-        )}
-      </Box>
-
-      {/* Right Section: Gemini Label and Console Summary */}
-      <Box alignItems="center" paddingTop={isNarrow ? 1 : 0}>
-        <Box alignItems="center">
-          <Text color={theme.text.accent}>
-            {isNarrow ? '' : ' '}
-            {model}{' '}
-            <ContextUsageDisplay
-              promptTokenCount={promptTokenCount}
-              model={model}
-            />
-          </Text>
-          {showMemoryUsage && <MemoryUsageDisplay />}
-        </Box>
-        <Box alignItems="center" paddingLeft={2}>
-          {corgiMode && (
-            <Text>
-              <Text color={theme.ui.symbol}>| </Text>
-              <Text color={theme.status.error}>▼</Text>
-              <Text color={theme.text.primary}>(´</Text>
-              <Text color={theme.status.error}>ᴥ</Text>
-              <Text color={theme.text.primary}>`)</Text>
-              <Text color={theme.status.error}>▼ </Text>
+          ) : process.env['SANDBOX'] === 'sandbox-exec' ? (
+            <Text color={theme.status.warning}>
+              macOS Seatbelt{' '}
+              <Text color={theme.text.secondary}>
+                ({process.env['SEATBELT_PROFILE']})
+              </Text>
+            </Text>
+          ) : (
+            <Text color={theme.status.error}>
+              no sandbox <Text color={theme.text.secondary}>(see /docs)</Text>
             </Text>
           )}
-          {!showErrorDetails && errorCount > 0 && (
-            <Box>
-              <Text color={theme.ui.symbol}>| </Text>
-              <ConsoleSummaryDisplay errorCount={errorCount} />
+        </Box>
+      )}
+
+      {/* Right Section: Gemini Label and Console Summary */}
+      {(!hideModelInfo || showMemoryUsage || corgiMode || (!showErrorDetails && errorCount > 0)) && (
+        <Box alignItems="center" paddingTop={isNarrow ? 1 : 0}>
+          {!hideModelInfo && (
+            <Box alignItems="center">
+              <Text color={theme.text.accent}>
+                {isNarrow ? '' : ' '}
+                {model}{' '}
+                <ContextUsageDisplay
+                  promptTokenCount={promptTokenCount}
+                  model={model}
+                />
+              </Text>
+              {showMemoryUsage && <MemoryUsageDisplay />}
             </Box>
           )}
+          <Box alignItems="center" paddingLeft={2}>
+            {corgiMode && (
+              <Text>
+                {!hideModelInfo && <Text color={theme.ui.symbol}>| </Text>}
+                <Text color={theme.status.error}>▼</Text>
+                <Text color={theme.text.primary}>(´</Text>
+                <Text color={theme.status.error}>ᴥ</Text>
+                <Text color={theme.text.primary}>`)</Text>
+                <Text color={theme.status.error}>▼ </Text>
+              </Text>
+            )}
+            {!showErrorDetails && errorCount > 0 && (
+              <Box>
+                {!hideModelInfo && <Text color={theme.ui.symbol}>| </Text>}
+                <ConsoleSummaryDisplay errorCount={errorCount} />
+              </Box>
+            )}
+          </Box>
         </Box>
-      </Box>
+      )}
     </Box>
   );
 };

From 2821d45ccecf4be274c5995e1b22de3219c3e902 Mon Sep 17 00:00:00 2001
From: Keith Lyons <lyonk71@gmail.com>
Date: Tue, 9 Sep 2025 22:41:20 -0400
Subject: [PATCH 2/9] style: Apply prettier formatting to Footer.tsx

---
 packages/cli/src/ui/components/Footer.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/cli/src/ui/components/Footer.tsx b/packages/cli/src/ui/components/Footer.tsx
index e2d4c6335bd..296ef0855d2 100644
--- a/packages/cli/src/ui/components/Footer.tsx
+++ b/packages/cli/src/ui/components/Footer.tsx
@@ -79,8 +79,8 @@ export const Footer: React.FC<FooterProps> = ({
         <Box>
           {debugMode && <DebugProfiler />}
           {vimMode && <Text color={theme.text.secondary}>[{vimMode}] </Text>}
-          {!hideCWD && (
-            nightly ? (
+          {!hideCWD &&
+            (nightly ? (
               <Gradient colors={theme.ui.gradient}>
                 <Text>
                   {displayPath}
@@ -94,8 +94,7 @@ export const Footer: React.FC<FooterProps> = ({
                   <Text color={theme.text.secondary}> ({branchName}*)</Text>
                 )}
               </Text>
-            )
-          )}
+            ))}
           {debugMode && (
             <Text color={theme.status.error}>
               {' ' + (debugMessage || '--debug')}
@@ -137,7 +136,10 @@ export const Footer: React.FC<FooterProps> = ({
       )}
 
       {/* Right Section: Gemini Label and Console Summary */}
-      {(!hideModelInfo || showMemoryUsage || corgiMode || (!showErrorDetails && errorCount > 0)) && (
+      {(!hideModelInfo ||
+        showMemoryUsage ||
+        corgiMode ||
+        (!showErrorDetails && errorCount > 0)) && (
         <Box alignItems="center" paddingTop={isNarrow ? 1 : 0}>
           {!hideModelInfo && (
             <Box alignItems="center">

From 73dee3211cb40aa4f613f16f0aa35cc7d772d046 Mon Sep 17 00:00:00 2001
From: Keith Lyons <lyonk71@gmail.com>
Date: Mon, 8 Sep 2025 23:09:03 -0400
Subject: [PATCH 3/9] fix: Restore footer configuration settings (#8041)

The footer configuration settings (hideCWD, hideSandboxStatus, hideModelInfo)
were lost during the AppContainer refactor. This commit reconnects the existing
settings to the Footer component to restore the ability to hide individual
footer elements.
---
 packages/cli/src/ui/components/Composer.tsx |   3 +
 packages/cli/src/ui/components/Footer.tsx   | 176 +++++++++++---------
 2 files changed, 100 insertions(+), 79 deletions(-)

diff --git a/packages/cli/src/ui/components/Composer.tsx b/packages/cli/src/ui/components/Composer.tsx
index 07d97660294..cf55d09220b 100644
--- a/packages/cli/src/ui/components/Composer.tsx
+++ b/packages/cli/src/ui/components/Composer.tsx
@@ -54,6 +54,9 @@ export const Composer = () => {
     promptTokenCount: uiState.sessionStats.lastPromptTokenCount,
     nightly: uiState.nightly,
     isTrustedFolder: uiState.isTrustedFolder,
+    hideCWD: settings.merged.ui?.footer?.hideCWD || false,
+    hideSandboxStatus: settings.merged.ui?.footer?.hideSandboxStatus || false,
+    hideModelInfo: settings.merged.ui?.footer?.hideModelInfo || false,
   };
 
   return (
diff --git a/packages/cli/src/ui/components/Footer.tsx b/packages/cli/src/ui/components/Footer.tsx
index f1cb7445fcb..e2d4c6335bd 100644
--- a/packages/cli/src/ui/components/Footer.tsx
+++ b/packages/cli/src/ui/components/Footer.tsx
@@ -33,6 +33,9 @@ export interface FooterProps {
   nightly: boolean;
   vimMode?: string;
   isTrustedFolder?: boolean;
+  hideCWD?: boolean;
+  hideSandboxStatus?: boolean;
+  hideModelInfo?: boolean;
 }
 
 export const Footer: React.FC<FooterProps> = ({
@@ -49,6 +52,9 @@ export const Footer: React.FC<FooterProps> = ({
   nightly,
   vimMode,
   isTrustedFolder,
+  hideCWD = false,
+  hideSandboxStatus = false,
+  hideModelInfo = false,
 }) => {
   const { columns: terminalWidth } = useTerminalSize();
 
@@ -60,100 +66,112 @@ export const Footer: React.FC<FooterProps> = ({
     ? path.basename(tildeifyPath(targetDir))
     : shortenPath(tildeifyPath(targetDir), pathLength);
 
+  const justifyContent = hideCWD && hideModelInfo ? 'center' : 'space-between';
+
   return (
     <Box
-      justifyContent="space-between"
+      justifyContent={justifyContent}
       width="100%"
       flexDirection={isNarrow ? 'column' : 'row'}
       alignItems={isNarrow ? 'flex-start' : 'center'}
     >
-      <Box>
-        {debugMode && <DebugProfiler />}
-        {vimMode && <Text color={theme.text.secondary}>[{vimMode}] </Text>}
-        {nightly ? (
-          <Gradient colors={theme.ui.gradient}>
-            <Text>
-              {displayPath}
-              {branchName && <Text> ({branchName}*)</Text>}
+      {(debugMode || vimMode || !hideCWD) && (
+        <Box>
+          {debugMode && <DebugProfiler />}
+          {vimMode && <Text color={theme.text.secondary}>[{vimMode}] </Text>}
+          {!hideCWD && (
+            nightly ? (
+              <Gradient colors={theme.ui.gradient}>
+                <Text>
+                  {displayPath}
+                  {branchName && <Text> ({branchName}*)</Text>}
+                </Text>
+              </Gradient>
+            ) : (
+              <Text color={theme.text.link}>
+                {displayPath}
+                {branchName && (
+                  <Text color={theme.text.secondary}> ({branchName}*)</Text>
+                )}
+              </Text>
+            )
+          )}
+          {debugMode && (
+            <Text color={theme.status.error}>
+              {' ' + (debugMessage || '--debug')}
             </Text>
-          </Gradient>
-        ) : (
-          <Text color={theme.text.link}>
-            {displayPath}
-            {branchName && (
-              <Text color={theme.text.secondary}> ({branchName}*)</Text>
-            )}
-          </Text>
-        )}
-        {debugMode && (
-          <Text color={theme.status.error}>
-            {' ' + (debugMessage || '--debug')}
-          </Text>
-        )}
-      </Box>
+          )}
+        </Box>
+      )}
 
       {/* Middle Section: Centered Trust/Sandbox Info */}
-      <Box
-        flexGrow={isNarrow ? 0 : 1}
-        alignItems="center"
-        justifyContent={isNarrow ? 'flex-start' : 'center'}
-        display="flex"
-        paddingX={isNarrow ? 0 : 1}
-        paddingTop={isNarrow ? 1 : 0}
-      >
-        {isTrustedFolder === false ? (
-          <Text color={theme.status.warning}>untrusted</Text>
-        ) : process.env['SANDBOX'] &&
-          process.env['SANDBOX'] !== 'sandbox-exec' ? (
-          <Text color="green">
-            {process.env['SANDBOX'].replace(/^gemini-(?:cli-)?/, '')}
-          </Text>
-        ) : process.env['SANDBOX'] === 'sandbox-exec' ? (
-          <Text color={theme.status.warning}>
-            macOS Seatbelt{' '}
-            <Text color={theme.text.secondary}>
-              ({process.env['SEATBELT_PROFILE']})
+      {!hideSandboxStatus && (
+        <Box
+          flexGrow={isNarrow || hideCWD || hideModelInfo ? 0 : 1}
+          alignItems="center"
+          justifyContent={isNarrow || hideCWD ? 'flex-start' : 'center'}
+          display="flex"
+          paddingX={isNarrow ? 0 : 1}
+          paddingTop={isNarrow ? 1 : 0}
+        >
+          {isTrustedFolder === false ? (
+            <Text color={theme.status.warning}>untrusted</Text>
+          ) : process.env['SANDBOX'] &&
+            process.env['SANDBOX'] !== 'sandbox-exec' ? (
+            <Text color="green">
+              {process.env['SANDBOX'].replace(/^gemini-(?:cli-)?/, '')}
             </Text>
-          </Text>
-        ) : (
-          <Text color={theme.status.error}>
-            no sandbox <Text color={theme.text.secondary}>(see /docs)</Text>
-          </Text>
-        )}
-      </Box>
-
-      {/* Right Section: Gemini Label and Console Summary */}
-      <Box alignItems="center" paddingTop={isNarrow ? 1 : 0}>
-        <Box alignItems="center">
-          <Text color={theme.text.accent}>
-            {isNarrow ? '' : ' '}
-            {model}{' '}
-            <ContextUsageDisplay
-              promptTokenCount={promptTokenCount}
-              model={model}
-            />
-          </Text>
-          {showMemoryUsage && <MemoryUsageDisplay />}
-        </Box>
-        <Box alignItems="center" paddingLeft={2}>
-          {corgiMode && (
-            <Text>
-              <Text color={theme.ui.symbol}>| </Text>
-              <Text color={theme.status.error}>▼</Text>
-              <Text color={theme.text.primary}>(´</Text>
-              <Text color={theme.status.error}>ᴥ</Text>
-              <Text color={theme.text.primary}>`)</Text>
-              <Text color={theme.status.error}>▼ </Text>
+          ) : process.env['SANDBOX'] === 'sandbox-exec' ? (
+            <Text color={theme.status.warning}>
+              macOS Seatbelt{' '}
+              <Text color={theme.text.secondary}>
+                ({process.env['SEATBELT_PROFILE']})
+              </Text>
+            </Text>
+          ) : (
+            <Text color={theme.status.error}>
+              no sandbox <Text color={theme.text.secondary}>(see /docs)</Text>
             </Text>
           )}
-          {!showErrorDetails && errorCount > 0 && (
-            <Box>
-              <Text color={theme.ui.symbol}>| </Text>
-              <ConsoleSummaryDisplay errorCount={errorCount} />
+        </Box>
+      )}
+
+      {/* Right Section: Gemini Label and Console Summary */}
+      {(!hideModelInfo || showMemoryUsage || corgiMode || (!showErrorDetails && errorCount > 0)) && (
+        <Box alignItems="center" paddingTop={isNarrow ? 1 : 0}>
+          {!hideModelInfo && (
+            <Box alignItems="center">
+              <Text color={theme.text.accent}>
+                {isNarrow ? '' : ' '}
+                {model}{' '}
+                <ContextUsageDisplay
+                  promptTokenCount={promptTokenCount}
+                  model={model}
+                />
+              </Text>
+              {showMemoryUsage && <MemoryUsageDisplay />}
             </Box>
           )}
+          <Box alignItems="center" paddingLeft={2}>
+            {corgiMode && (
+              <Text>
+                {!hideModelInfo && <Text color={theme.ui.symbol}>| </Text>}
+                <Text color={theme.status.error}>▼</Text>
+                <Text color={theme.text.primary}>(´</Text>
+                <Text color={theme.status.error}>ᴥ</Text>
+                <Text color={theme.text.primary}>`)</Text>
+                <Text color={theme.status.error}>▼ </Text>
+              </Text>
+            )}
+            {!showErrorDetails && errorCount > 0 && (
+              <Box>
+                {!hideModelInfo && <Text color={theme.ui.symbol}>| </Text>}
+                <ConsoleSummaryDisplay errorCount={errorCount} />
+              </Box>
+            )}
+          </Box>
         </Box>
-      </Box>
+      )}
     </Box>
   );
 };

From e02366367e8022438c85ddc58520cdf6cbbe7212 Mon Sep 17 00:00:00 2001
From: Keith Lyons <lyonk71@gmail.com>
Date: Tue, 9 Sep 2025 22:41:20 -0400
Subject: [PATCH 4/9] style: Apply prettier formatting to Footer.tsx

---
 packages/cli/src/ui/components/Footer.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/cli/src/ui/components/Footer.tsx b/packages/cli/src/ui/components/Footer.tsx
index e2d4c6335bd..296ef0855d2 100644
--- a/packages/cli/src/ui/components/Footer.tsx
+++ b/packages/cli/src/ui/components/Footer.tsx
@@ -79,8 +79,8 @@ export const Footer: React.FC<FooterProps> = ({
         <Box>
           {debugMode && <DebugProfiler />}
           {vimMode && <Text color={theme.text.secondary}>[{vimMode}] </Text>}
-          {!hideCWD && (
-            nightly ? (
+          {!hideCWD &&
+            (nightly ? (
               <Gradient colors={theme.ui.gradient}>
                 <Text>
                   {displayPath}
@@ -94,8 +94,7 @@ export const Footer: React.FC<FooterProps> = ({
                   <Text color={theme.text.secondary}> ({branchName}*)</Text>
                 )}
               </Text>
-            )
-          )}
+            ))}
           {debugMode && (
             <Text color={theme.status.error}>
               {' ' + (debugMessage || '--debug')}
@@ -137,7 +136,10 @@ export const Footer: React.FC<FooterProps> = ({
       )}
 
       {/* Right Section: Gemini Label and Console Summary */}
-      {(!hideModelInfo || showMemoryUsage || corgiMode || (!showErrorDetails && errorCount > 0)) && (
+      {(!hideModelInfo ||
+        showMemoryUsage ||
+        corgiMode ||
+        (!showErrorDetails && errorCount > 0)) && (
         <Box alignItems="center" paddingTop={isNarrow ? 1 : 0}>
           {!hideModelInfo && (
             <Box alignItems="center">

From c52fc84ac740163d5f18241bc28ab27e18c562ce Mon Sep 17 00:00:00 2001
From: Keith Lyons <lyonk71@gmail.com>
Date: Wed, 10 Sep 2025 22:15:18 -0400
Subject: [PATCH 5/9] fix(cli): Restore context summary alignment tweaks

---
 packages/cli/src/ui/components/Composer.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/ui/components/Composer.tsx b/packages/cli/src/ui/components/Composer.tsx
index cf55d09220b..d452abe7f58 100644
--- a/packages/cli/src/ui/components/Composer.tsx
+++ b/packages/cli/src/ui/components/Composer.tsx
@@ -108,7 +108,9 @@ export const Composer = () => {
 
       <Box
         marginTop={1}
-        justifyContent="space-between"
+        justifyContent={
+          settings.merged.ui?.hideContextSummary ? 'flex-end' : 'space-between'
+        }
         width="100%"
         flexDirection={isNarrow ? 'column' : 'row'}
         alignItems={isNarrow ? 'flex-start' : 'center'}

From ba6e27f283c3e3dc6082c70730450ad163a2a4cc Mon Sep 17 00:00:00 2001
From: Miguel Solorio <miguel.solorio07@gmail.com>
Date: Thu, 11 Sep 2025 10:01:08 -0700
Subject: [PATCH 6/9] Adjust alignment for accept/yolo/shell mode

---
 packages/cli/src/ui/components/Composer.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/ui/components/Composer.tsx b/packages/cli/src/ui/components/Composer.tsx
index d452abe7f58..562817a92f3 100644
--- a/packages/cli/src/ui/components/Composer.tsx
+++ b/packages/cli/src/ui/components/Composer.tsx
@@ -109,13 +109,13 @@ export const Composer = () => {
       <Box
         marginTop={1}
         justifyContent={
-          settings.merged.ui?.hideContextSummary ? 'flex-end' : 'space-between'
+          settings.merged.ui?.hideContextSummary ? 'flex-start' : 'space-between'
         }
         width="100%"
         flexDirection={isNarrow ? 'column' : 'row'}
         alignItems={isNarrow ? 'flex-start' : 'center'}
       >
-        <Box>
+        <Box marginRight={1}>
           {process.env['GEMINI_SYSTEM_MD'] && (
             <Text color={theme.status.error}>|⌐■_■| </Text>
           )}

From f78a96413443990ee31d2fd32a2abecbc35cf9d7 Mon Sep 17 00:00:00 2001
From: Miguel Solorio <miguel.solorio07@gmail.com>
Date: Thu, 11 Sep 2025 10:03:00 -0700
Subject: [PATCH 7/9] Format

---
 packages/cli/src/ui/components/Composer.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/ui/components/Composer.tsx b/packages/cli/src/ui/components/Composer.tsx
index 562817a92f3..ef6bcd1cb60 100644
--- a/packages/cli/src/ui/components/Composer.tsx
+++ b/packages/cli/src/ui/components/Composer.tsx
@@ -109,7 +109,9 @@ export const Composer = () => {
       <Box
         marginTop={1}
         justifyContent={
-          settings.merged.ui?.hideContextSummary ? 'flex-start' : 'space-between'
+          settings.merged.ui?.hideContextSummary
+            ? 'flex-start'
+            : 'space-between'
         }
         width="100%"
         flexDirection={isNarrow ? 'column' : 'row'}

From a0fd00a170b487d85efb874e1eb1e17ad39cb5a4 Mon Sep 17 00:00:00 2001
From: Keith Lyons <lyonk71@gmail.com>
Date: Thu, 11 Sep 2025 09:13:22 -0400
Subject: [PATCH 8/9] test(cli): Add golden snapshot tests for footer

---
 .../cli/src/ui/components/Footer.test.tsx     | 52 +++++++++++++++++++
 .../__snapshots__/Footer.test.tsx.snap        | 20 +++++++
 2 files changed, 72 insertions(+)
 create mode 100644 packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap

diff --git a/packages/cli/src/ui/components/Footer.test.tsx b/packages/cli/src/ui/components/Footer.test.tsx
index e3673dfee75..bfcd94ba16e 100644
--- a/packages/cli/src/ui/components/Footer.test.tsx
+++ b/packages/cli/src/ui/components/Footer.test.tsx
@@ -156,4 +156,56 @@ describe('<Footer />', () => {
       vi.unstubAllEnvs();
     });
   });
+
+  describe('footer configuration filtering (golden snapshots)', () => {
+    it('renders complete footer with all sections visible (baseline)', () => {
+      const { lastFrame } = renderWithWidth(120, {
+        ...defaultProps,
+        hideCWD: false,
+        hideSandboxStatus: false,
+        hideModelInfo: false,
+      });
+      expect(lastFrame()).toMatchSnapshot('complete-footer-wide');
+    });
+
+    it('renders footer with all optional sections hidden (minimal footer)', () => {
+      const { lastFrame } = renderWithWidth(120, {
+        ...defaultProps,
+        hideCWD: true,
+        hideSandboxStatus: true,
+        hideModelInfo: true,
+      });
+      expect(lastFrame()).toMatchSnapshot('footer-minimal');
+    });
+
+    it('renders footer with only model info hidden (partial filtering)', () => {
+      const { lastFrame } = renderWithWidth(120, {
+        ...defaultProps,
+        hideCWD: false,
+        hideSandboxStatus: false,
+        hideModelInfo: true,
+      });
+      expect(lastFrame()).toMatchSnapshot('footer-no-model');
+    });
+
+    it('renders footer with CWD and model info hidden to test alignment (only sandbox visible)', () => {
+      const { lastFrame } = renderWithWidth(120, {
+        ...defaultProps,
+        hideCWD: true,
+        hideSandboxStatus: false,
+        hideModelInfo: true,
+      });
+      expect(lastFrame()).toMatchSnapshot('footer-only-sandbox');
+    });
+
+    it('renders complete footer in narrow terminal (baseline narrow)', () => {
+      const { lastFrame } = renderWithWidth(79, {
+        ...defaultProps,
+        hideCWD: false,
+        hideSandboxStatus: false,
+        hideModelInfo: false,
+      });
+      expect(lastFrame()).toMatchSnapshot('complete-footer-narrow');
+    });
+  });
 });
diff --git a/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap
new file mode 100644
index 00000000000..8c6553c33dd
--- /dev/null
+++ b/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap
@@ -0,0 +1,20 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders complete footer in narrow terminal (baseline narrow) > complete-footer-narrow 1`] = `
+"long (main*)
+
+no sandbox (see /docs)
+
+gemini-pro (100% context left)"
+`;
+
+exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders complete footer with all sections visible (baseline) > complete-footer-wide 1`] = `
+"...bar/and/some/more/directories/to/make/it/long    no sandbox (see     gemini-pro (100% context
+(main*)                                             /docs)             left)"
+`;
+
+exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders footer with CWD and model info hidden to test alignment (only sandbox visible) > footer-only-sandbox 1`] = `"                                       no sandbox (see /docs)"`;
+
+exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders footer with all optional sections hidden (minimal footer) > footer-minimal 1`] = `""`;
+
+exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders footer with only model info hidden (partial filtering) > footer-no-model 1`] = `"...bar/and/some/more/directories/to/make/it/long (main*)                     no sandbox (see /docs)"`;

From b10168b8c5f9f055b5460cf2e1a7c814dcd4f3ed Mon Sep 17 00:00:00 2001
From: Miguel Solorio <miguel.solorio07@gmail.com>
Date: Thu, 11 Sep 2025 14:20:37 -0700
Subject: [PATCH 9/9] Fix conflict override

---
 packages/cli/src/ui/components/Footer.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/ui/components/Footer.tsx b/packages/cli/src/ui/components/Footer.tsx
index 296ef0855d2..73b40c5d656 100644
--- a/packages/cli/src/ui/components/Footer.tsx
+++ b/packages/cli/src/ui/components/Footer.tsx
@@ -157,7 +157,7 @@ export const Footer: React.FC<FooterProps> = ({
           <Box alignItems="center" paddingLeft={2}>
             {corgiMode && (
               <Text>
-                {!hideModelInfo && <Text color={theme.ui.symbol}>| </Text>}
+                {!hideModelInfo && <Text color={theme.ui.comment}>| </Text>}
                 <Text color={theme.status.error}>▼</Text>
                 <Text color={theme.text.primary}>(´</Text>
                 <Text color={theme.status.error}>ᴥ</Text>
@@ -167,7 +167,7 @@ export const Footer: React.FC<FooterProps> = ({
             )}
             {!showErrorDetails && errorCount > 0 && (
               <Box>
-                {!hideModelInfo && <Text color={theme.ui.symbol}>| </Text>}
+                {!hideModelInfo && <Text color={theme.ui.comment}>| </Text>}
                 <ConsoleSummaryDisplay errorCount={errorCount} />
               </Box>
             )}