From dbeda91ec440e832e17802801b0bb211b218af74 Mon Sep 17 00:00:00 2001
From: Adam Weidman <65992621+adamfweidman@users.noreply.github.com>
Date: Tue, 16 Dec 2025 14:22:13 -0500
Subject: [PATCH] feat: update to match mocks (#89)

---
 packages/cli/src/ui/components/Footer.tsx     |  1 +
 .../src/ui/components/ProQuotaDialog.test.tsx | 47 +------------------
 .../cli/src/ui/components/ProQuotaDialog.tsx  | 35 ++++++++------
 .../__snapshots__/Footer.test.tsx.snap        |  4 +-
 .../src/ui/hooks/useQuotaAndFallback.test.ts  |  2 +-
 .../cli/src/ui/hooks/useQuotaAndFallback.ts   |  8 +++-
 packages/core/src/config/models.ts            | 16 ++++---
 7 files changed, 42 insertions(+), 71 deletions(-)

diff --git a/packages/cli/src/ui/components/Footer.tsx b/packages/cli/src/ui/components/Footer.tsx
index 5192461c43..358342faa1 100644
--- a/packages/cli/src/ui/components/Footer.tsx
+++ b/packages/cli/src/ui/components/Footer.tsx
@@ -150,6 +150,7 @@ export const Footer: React.FC = () => {
           <Box alignItems="center">
             <Text color={theme.text.accent}>
               {getDisplayString(model, config.getPreviewFeatures())}
+              <Text color={theme.text.secondary}> /model</Text>
               {!hideContextPercentage && (
                 <>
                   {' '}
diff --git a/packages/cli/src/ui/components/ProQuotaDialog.test.tsx b/packages/cli/src/ui/components/ProQuotaDialog.test.tsx
index 2bf83a6067..42746678e2 100644
--- a/packages/cli/src/ui/components/ProQuotaDialog.test.tsx
+++ b/packages/cli/src/ui/components/ProQuotaDialog.test.tsx
@@ -169,7 +169,7 @@ describe('ProQuotaDialog', () => {
     });
 
     describe('when it is a capacity error', () => {
-      it('should render keep trying, switch, and stop options', () => {
+      it('should render keep trying and stop options', () => {
         const { unmount } = render(
           <ProQuotaDialog
             failedModel="gemini-2.5-pro"
@@ -190,11 +190,6 @@ describe('ProQuotaDialog', () => {
                 value: 'retry_once',
                 key: 'retry_once',
               },
-              {
-                label: 'Switch to gemini-2.5-flash',
-                value: 'retry_always',
-                key: 'retry_always',
-              },
               { label: 'Stop', value: 'retry_later', key: 'retry_later' },
             ],
           }),
@@ -295,44 +290,4 @@ describe('ProQuotaDialog', () => {
       unmount();
     });
   });
-
-  describe('footer note', () => {
-    it('should show a special note for PREVIEW_GEMINI_MODEL', () => {
-      const { lastFrame, unmount } = render(
-        <ProQuotaDialog
-          failedModel={PREVIEW_GEMINI_MODEL}
-          fallbackModel="gemini-2.5-pro"
-          message=""
-          isTerminalQuotaError={false}
-          onChoice={mockOnChoice}
-          userTier={UserTierId.FREE}
-        />,
-      );
-
-      const output = lastFrame();
-      expect(output).toContain(
-        'Note: We will periodically retry Preview Model to see if congestion has cleared.',
-      );
-      unmount();
-    });
-
-    it('should show the default note for other models', () => {
-      const { lastFrame, unmount } = render(
-        <ProQuotaDialog
-          failedModel="gemini-2.5-pro"
-          fallbackModel="gemini-2.5-flash"
-          message=""
-          isTerminalQuotaError={false}
-          onChoice={mockOnChoice}
-          userTier={UserTierId.FREE}
-        />,
-      );
-
-      const output = lastFrame();
-      expect(output).toContain(
-        'Note: You can always use /model to select a different option.',
-      );
-      unmount();
-    });
-  });
 });
diff --git a/packages/cli/src/ui/components/ProQuotaDialog.tsx b/packages/cli/src/ui/components/ProQuotaDialog.tsx
index 88351a425b..cda3937a7f 100644
--- a/packages/cli/src/ui/components/ProQuotaDialog.tsx
+++ b/packages/cli/src/ui/components/ProQuotaDialog.tsx
@@ -9,7 +9,7 @@ import { Box, Text } from 'ink';
 import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
 import { theme } from '../semantic-colors.js';
 
-import { DEFAULT_GEMINI_MODEL, UserTierId } from '@google/gemini-cli-core';
+import { UserTierId } from '@google/gemini-cli-core';
 
 interface ProQuotaDialogProps {
   failedModel: string;
@@ -91,11 +91,6 @@ export function ProQuotaDialog({
         value: 'retry_once' as const,
         key: 'retry_once',
       },
-      {
-        label: `Switch to ${fallbackModel}`,
-        value: 'retry_always' as const,
-        key: 'retry_always',
-      },
       {
         label: 'Stop',
         value: 'retry_later' as const,
@@ -110,19 +105,31 @@ export function ProQuotaDialog({
     onChoice(choice);
   };
 
+  // Helper to highlight simple slash commands in the message
+  const renderMessage = (msg: string) => {
+    const parts = msg.split(/(\s+)/);
+    return (
+      <Text>
+        {parts.map((part, index) => {
+          if (part.startsWith('/')) {
+            return (
+              <Text key={index} bold color={theme.text.accent}>
+                {part}
+              </Text>
+            );
+          }
+          return <Text key={index}>{part}</Text>;
+        })}
+      </Text>
+    );
+  };
+
   return (
     <Box borderStyle="round" flexDirection="column" padding={1}>
-      <Box marginBottom={1}>
-        <Text>{message}</Text>
-      </Box>
+      <Box marginBottom={1}>{renderMessage(message)}</Box>
       <Box marginTop={1} marginBottom={1}>
         <RadioButtonSelect items={items} onSelect={handleSelect} />
       </Box>
-      <Text color={theme.text.primary}>
-        {fallbackModel === DEFAULT_GEMINI_MODEL && !isModelNotFoundError
-          ? 'Note: We will periodically retry Preview Model to see if congestion has cleared.'
-          : 'Note: You can always use /model to select a different option.'}
-      </Text>
     </Box>
   );
 }
diff --git a/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap
index 83c0fb0dba..be6f152e9f 100644
--- a/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap
+++ b/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap
@@ -1,8 +1,8 @@
 // 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`] = `" ...s/to/make/it/long              no sandbox               gemini-pro (100%)"`;
+exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders complete footer in narrow terminal (baseline narrow) > complete-footer-narrow 1`] = `" ...s/to/make/it/long      no sandbox       Manual (gemini-pro) /model (100%)"`;
 
-exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders complete footer with all sections visible (baseline) > complete-footer-wide 1`] = `" ...irectories/to/make/it/long                  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`] = `" ...irectories/to/make/it/long          no sandbox (see /docs)          Manual (gemini-pro) /model (100% context 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)"`;
 
diff --git a/packages/cli/src/ui/hooks/useQuotaAndFallback.test.ts b/packages/cli/src/ui/hooks/useQuotaAndFallback.test.ts
index 06a4d71af7..366b748959 100644
--- a/packages/cli/src/ui/hooks/useQuotaAndFallback.test.ts
+++ b/packages/cli/src/ui/hooks/useQuotaAndFallback.test.ts
@@ -261,7 +261,7 @@ describe('useQuotaAndFallback', () => {
           expect(mockHistoryManager.addItem).not.toHaveBeenCalled();
           const message = request!.message;
           expect(message).toContain(
-            'model-A is currently experiencing high demand. We apologize and appreciate your patience.',
+            'We are currently experiencing high demand.',
           );
 
           // Simulate the user choosing to continue with the fallback model
diff --git a/packages/cli/src/ui/hooks/useQuotaAndFallback.ts b/packages/cli/src/ui/hooks/useQuotaAndFallback.ts
index 6a93c0f4ce..ff4bc6c4b8 100644
--- a/packages/cli/src/ui/hooks/useQuotaAndFallback.ts
+++ b/packages/cli/src/ui/hooks/useQuotaAndFallback.ts
@@ -69,6 +69,7 @@ export function useQuotaAndFallback({
           `Usage limit reached for ${usageLimitReachedModel}.`,
           error.retryDelayMs ? getResetTimeMessage(error.retryDelayMs) : null,
           `/stats for usage details`,
+          `/model to switch models.`,
           `/auth to switch to API key.`,
         ].filter(Boolean);
         message = messageLines.join('\n');
@@ -84,7 +85,12 @@ export function useQuotaAndFallback({
         ];
         message = messageLines.join('\n');
       } else {
-        message = `${failedModel} is currently experiencing high demand. We apologize and appreciate your patience.`;
+        const messageLines = [
+          `We are currently experiencing high demand.`,
+          'We apologize and appreciate your patience.',
+          '/model to switch models.',
+        ];
+        message = messageLines.join('\n');
       }
 
       setModelSwitchedFromQuotaError(true);
diff --git a/packages/core/src/config/models.ts b/packages/core/src/config/models.ts
index b5829c895c..25ab0720dc 100644
--- a/packages/core/src/config/models.ts
+++ b/packages/core/src/config/models.ts
@@ -125,15 +125,17 @@ export function getDisplayString(
     case DEFAULT_GEMINI_MODEL_AUTO:
       return 'Auto (Gemini 2.5)';
     case GEMINI_MODEL_ALIAS_PRO:
-      return previewFeaturesEnabled
-        ? PREVIEW_GEMINI_MODEL
-        : DEFAULT_GEMINI_MODEL;
+      return `Manual (${
+        previewFeaturesEnabled ? PREVIEW_GEMINI_MODEL : DEFAULT_GEMINI_MODEL
+      })`;
     case GEMINI_MODEL_ALIAS_FLASH:
-      return previewFeaturesEnabled
-        ? PREVIEW_GEMINI_FLASH_MODEL
-        : DEFAULT_GEMINI_FLASH_MODEL;
+      return `Manual (${
+        previewFeaturesEnabled
+          ? PREVIEW_GEMINI_FLASH_MODEL
+          : DEFAULT_GEMINI_FLASH_MODEL
+      })`;
     default:
-      return model;
+      return `Manual (${model})`;
   }
 }