fix(policy): resolve type errors and add test for isSensitive plumbing

fix(policy): resolve regressions and refine sensitive tool plumbing
merge origin/main and resolve regressions
2026-08-01 20:51:00 -07:00 · 2026-02-27 18:55:23 -05:00 · 2026-02-27 23:06:07 +00:00 · 2026-02-27 22:49:17 +00:00 · 2026-02-27 22:28:06 +00:00 · 2026-02-27 21:13:30 +00:00
228 changed files with 9854 additions and 1583 deletions
@@ -0,0 +1,29 @@
+description = "Promote behavioral evals that have a 100% success rate over the last 7 nightly runs."
+prompt = """
+You are an expert at analyzing and promoting behavioral evaluations.
+
+1. **Investigate**:
+   - Use 'gh' cli to fetch the results from the most recent run from the main branch: https://github.com/google-gemini/gemini-cli/actions/workflows/evals-nightly.yml.
+   - DO NOT push any changes or start any runs. The rest of your evaluation will be local.
+   - Evals are in evals/ directory and are documented by evals/README.md.
+   - Identify tests that have passed 100% of the time for ALL enabled models across the past 7 runs in a row.
+   - NOTE: the results summary from the most recent run contains the last 7 runs test results. 100% means the test passed 3/3 times for that model and run.
+   - If a test meets this criteria, it is a candidate for promotion.
+
+2. **Promote**:
+   - For each candidate test, locate the test file in the evals/ directory.
+   - Promote the test according to the project's standard promotion process (e.g., moving it to a stable suite, updating its tags, or removing skip/flaky annotations). 
+   - Ensure you follow any guidelines in evals/README.md for stable tests.
+   - Your **final** change should be **minimal and targeted** to just promoting the test status.
+
+3. **Verify**:
+   - Run the promoted tests locally to validate that they still execute correctly. Be sure to run vitest in non-interactive mode.
+   - Check that the test is now part of the expected standard or stable test suites.
+
+4. **Report**:
+   - Provide a summary of the tests that were promoted.
+   - Include the success rate evidence (7/7 runs passed for all models) for each promoted test.
+   - If no tests met the criteria for promotion, clearly state that and summarize the closest candidates.
+
+{{args}}
+"""
@@ -9,4 +9,5 @@ code_review:
    help: false
    summary: true
    code_review: true
+    include_drafts: false
 ignore_patterns: []
@@ -31,6 +31,7 @@ jobs:
    name: 'Merge Queue Skipper'
    permissions: 'read-all'
    runs-on: 'gemini-cli-ubuntu-16-core'
+    if: "github.repository == 'google-gemini/gemini-cli'"
    outputs:
      skip: '${{ steps.merge-queue-e2e-skipper.outputs.skip-check }}'
    steps:
@@ -42,7 +43,7 @@ jobs:

  download_repo_name:
    runs-on: 'gemini-cli-ubuntu-16-core'
-    if: "${{github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_run'}}"
+    if: "github.repository == 'google-gemini/gemini-cli' && (github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_run')"
    outputs:
      repo_name: '${{ steps.output-repo-name.outputs.repo_name }}'
      head_sha: '${{ steps.output-repo-name.outputs.head_sha }}'
@@ -91,7 +92,7 @@ jobs:
    name: 'Parse run context'
    runs-on: 'gemini-cli-ubuntu-16-core'
    needs: 'download_repo_name'
-    if: 'always()'
+    if: "github.repository == 'google-gemini/gemini-cli' && always()"
    outputs:
      repository: '${{ steps.set_context.outputs.REPO }}'
      sha: '${{ steps.set_context.outputs.SHA }}'
@@ -111,11 +112,11 @@ jobs:
    permissions: 'write-all'
    needs:
      - 'parse_run_context'
-    if: 'always()'
+    if: "github.repository == 'google-gemini/gemini-cli' && always()"
    steps:
      - name: 'Set pending status'
        uses: 'myrotvorets/set-commit-status-action@16037e056d73b2d3c88e37e393ff369047f70886' # ratchet:myrotvorets/set-commit-status-action@master
-        if: 'always()'
+        if: "github.repository == 'google-gemini/gemini-cli' && always()"
        with:
          allowForks: 'true'
          repo: '${{ github.repository }}'
@@ -131,7 +132,7 @@ jobs:
      - 'parse_run_context'
    runs-on: 'gemini-cli-ubuntu-16-core'
    if: |
-      always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
+      github.repository == 'google-gemini/gemini-cli' && always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
    strategy:
      fail-fast: false
      matrix:
@@ -184,7 +185,7 @@ jobs:
      - 'parse_run_context'
    runs-on: 'macos-latest'
    if: |
-      always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
+      github.repository == 'google-gemini/gemini-cli' && always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
    steps:
      - name: 'Checkout'
        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
@@ -222,7 +223,7 @@ jobs:
      - 'merge_queue_skipper'
      - 'parse_run_context'
    if: |
-      always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
+      github.repository == 'google-gemini/gemini-cli' && always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
    runs-on: 'gemini-cli-windows-16-core'
    steps:
      - name: 'Checkout'
@@ -282,7 +283,7 @@ jobs:
      - 'parse_run_context'
    runs-on: 'gemini-cli-ubuntu-16-core'
    if: |
-      always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
+      github.repository == 'google-gemini/gemini-cli' && always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
    steps:
      - name: 'Checkout'
        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
@@ -309,7 +310,7 @@ jobs:
  e2e:
    name: 'E2E'
    if: |
-      always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
+      github.repository == 'google-gemini/gemini-cli' && always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
    needs:
      - 'e2e_linux'
      - 'e2e_mac'
@@ -337,14 +338,14 @@ jobs:
  set_workflow_status:
    runs-on: 'gemini-cli-ubuntu-16-core'
    permissions: 'write-all'
-    if: 'always()'
+    if: "github.repository == 'google-gemini/gemini-cli' && always()"
    needs:
      - 'parse_run_context'
      - 'e2e'
    steps:
      - name: 'Set workflow status'
        uses: 'myrotvorets/set-commit-status-action@16037e056d73b2d3c88e37e393ff369047f70886' # ratchet:myrotvorets/set-commit-status-action@master
-        if: 'always()'
+        if: "github.repository == 'google-gemini/gemini-cli' && always()"
        with:
          allowForks: 'true'
          repo: '${{ github.repository }}'
@@ -37,6 +37,7 @@ jobs:
    permissions: 'read-all'
    name: 'Merge Queue Skipper'
    runs-on: 'gemini-cli-ubuntu-16-core'
+    if: "github.repository == 'google-gemini/gemini-cli'"
    outputs:
      skip: '${{ steps.merge-queue-ci-skipper.outputs.skip-check }}'
    steps:
@@ -49,7 +50,7 @@ jobs:
    name: 'Lint'
    runs-on: 'gemini-cli-ubuntu-16-core'
    needs: 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
+    if: "github.repository == 'google-gemini/gemini-cli' && needs.merge_queue_skipper.outputs.skip == 'false'"
    env:
      GEMINI_LINT_TEMP_DIR: '${{ github.workspace }}/.gemini-linters'
    steps:
@@ -116,6 +117,7 @@ jobs:
  link_checker:
    name: 'Link Checker'
    runs-on: 'ubuntu-latest'
+    if: "github.repository == 'google-gemini/gemini-cli'"
    steps:
      - name: 'Checkout'
        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
@@ -129,7 +131,7 @@ jobs:
    runs-on: 'gemini-cli-ubuntu-16-core'
    needs:
      - 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
+    if: "github.repository == 'google-gemini/gemini-cli' && needs.merge_queue_skipper.outputs.skip == 'false'"
    permissions:
      contents: 'read'
      checks: 'write'
@@ -216,7 +218,7 @@ jobs:
    runs-on: 'macos-latest'
    needs:
      - 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
+    if: "github.repository == 'google-gemini/gemini-cli' && needs.merge_queue_skipper.outputs.skip == 'false'"
    permissions:
      contents: 'read'
      checks: 'write'
@@ -311,7 +313,7 @@ jobs:
    name: 'CodeQL'
    runs-on: 'gemini-cli-ubuntu-16-core'
    needs: 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
+    if: "github.repository == 'google-gemini/gemini-cli' && needs.merge_queue_skipper.outputs.skip == 'false'"
    permissions:
      actions: 'read'
      contents: 'read'
@@ -334,7 +336,7 @@ jobs:
  bundle_size:
    name: 'Check Bundle Size'
    needs: 'merge_queue_skipper'
-    if: "${{github.event_name == 'pull_request' && needs.merge_queue_skipper.outputs.skip == 'false'}}"
+    if: "github.repository == 'google-gemini/gemini-cli' && github.event_name == 'pull_request' && needs.merge_queue_skipper.outputs.skip == 'false'"
    runs-on: 'gemini-cli-ubuntu-16-core'
    permissions:
      contents: 'read' # For checkout
@@ -359,7 +361,7 @@ jobs:
    name: 'Slow Test - Win - ${{ matrix.shard }}'
    runs-on: 'gemini-cli-windows-16-core'
    needs: 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
+    if: "github.repository == 'google-gemini/gemini-cli' && needs.merge_queue_skipper.outputs.skip == 'false'"
    timeout-minutes: 60
    strategy:
      matrix:
@@ -451,7 +453,7 @@ jobs:

  ci:
    name: 'CI'
-    if: 'always()'
+    if: "github.repository == 'google-gemini/gemini-cli' && always()"
    needs:
      - 'lint'
      - 'link_checker'
@@ -27,6 +27,7 @@ jobs:
  deflake_e2e_linux:
    name: 'E2E Test (Linux) - ${{ matrix.sandbox }}'
    runs-on: 'gemini-cli-ubuntu-16-core'
+    if: "github.repository == 'google-gemini/gemini-cli'"
    strategy:
      fail-fast: false
      matrix:
@@ -77,6 +78,7 @@ jobs:
  deflake_e2e_mac:
    name: 'E2E Test (macOS)'
    runs-on: 'macos-latest'
+    if: "github.repository == 'google-gemini/gemini-cli'"
    steps:
      - name: 'Checkout'
        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
@@ -114,6 +116,7 @@ jobs:
  deflake_e2e_windows:
    name: 'Slow E2E - Win'
    runs-on: 'gemini-cli-windows-16-core'
+    if: "github.repository == 'google-gemini/gemini-cli'"

    steps:
      - name: 'Checkout'
@@ -19,8 +19,7 @@ concurrency:

 jobs:
  build:
-    if: |-
-      ${{ !contains(github.ref_name, 'nightly') }}
+    if: "github.repository == 'google-gemini/gemini-cli' && !contains(github.ref_name, 'nightly')"
    runs-on: 'ubuntu-latest'
    steps:
      - name: 'Checkout'
@@ -39,6 +38,7 @@ jobs:
        uses: 'actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa' # ratchet:actions/upload-pages-artifact@v3

  deploy:
+    if: "github.repository == 'google-gemini/gemini-cli'"
    environment:
      name: 'github-pages'
      url: '${{ steps.deployment.outputs.page_url }}'
@@ -7,6 +7,7 @@ on:
      - 'docs/**'
 jobs:
  trigger-rebuild:
+    if: "github.repository == 'google-gemini/gemini-cli'"
    runs-on: 'ubuntu-latest'
    steps:
      - name: 'Trigger rebuild'
@@ -23,6 +23,7 @@ jobs:
  evals:
    name: 'Evals (USUALLY_PASSING) nightly run'
    runs-on: 'gemini-cli-ubuntu-16-core'
+    if: "github.repository == 'google-gemini/gemini-cli'"
    strategy:
      fail-fast: false
      matrix:
@@ -85,7 +86,7 @@ jobs:
  aggregate-results:
    name: 'Aggregate Results'
    needs: ['evals']
-    if: 'always()'
+    if: "github.repository == 'google-gemini/gemini-cli' && always()"
    runs-on: 'gemini-cli-ubuntu-16-core'
    steps:
      - name: 'Checkout'
@@ -21,6 +21,7 @@ defaults:

 jobs:
  close-stale-issues:
+    if: "github.repository == 'google-gemini/gemini-cli'"
    runs-on: 'ubuntu-latest'
    permissions:
      issues: 'write'
@@ -14,7 +14,7 @@ permissions:
 jobs:
  # Event-based: Quick reaction to new/edited issues in THIS repo
  labeler:
-    if: "github.event_name == 'issues'"
+    if: "github.repository == 'google-gemini/gemini-cli' && github.event_name == 'issues'"
    runs-on: 'ubuntu-latest'
    steps:
      - name: 'Checkout'
@@ -36,7 +36,7 @@ jobs:

  # Scheduled/Manual: Recursive sync across multiple repos
  sync-maintainer-labels:
-    if: "github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'"
+    if: "github.repository == 'google-gemini/gemini-cli' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')"
    runs-on: 'ubuntu-latest'
    steps:
      - name: 'Checkout'
@@ -9,6 +9,7 @@ on:

 jobs:
  labeler:
+    if: "github.repository == 'google-gemini/gemini-cli'"
    runs-on: 'ubuntu-latest'
    permissions:
      issues: 'write'
@@ -32,6 +32,7 @@ on:

 jobs:
  change-tags:
+    if: "github.repository == 'google-gemini/gemini-cli'"
    runs-on: 'ubuntu-latest'
    environment: "${{ github.event.inputs.environment || 'prod' }}"
    permissions:
@@ -47,6 +47,7 @@ on:

 jobs:
  release:
+    if: "github.repository == 'google-gemini/gemini-cli'"
    runs-on: 'ubuntu-latest'
    environment: "${{ github.event.inputs.environment || 'prod' }}"
    permissions:
@@ -22,6 +22,7 @@ on:

 jobs:
  generate-release-notes:
+    if: "github.repository == 'google-gemini/gemini-cli'"
    runs-on: 'ubuntu-latest'
    permissions:
      contents: 'write'
@@ -42,6 +42,7 @@ on:

 jobs:
  change-tags:
+    if: "github.repository == 'google-gemini/gemini-cli'"
    environment: "${{ github.event.inputs.environment || 'prod' }}"
    runs-on: 'ubuntu-latest'
    permissions:
@@ -16,6 +16,7 @@ on:

 jobs:
  build:
+    if: "github.repository == 'google-gemini/gemini-cli'"
    runs-on: 'ubuntu-latest'
    permissions:
      contents: 'read'
@@ -20,6 +20,7 @@ on:

 jobs:
  smoke-test:
+    if: "github.repository == 'google-gemini/gemini-cli'"
    runs-on: 'ubuntu-latest'
    permissions:
      contents: 'write'
@@ -15,6 +15,7 @@ on:

 jobs:
  save_repo_name:
+    if: "github.repository == 'google-gemini/gemini-cli'"
    runs-on: 'gemini-cli-ubuntu-16-core'
    steps:
      - name: 'Save Repo name'
@@ -31,6 +32,7 @@ jobs:
          path: 'pr/'
  trigger_e2e:
    name: 'Trigger e2e'
+    if: "github.repository == 'google-gemini/gemini-cli'"
    runs-on: 'gemini-cli-ubuntu-16-core'
    steps:
      - id: 'trigger-e2e'
@@ -28,6 +28,7 @@ on:

 jobs:
  verify-release:
+    if: "github.repository == 'google-gemini/gemini-cli'"
    environment: "${{ github.event.inputs.environment || 'prod' }}"
    strategy:
      fail-fast: false
@@ -1,6 +1,6 @@
-# Latest stable release: v0.30.0
+# Latest stable release: v0.30.1

-Released: February 25, 2026
+Released: February 27, 2026

 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -28,6 +28,9 @@ npm install -g @google/gemini-cli

 ## What's Changed

+- fix(patch): cherry-pick 58df1c6 to release/v0.30.0-pr-20374 [CONFLICTS] by
+  @gemini-cli-robot in
+  [#20567](https://github.com/google-gemini/gemini-cli/pull/20567)
 - feat(ux): added text wrapping capabilities to markdown tables by @devr0306 in
  [#18240](https://github.com/google-gemini/gemini-cli/pull/18240)
 - Revert "fix(mcp): ensure MCP transport is closed to prevent memory leaks" by
@@ -330,4 +333,4 @@ npm install -g @google/gemini-cli
  [#20112](https://github.com/google-gemini/gemini-cli/pull/20112)

 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.29.7...v0.30.0
+https://github.com/google-gemini/gemini-cli/compare/v0.29.7...v0.30.1
@@ -1,6 +1,6 @@
-# Preview release: v0.31.0-preview.0
+# Preview release: v0.31.0-preview.1

-Released: February 25, 2026
+Released: February 27, 2026

 Our preview release includes the latest, new, and experimental features. This
 release may not be as stable as our [latest weekly release](latest.md).
@@ -33,6 +33,10 @@ npm install -g @google/gemini-cli@preview

 ## What's Changed

+- fix(patch): cherry-pick 58df1c6 to release/v0.31.0-preview.0-pr-20374 to patch
+  version v0.31.0-preview.0 and create version 0.31.0-preview.1 by
+  @gemini-cli-robot in
+  [#20568](https://github.com/google-gemini/gemini-cli/pull/20568)
 - Use ranged reads and limited searches and fuzzy editing improvements by
  @gundermanc in
  [#19240](https://github.com/google-gemini/gemini-cli/pull/19240)
@@ -409,4 +413,4 @@ npm install -g @google/gemini-cli@preview
  [#20240](https://github.com/google-gemini/gemini-cli/pull/20240)

 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.30.0-preview.6...v0.31.0-preview.0
+https://github.com/google-gemini/gemini-cli/compare/v0.30.0-preview.6...v0.31.0-preview.1
@@ -19,24 +19,15 @@ Use the following command in Gemini CLI:

 Running this command will open a dialog with your options:

-| Option            | Description                                                    | Models                                                                 |
-| ----------------- | -------------------------------------------------------------- | ---------------------------------------------------------------------- |
-| Auto (Gemini 3)   | Let the system choose the best Gemini 3 model for your task.   | gemini-3-pro-preview (if enabled), gemini-3-flash-preview (if enabled) |
-| Auto (Gemini 2.5) | Let the system choose the best Gemini 2.5 model for your task. | gemini-2.5-pro, gemini-2.5-flash                                       |
-| Manual            | Select a specific model.                                       | Any available model.                                                   |
+| Option            | Description                                                    | Models                                       |
+| ----------------- | -------------------------------------------------------------- | -------------------------------------------- |
+| Auto (Gemini 3)   | Let the system choose the best Gemini 3 model for your task.   | gemini-3-pro-preview, gemini-3-flash-preview |
+| Auto (Gemini 2.5) | Let the system choose the best Gemini 2.5 model for your task. | gemini-2.5-pro, gemini-2.5-flash             |
+| Manual            | Select a specific model.                                       | Any available model.                         |

 We recommend selecting one of the above **Auto** options. However, you can
 select **Manual** to select a specific model from those available.

-### Gemini 3 and preview features
-
-> **Note:** Gemini 3 is not currently available on all account types. To learn
-> more about Gemini 3 access, refer to
-> [Gemini 3 on Gemini CLI](../get-started/gemini-3.md).
-
-To enable Gemini 3 Pro and Gemini 3 Flash (if available), enable
-[**Preview Features** by using the `settings` command](../cli/settings.md).
-
 You can also use the `--model` flag to specify a particular Gemini model on
 startup. For more details, refer to the
 [configuration documentation](../reference/configuration.md).
@@ -72,6 +72,7 @@ they appear in the UI.
 | Incremental Rendering                | `ui.incrementalRendering`              | Enable incremental rendering for the UI. This option will reduce flickering but may cause rendering artifacts. Only supported when useAlternateBuffer is enabled. | `true`   |
 | Show Spinner                         | `ui.showSpinner`                       | Show the spinner during operations.                                                                                                                               | `true`   |
 | Loading Phrases                      | `ui.loadingPhrases`                    | What to show while the model is working: tips, witty comments, both, or nothing.                                                                                  | `"tips"` |
+| Error Verbosity                      | `ui.errorVerbosity`                    | Controls whether recoverable errors are hidden (low) or fully shown (full).                                                                                       | `"low"`  |
 | Screen Reader Mode                   | `ui.accessibility.screenReader`        | Render output in plain-text to be more screen reader accessible                                                                                                   | `false`  |

 ### IDE
@@ -80,6 +81,12 @@ they appear in the UI.
 | -------- | ------------- | ---------------------------- | ------- |
 | IDE Mode | `ide.enabled` | Enable IDE integration mode. | `false` |

+### Billing
+
+| UI Label         | Setting                   | Description                                                                                                                                                | Default |
+| ---------------- | ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| Overage Strategy | `billing.overageStrategy` | How to handle quota exhaustion when AI credits are available. 'ask' prompts each time, 'always' automatically uses credits, 'never' disables credit usage. | `"ask"` |
+
 ### Model

 | UI Label                | Setting                      | Description                                                                            | Default     |
@@ -1,6 +1,6 @@
 # Gemini CLI installation, execution, and releases

-This document provides an overview of Gemini CLI's sytem requriements,
+This document provides an overview of Gemini CLI's system requirements,
 installation methods, and release types.

 ## Recommended system specifications
@@ -322,6 +322,12 @@ their corresponding top-level category object in your `settings.json` file.
  - **Default:** `"tips"`
  - **Values:** `"tips"`, `"witty"`, `"all"`, `"off"`

+- **`ui.errorVerbosity`** (enum):
+  - **Description:** Controls whether recoverable errors are hidden (low) or
+    fully shown (full).
+  - **Default:** `"low"`
+  - **Values:** `"low"`, `"full"`
+
 - **`ui.customWittyPhrases`** (array):
  - **Description:** Custom witty phrases to display during loading. When
    provided, the CLI cycles through these instead of the defaults.
@@ -357,6 +363,15 @@ their corresponding top-level category object in your `settings.json` file.
  - **Default:** `true`
  - **Requires restart:** Yes

+#### `billing`
+
+- **`billing.overageStrategy`** (enum):
+  - **Description:** How to handle quota exhaustion when AI credits are
+    available. 'ask' prompts each time, 'always' automatically uses credits,
+    'never' disables credit usage.
+  - **Default:** `"ask"`
+  - **Values:** `"ask"`, `"always"`, `"never"`
+
 #### `model`

 - **`model.name`** (string):
@@ -5,14 +5,18 @@ problems encountered while using Gemini CLI.

 ## General issues

+This section addresses common questions about Gemini CLI usage, security, and
+troubleshooting general errors.
+
 ### Why can't I use third-party software (e.g. Claude Code, OpenClaw, OpenCode) with Gemini CLI?

-Using third-party software, tools, or services to access Gemini CLI is a
-violation of our [applicable terms and policies](tos-privacy.md), and severely
-degrades the experience for legitimate product users. Such actions may be
-grounds for suspension or termination of your account. If you would like to use
-a third-party coding agent with Gemini, we recommend using a Vertex or AI Studio
-API key.
+Using third-party software, tools, or services to harvest or piggyback on Gemini
+CLI's OAuth authentication to access our backend services is a direct violation
+of our [applicable terms and policies](tos-privacy.md). Doing so bypasses our
+intended authentication and security structures, and such actions may be grounds
+for immediate suspension or termination of your account. If you would like to
+use a third-party coding agent with Gemini, the supported and secure method is
+to use a Vertex AI or Google AI Studio API key.

 ### Why am I getting an `API error: 429 - Resource exhausted`?

@@ -1066,6 +1066,11 @@ command has no flags.
 gemini mcp list
 ```

+> **Note on Trust:** For security, `stdio` MCP servers (those using the
+> `command` property) are only tested and displayed as "Connected" if the
+> current folder is trusted. If the folder is untrusted, they will show as
+> "Disconnected". Use `gemini trust` to trust the current folder.
+
 **Example output:**

 ```sh
@@ -1074,6 +1079,23 @@ gemini mcp list
 ✗ sse-server: https://api.example.com/sse (sse) - Disconnected
 ```

+## Troubleshooting and Diagnostics
+
+To minimize noise during startup, MCP connection errors for background servers
+are "silent by default." If issues are detected during startup, a single
+informational hint will be shown: _"MCP issues detected. Run /mcp list for
+status."_
+
+Detailed, actionable diagnostics for a specific server are automatically
+re-enabled when:
+
+1.  You run an interactive command like `/mcp list`, `/mcp auth`, etc.
+2.  The model attempts to execute a tool from that server.
+3.  You invoke an MCP prompt from that server.
+
+You can also use `gemini mcp list` from your shell to see connection errors for
+all configured servers.
+
 ### Removing a server (`gemini mcp remove`)

 To delete a server from your configuration, use the `remove` command with the
@@ -55,26 +55,8 @@ export default tseslint.config(
    },
  },
  {
-    // Import specific config
-    files: ['packages/*/src/**/*.{ts,tsx}'], // Target all TS/TSX in the packages
-    plugins: {
-      import: importPlugin,
-    },
-    settings: {
-      'import/resolver': {
-        node: true,
-      },
-    },
-    rules: {
-      ...importPlugin.configs.recommended.rules,
-      ...importPlugin.configs.typescript.rules,
-      'import/no-default-export': 'warn',
-      'import/no-unresolved': 'off', // Disable for now, can be noisy with monorepos/paths
-    },
-  },
-  {
-    // General overrides and rules for the project (TS/TSX files)
-    files: ['packages/*/src/**/*.{ts,tsx}'], // Target only TS/TSX in the cli package
+    // Rules for packages/*/src (TS/TSX)
+    files: ['packages/*/src/**/*.{ts,tsx}'],
    plugins: {
      import: importPlugin,
    },
@@ -95,6 +77,11 @@ export default tseslint.config(
      },
    },
    rules: {
+      ...importPlugin.configs.recommended.rules,
+      ...importPlugin.configs.typescript.rules,
+      'import/no-default-export': 'warn',
+      'import/no-unresolved': 'off',
+      'import/no-duplicates': 'error',
      // General Best Practice Rules (subset adapted for flat config)
      '@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
      'arrow-body-style': ['error', 'as-needed'],
@@ -46,18 +46,20 @@ two arguments:

 #### Policies

-Policies control how strictly a test is validated. Tests should generally use
-the ALWAYS_PASSES policy to offer the strictest guarantees.
-
-USUALLY_PASSES exists to enable assertion of less consistent or aspirational
-behaviors.
+Policies control how strictly a test is validated.

 - `ALWAYS_PASSES`: Tests expected to pass 100% of the time. These are typically
-  trivial and test basic functionality. These run in every CI.
+  trivial and test basic functionality. These run in every CI and can block PRs
+  on failure.
 - `USUALLY_PASSES`: Tests expected to pass most of the time but may have some
  flakiness due to non-deterministic behaviors. These are run nightly and used
  to track the health of the product from build to build.

+**All new behavioral evaluations must be created with the `USUALLY_PASSES`
+policy.** A subset that prove to be highly stable over time may be promoted to
+`ALWAYS_PASSES`. For more information, see
+[Test promotion process](#test-promotion-process).
+
 #### `EvalCase` Properties

 - `name`: The name of the evaluation case.
@@ -76,7 +78,8 @@ import { describe, expect } from 'vitest';
 import { evalTest } from './test-helper.js';

 describe('my_feature', () => {
-  evalTest('ALWAYS_PASSES', {
+  // New tests MUST start as USUALLY_PASSES and be promoted via /promote-behavioral-eval
+  evalTest('USUALLY_PASSES', {
    name: 'should do something',
    prompt: 'do it',
    assert: async (rig, result) => {
@@ -114,6 +117,39 @@ npm run test:all_evals
 This command sets the `RUN_EVALS` environment variable to `1`, which enables the
 `USUALLY_PASSES` tests.

+## Ensuring Eval is Stable Prior to Check-in
+
+The
+[Evals: Nightly](https://github.com/google-gemini/gemini-cli/actions/workflows/evals-nightly.yml)
+run is considered to be the source of truth for the quality of an eval test.
+Each run of it executes a test 3 times in a row, for each supported model. The
+result is then scored 0%, 33%, 66%, or 100% respectively, to indicate how many
+of the individual executions passed.
+
+Googlers can schedule a manual run against their branch by clicking the link
+above.
+
+Tests should score at least 66% with key models including Gemini 3.1 pro, Gemini
+3.0 pro, and Gemini 3 flash prior to check in and they must pass 100% of the
+time before they are promoted.
+
+## Test promotion process
+
+To maintain a stable and reliable CI, all new behavioral evaluations follow a
+mandatory deflaking process.
+
+1. **Incubation**: You must create all new tests with the `USUALLY_PASSES`
+   policy. This lets them be monitored in the nightly runs without blocking PRs.
+2. **Monitoring**: The test must complete at least 10 nightly runs across all
+   supported models.
+3. **Promotion**: Promotion to `ALWAYS_PASSES` happens exclusively through the
+   `/promote-behavioral-eval` slash command. This command verifies the 100%
+   success rate requirement is met across many runs before updating the test
+   policy.
+
+This promotion process is essential for preventing the introduction of flaky
+evaluations into the CI.
+
 ## Reporting

 Results for evaluations are available on GitHub Actions:
@@ -135,7 +171,7 @@ aggregated into a **Nightly Summary** attached to the workflow run.

 - **Pass Rate (%)**: Each cell represents the percentage of successful runs for
  a specific test in that workflow instance.
- **History**: The table shows the pass rates for the last 10 nightly runs,
+- **History**: The table shows the pass rates for the last 7 nightly runs,
  allowing you to identify if a model's behavior is trending towards
  instability.
 - **Total Pass Rate**: An aggregate metric of all evaluations run in that batch.
@@ -184,8 +220,35 @@ gemini /fix-behavioral-eval https://github.com/google-gemini/gemini-cli/actions/
 When investigating failures manually, you can also enable verbose agent logs by
 setting the `GEMINI_DEBUG_LOG_FILE` environment variable.

+### Best practices
+
 It's highly recommended to manually review and/or ask the agent to iterate on
 any prompt changes, even if they pass all evals. The prompt should prefer
 positive traits ('do X') and resort to negative traits ('do not do X') only when
 unable to accomplish the goal with positive traits. Gemini is quite good at
 instrospecting on its prompt when asked the right questions.
+
+## Promoting evaluations
+
+Evaluations must be promoted from `USUALLY_PASSES` to `ALWAYS_PASSES`
+exclusively using the `/promote-behavioral-eval` slash command. Manual promotion
+is not allowed to ensure that the 100% success rate requirement is empirically
+met.
+
+### `/promote-behavioral-eval`
+
+This command automates the promotion of stable tests by:
+
+1.  **Investigating**: Analyzing the results of the last 7 nightly runs on the
+    `main` branch using the `gh` CLI.
+2.  **Criteria Check**: Identifying tests that have passed 100% of the time for
+    ALL enabled models across the entire 7-run history.
+3.  **Promotion**: Updating the test file's policy from `USUALLY_PASSES` to
+    `ALWAYS_PASSES`.
+4.  **Verification**: Running the promoted test locally to ensure correctness.
+
+To run it:
+
+```bash
+gemini /promote-behavioral-eval
+```
@@ -88,7 +88,7 @@ describe('Answer vs. ask eval', () => {
   * Ensures that when the user asks a general question, the agent does NOT
   * automatically modify the file.
   */
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
    name: 'should not edit files when asked a general question',
    prompt: 'How does app.ts work?',
    files: FILES,
@@ -25,7 +25,7 @@ describe('git repo eval', () => {
   * The phrasing is intentionally chosen to evoke 'complete' to help the test
   * be more consistent.
   */
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
    name: 'should not git add commit changes unprompted',
    prompt:
      'Finish this up for me by just making a targeted fix for the bug in index.ts. Do not build, install anything, or add tests',
@@ -86,7 +86,7 @@ Provide the answer as an XML block like this:
  });

  const extensionVsGlobalTest = 'Extension memory wins over Global memory';
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
    name: extensionVsGlobalTest,
    params: {
      settings: {
@@ -18,7 +18,7 @@ describe('plan_mode', () => {
    experimental: { plan: true },
  };

-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
    name: 'should refuse file modification when in plan mode',
    approvalMode: ApprovalMode.PLAN,
    params: {
@@ -57,7 +57,7 @@ describe('plan_mode', () => {
    },
  });

-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
    name: 'should refuse saving new documentation to the repo when in plan mode',
    approvalMode: ApprovalMode.PLAN,
    params: {
@@ -125,7 +125,7 @@ describe('save_memory', () => {
  });

  const rememberingCommandAlias = 'Agent remembers custom command aliases';
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
    name: rememberingCommandAlias,
    params: {
      settings: { tools: { core: ['save_memory'] } },
@@ -178,7 +178,7 @@ describe('save_memory', () => {

  const rememberingCodingStyle =
    "Agent remembers user's coding style preference";
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
    name: rememberingCodingStyle,
    params: {
      settings: { tools: { core: ['save_memory'] } },
@@ -260,7 +260,7 @@ describe('save_memory', () => {
  });

  const rememberingBirthday = "Agent remembers user's birthday";
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
    name: rememberingBirthday,
    params: {
      settings: { tools: { core: ['save_memory'] } },
@@ -72,7 +72,7 @@ describe('Shell Efficiency', () => {
    },
  });

-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
    name: 'should NOT use efficiency flags when enableShellOutputEfficiency is disabled',
    params: {
      settings: {
@@ -8,7 +8,7 @@ import { describe, expect } from 'vitest';
 import { evalTest } from './test-helper.js';

 describe('validation_fidelity', () => {
-  evalTest('ALWAYS_PASSES', {
+  evalTest('USUALLY_PASSES', {
    name: 'should perform exhaustive validation autonomously when guided by system instructions',
    files: {
      'src/types.ts': `
@@ -12,23 +12,22 @@ import type {
  RequestContext,
  ExecutionEventBus,
 } from '@a2a-js/sdk/server';
-import type { ToolCallRequestInfo, Config } from '@google/gemini-cli-core';
 import {
  GeminiEventType,
  SimpleExtensionLoader,
+  type ToolCallRequestInfo,
+  type Config,
 } from '@google/gemini-cli-core';
 import { v4 as uuidv4 } from 'uuid';

 import { logger } from '../utils/logger.js';
-import type {
-  StateChange,
-  AgentSettings,
-  PersistedStateMetadata,
-} from '../types.js';
 import {
  CoderAgentEvent,
  getPersistedState,
  setPersistedState,
+  type StateChange,
+  type AgentSettings,
+  type PersistedStateMetadata,
  getContextIdFromMetadata,
  getAgentSettingsFromMetadata,
 } from '../types.js';
@@ -14,17 +14,15 @@ import {
  type Mock,
 } from 'vitest';
 import { Task } from './task.js';
-import type {
-  ToolCall,
-  Config,
-  ToolCallRequestInfo,
-  GitService,
-  CompletedToolCall,
-} from '@google/gemini-cli-core';
 import {
  GeminiEventType,
  ApprovalMode,
  ToolConfirmationOutcome,
+  type Config,
+  type ToolCallRequestInfo,
+  type GitService,
+  type CompletedToolCall,
+  type ToolCall,
 } from '@google/gemini-cli-core';
 import { createMockConfig } from '../utils/testing_utils.js';
 import type { ExecutionEventBus, RequestContext } from '@a2a-js/sdk/server';
@@ -31,7 +31,10 @@ import {
  EDIT_TOOL_NAMES,
  processRestorableToolCalls,
 } from '@google/gemini-cli-core';
-import type { RequestContext, ExecutionEventBus } from '@a2a-js/sdk/server';
+import {
+  type ExecutionEventBus,
+  type RequestContext,
+} from '@a2a-js/sdk/server';
 import type {
  TaskStatusUpdateEvent,
  TaskArtifactUpdateEvent,
@@ -44,16 +47,16 @@ import { v4 as uuidv4 } from 'uuid';
 import { logger } from '../utils/logger.js';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-import { CoderAgentEvent } from '../types.js';
-import type {
-  CoderAgentMessage,
-  StateChange,
-  ToolCallUpdate,
-  TextContent,
-  TaskMetadata,
-  Thought,
-  ThoughtSummary,
-  Citation,
+import {
+  CoderAgentEvent,
+  type CoderAgentMessage,
+  type StateChange,
+  type ToolCallUpdate,
+  type TextContent,
+  type TaskMetadata,
+  type Thought,
+  type ThoughtSummary,
+  type Citation,
 } from '../types.js';
 import type { PartUnion, Part as genAiPart } from '@google/genai';

@@ -6,7 +6,11 @@

 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { InitCommand } from './init.js';
-import { performInit } from '@google/gemini-cli-core';
+import {
+  performInit,
+  type CommandActionReturn,
+  type Config,
+} from '@google/gemini-cli-core';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { CoderAgentExecutor } from '../agent/executor.js';
@@ -14,7 +18,6 @@ import { CoderAgentEvent } from '../types.js';
 import type { ExecutionEventBus } from '@a2a-js/sdk/server';
 import { createMockConfig } from '../utils/testing_utils.js';
 import type { CommandContext } from './types.js';
-import type { CommandActionReturn, Config } from '@google/gemini-cli-core';
 import { logger } from '../utils/logger.js';

 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
@@ -9,6 +9,9 @@ import {
  listMemoryFiles,
  refreshMemory,
  showMemory,
+  type AnyDeclarativeTool,
+  type Config,
+  type ToolRegistry,
 } from '@google/gemini-cli-core';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import {
@@ -19,11 +22,6 @@ import {
  ShowMemoryCommand,
 } from './memory.js';
 import type { CommandContext } from './types.js';
-import type {
-  AnyDeclarativeTool,
-  Config,
-  ToolRegistry,
-} from '@google/gemini-cli-core';

 // Mock the core functions
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
@@ -8,11 +8,6 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as dotenv from 'dotenv';

-import type {
-  TelemetryTarget,
-  ConfigParameters,
-  ExtensionLoader,
-} from '@google/gemini-cli-core';
 import {
  AuthType,
  Config,
@@ -28,6 +23,9 @@ import {
  fetchAdminControlsOnce,
  getCodeAssistServer,
  ExperimentFlags,
+  type TelemetryTarget,
+  type ConfigParameters,
+  type ExtensionLoader,
 } from '@google/gemini-cli-core';

 import { logger } from '../utils/logger.js';
@@ -4,11 +4,12 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import type {
-  Config,
-  ToolCallConfirmationDetails,
+import {
+  GeminiEventType,
+  ApprovalMode,
+  type Config,
+  type ToolCallConfirmationDetails,
 } from '@google/gemini-cli-core';
-import { GeminiEventType, ApprovalMode } from '@google/gemini-cli-core';
 import type {
  TaskStatusUpdateEvent,
  SendStreamingMessageSuccessResponse,
@@ -11,8 +11,16 @@ import { gzipSync, gunzipSync } from 'node:zlib';
 import { v4 as uuidv4 } from 'uuid';
 import type { Task as SDKTask } from '@a2a-js/sdk';
 import type { TaskStore } from '@a2a-js/sdk/server';
-import type { Mocked, MockedClass, Mock } from 'vitest';
-import { describe, it, expect, beforeEach, vi } from 'vitest';
+import {
+  describe,
+  it,
+  expect,
+  beforeEach,
+  vi,
+  type Mocked,
+  type MockedClass,
+  type Mock,
+} from 'vitest';

 import { GCSTaskStore, NoOpTaskStore } from './gcs.js';
 import { logger } from '../utils/logger.js';
@@ -8,8 +8,7 @@ import type { Message } from '@a2a-js/sdk';
 import type { ExecutionEventBus } from '@a2a-js/sdk/server';
 import { v4 as uuidv4 } from 'uuid';

-import { CoderAgentEvent } from '../types.js';
-import type { StateChange } from '../types.js';
+import { CoderAgentEvent, type StateChange } from '../types.js';

 export async function pushTaskStateFailed(
  error: unknown,
@@ -18,9 +18,10 @@ import {
  HookSystem,
  PolicyDecision,
  tmpdir,
+  type Config,
+  type Storage,
 } from '@google/gemini-cli-core';
 import { createMockMessageBus } from '@google/gemini-cli-core/src/test-utils/mock-message-bus.js';
-import type { Config, Storage } from '@google/gemini-cli-core';
 import { expect, vi } from 'vitest';

 export function createMockConfig(
@@ -4,7 +4,15 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { vi, describe, it, expect, beforeEach, type Mock } from 'vitest';
+import {
+  vi,
+  describe,
+  it,
+  expect,
+  beforeEach,
+  afterEach,
+  type Mock,
+} from 'vitest';
 import { listMcpServers } from './list.js';
 import { loadSettings, mergeSettings } from '../../config/settings.js';
 import { createTransport, debugLogger } from '@google/gemini-cli-core';
@@ -106,6 +114,10 @@ describe('mcp list command', () => {
    mockedGetUserExtensionsDir.mockReturnValue('/mocked/extensions/dir');
  });

+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
  it('should display message when no servers configured', async () => {
    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
    mockedLoadSettings.mockReturnValue({
@@ -133,6 +145,7 @@ describe('mcp list command', () => {
          },
        },
      },
+      isTrusted: true,
    });

    mockClient.connect.mockResolvedValue(undefined);
@@ -199,6 +212,7 @@ describe('mcp list command', () => {
          'config-server': { command: '/config/server' },
        },
      },
+      isTrusted: true,
    });

    mockExtensionManager.loadExtensions.mockReturnValue([
@@ -266,4 +280,28 @@ describe('mcp list command', () => {
      expect.anything(),
    );
  });
+
+  it('should show stdio servers as disconnected in untrusted folders', async () => {
+    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
+    mockedLoadSettings.mockReturnValue({
+      merged: {
+        ...defaultMergedSettings,
+        mcpServers: {
+          'test-server': { command: '/test/server' },
+        },
+      },
+      isTrusted: false,
+    });
+
+    // createTransport will throw in core if not trusted
+    mockedCreateTransport.mockRejectedValue(new Error('Folder not trusted'));
+
+    await listMcpServers();
+
+    expect(debugLogger.log).toHaveBeenCalledWith(
+      expect.stringContaining(
+        'test-server: /test/server  (stdio) - Disconnected',
+      ),
+    );
+  });
 });
@@ -20,11 +20,7 @@ import { ExtensionManager } from '../../config/extension-manager.js';
 import { requestConsentNonInteractive } from '../../config/extensions/consent.js';
 import { promptForSetting } from '../../config/extensions/extensionSettings.js';
 import { exitCli } from '../utils.js';
-
-const COLOR_GREEN = '\u001b[32m';
-const COLOR_YELLOW = '\u001b[33m';
-const COLOR_RED = '\u001b[31m';
-const RESET_COLOR = '\u001b[0m';
+import chalk from 'chalk';

 export async function getMcpServersFromConfig(
  settings?: MergedSettings,
@@ -66,27 +62,56 @@ async function testMCPConnection(
  serverName: string,
  config: MCPServerConfig,
 ): Promise<MCPServerStatus> {
+  const settings = loadSettings();
+
+  // SECURITY: Only test connection if workspace is trusted or if it's a remote server.
+  // stdio servers execute local commands and must never run in untrusted workspaces.
+  const isStdio = !!config.command;
+  if (isStdio && !settings.isTrusted) {
+    return MCPServerStatus.DISCONNECTED;
+  }
+
  const client = new Client({
    name: 'mcp-test-client',
    version: '0.0.1',
  });

-  const settings = loadSettings();
-  const sanitizationConfig = {
-    enableEnvironmentVariableRedaction: true,
-    allowedEnvironmentVariables: [],
-    blockedEnvironmentVariables: settings.merged.advanced.excludedEnvVars,
+  const mcpContext = {
+    sanitizationConfig: {
+      enableEnvironmentVariableRedaction: true,
+      allowedEnvironmentVariables: [],
+      blockedEnvironmentVariables: settings.merged.advanced.excludedEnvVars,
+    },
+    emitMcpDiagnostic: (
+      severity: 'info' | 'warning' | 'error',
+      message: string,
+      error?: unknown,
+      serverName?: string,
+    ) => {
+      // In non-interactive list, we log everything through debugLogger for consistency
+      if (severity === 'error') {
+        debugLogger.error(
+          chalk.red(`Error${serverName ? ` (${serverName})` : ''}: ${message}`),
+          error,
+        );
+      } else if (severity === 'warning') {
+        debugLogger.warn(
+          chalk.yellow(
+            `Warning${serverName ? ` (${serverName})` : ''}: ${message}`,
+          ),
+          error,
+        );
+      } else {
+        debugLogger.log(message, error);
+      }
+    },
+    isTrustedFolder: () => settings.isTrusted,
  };

  let transport;
  try {
    // Use the same transport creation logic as core
-    transport = await createTransport(
-      serverName,
-      config,
-      false,
-      sanitizationConfig,
-    );
+    transport = await createTransport(serverName, config, false, mcpContext);
  } catch (_error) {
    await client.close();
    return MCPServerStatus.DISCONNECTED;
@@ -125,7 +150,7 @@ export async function listMcpServers(settings?: MergedSettings): Promise<void> {
      blockedServerNames,
      undefined,
    );
-    debugLogger.log(COLOR_YELLOW + message + RESET_COLOR + '\n');
+    debugLogger.log(chalk.yellow(message + '\n'));
  }

  if (serverNames.length === 0) {
@@ -146,16 +171,16 @@ export async function listMcpServers(settings?: MergedSettings): Promise<void> {
    let statusText = '';
    switch (status) {
      case MCPServerStatus.CONNECTED:
-        statusIndicator = COLOR_GREEN + '✓' + RESET_COLOR;
+        statusIndicator = chalk.green('✓');
        statusText = 'Connected';
        break;
      case MCPServerStatus.CONNECTING:
-        statusIndicator = COLOR_YELLOW + '…' + RESET_COLOR;
+        statusIndicator = chalk.yellow('…');
        statusText = 'Connecting';
        break;
      case MCPServerStatus.DISCONNECTED:
      default:
-        statusIndicator = COLOR_RED + '✗' + RESET_COLOR;
+        statusIndicator = chalk.red('✗');
        statusText = 'Disconnected';
        break;
    }
@@ -843,6 +843,7 @@ export async function loadCliConfig(
    interactive,
    trustedFolder,
    useBackgroundColor: settings.ui?.useBackgroundColor,
+    useAlternateBuffer: settings.ui?.useAlternateBuffer,
    useRipgrep: settings.tools?.useRipgrep,
    enableInteractiveShell: settings.tools?.shell?.enableInteractiveShell,
    shellToolInactivityTimeout: settings.tools?.shell?.inactivityTimeout,
@@ -12,6 +12,8 @@ import {
  resolveWorkspacePolicyState,
  autoAcceptWorkspacePolicies,
  setAutoAcceptWorkspacePolicies,
+  disableWorkspacePolicies,
+  setDisableWorkspacePolicies,
 } from './policy.js';
 import { writeToStderr } from '@google/gemini-cli-core';

@@ -45,6 +47,9 @@ describe('resolveWorkspacePolicyState', () => {
    fs.mkdirSync(workspaceDir);
    policiesDir = path.join(workspaceDir, '.gemini', 'policies');

+    // Enable policies for these tests to verify loading logic
+    setDisableWorkspacePolicies(false);
+
    vi.clearAllMocks();
  });

@@ -67,6 +72,13 @@ describe('resolveWorkspacePolicyState', () => {
    });
  });

+  it('should have disableWorkspacePolicies set to true by default', () => {
+    // We explicitly set it to false in beforeEach for other tests,
+    // so here we test that setting it to true works.
+    setDisableWorkspacePolicies(true);
+    expect(disableWorkspacePolicies).toBe(true);
+  });
+
  it('should return policy directory if integrity matches', async () => {
    // Set up policies directory with a file
    fs.mkdirSync(policiesDir, { recursive: true });
@@ -188,7 +200,26 @@ describe('resolveWorkspacePolicyState', () => {
    expect(result.policyUpdateConfirmationRequest).toBeUndefined();
  });

-  it('should not return workspace policies if cwd is a symlink to the home directory', async () => {
+  it('should return empty state if disableWorkspacePolicies is true even if folder is trusted', async () => {
+    setDisableWorkspacePolicies(true);
+
+    // Set up policies directory with a file
+    fs.mkdirSync(policiesDir, { recursive: true });
+    fs.writeFileSync(path.join(policiesDir, 'policy.toml'), 'rules = []');
+
+    const result = await resolveWorkspacePolicyState({
+      cwd: workspaceDir,
+      trustedFolder: true,
+      interactive: true,
+    });
+
+    expect(result).toEqual({
+      workspacePoliciesDir: undefined,
+      policyUpdateConfirmationRequest: undefined,
+    });
+  });
+
+  it('should return empty state if cwd is a symlink to the home directory', async () => {
    const policiesDir = path.join(tempDir, '.gemini', 'policies');
    fs.mkdirSync(policiesDir, { recursive: true });
    fs.writeFileSync(path.join(policiesDir, 'policy.toml'), 'rules = []');
@@ -35,6 +35,20 @@ export function setAutoAcceptWorkspacePolicies(value: boolean) {
  autoAcceptWorkspacePolicies = value;
 }

+/**
+ * Temporary flag to disable workspace level policies altogether.
+ * Exported as 'let' to allow monkey patching in tests via the setter.
+ */
+export let disableWorkspacePolicies = true;
+
+/**
+ * Sets the disableWorkspacePolicies flag.
+ * Used primarily for testing purposes.
+ */
+export function setDisableWorkspacePolicies(value: boolean) {
+  disableWorkspacePolicies = value;
+}
+
 export async function createPolicyEngineConfig(
  settings: Settings,
  approvalMode: ApprovalMode,
@@ -81,7 +95,7 @@ export async function resolveWorkspacePolicyState(options: {
    | PolicyUpdateConfirmationRequest
    | undefined;

-  if (trustedFolder) {
+  if (trustedFolder && !disableWorkspacePolicies) {
    const storage = new Storage(cwd);

    // If we are in the home directory (or rather, our target Gemini dir is the global one),
@@ -96,6 +96,14 @@ describe('SettingsSchema', () => {
      ]);
    });

+    it('should have errorVerbosity enum property', () => {
+      const definition = getSettingsSchema().ui?.properties?.errorVerbosity;
+      expect(definition).toBeDefined();
+      expect(definition?.type).toBe('enum');
+      expect(definition?.default).toBe('low');
+      expect(definition?.options?.map((o) => o.value)).toEqual(['low', 'full']);
+    });
+
    it('should have checkpointing nested properties', () => {
      expect(
        getSettingsSchema().general?.properties?.checkpointing.properties
@@ -719,6 +719,20 @@ const SETTINGS_SCHEMA = {
          { value: 'off', label: 'Off' },
        ],
      },
+      errorVerbosity: {
+        type: 'enum',
+        label: 'Error Verbosity',
+        category: 'UI',
+        requiresRestart: false,
+        default: 'low',
+        description:
+          'Controls whether recoverable errors are hidden (low) or fully shown (full).',
+        showInDialog: true,
+        options: [
+          { value: 'low', label: 'Low' },
+          { value: 'full', label: 'Full' },
+        ],
+      },
      customWittyPhrases: {
        type: 'array',
        label: 'Custom Witty Phrases',
@@ -828,6 +842,36 @@ const SETTINGS_SCHEMA = {
    ref: 'TelemetrySettings',
  },

+  billing: {
+    type: 'object',
+    label: 'Billing',
+    category: 'Advanced',
+    requiresRestart: false,
+    default: {},
+    description: 'Billing and AI credits settings.',
+    showInDialog: false,
+    properties: {
+      overageStrategy: {
+        type: 'enum',
+        label: 'Overage Strategy',
+        category: 'Advanced',
+        requiresRestart: false,
+        default: 'ask',
+        description: oneLine`
+          How to handle quota exhaustion when AI credits are available.
+          'ask' prompts each time, 'always' automatically uses credits,
+          'never' disables credit usage.
+        `,
+        showInDialog: true,
+        options: [
+          { value: 'ask', label: 'Ask each time' },
+          { value: 'always', label: 'Always use credits' },
+          { value: 'never', label: 'Never use credits' },
+        ],
+      },
+    },
+  },
+
  model: {
    type: 'object',
    label: 'Model',
@@ -54,6 +54,7 @@ describe('Workspace-Level Policy CLI Integration', () => {

  beforeEach(() => {
    vi.clearAllMocks();
+    Policy.setDisableWorkspacePolicies(false);
    // Default to MATCH for existing tests
    mockCheckIntegrity.mockResolvedValue({
      status: 'match',
@@ -17,7 +17,6 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
    await importOriginal<typeof import('@google/gemini-cli-core')>();
  return {
    ...actual,
-    getErrorMessage: (e: unknown) => (e as Error).message,
  };
 });

@@ -32,7 +31,7 @@ describe('auth', () => {

  it('should return null if authType is undefined', async () => {
    const result = await performInitialAuth(mockConfig, undefined);
-    expect(result).toBeNull();
+    expect(result).toEqual({ authError: null, accountSuspensionInfo: null });
    expect(mockConfig.refreshAuth).not.toHaveBeenCalled();
  });

@@ -41,7 +40,7 @@ describe('auth', () => {
      mockConfig,
      AuthType.LOGIN_WITH_GOOGLE,
    );
-    expect(result).toBeNull();
+    expect(result).toEqual({ authError: null, accountSuspensionInfo: null });
    expect(mockConfig.refreshAuth).toHaveBeenCalledWith(
      AuthType.LOGIN_WITH_GOOGLE,
    );
@@ -54,7 +53,10 @@ describe('auth', () => {
      mockConfig,
      AuthType.LOGIN_WITH_GOOGLE,
    );
-    expect(result).toBe('Failed to login. Message: Auth failed');
+    expect(result).toEqual({
+      authError: 'Failed to login. Message: Auth failed',
+      accountSuspensionInfo: null,
+    });
    expect(mockConfig.refreshAuth).toHaveBeenCalledWith(
      AuthType.LOGIN_WITH_GOOGLE,
    );
@@ -68,7 +70,48 @@ describe('auth', () => {
      mockConfig,
      AuthType.LOGIN_WITH_GOOGLE,
    );
-    expect(result).toBeNull();
+    expect(result).toEqual({ authError: null, accountSuspensionInfo: null });
+    expect(mockConfig.refreshAuth).toHaveBeenCalledWith(
+      AuthType.LOGIN_WITH_GOOGLE,
+    );
+  });
+
+  it('should return accountSuspensionInfo for 403 TOS_VIOLATION error', async () => {
+    vi.mocked(mockConfig.refreshAuth).mockRejectedValue({
+      response: {
+        data: {
+          error: {
+            code: 403,
+            message:
+              'This service has been disabled for violation of Terms of Service.',
+            details: [
+              {
+                '@type': 'type.googleapis.com/google.rpc.ErrorInfo',
+                reason: 'TOS_VIOLATION',
+                domain: 'example.googleapis.com',
+                metadata: {
+                  appeal_url: 'https://example.com/appeal',
+                  appeal_url_link_text: 'Appeal Here',
+                },
+              },
+            ],
+          },
+        },
+      },
+    });
+    const result = await performInitialAuth(
+      mockConfig,
+      AuthType.LOGIN_WITH_GOOGLE,
+    );
+    expect(result).toEqual({
+      authError: null,
+      accountSuspensionInfo: {
+        message:
+          'This service has been disabled for violation of Terms of Service.',
+        appealUrl: 'https://example.com/appeal',
+        appealLinkText: 'Appeal Here',
+      },
+    });
    expect(mockConfig.refreshAuth).toHaveBeenCalledWith(
      AuthType.LOGIN_WITH_GOOGLE,
    );
@@ -9,20 +9,28 @@ import {
  type Config,
  getErrorMessage,
  ValidationRequiredError,
+  isAccountSuspendedError,
 } from '@google/gemini-cli-core';

+import type { AccountSuspensionInfo } from '../ui/contexts/UIStateContext.js';
+
+export interface InitialAuthResult {
+  authError: string | null;
+  accountSuspensionInfo: AccountSuspensionInfo | null;
+}
+
 /**
 * Handles the initial authentication flow.
 * @param config The application config.
 * @param authType The selected auth type.
- * @returns An error message if authentication fails, otherwise null.
+ * @returns The auth result with error message and account suspension status.
 */
 export async function performInitialAuth(
  config: Config,
  authType: AuthType | undefined,
-): Promise<string | null> {
+): Promise<InitialAuthResult> {
  if (!authType) {
-    return null;
+    return { authError: null, accountSuspensionInfo: null };
  }

  try {
@@ -33,10 +41,24 @@ export async function performInitialAuth(
    if (e instanceof ValidationRequiredError) {
      // Don't treat validation required as a fatal auth error during startup.
      // This allows the React UI to load and show the ValidationDialog.
-      return null;
+      return { authError: null, accountSuspensionInfo: null };
    }
-    return `Failed to login. Message: ${getErrorMessage(e)}`;
+    const suspendedError = isAccountSuspendedError(e);
+    if (suspendedError) {
+      return {
+        authError: null,
+        accountSuspensionInfo: {
+          message: suspendedError.message,
+          appealUrl: suspendedError.appealUrl,
+          appealLinkText: suspendedError.appealLinkText,
+        },
+      };
+    }
+    return {
+      authError: `Failed to login. Message: ${getErrorMessage(e)}`,
+      accountSuspensionInfo: null,
+    };
  }

-  return null;
+  return { authError: null, accountSuspensionInfo: null };
 }
@@ -72,7 +72,10 @@ describe('initializer', () => {
    vi.mocked(IdeClient.getInstance).mockResolvedValue(
      mockIdeClient as unknown as IdeClient,
    );
-    vi.mocked(performInitialAuth).mockResolvedValue(null);
+    vi.mocked(performInitialAuth).mockResolvedValue({
+      authError: null,
+      accountSuspensionInfo: null,
+    });
    vi.mocked(validateTheme).mockReturnValue(null);
  });

@@ -84,6 +87,7 @@ describe('initializer', () => {

    expect(result).toEqual({
      authError: null,
+      accountSuspensionInfo: null,
      themeError: null,
      shouldOpenAuthDialog: false,
      geminiMdFileCount: 5,
@@ -103,6 +107,7 @@ describe('initializer', () => {

    expect(result).toEqual({
      authError: null,
+      accountSuspensionInfo: null,
      themeError: null,
      shouldOpenAuthDialog: false,
      geminiMdFileCount: 5,
@@ -116,7 +121,10 @@ describe('initializer', () => {
  });

  it('should handle auth error', async () => {
-    vi.mocked(performInitialAuth).mockResolvedValue('Auth failed');
+    vi.mocked(performInitialAuth).mockResolvedValue({
+      authError: 'Auth failed',
+      accountSuspensionInfo: null,
+    });
    const result = await initializeApp(
      mockConfig as unknown as Config,
      mockSettings,
@@ -17,9 +17,11 @@ import {
 import { type LoadedSettings } from '../config/settings.js';
 import { performInitialAuth } from './auth.js';
 import { validateTheme } from './theme.js';
+import type { AccountSuspensionInfo } from '../ui/contexts/UIStateContext.js';

 export interface InitializationResult {
  authError: string | null;
+  accountSuspensionInfo: AccountSuspensionInfo | null;
  themeError: string | null;
  shouldOpenAuthDialog: boolean;
  geminiMdFileCount: number;
@@ -37,7 +39,7 @@ export async function initializeApp(
  settings: LoadedSettings,
 ): Promise<InitializationResult> {
  const authHandle = startupProfiler.start('authenticate');
-  const authError = await performInitialAuth(
+  const { authError, accountSuspensionInfo } = await performInitialAuth(
    config,
    settings.merged.security.auth.selectedType,
  );
@@ -60,6 +62,7 @@ export async function initializeApp(

  return {
    authError,
+    accountSuspensionInfo,
    themeError,
    shouldOpenAuthDialog,
    geminiMdFileCount: config.getGeminiMdFileCount(),
@@ -1182,6 +1182,7 @@ describe('startInteractiveUI', () => {
    getProjectRoot: () => '/root',
    getScreenReader: () => false,
    getDebugMode: () => false,
+    getUseAlternateBuffer: () => true,
  });
  const mockSettings = {
    merged: {
@@ -1201,6 +1202,7 @@ describe('startInteractiveUI', () => {
  const mockWorkspaceRoot = '/root';
  const mockInitializationResult = {
    authError: null,
+    accountSuspensionInfo: null,
    themeError: null,
    shouldOpenAuthDialog: false,
    geminiMdFileCount: 0,
@@ -102,8 +102,8 @@ import { loadSandboxConfig } from './config/sandboxConfig.js';
 import { deleteSession, listSessions } from './utils/sessions.js';
 import { createPolicyUpdater } from './config/policy.js';
 import { ScrollProvider } from './ui/contexts/ScrollProvider.js';
-import { isAlternateBufferEnabled } from './ui/hooks/useAlternateBuffer.js';
 import { TerminalProvider } from './ui/contexts/TerminalContext.js';
+import { isAlternateBufferEnabled } from './ui/hooks/useAlternateBuffer.js';
 import { OverflowProvider } from './ui/contexts/OverflowContext.js';

 import { setupTerminalAndTheme } from './utils/terminalTheme.js';
@@ -196,7 +196,7 @@ export async function startInteractiveUI(
  // and the Ink alternate buffer mode requires line wrapping harmful to
  // screen readers.
  const useAlternateBuffer = shouldEnterAlternateScreen(
-    isAlternateBufferEnabled(settings),
+    isAlternateBufferEnabled(config),
    config.getScreenReader(),
  );
  const mouseEventsEnabled = useAlternateBuffer;
@@ -678,7 +678,7 @@ export async function main() {

    let input = config.getQuestion();
    const useAlternateBuffer = shouldEnterAlternateScreen(
-      isAlternateBufferEnabled(settings),
+      isAlternateBufferEnabled(config),
      config.getScreenReader(),
    );
    const rawStartupWarnings = await getStartupWarnings();
@@ -104,6 +104,8 @@ vi.mock('../ui/auth/useAuth.js', () => ({
    onAuthError: vi.fn(),
    apiKeyDefaultValue: 'test-api-key',
    reloadApiKey: vi.fn().mockResolvedValue('test-api-key'),
+    accountSuspensionInfo: null,
+    setAccountSuspensionInfo: vi.fn(),
  }),
  validateAuthMethodWithSettings: () => null,
 }));
@@ -387,6 +389,7 @@ export class AppRig {
          version="test-version"
          initializationResult={{
            authError: null,
+            accountSuspensionInfo: null,
            themeError: null,
            shouldOpenAuthDialog: false,
            geminiMdFileCount: 0,
@@ -141,7 +141,10 @@ export const createMockConfig = (overrides: Partial<Config> = {}): Config =>
    getMcpClientManager: vi.fn().mockReturnValue({
      getMcpInstructions: vi.fn().mockReturnValue(''),
      getMcpServers: vi.fn().mockReturnValue({}),
+      getLastError: vi.fn().mockReturnValue(undefined),
    }),
+    setUserInteractedWithMcp: vi.fn(),
+    emitMcpDiagnostic: vi.fn(),
    getEnableEventDrivenScheduler: vi.fn().mockReturnValue(false),
    getAdminSkillsEnabled: vi.fn().mockReturnValue(false),
    getDisabledSkills: vi.fn().mockReturnValue([]),
@@ -156,6 +159,7 @@ export const createMockConfig = (overrides: Partial<Config> = {}): Config =>
    getExperiments: vi.fn().mockReturnValue(undefined),
    getHasAccessToPreviewModel: vi.fn().mockReturnValue(false),
    validatePathAccess: vi.fn().mockReturnValue(null),
+    getUseAlternateBuffer: vi.fn().mockReturnValue(false),
    ...overrides,
  }) as unknown as Config;

@@ -591,6 +591,8 @@ const mockUIActions: UIActions = {
  handleClearScreen: vi.fn(),
  handleProQuotaChoice: vi.fn(),
  handleValidationChoice: vi.fn(),
+  handleOverageMenuChoice: vi.fn(),
+  handleEmptyWalletChoice: vi.fn(),
  setQueueErrorMessage: vi.fn(),
  popAllMessages: vi.fn(),
  handleApiKeySubmit: vi.fn(),
@@ -613,6 +615,7 @@ const mockUIActions: UIActions = {
  handleRestart: vi.fn(),
  handleNewAgentsSelect: vi.fn(),
  getPreferredEditor: vi.fn(),
+  clearAccountSuspension: vi.fn(),
 };

 let capturedOverflowState: OverflowState | undefined;
@@ -703,6 +706,21 @@ export const renderWithProviders = (
    });
  }

+  // Wrap config in a Proxy so useAlternateBuffer hook (which reads from Config) gets the correct value,
+  // without replacing the entire config object and its other values.
+  let finalConfig = config;
+  if (useAlternateBuffer !== undefined) {
+    finalConfig = new Proxy(config, {
+      get(target, prop, receiver) {
+        if (prop === 'getUseAlternateBuffer') {
+          return () => useAlternateBuffer;
+        }
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+        return Reflect.get(target, prop, receiver);
+      },
+    });
+  }
+
  const mainAreaWidth = terminalWidth;

  const finalUiState = {
@@ -731,7 +749,7 @@ export const renderWithProviders = (

  const renderResult = render(
    <AppContext.Provider value={appState}>
-      <ConfigContext.Provider value={config}>
+      <ConfigContext.Provider value={finalConfig}>
        <SettingsContext.Provider value={finalSettings}>
          <UIStateContext.Provider value={finalUiState}>
            <VimModeProvider settings={finalSettings}>
@@ -743,7 +761,7 @@ export const renderWithProviders = (
                    <UIActionsContext.Provider value={finalUIActions}>
                      <OverflowProvider>
                        <ToolActionsProvider
-                          config={config}
+                          config={finalConfig}
                          toolCalls={allToolCalls}
                        >
                          <AskUserActionsProvider
@@ -2544,6 +2544,136 @@ describe('AppContainer State Management', () => {
    });
  });

+  describe('Expansion Persistence', () => {
+    let rerender: () => void;
+    let unmount: () => void;
+    let stdin: ReturnType<typeof render>['stdin'];
+
+    const setupExpansionPersistenceTest = async (
+      HighPriorityChild?: React.FC,
+    ) => {
+      const getTree = () => (
+        <SettingsContext.Provider value={mockSettings}>
+          <KeypressProvider config={mockConfig}>
+            <OverflowProvider>
+              <AppContainer
+                config={mockConfig}
+                version="1.0.0"
+                initializationResult={mockInitResult}
+              />
+              {HighPriorityChild && <HighPriorityChild />}
+            </OverflowProvider>
+          </KeypressProvider>
+        </SettingsContext.Provider>
+      );
+
+      const renderResult = render(getTree());
+      stdin = renderResult.stdin;
+      await act(async () => {
+        vi.advanceTimersByTime(100);
+      });
+      rerender = () => renderResult.rerender(getTree());
+      unmount = () => renderResult.unmount();
+    };
+
+    const writeStdin = async (sequence: string) => {
+      await act(async () => {
+        stdin.write(sequence);
+        // Advance timers to allow escape sequence parsing and broadcasting
+        vi.advanceTimersByTime(100);
+      });
+      rerender();
+    };
+
+    beforeEach(() => {
+      vi.useFakeTimers();
+    });
+
+    afterEach(() => {
+      vi.useRealTimers();
+      vi.restoreAllMocks();
+    });
+
+    it('should reset expansion when a key is NOT handled by anyone', async () => {
+      await setupExpansionPersistenceTest();
+
+      // Expand first
+      act(() => capturedUIActions.setConstrainHeight(false));
+      rerender();
+      expect(capturedUIState.constrainHeight).toBe(false);
+
+      // Press a random key that no one handles (hits Low priority fallback)
+      await writeStdin('x');
+
+      // Should be reset to true (collapsed)
+      expect(capturedUIState.constrainHeight).toBe(true);
+
+      unmount();
+    });
+
+    it('should toggle expansion when Ctrl+O is pressed', async () => {
+      await setupExpansionPersistenceTest();
+
+      // Initial state is collapsed
+      expect(capturedUIState.constrainHeight).toBe(true);
+
+      // Press Ctrl+O to expand (Ctrl+O is sequence \x0f)
+      await writeStdin('\x0f');
+      expect(capturedUIState.constrainHeight).toBe(false);
+
+      // Press Ctrl+O again to collapse
+      await writeStdin('\x0f');
+      expect(capturedUIState.constrainHeight).toBe(true);
+
+      unmount();
+    });
+
+    it('should NOT collapse when a high-priority component handles the key (e.g., up/down arrows)', async () => {
+      const NavigationHandler = () => {
+        // use real useKeypress
+        useKeypress(
+          (key: Key) => {
+            if (key.name === 'up' || key.name === 'down') {
+              return true; // Handle navigation
+            }
+            return false;
+          },
+          { isActive: true, priority: true }, // High priority
+        );
+        return null;
+      };
+
+      await setupExpansionPersistenceTest(NavigationHandler);
+
+      // Expand first
+      act(() => capturedUIActions.setConstrainHeight(false));
+      rerender();
+      expect(capturedUIState.constrainHeight).toBe(false);
+
+      // 1. Simulate Up arrow (handled by high priority child)
+      // CSI A is Up arrow
+      await writeStdin('\u001b[A');
+
+      // Should STILL be expanded
+      expect(capturedUIState.constrainHeight).toBe(false);
+
+      // 2. Simulate Down arrow (handled by high priority child)
+      // CSI B is Down arrow
+      await writeStdin('\u001b[B');
+
+      // Should STILL be expanded
+      expect(capturedUIState.constrainHeight).toBe(false);
+
+      // 3. Sanity check: press an unhandled key
+      await writeStdin('x');
+
+      // Should finally collapse
+      expect(capturedUIState.constrainHeight).toBe(true);
+
+      unmount();
+    });
+  });
+
  describe('Shortcuts Help Visibility', () => {
    let handleGlobalKeypress: (key: Key) => boolean;
    let mockedUseKeypress: Mock;
@@ -2675,6 +2805,10 @@ describe('AppContainer State Management', () => {
      isAlternateMode = false,
      childHandler?: Mock,
    ) => {
+      vi.spyOn(mockConfig, 'getUseAlternateBuffer').mockReturnValue(
+        isAlternateMode,
+      );
+
      // Update settings for this test run
      const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
      const testSettings = {
@@ -3364,6 +3498,8 @@ describe('AppContainer State Management', () => {
      );
      vi.mocked(checkPermissions).mockResolvedValue([]);

+      vi.spyOn(mockConfig, 'getUseAlternateBuffer').mockReturnValue(true);
+
      let unmount: () => void;
      await act(async () => {
        unmount = renderAppContainer({
@@ -3596,6 +3732,8 @@ describe('AppContainer State Management', () => {
        },
      } as unknown as LoadedSettings;

+      vi.spyOn(mockConfig, 'getUseAlternateBuffer').mockReturnValue(true);
+
      let unmount: () => void;
      await act(async () => {
        const result = renderAppContainer({
@@ -47,6 +47,7 @@ import {
  type IdeInfo,
  type IdeContext,
  type UserTierId,
+  type GeminiUserTier,
  type UserFeedbackPayload,
  type AgentDefinition,
  type ApprovalMode,
@@ -82,6 +83,8 @@ import {
  CoreToolCallStatus,
  generateSteeringAckMessage,
  buildUserSteeringHintPrompt,
+  logBillingEvent,
+  ApiKeyUpdatedEvent,
 } from '@google/gemini-cli-core';
 import { validateAuthMethod } from '../config/auth.js';
 import process from 'node:process';
@@ -145,7 +148,6 @@ import { useSessionResume } from './hooks/useSessionResume.js';
 import { useIncludeDirsTrust } from './hooks/useIncludeDirsTrust.js';
 import { useSessionRetentionCheck } from './hooks/useSessionRetentionCheck.js';
 import { isWorkspaceTrusted } from '../config/trustedFolders.js';
-import { useAlternateBuffer } from './hooks/useAlternateBuffer.js';
 import { useSettings } from './contexts/SettingsContext.js';
 import { terminalCapabilityManager } from './utils/terminalCapabilityManager.js';
 import { useInputHistoryStore } from './hooks/useInputHistoryStore.js';
@@ -228,7 +230,7 @@ export const AppContainer = (props: AppContainerProps) => {
  });

  useMemoryMonitor(historyManager);
-  const isAlternateBuffer = useAlternateBuffer();
+  const isAlternateBuffer = config.getUseAlternateBuffer();
  const [corgiMode, setCorgiMode] = useState(false);
  const [forceRerenderKey, setForceRerenderKey] = useState(0);
  const [debugMessage, setDebugMessage] = useState<string>('');
@@ -264,14 +266,16 @@ export const AppContainer = (props: AppContainerProps) => {
    () => isWorkspaceTrusted(settings.merged).isTrusted,
  );

-  const [queueErrorMessage, setQueueErrorMessage] = useState<string | null>(
-    null,
+  const [queueErrorMessage, setQueueErrorMessage] = useTimedMessage<string>(
+    QUEUE_ERROR_DISPLAY_DURATION_MS,
  );

  const [newAgents, setNewAgents] = useState<AgentDefinition[] | null>(null);
  const [constrainHeight, setConstrainHeight] = useState<boolean>(true);
-  const [showIsExpandableHint, setShowIsExpandableHint] = useState(false);
-  const expandHintTimerRef = useRef<NodeJS.Timeout | null>(null);
+  const [expandHintTrigger, triggerExpandHint] = useTimedMessage<boolean>(
+    EXPAND_HINT_DURATION_MS,
+  );
+  const showIsExpandableHint = Boolean(expandHintTrigger);
  const overflowState = useOverflowState();
  const overflowingIdsSize = overflowState?.overflowingIds.size ?? 0;
  const hasOverflowState = overflowingIdsSize > 0 || !constrainHeight;
@@ -284,39 +288,15 @@ export const AppContainer = (props: AppContainerProps) => {
   * boolean dependency (hasOverflowState) to ensure the timer only resets on
   * genuine state transitions, preventing it from infinitely resetting during
   * active text streaming.
+   *
+   * In alternate buffer mode, we don't trigger the hint automatically on overflow
+   * to avoid noise, but the user can still trigger it manually with Ctrl+O.
   */
  useEffect(() => {
-    if (isAlternateBuffer) {
-      setShowIsExpandableHint(false);
-      if (expandHintTimerRef.current) {
-        clearTimeout(expandHintTimerRef.current);
-      }
-      return;
+    if (hasOverflowState && !isAlternateBuffer) {
+      triggerExpandHint(true);
    }
-
-    if (hasOverflowState) {
-      setShowIsExpandableHint(true);
-      if (expandHintTimerRef.current) {
-        clearTimeout(expandHintTimerRef.current);
-      }
-      expandHintTimerRef.current = setTimeout(() => {
-        setShowIsExpandableHint(false);
-      }, EXPAND_HINT_DURATION_MS);
-    }
-  }, [hasOverflowState, isAlternateBuffer, constrainHeight]);
-
-  /**
-   * Safe cleanup to ensure the expansion hint timer is cancelled when the
-   * component unmounts, preventing memory leaks.
-   */
-  useEffect(
-    () => () => {
-      if (expandHintTimerRef.current) {
-        clearTimeout(expandHintTimerRef.current);
-      }
-    },
-    [],
-  );
+  }, [hasOverflowState, isAlternateBuffer, triggerExpandHint]);

  const [defaultBannerText, setDefaultBannerText] = useState('');
  const [warningBannerText, setWarningBannerText] = useState('');
@@ -414,6 +394,9 @@ export const AppContainer = (props: AppContainerProps) => {
      ? { remaining, limit, resetTime }
      : undefined;
  });
+  const [paidTier, setPaidTier] = useState<GeminiUserTier | undefined>(
+    undefined,
+  );

  const [isConfigInitialized, setConfigInitialized] = useState(false);

@@ -567,7 +550,7 @@ export const AppContainer = (props: AppContainerProps) => {
  const { consoleMessages, clearConsoleMessages: clearConsoleMessagesState } =
    useConsoleMessages();

-  const mainAreaWidth = calculateMainAreaWidth(terminalWidth, settings);
+  const mainAreaWidth = calculateMainAreaWidth(terminalWidth, config);
  // Derive widths for InputPrompt using shared helper
  const { inputWidth, suggestionsWidth } = useMemo(() => {
    const { inputWidth, suggestionsWidth } =
@@ -692,7 +675,14 @@ export const AppContainer = (props: AppContainerProps) => {
    onAuthError,
    apiKeyDefaultValue,
    reloadApiKey,
-  } = useAuthCommand(settings, config, initializationResult.authError);
+    accountSuspensionInfo,
+    setAccountSuspensionInfo,
+  } = useAuthCommand(
+    settings,
+    config,
+    initializationResult.authError,
+    initializationResult.accountSuspensionInfo,
+  );
  const [authContext, setAuthContext] = useState<{ requiresRestart?: boolean }>(
    {},
  );
@@ -709,12 +699,20 @@ export const AppContainer = (props: AppContainerProps) => {
    handleProQuotaChoice,
    validationRequest,
    handleValidationChoice,
+    // G1 AI Credits
+    overageMenuRequest,
+    handleOverageMenuChoice,
+    emptyWalletRequest,
+    handleEmptyWalletChoice,
  } = useQuotaAndFallback({
    config,
    historyManager,
    userTier,
+    paidTier,
+    settings,
    setModelSwitchedFromQuotaError,
    onShowAuthSelection: () => setAuthState(AuthState.Updating),
+    errorVerbosity: settings.merged.ui.errorVerbosity,
  });

  // Derive auth state variables for backward compatibility with UIStateContext
@@ -752,6 +750,8 @@ export const AppContainer = (props: AppContainerProps) => {
  const handleAuthSelect = useCallback(
    async (authType: AuthType | undefined, scope: LoadableSettingScope) => {
      if (authType) {
+        const previousAuthType =
+          config.getContentGeneratorConfig()?.authType ?? 'unknown';
        if (authType === AuthType.LOGIN_WITH_GOOGLE) {
          setAuthContext({ requiresRestart: true });
        } else {
@@ -764,6 +764,10 @@ export const AppContainer = (props: AppContainerProps) => {
          config.setRemoteAdminSettings(undefined);
          await config.refreshAuth(authType);
          setAuthState(AuthState.Authenticated);
+          logBillingEvent(
+            config,
+            new ApiKeyUpdatedEvent(previousAuthType, authType),
+          );
        } catch (e) {
          if (e instanceof ChangeAuthRequestedError) {
            return;
@@ -826,6 +830,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
    // Only sync when not currently authenticating
    if (authState === AuthState.Authenticated) {
      setUserTier(config.getUserTier());
+      setPaidTier(config.getUserPaidTier());
    }
  }, [config, authState]);

@@ -1252,10 +1257,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
    async (submittedValue: string) => {
      reset();
      // Explicitly hide the expansion hint and clear its x-second timer when a new turn begins.
-      setShowIsExpandableHint(false);
-      if (expandHintTimerRef.current) {
-        clearTimeout(expandHintTimerRef.current);
-      }
+      triggerExpandHint(null);
      if (!constrainHeight) {
        setConstrainHeight(true);
        if (!isAlternateBuffer) {
@@ -1327,16 +1329,14 @@ Logging in with Google... Restarting Gemini CLI to continue.
      refreshStatic,
      reset,
      handleHintSubmit,
+      triggerExpandHint,
    ],
  );

  const handleClearScreen = useCallback(() => {
    reset();
    // Explicitly hide the expansion hint and clear its x-second timer when clearing the screen.
-    setShowIsExpandableHint(false);
-    if (expandHintTimerRef.current) {
-      clearTimeout(expandHintTimerRef.current);
-    }
+    triggerExpandHint(null);
    historyManager.clearItems();
    clearConsoleMessagesState();
    refreshStatic();
@@ -1345,7 +1345,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
    clearConsoleMessagesState,
    refreshStatic,
    reset,
-    setShowIsExpandableHint,
+    triggerExpandHint,
  ]);

  const { handleInput: vimHandleInput } = useVim(buffer, handleFinalSubmit);
@@ -1632,17 +1632,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
    }
  }, [ideNeedsRestart]);

-  useEffect(() => {
-    if (queueErrorMessage) {
-      const timer = setTimeout(() => {
-        setQueueErrorMessage(null);
-      }, QUEUE_ERROR_DISPLAY_DURATION_MS);
-
-      return () => clearTimeout(timer);
-    }
-    return undefined;
-  }, [queueErrorMessage, setQueueErrorMessage]);
-
  useEffect(() => {
    if (isInitialMount.current) {
      isInitialMount.current = false;
@@ -1700,6 +1689,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
    retryStatus,
    loadingPhrasesMode: settings.merged.ui.loadingPhrases,
    customWittyPhrases: settings.merged.ui.customWittyPhrases,
+    errorVerbosity: settings.merged.ui.errorVerbosity,
  });

  const handleGlobalKeypress = useCallback(
@@ -1748,13 +1738,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
        setConstrainHeight(true);
        if (keyMatchers[Command.SHOW_MORE_LINES](key)) {
          // If the user manually collapses the view, show the hint and reset the x-second timer.
-          setShowIsExpandableHint(true);
-          if (expandHintTimerRef.current) {
-            clearTimeout(expandHintTimerRef.current);
-          }
-          expandHintTimerRef.current = setTimeout(() => {
-            setShowIsExpandableHint(false);
-          }, EXPAND_HINT_DURATION_MS);
+          triggerExpandHint(true);
        }
        if (!isAlternateBuffer) {
          refreshStatic();
@@ -1803,13 +1787,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
      ) {
        setConstrainHeight(false);
        // If the user manually expands the view, show the hint and reset the x-second timer.
-        setShowIsExpandableHint(true);
-        if (expandHintTimerRef.current) {
-          clearTimeout(expandHintTimerRef.current);
-        }
-        expandHintTimerRef.current = setTimeout(() => {
-          setShowIsExpandableHint(false);
-        }, EXPAND_HINT_DURATION_MS);
+        triggerExpandHint(true);
        if (!isAlternateBuffer) {
          refreshStatic();
        }
@@ -1914,10 +1892,14 @@ Logging in with Google... Restarting Gemini CLI to continue.
      showTransientMessage,
      settings.merged.general.devtools,
      showErrorDetails,
+      triggerExpandHint,
    ],
  );

-  useKeypress(handleGlobalKeypress, { isActive: true, priority: true });
+  useKeypress(handleGlobalKeypress, {
+    isActive: true,
+    priority: KeypressPriority.Low,
+  });

  useKeypress(
    () => {
@@ -2056,6 +2038,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
    showIdeRestartPrompt ||
    !!proQuotaRequest ||
    !!validationRequest ||
+    !!overageMenuRequest ||
+    !!emptyWalletRequest ||
    isSessionBrowserOpen ||
    authState === AuthState.AwaitingApiKeyInput ||
    !!newAgents;
@@ -2083,6 +2067,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
    hasLoopDetectionConfirmationRequest ||
    !!proQuotaRequest ||
    !!validationRequest ||
+    !!overageMenuRequest ||
+    !!emptyWalletRequest ||
    !!customDialog;

  const allowPlanMode =
@@ -2223,6 +2209,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
      isAuthenticating,
      isConfigInitialized,
      authError,
+      accountSuspensionInfo,
      isAuthDialogOpen,
      isAwaitingApiKeyInput: authState === AuthState.AwaitingApiKeyInput,
      apiKeyDefaultValue,
@@ -2293,6 +2280,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
        stats: quotaStats,
        proQuotaRequest,
        validationRequest,
+        // G1 AI Credits dialog state
+        overageMenuRequest,
+        emptyWalletRequest,
      },
      contextFileNames,
      errorCount,
@@ -2351,6 +2341,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
      isAuthenticating,
      isConfigInitialized,
      authError,
+      accountSuspensionInfo,
      isAuthDialogOpen,
      editorError,
      isEditorDialogOpen,
@@ -2417,6 +2408,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
      quotaStats,
      proQuotaRequest,
      validationRequest,
+      overageMenuRequest,
+      emptyWalletRequest,
      contextFileNames,
      errorCount,
      availableTerminalHeight,
@@ -2498,6 +2491,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
      handleClearScreen,
      handleProQuotaChoice,
      handleValidationChoice,
+      // G1 AI Credits handlers
+      handleOverageMenuChoice,
+      handleEmptyWalletChoice,
      openSessionBrowser,
      closeSessionBrowser,
      handleResumeSession,
@@ -2555,6 +2551,10 @@ Logging in with Google... Restarting Gemini CLI to continue.
        setNewAgents(null);
      },
      getPreferredEditor,
+      clearAccountSuspension: () => {
+        setAccountSuspensionInfo(null);
+        setAuthState(AuthState.Updating);
+      },
    }),
    [
      handleThemeSelect,
@@ -2584,6 +2584,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
      handleClearScreen,
      handleProQuotaChoice,
      handleValidationChoice,
+      handleOverageMenuChoice,
+      handleEmptyWalletChoice,
      openSessionBrowser,
      closeSessionBrowser,
      handleResumeSession,
@@ -2603,6 +2605,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
      setActiveBackgroundShellPid,
      setIsBackgroundShellListOpen,
      setAuthContext,
+      setAccountSuspensionInfo,
      newAgents,
      config,
      historyManager,
@@ -0,0 +1,241 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
+import { renderWithProviders } from '../../test-utils/render.js';
+import { waitFor } from '../../test-utils/async.js';
+import { BannedAccountDialog } from './BannedAccountDialog.js';
+import { RadioButtonSelect } from '../components/shared/RadioButtonSelect.js';
+import { useKeypress } from '../hooks/useKeypress.js';
+import {
+  openBrowserSecurely,
+  shouldLaunchBrowser,
+} from '@google/gemini-cli-core';
+import { Text } from 'ink';
+import { runExitCleanup } from '../../utils/cleanup.js';
+import type { AccountSuspensionInfo } from '../contexts/UIStateContext.js';
+
+vi.mock('@google/gemini-cli-core', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@google/gemini-cli-core')>();
+  return {
+    ...actual,
+    openBrowserSecurely: vi.fn(),
+    shouldLaunchBrowser: vi.fn().mockReturnValue(true),
+  };
+});
+
+vi.mock('../../utils/cleanup.js', () => ({
+  runExitCleanup: vi.fn().mockResolvedValue(undefined),
+}));
+
+vi.mock('../hooks/useKeypress.js', () => ({
+  useKeypress: vi.fn(),
+}));
+
+vi.mock('../components/shared/RadioButtonSelect.js', () => ({
+  RadioButtonSelect: vi.fn(({ items }) => (
+    <>
+      {items.map((item: { value: string; label: string }) => (
+        <Text key={item.value}>{item.label}</Text>
+      ))}
+    </>
+  )),
+}));
+
+const mockedRadioButtonSelect = RadioButtonSelect as Mock;
+const mockedUseKeypress = useKeypress as Mock;
+const mockedOpenBrowser = openBrowserSecurely as Mock;
+const mockedShouldLaunchBrowser = shouldLaunchBrowser as Mock;
+const mockedRunExitCleanup = runExitCleanup as Mock;
+
+const DEFAULT_SUSPENSION_INFO: AccountSuspensionInfo = {
+  message:
+    'This service has been disabled in this account for violation of Terms of Service. Please submit an appeal to continue using this product.',
+  appealUrl: 'https://example.com/appeal',
+  appealLinkText: 'Appeal Here',
+};
+
+describe('BannedAccountDialog', () => {
+  let onExit: Mock;
+  let onChangeAuth: Mock;
+
+  beforeEach(() => {
+    vi.resetAllMocks();
+    mockedShouldLaunchBrowser.mockReturnValue(true);
+    mockedOpenBrowser.mockResolvedValue(undefined);
+    mockedRunExitCleanup.mockResolvedValue(undefined);
+    onExit = vi.fn();
+    onChangeAuth = vi.fn();
+  });
+
+  it('renders the suspension message from accountSuspensionInfo', async () => {
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+      <BannedAccountDialog
+        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
+        onExit={onExit}
+        onChangeAuth={onChangeAuth}
+      />,
+    );
+    await waitUntilReady();
+    const frame = lastFrame();
+    expect(frame).toContain('Account Suspended');
+    expect(frame).toContain('violation of Terms of Service');
+    expect(frame).toContain('Escape to exit');
+    unmount();
+  });
+
+  it('renders menu options with appeal link text from response', async () => {
+    const { waitUntilReady, unmount } = renderWithProviders(
+      <BannedAccountDialog
+        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
+        onExit={onExit}
+        onChangeAuth={onChangeAuth}
+      />,
+    );
+    await waitUntilReady();
+    const items = mockedRadioButtonSelect.mock.calls[0][0].items;
+    expect(items).toHaveLength(3);
+    expect(items[0].label).toBe('Appeal Here');
+    expect(items[1].label).toBe('Change authentication');
+    expect(items[2].label).toBe('Exit');
+    unmount();
+  });
+
+  it('hides form option when no appealUrl is provided', async () => {
+    const infoWithoutUrl: AccountSuspensionInfo = {
+      message: 'Account suspended.',
+    };
+    const { waitUntilReady, unmount } = renderWithProviders(
+      <BannedAccountDialog
+        accountSuspensionInfo={infoWithoutUrl}
+        onExit={onExit}
+        onChangeAuth={onChangeAuth}
+      />,
+    );
+    await waitUntilReady();
+    const items = mockedRadioButtonSelect.mock.calls[0][0].items;
+    expect(items).toHaveLength(2);
+    expect(items[0].label).toBe('Change authentication');
+    expect(items[1].label).toBe('Exit');
+    unmount();
+  });
+
+  it('uses default label when appealLinkText is not provided', async () => {
+    const infoWithoutLinkText: AccountSuspensionInfo = {
+      message: 'Account suspended.',
+      appealUrl: 'https://example.com/appeal',
+    };
+    const { waitUntilReady, unmount } = renderWithProviders(
+      <BannedAccountDialog
+        accountSuspensionInfo={infoWithoutLinkText}
+        onExit={onExit}
+        onChangeAuth={onChangeAuth}
+      />,
+    );
+    await waitUntilReady();
+    const items = mockedRadioButtonSelect.mock.calls[0][0].items;
+    expect(items[0].label).toBe('Open the Google Form');
+    unmount();
+  });
+
+  it('opens browser when appeal option is selected', async () => {
+    const { waitUntilReady, unmount } = renderWithProviders(
+      <BannedAccountDialog
+        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
+        onExit={onExit}
+        onChangeAuth={onChangeAuth}
+      />,
+    );
+    await waitUntilReady();
+    const { onSelect } = mockedRadioButtonSelect.mock.calls[0][0];
+    await onSelect('open_form');
+    expect(mockedOpenBrowser).toHaveBeenCalledWith(
+      'https://example.com/appeal',
+    );
+    expect(onExit).not.toHaveBeenCalled();
+    unmount();
+  });
+
+  it('shows URL when browser cannot be launched', async () => {
+    mockedShouldLaunchBrowser.mockReturnValue(false);
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+      <BannedAccountDialog
+        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
+        onExit={onExit}
+        onChangeAuth={onChangeAuth}
+      />,
+    );
+    await waitUntilReady();
+    const { onSelect } = mockedRadioButtonSelect.mock.calls[0][0];
+    onSelect('open_form');
+    await waitFor(() => {
+      expect(lastFrame()).toContain('Please open this URL in a browser');
+    });
+    expect(mockedOpenBrowser).not.toHaveBeenCalled();
+    unmount();
+  });
+
+  it('calls onExit when "Exit" is selected', async () => {
+    const { waitUntilReady, unmount } = renderWithProviders(
+      <BannedAccountDialog
+        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
+        onExit={onExit}
+        onChangeAuth={onChangeAuth}
+      />,
+    );
+    await waitUntilReady();
+    const { onSelect } = mockedRadioButtonSelect.mock.calls[0][0];
+    await onSelect('exit');
+    expect(mockedRunExitCleanup).toHaveBeenCalled();
+    expect(onExit).toHaveBeenCalled();
+    unmount();
+  });
+
+  it('calls onChangeAuth when "Change authentication" is selected', async () => {
+    const { waitUntilReady, unmount } = renderWithProviders(
+      <BannedAccountDialog
+        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
+        onExit={onExit}
+        onChangeAuth={onChangeAuth}
+      />,
+    );
+    await waitUntilReady();
+    const { onSelect } = mockedRadioButtonSelect.mock.calls[0][0];
+    onSelect('change_auth');
+    expect(onChangeAuth).toHaveBeenCalled();
+    expect(onExit).not.toHaveBeenCalled();
+    unmount();
+  });
+
+  it('exits on escape key', async () => {
+    const { waitUntilReady, unmount } = renderWithProviders(
+      <BannedAccountDialog
+        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
+        onExit={onExit}
+        onChangeAuth={onChangeAuth}
+      />,
+    );
+    await waitUntilReady();
+    const keypressHandler = mockedUseKeypress.mock.calls[0][0];
+    const result = keypressHandler({ name: 'escape' });
+    expect(result).toBe(true);
+    unmount();
+  });
+
+  it('renders snapshot correctly', async () => {
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+      <BannedAccountDialog
+        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
+        onExit={onExit}
+        onChangeAuth={onChangeAuth}
+      />,
+    );
+    await waitUntilReady();
+    expect(lastFrame()).toMatchSnapshot();
+    unmount();
+  });
+});
@@ -0,0 +1,138 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type React from 'react';
+import { useCallback, useMemo, useState } from 'react';
+import { Box, Text } from 'ink';
+import { theme } from '../semantic-colors.js';
+import { RadioButtonSelect } from '../components/shared/RadioButtonSelect.js';
+import { useKeypress } from '../hooks/useKeypress.js';
+import {
+  openBrowserSecurely,
+  shouldLaunchBrowser,
+} from '@google/gemini-cli-core';
+import { runExitCleanup } from '../../utils/cleanup.js';
+import type { AccountSuspensionInfo } from '../contexts/UIStateContext.js';
+
+interface BannedAccountDialogProps {
+  accountSuspensionInfo: AccountSuspensionInfo;
+  onExit: () => void;
+  onChangeAuth: () => void;
+}
+
+export function BannedAccountDialog({
+  accountSuspensionInfo,
+  onExit,
+  onChangeAuth,
+}: BannedAccountDialogProps): React.JSX.Element {
+  const [errorMessage, setErrorMessage] = useState<string | null>(null);
+
+  const appealUrl = accountSuspensionInfo.appealUrl;
+  const appealLinkText =
+    accountSuspensionInfo.appealLinkText ?? 'Open the Google Form';
+
+  const items = useMemo(() => {
+    const menuItems = [];
+    if (appealUrl) {
+      menuItems.push({
+        label: appealLinkText,
+        value: 'open_form' as const,
+        key: 'open_form',
+      });
+    }
+    menuItems.push(
+      {
+        label: 'Change authentication',
+        value: 'change_auth' as const,
+        key: 'change_auth',
+      },
+      {
+        label: 'Exit',
+        value: 'exit' as const,
+        key: 'exit',
+      },
+    );
+    return menuItems;
+  }, [appealUrl, appealLinkText]);
+
+  useKeypress(
+    (key) => {
+      if (key.name === 'escape') {
+        void handleExit();
+        return true;
+      }
+      return false;
+    },
+    { isActive: true },
+  );
+
+  const handleExit = useCallback(async () => {
+    await runExitCleanup();
+    onExit();
+  }, [onExit]);
+
+  const handleSelect = useCallback(
+    async (choice: string) => {
+      if (choice === 'open_form' && appealUrl) {
+        if (!shouldLaunchBrowser()) {
+          setErrorMessage(`Please open this URL in a browser: ${appealUrl}`);
+          return;
+        }
+
+        try {
+          await openBrowserSecurely(appealUrl);
+        } catch {
+          setErrorMessage(`Failed to open browser. Please visit: ${appealUrl}`);
+        }
+      } else if (choice === 'change_auth') {
+        onChangeAuth();
+      } else {
+        await handleExit();
+      }
+    },
+    [handleExit, onChangeAuth, appealUrl],
+  );
+
+  return (
+    <Box flexDirection="column" padding={1}>
+      <Text bold color={theme.status.error}>
+        Error: Account Suspended
+      </Text>
+
+      <Box marginTop={1}>
+        <Text>{accountSuspensionInfo.message}</Text>
+      </Box>
+
+      {appealUrl && (
+        <>
+          <Box marginTop={1}>
+            <Text>Appeal URL:</Text>
+          </Box>
+          <Box>
+            <Text color={theme.text.link}>[{appealUrl}]</Text>
+          </Box>
+        </>
+      )}
+
+      {errorMessage && (
+        <Box marginTop={1}>
+          <Text color={theme.status.error}>{errorMessage}</Text>
+        </Box>
+      )}
+
+      <Box marginTop={1}>
+        <RadioButtonSelect
+          items={items}
+          onSelect={(choice) => void handleSelect(choice)}
+        />
+      </Box>
+
+      <Box marginTop={1}>
+        <Text dimColor>Escape to exit</Text>
+      </Box>
+    </Box>
+  );
+}
@@ -0,0 +1,17 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`BannedAccountDialog > renders snapshot correctly 1`] = `
+"
+ Error: Account Suspended
+
+ This service has been disabled in this account for violation of Terms of Service. Please submit an
+ appeal to continue using this product.
+
+ Appeal URL:
+ [https://example.com/appeal]
+
+ Appeal HereChange authenticationExit
+
+ Escape to exit
+"
+`;
@@ -11,6 +11,7 @@ import {
  type Config,
  loadApiKey,
  debugLogger,
+  isAccountSuspendedError,
 } from '@google/gemini-cli-core';
 import { getErrorMessage } from '@google/gemini-cli-core';
 import { AuthState } from '../types.js';
@@ -34,16 +35,21 @@ export function validateAuthMethodWithSettings(
  return validateAuthMethod(authType);
 }

+import type { AccountSuspensionInfo } from '../contexts/UIStateContext.js';
+
 export const useAuthCommand = (
  settings: LoadedSettings,
  config: Config,
  initialAuthError: string | null = null,
+  initialAccountSuspensionInfo: AccountSuspensionInfo | null = null,
 ) => {
  const [authState, setAuthState] = useState<AuthState>(
    initialAuthError ? AuthState.Updating : AuthState.Unauthenticated,
  );

  const [authError, setAuthError] = useState<string | null>(initialAuthError);
+  const [accountSuspensionInfo, setAccountSuspensionInfo] =
+    useState<AccountSuspensionInfo | null>(initialAccountSuspensionInfo);
  const [apiKeyDefaultValue, setApiKeyDefaultValue] = useState<
    string | undefined
  >(undefined);
@@ -130,7 +136,16 @@ export const useAuthCommand = (
        setAuthError(null);
        setAuthState(AuthState.Authenticated);
      } catch (e) {
-        onAuthError(`Failed to login. Message: ${getErrorMessage(e)}`);
+        const suspendedError = isAccountSuspendedError(e);
+        if (suspendedError) {
+          setAccountSuspensionInfo({
+            message: suspendedError.message,
+            appealUrl: suspendedError.appealUrl,
+            appealLinkText: suspendedError.appealLinkText,
+          });
+        } else {
+          onAuthError(`Failed to login. Message: ${getErrorMessage(e)}`);
+        }
      }
    })();
  }, [
@@ -150,5 +165,7 @@ export const useAuthCommand = (
    onAuthError,
    apiKeyDefaultValue,
    reloadApiKey,
+    accountSuspensionInfo,
+    setAccountSuspensionInfo,
  };
 };
@@ -4,7 +4,7 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { mcpCommand } from './mcpCommand.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
 import {
@@ -77,6 +77,8 @@ describe('mcpCommand', () => {
    getGeminiClient: ReturnType<typeof vi.fn>;
    getMcpClientManager: ReturnType<typeof vi.fn>;
    getResourceRegistry: ReturnType<typeof vi.fn>;
+    setUserInteractedWithMcp: ReturnType<typeof vi.fn>;
+    getLastMcpError: ReturnType<typeof vi.fn>;
  };

  beforeEach(() => {
@@ -104,12 +106,15 @@ describe('mcpCommand', () => {
      }),
      getGeminiClient: vi.fn(),
      getMcpClientManager: vi.fn().mockImplementation(() => ({
-        getBlockedMcpServers: vi.fn(),
-        getMcpServers: vi.fn(),
+        getBlockedMcpServers: vi.fn().mockReturnValue([]),
+        getMcpServers: vi.fn().mockReturnValue({}),
+        getLastError: vi.fn().mockReturnValue(undefined),
      })),
      getResourceRegistry: vi.fn().mockReturnValue({
        getAllResources: vi.fn().mockReturnValue([]),
      }),
+      setUserInteractedWithMcp: vi.fn(),
+      getLastMcpError: vi.fn().mockReturnValue(undefined),
    };

    mockContext = createMockCommandContext({
@@ -119,6 +124,10 @@ describe('mcpCommand', () => {
    });
  });

+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
  describe('basic functionality', () => {
    it('should show an error if config is not available', async () => {
      const contextWithoutConfig = createMockCommandContext({
@@ -161,6 +170,7 @@ describe('mcpCommand', () => {
      mockConfig.getMcpClientManager = vi.fn().mockReturnValue({
        getMcpServers: vi.fn().mockReturnValue(mockMcpServers),
        getBlockedMcpServers: vi.fn().mockReturnValue([]),
+        getLastError: vi.fn().mockReturnValue(undefined),
      });
    });

@@ -52,6 +52,8 @@ const authCommand: SlashCommand = {
      };
    }

+    config.setUserInteractedWithMcp();
+
    const mcpServers = config.getMcpClientManager()?.getMcpServers() ?? {};

    if (!serverName) {
@@ -184,6 +186,8 @@ const listAction = async (
    };
  }

+  config.setUserInteractedWithMcp();
+
  const toolRegistry = config.getToolRegistry();
  if (!toolRegistry) {
    return {
@@ -250,6 +254,13 @@ const listAction = async (
    enablementState[serverName] =
      await enablementManager.getDisplayState(serverName);
  }
+  const errors: Record<string, string> = {};
+  for (const serverName of serverNames) {
+    const error = config.getMcpClientManager()?.getLastError(serverName);
+    if (error) {
+      errors[serverName] = error;
+    }
+  }

  const mcpStatusItem: HistoryItemMcpStatus = {
    type: MessageType.MCP_STATUS,
@@ -274,16 +285,19 @@ const listAction = async (
    })),
    authStatus,
    enablementState,
-    blockedServers: blockedMcpServers,
+    errors,
+    blockedServers: blockedMcpServers.map((s) => ({
+      name: s.name,
+      extensionName: s.extensionName,
+    })),
    discoveryInProgress,
    connectingServers,
-    showDescriptions,
-    showSchema,
+    showDescriptions: Boolean(showDescriptions),
+    showSchema: Boolean(showSchema),
  };

  context.ui.addItem(mcpStatusItem);
 };
-
 const listCommand: SlashCommand = {
  name: 'list',
  altNames: ['ls', 'nodesc', 'nodescription'],
@@ -372,6 +386,8 @@ async function handleEnableDisable(
    };
  }

+  config.setUserInteractedWithMcp();
+
  const parts = args.trim().split(/\s+/);
  const isSession = parts.includes('--session');
  const serverName = parts.filter((p) => p !== '--session')[0];
@@ -39,11 +39,18 @@ describe('statsCommand', () => {
    mockContext.session.stats.sessionStartTime = startTime;
  });

-  it('should display general session stats when run with no subcommand', () => {
+  it('should display general session stats when run with no subcommand', async () => {
    if (!statsCommand.action) throw new Error('Command has no action');

-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    statsCommand.action(mockContext, '');
+    mockContext.services.config = {
+      refreshUserQuota: vi.fn(),
+      refreshAvailableCredits: vi.fn(),
+      getUserTierName: vi.fn(),
+      getUserPaidTier: vi.fn(),
+      getModel: vi.fn(),
+    } as unknown as Config;
+
+    await statsCommand.action(mockContext, '');

    const expectedDuration = formatDuration(
      endTime.getTime() - startTime.getTime(),
@@ -55,6 +62,7 @@ describe('statsCommand', () => {
      tier: undefined,
      userEmail: 'mock@example.com',
      currentModel: undefined,
+      creditBalance: undefined,
    });
  });

@@ -78,6 +86,8 @@ describe('statsCommand', () => {
      getQuotaRemaining: mockGetQuotaRemaining,
      getQuotaLimit: mockGetQuotaLimit,
      getQuotaResetTime: mockGetQuotaResetTime,
+      getUserPaidTier: vi.fn(),
+      refreshAvailableCredits: vi.fn(),
    } as unknown as Config;

    await statsCommand.action(mockContext, '');
@@ -11,7 +11,10 @@ import type {
 } from '../types.js';
 import { MessageType } from '../types.js';
 import { formatDuration } from '../utils/formatters.js';
-import { UserAccountManager } from '@google/gemini-cli-core';
+import {
+  UserAccountManager,
+  getG1CreditBalance,
+} from '@google/gemini-cli-core';
 import {
  type CommandContext,
  type SlashCommand,
@@ -27,8 +30,10 @@ function getUserIdentity(context: CommandContext) {
  const userEmail = cachedAccount ?? undefined;

  const tier = context.services.config?.getUserTierName();
+  const paidTier = context.services.config?.getUserPaidTier();
+  const creditBalance = getG1CreditBalance(paidTier) ?? undefined;

-  return { selectedAuthType, userEmail, tier };
+  return { selectedAuthType, userEmail, tier, creditBalance };
 }

 async function defaultSessionView(context: CommandContext) {
@@ -43,7 +48,8 @@ async function defaultSessionView(context: CommandContext) {
  }
  const wallDuration = now.getTime() - sessionStartTime.getTime();

-  const { selectedAuthType, userEmail, tier } = getUserIdentity(context);
+  const { selectedAuthType, userEmail, tier, creditBalance } =
+    getUserIdentity(context);
  const currentModel = context.services.config?.getModel();

  const statsItem: HistoryItemStats = {
@@ -53,10 +59,14 @@ async function defaultSessionView(context: CommandContext) {
    userEmail,
    tier,
    currentModel,
+    creditBalance,
  };

  if (context.services.config) {
-    const quota = await context.services.config.refreshUserQuota();
+    const [quota] = await Promise.all([
+      context.services.config.refreshUserQuota(),
+      context.services.config.refreshAvailableCredits(),
+    ]);
    if (quota) {
      statsItem.quotas = quota;
      statsItem.pooledRemaining = context.services.config.getQuotaRemaining();
@@ -6,8 +6,8 @@

 import { beforeEach, afterEach, describe, it, expect, vi } from 'vitest';
 import { render } from '../../test-utils/render.js';
+import { act, useEffect } from 'react';
 import { Box, Text } from 'ink';
-import { useEffect } from 'react';
 import { Composer } from './Composer.js';
 import { UIStateContext, type UIState } from '../contexts/UIStateContext.js';
 import {
@@ -34,6 +34,7 @@ import { StreamingState } from '../types.js';
 import { TransientMessageType } from '../../utils/events.js';
 import type { LoadedSettings } from '../../config/settings.js';
 import type { SessionMetrics } from '../contexts/SessionContext.js';
+import type { TextBuffer } from './shared/text-buffer.js';

 const composerTestControls = vi.hoisted(() => ({
  suggestionsVisible: false,
@@ -263,16 +264,26 @@ const renderComposer = async (
    </ConfigContext.Provider>,
  );
  await result.waitUntilReady();
+
+  // Wait for shortcuts hint debounce if using fake timers
+  if (vi.isFakeTimers()) {
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(250);
+    });
+  }
+
  return result;
 };

 describe('Composer', () => {
  beforeEach(() => {
+    vi.useFakeTimers();
    composerTestControls.suggestionsVisible = false;
    composerTestControls.isAlternateBuffer = false;
  });

  afterEach(() => {
+    vi.useRealTimers();
    vi.restoreAllMocks();
  });

@@ -391,7 +402,7 @@ describe('Composer', () => {
      expect(output).not.toContain('ShortcutsHint');
    });

-    it('renders LoadingIndicator without thought when loadingPhrases is off', async () => {
+    it('renders LoadingIndicator with thought when loadingPhrases is off', async () => {
      const uiState = createMockUIState({
        streamingState: StreamingState.Responding,
        thought: { subject: 'Hidden', description: 'Should not show' },
@@ -404,7 +415,7 @@ describe('Composer', () => {

      const output = lastFrame();
      expect(output).toContain('LoadingIndicator');
-      expect(output).not.toContain('Should not show');
+      expect(output).toContain('LoadingIndicator: Hidden');
    });

    it('does not render LoadingIndicator when waiting for confirmation', async () => {
@@ -809,6 +820,28 @@ describe('Composer', () => {
  });

  describe('Shortcuts Hint', () => {
+    it('restores shortcuts hint after 200ms debounce when buffer is empty', async () => {
+      const { lastFrame } = await renderComposer(
+        createMockUIState({
+          buffer: { text: '' } as unknown as TextBuffer,
+          cleanUiDetailsVisible: false,
+        }),
+      );
+
+      expect(lastFrame({ allowEmpty: true })).toContain('ShortcutsHint');
+    });
+
+    it('does not show shortcuts hint immediately when buffer has text', async () => {
+      const uiState = createMockUIState({
+        buffer: { text: 'hello' } as unknown as TextBuffer,
+        cleanUiDetailsVisible: false,
+      });
+
+      const { lastFrame } = await renderComposer(uiState);
+
+      expect(lastFrame()).not.toContain('ShortcutsHint');
+    });
+
    it('hides shortcuts hint when showShortcutsHint setting is false', async () => {
      const uiState = createMockUIState();
      const settings = createMockSettings({
@@ -857,6 +890,27 @@ describe('Composer', () => {
      expect(lastFrame()).toContain('ShortcutsHint');
    });

+    it('hides shortcuts hint while loading when full UI details are visible', async () => {
+      const uiState = createMockUIState({
+        cleanUiDetailsVisible: true,
+        streamingState: StreamingState.Responding,
+      });
+
+      const { lastFrame } = await renderComposer(uiState);
+
+      expect(lastFrame()).not.toContain('ShortcutsHint');
+    });
+
+    it('hides shortcuts hint when text is typed in buffer', async () => {
+      const uiState = createMockUIState({
+        buffer: { text: 'hello' } as unknown as TextBuffer,
+      });
+
+      const { lastFrame } = await renderComposer(uiState);
+
+      expect(lastFrame()).not.toContain('ShortcutsHint');
+    });
+
    it('hides shortcuts hint while loading in minimal mode', async () => {
      const uiState = createMockUIState({
        cleanUiDetailsVisible: false,
@@ -930,9 +984,10 @@ describe('Composer', () => {
        streamingState: StreamingState.Idle,
      });

-      const { lastFrame } = await renderComposer(uiState);
+      const { lastFrame, unmount } = await renderComposer(uiState);

      expect(lastFrame()).toContain('ShortcutsHelp');
+      unmount();
    });

    it('hides shortcuts help while streaming', async () => {
@@ -941,9 +996,10 @@ describe('Composer', () => {
        streamingState: StreamingState.Responding,
      });

-      const { lastFrame } = await renderComposer(uiState);
+      const { lastFrame, unmount } = await renderComposer(uiState);

      expect(lastFrame()).not.toContain('ShortcutsHelp');
+      unmount();
    });

    it('hides shortcuts help when action is required', async () => {
@@ -956,9 +1012,10 @@ describe('Composer', () => {
        ),
      });

-      const { lastFrame } = await renderComposer(uiState);
+      const { lastFrame, unmount } = await renderComposer(uiState);

      expect(lastFrame()).not.toContain('ShortcutsHelp');
+      unmount();
    });
  });

@@ -151,11 +151,30 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
        : undefined,
    );
  const hideShortcutsHintForSuggestions = hideUiDetailsForSuggestions;
+  const isModelIdle = uiState.streamingState === StreamingState.Idle;
+  const isBufferEmpty = uiState.buffer.text.length === 0;
+  const canShowShortcutsHint =
+    isModelIdle && isBufferEmpty && !hasPendingActionRequired;
+  const [showShortcutsHintDebounced, setShowShortcutsHintDebounced] =
+    useState(canShowShortcutsHint);
+
+  useEffect(() => {
+    if (!canShowShortcutsHint) {
+      setShowShortcutsHintDebounced(false);
+      return;
+    }
+
+    const timeout = setTimeout(() => {
+      setShowShortcutsHintDebounced(true);
+    }, 200);
+
+    return () => clearTimeout(timeout);
+  }, [canShowShortcutsHint]);
+
  const showShortcutsHint =
    settings.merged.ui.showShortcutsHint &&
    !hideShortcutsHintForSuggestions &&
-    !hideMinimalModeHintWhileBusy &&
-    !hasPendingActionRequired;
+    showShortcutsHintDebounced;
  const showMinimalModeBleedThrough =
    !hideUiDetailsForSuggestions && Boolean(minimalModeBleedThrough);
  const showMinimalInlineLoading = !showUiDetails && showLoadingIndicator;
@@ -210,8 +229,7 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
                inline
                thought={
                  uiState.streamingState ===
-                    StreamingState.WaitingForConfirmation ||
-                  settings.merged.ui.loadingPhrases === 'off'
+                  StreamingState.WaitingForConfirmation
                    ? undefined
                    : uiState.thought
                }
@@ -254,8 +272,7 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
                  inline
                  thought={
                    uiState.streamingState ===
-                      StreamingState.WaitingForConfirmation ||
-                    settings.merged.ui.loadingPhrases === 'off'
+                    StreamingState.WaitingForConfirmation
                      ? undefined
                      : uiState.thought
                  }
@@ -4,12 +4,13 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import { render } from '../../test-utils/render.js';
+import { renderWithProviders } from '../../test-utils/render.js';
 import { DetailedMessagesDisplay } from './DetailedMessagesDisplay.js';
 import { describe, it, expect, vi } from 'vitest';
 import type { ConsoleMessageItem } from '../types.js';
 import { Box } from 'ink';
 import type React from 'react';
+import { createMockSettings } from '../../test-utils/settings.js';

 vi.mock('./shared/ScrollableList.js', () => ({
  ScrollableList: ({
@@ -29,13 +30,18 @@ vi.mock('./shared/ScrollableList.js', () => ({

 describe('DetailedMessagesDisplay', () => {
  it('renders nothing when messages are empty', async () => {
-    const { lastFrame, waitUntilReady, unmount } = render(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <DetailedMessagesDisplay
        messages={[]}
        maxHeight={10}
        width={80}
        hasFocus={false}
      />,
+      {
+        settings: createMockSettings({
+          merged: { ui: { errorVerbosity: 'full' } },
+        }),
+      },
    );
    await waitUntilReady();
    expect(lastFrame({ allowEmpty: true })).toBe('');
@@ -50,13 +56,18 @@ describe('DetailedMessagesDisplay', () => {
      { type: 'debug', content: 'Debug message', count: 1 },
    ];

-    const { lastFrame, waitUntilReady, unmount } = render(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <DetailedMessagesDisplay
        messages={messages}
        maxHeight={20}
        width={80}
        hasFocus={true}
      />,
+      {
+        settings: createMockSettings({
+          merged: { ui: { errorVerbosity: 'full' } },
+        }),
+      },
    );
    await waitUntilReady();
    const output = lastFrame();
@@ -65,18 +76,69 @@ describe('DetailedMessagesDisplay', () => {
    unmount();
  });

+  it('hides the F12 hint in low error verbosity mode', async () => {
+    const messages: ConsoleMessageItem[] = [
+      { type: 'error', content: 'Error message', count: 1 },
+    ];
+
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+      <DetailedMessagesDisplay
+        messages={messages}
+        maxHeight={20}
+        width={80}
+        hasFocus={true}
+      />,
+      {
+        settings: createMockSettings({
+          merged: { ui: { errorVerbosity: 'low' } },
+        }),
+      },
+    );
+    await waitUntilReady();
+    expect(lastFrame()).not.toContain('(F12 to close)');
+    unmount();
+  });
+
+  it('shows the F12 hint in full error verbosity mode', async () => {
+    const messages: ConsoleMessageItem[] = [
+      { type: 'error', content: 'Error message', count: 1 },
+    ];
+
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+      <DetailedMessagesDisplay
+        messages={messages}
+        maxHeight={20}
+        width={80}
+        hasFocus={true}
+      />,
+      {
+        settings: createMockSettings({
+          merged: { ui: { errorVerbosity: 'full' } },
+        }),
+      },
+    );
+    await waitUntilReady();
+    expect(lastFrame()).toContain('(F12 to close)');
+    unmount();
+  });
+
  it('renders message counts', async () => {
    const messages: ConsoleMessageItem[] = [
      { type: 'log', content: 'Repeated message', count: 5 },
    ];

-    const { lastFrame, waitUntilReady, unmount } = render(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <DetailedMessagesDisplay
        messages={messages}
        maxHeight={10}
        width={80}
        hasFocus={false}
      />,
+      {
+        settings: createMockSettings({
+          merged: { ui: { errorVerbosity: 'full' } },
+        }),
+      },
    );
    await waitUntilReady();
    const output = lastFrame();
@@ -13,6 +13,8 @@ import {
  ScrollableList,
  type ScrollableListRef,
 } from './shared/ScrollableList.js';
+import { useConfig } from '../contexts/ConfigContext.js';
+import { useSettings } from '../contexts/SettingsContext.js';

 interface DetailedMessagesDisplayProps {
  messages: ConsoleMessageItem[];
@@ -27,6 +29,10 @@ export const DetailedMessagesDisplay: React.FC<
  DetailedMessagesDisplayProps
 > = ({ messages, maxHeight, width, hasFocus }) => {
  const scrollableListRef = useRef<ScrollableListRef<ConsoleMessageItem>>(null);
+  const config = useConfig();
+  const settings = useSettings();
+  const showHotkeyHint =
+    settings.merged.ui.errorVerbosity === 'full' || config.getDebugMode();

  const borderAndPadding = 3;

@@ -65,7 +71,10 @@ export const DetailedMessagesDisplay: React.FC<
    >
      <Box marginBottom={1}>
        <Text bold color={theme.text.primary}>
-          Debug Console <Text color={theme.text.secondary}>(F12 to close)</Text>
+          Debug Console{' '}
+          {showHotkeyHint && (
+            <Text color={theme.text.secondary}>(F12 to close)</Text>
+          )}
        </Text>
      </Box>
      <Box height={maxHeight} width={width - borderAndPadding}>
@@ -80,6 +80,8 @@ describe('DialogManager', () => {
      stats: undefined,
      proQuotaRequest: null,
      validationRequest: null,
+      overageMenuRequest: null,
+      emptyWalletRequest: null,
    },
    shouldShowIdePrompt: false,
    isFolderTrustDialogOpen: false,
@@ -132,6 +134,8 @@ describe('DialogManager', () => {
            resolve: vi.fn(),
          },
          validationRequest: null,
+          overageMenuRequest: null,
+          emptyWalletRequest: null,
        },
      },
      'ProQuotaDialog',
@@ -13,11 +13,14 @@ import { ThemeDialog } from './ThemeDialog.js';
 import { SettingsDialog } from './SettingsDialog.js';
 import { AuthInProgress } from '../auth/AuthInProgress.js';
 import { AuthDialog } from '../auth/AuthDialog.js';
+import { BannedAccountDialog } from '../auth/BannedAccountDialog.js';
 import { ApiAuthDialog } from '../auth/ApiAuthDialog.js';
 import { EditorSettingsDialog } from './EditorSettingsDialog.js';
 import { PrivacyNotice } from '../privacy/PrivacyNotice.js';
 import { ProQuotaDialog } from './ProQuotaDialog.js';
 import { ValidationDialog } from './ValidationDialog.js';
+import { OverageMenuDialog } from './OverageMenuDialog.js';
+import { EmptyWalletDialog } from './EmptyWalletDialog.js';
 import { runExitCleanup } from '../../utils/cleanup.js';
 import { RELAUNCH_EXIT_CODE } from '../../utils/processUtils.js';
 import { SessionBrowser } from './SessionBrowser.js';
@@ -152,6 +155,28 @@ export const DialogManager = ({
      />
    );
  }
+  if (uiState.quota.overageMenuRequest) {
+    return (
+      <OverageMenuDialog
+        failedModel={uiState.quota.overageMenuRequest.failedModel}
+        fallbackModel={uiState.quota.overageMenuRequest.fallbackModel}
+        resetTime={uiState.quota.overageMenuRequest.resetTime}
+        creditBalance={uiState.quota.overageMenuRequest.creditBalance}
+        onChoice={uiActions.handleOverageMenuChoice}
+      />
+    );
+  }
+  if (uiState.quota.emptyWalletRequest) {
+    return (
+      <EmptyWalletDialog
+        failedModel={uiState.quota.emptyWalletRequest.failedModel}
+        fallbackModel={uiState.quota.emptyWalletRequest.fallbackModel}
+        resetTime={uiState.quota.emptyWalletRequest.resetTime}
+        onGetCredits={uiState.quota.emptyWalletRequest.onGetCredits}
+        onChoice={uiActions.handleEmptyWalletChoice}
+      />
+    );
+  }
  if (uiState.shouldShowIdePrompt) {
    return (
      <IdeIntegrationNudge
@@ -296,6 +321,21 @@ export const DialogManager = ({
      </Box>
    );
  }
+  if (uiState.accountSuspensionInfo) {
+    return (
+      <Box flexDirection="column">
+        <BannedAccountDialog
+          accountSuspensionInfo={uiState.accountSuspensionInfo}
+          onExit={() => {
+            process.exit(1);
+          }}
+          onChangeAuth={() => {
+            uiActions.clearAccountSuspension();
+          }}
+        />
+      </Box>
+    );
+  }
  if (uiState.isAuthenticating) {
    return (
      <AuthInProgress
@@ -318,6 +358,7 @@ export const DialogManager = ({
      </Box>
    );
  }
+
  if (uiState.isAuthDialogOpen) {
    return (
      <Box flexDirection="column">
@@ -0,0 +1,218 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { renderWithProviders } from '../../test-utils/render.js';
+import { waitFor } from '../../test-utils/async.js';
+import { act } from 'react';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { EmptyWalletDialog } from './EmptyWalletDialog.js';
+
+const writeKey = (stdin: { write: (data: string) => void }, key: string) => {
+  act(() => {
+    stdin.write(key);
+  });
+};
+
+describe('EmptyWalletDialog', () => {
+  const mockOnChoice = vi.fn();
+  const mockOnGetCredits = vi.fn();
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  describe('rendering', () => {
+    it('should match snapshot with fallback available', async () => {
+      const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+        <EmptyWalletDialog
+          failedModel="gemini-2.5-pro"
+          fallbackModel="gemini-3-flash-preview"
+          resetTime="2:00 PM"
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      expect(lastFrame()).toMatchSnapshot();
+      unmount();
+    });
+
+    it('should match snapshot without fallback', async () => {
+      const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+        <EmptyWalletDialog
+          failedModel="gemini-2.5-pro"
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      expect(lastFrame()).toMatchSnapshot();
+      unmount();
+    });
+
+    it('should display the model name and usage limit message', async () => {
+      const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+        <EmptyWalletDialog
+          failedModel="gemini-2.5-pro"
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      const output = lastFrame() ?? '';
+      expect(output).toContain('gemini-2.5-pro');
+      expect(output).toContain('Usage limit reached');
+      unmount();
+    });
+
+    it('should display purchase prompt and credits update notice', async () => {
+      const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+        <EmptyWalletDialog
+          failedModel="gemini-2.5-pro"
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      const output = lastFrame() ?? '';
+      expect(output).toContain('purchase more AI Credits');
+      expect(output).toContain(
+        'Newly purchased AI credits may take a few minutes to update',
+      );
+      unmount();
+    });
+
+    it('should display reset time when provided', async () => {
+      const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+        <EmptyWalletDialog
+          failedModel="gemini-2.5-pro"
+          resetTime="3:45 PM"
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      const output = lastFrame() ?? '';
+      expect(output).toContain('3:45 PM');
+      expect(output).toContain('Access resets at');
+      unmount();
+    });
+
+    it('should not display reset time when not provided', async () => {
+      const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+        <EmptyWalletDialog
+          failedModel="gemini-2.5-pro"
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      const output = lastFrame() ?? '';
+      expect(output).not.toContain('Access resets at');
+      unmount();
+    });
+
+    it('should display slash command hints', async () => {
+      const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+        <EmptyWalletDialog
+          failedModel="gemini-2.5-pro"
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      const output = lastFrame() ?? '';
+      expect(output).toContain('/stats');
+      expect(output).toContain('/model');
+      expect(output).toContain('/auth');
+      unmount();
+    });
+  });
+
+  describe('onChoice handling', () => {
+    it('should call onGetCredits and onChoice when get_credits is selected', async () => {
+      // get_credits is the first item, so just press Enter
+      const { unmount, stdin, waitUntilReady } = renderWithProviders(
+        <EmptyWalletDialog
+          failedModel="gemini-2.5-pro"
+          onChoice={mockOnChoice}
+          onGetCredits={mockOnGetCredits}
+        />,
+      );
+      await waitUntilReady();
+
+      writeKey(stdin, '\r');
+
+      await waitFor(() => {
+        expect(mockOnGetCredits).toHaveBeenCalled();
+        expect(mockOnChoice).toHaveBeenCalledWith('get_credits');
+      });
+      unmount();
+    });
+
+    it('should call onChoice without onGetCredits when onGetCredits is not provided', async () => {
+      const { unmount, stdin, waitUntilReady } = renderWithProviders(
+        <EmptyWalletDialog
+          failedModel="gemini-2.5-pro"
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      writeKey(stdin, '\r');
+
+      await waitFor(() => {
+        expect(mockOnChoice).toHaveBeenCalledWith('get_credits');
+      });
+      unmount();
+    });
+
+    it('should call onChoice with use_fallback when selected', async () => {
+      // With fallback: items are [get_credits, use_fallback, stop]
+      // use_fallback is the second item: Down + Enter
+      const { unmount, stdin, waitUntilReady } = renderWithProviders(
+        <EmptyWalletDialog
+          failedModel="gemini-2.5-pro"
+          fallbackModel="gemini-3-flash-preview"
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      writeKey(stdin, '\x1b[B'); // Down arrow
+      writeKey(stdin, '\r');
+
+      await waitFor(() => {
+        expect(mockOnChoice).toHaveBeenCalledWith('use_fallback');
+      });
+      unmount();
+    });
+
+    it('should call onChoice with stop when selected', async () => {
+      // Without fallback: items are [get_credits, stop]
+      // stop is the second item: Down + Enter
+      const { unmount, stdin, waitUntilReady } = renderWithProviders(
+        <EmptyWalletDialog
+          failedModel="gemini-2.5-pro"
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      writeKey(stdin, '\x1b[B'); // Down arrow
+      writeKey(stdin, '\r');
+
+      await waitFor(() => {
+        expect(mockOnChoice).toHaveBeenCalledWith('stop');
+      });
+      unmount();
+    });
+  });
+});
@@ -0,0 +1,110 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type React from 'react';
+import { Box, Text } from 'ink';
+import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
+import { theme } from '../semantic-colors.js';
+
+/** Available choices in the empty wallet dialog */
+export type EmptyWalletChoice = 'get_credits' | 'use_fallback' | 'stop';
+
+interface EmptyWalletDialogProps {
+  /** The model that hit the quota limit */
+  failedModel: string;
+  /** The fallback model to offer (omit if none available) */
+  fallbackModel?: string;
+  /** Time when access resets (human-readable) */
+  resetTime?: string;
+  /** Callback to log click and open the browser for purchasing credits */
+  onGetCredits?: () => void;
+  /** Callback when user makes a selection */
+  onChoice: (choice: EmptyWalletChoice) => void;
+}
+
+export function EmptyWalletDialog({
+  failedModel,
+  fallbackModel,
+  resetTime,
+  onGetCredits,
+  onChoice,
+}: EmptyWalletDialogProps): React.JSX.Element {
+  const items: Array<{
+    label: string;
+    value: EmptyWalletChoice;
+    key: string;
+  }> = [
+    {
+      label: 'Get AI Credits - Open browser to purchase credits',
+      value: 'get_credits',
+      key: 'get_credits',
+    },
+  ];
+
+  if (fallbackModel) {
+    items.push({
+      label: `Switch to ${fallbackModel}`,
+      value: 'use_fallback',
+      key: 'use_fallback',
+    });
+  }
+
+  items.push({
+    label: 'Stop - Abort request',
+    value: 'stop',
+    key: 'stop',
+  });
+
+  const handleSelect = (choice: EmptyWalletChoice) => {
+    if (choice === 'get_credits') {
+      onGetCredits?.();
+    }
+    onChoice(choice);
+  };
+
+  return (
+    <Box borderStyle="round" flexDirection="column" padding={1}>
+      <Box marginBottom={1} flexDirection="column">
+        <Text color={theme.status.warning}>
+          Usage limit reached for {failedModel}.
+        </Text>
+        {resetTime && <Text>Access resets at {resetTime}.</Text>}
+        <Text>
+          <Text bold color={theme.text.accent}>
+            /stats
+          </Text>{' '}
+          model for usage details
+        </Text>
+        <Text>
+          <Text bold color={theme.text.accent}>
+            /model
+          </Text>{' '}
+          to switch models.
+        </Text>
+        <Text>
+          <Text bold color={theme.text.accent}>
+            /auth
+          </Text>{' '}
+          to switch to API key.
+        </Text>
+      </Box>
+      <Box marginBottom={1}>
+        <Text>To continue using this model now, purchase more AI Credits.</Text>
+      </Box>
+      <Box marginBottom={1}>
+        <Text dimColor>
+          Newly purchased AI credits may take a few minutes to update.
+        </Text>
+      </Box>
+      <Box marginBottom={1}>
+        <Text>How would you like to proceed?</Text>
+      </Box>
+      <Box marginTop={1} marginBottom={1}>
+        <RadioButtonSelect items={items} onSelect={handleSelect} />
+      </Box>
+    </Box>
+  );
+}
@@ -167,6 +167,7 @@ Implement a comprehensive authentication system with multiple providers.
            readTextFile: vi.fn(),
            writeTextFile: vi.fn(),
          }),
+          getUseAlternateBuffer: () => options?.useAlternateBuffer ?? true,
        } as unknown as import('@google/gemini-cli-core').Config,
      },
    );
@@ -443,6 +444,7 @@ Implement a comprehensive authentication system with multiple providers.
                readTextFile: vi.fn(),
                writeTextFile: vi.fn(),
              }),
+              getUseAlternateBuffer: () => useAlternateBuffer ?? true,
            } as unknown as import('@google/gemini-cli-core').Config,
          },
        );
@@ -8,7 +8,11 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { renderWithProviders } from '../../test-utils/render.js';
 import { createMockSettings } from '../../test-utils/settings.js';
 import { Footer } from './Footer.js';
-import { tildeifyPath, ToolCallDecision } from '@google/gemini-cli-core';
+import {
+  makeFakeConfig,
+  tildeifyPath,
+  ToolCallDecision,
+} from '@google/gemini-cli-core';
 import type { SessionStatsState } from '../contexts/SessionContext.js';

 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
@@ -177,6 +181,8 @@ describe('<Footer />', () => {
            },
            proQuotaRequest: null,
            validationRequest: null,
+            overageMenuRequest: null,
+            emptyWalletRequest: null,
          },
        },
      },
@@ -203,6 +209,8 @@ describe('<Footer />', () => {
            },
            proQuotaRequest: null,
            validationRequest: null,
+            overageMenuRequest: null,
+            emptyWalletRequest: null,
          },
        },
      },
@@ -229,6 +237,8 @@ describe('<Footer />', () => {
            },
            proQuotaRequest: null,
            validationRequest: null,
+            overageMenuRequest: null,
+            emptyWalletRequest: null,
          },
        },
      },
@@ -497,6 +507,75 @@ describe('<Footer />', () => {
      unmount();
    });
  });
+
+  describe('error summary visibility', () => {
+    it('hides error summary in low verbosity mode', async () => {
+      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+        <Footer />,
+        {
+          width: 120,
+          uiState: {
+            sessionStats: mockSessionStats,
+            errorCount: 2,
+            showErrorDetails: false,
+          },
+          settings: createMockSettings({
+            merged: { ui: { errorVerbosity: 'low' } },
+          }),
+        },
+      );
+      await waitUntilReady();
+      expect(lastFrame()).not.toContain('F12 for details');
+      expect(lastFrame()).not.toContain('2 errors');
+      unmount();
+    });
+
+    it('shows error summary in full verbosity mode', async () => {
+      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+        <Footer />,
+        {
+          width: 120,
+          uiState: {
+            sessionStats: mockSessionStats,
+            errorCount: 2,
+            showErrorDetails: false,
+          },
+          settings: createMockSettings({
+            merged: { ui: { errorVerbosity: 'full' } },
+          }),
+        },
+      );
+      await waitUntilReady();
+      expect(lastFrame()).toContain('F12 for details');
+      expect(lastFrame()).toContain('2 errors');
+      unmount();
+    });
+
+    it('shows error summary in debug mode even when verbosity is low', async () => {
+      const debugConfig = makeFakeConfig();
+      vi.spyOn(debugConfig, 'getDebugMode').mockReturnValue(true);
+
+      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
+        <Footer />,
+        {
+          width: 120,
+          config: debugConfig,
+          uiState: {
+            sessionStats: mockSessionStats,
+            errorCount: 1,
+            showErrorDetails: false,
+          },
+          settings: createMockSettings({
+            merged: { ui: { errorVerbosity: 'low' } },
+          }),
+        },
+      );
+      await waitUntilReady();
+      expect(lastFrame()).toContain('F12 for details');
+      expect(lastFrame()).toContain('1 error');
+      unmount();
+    });
+  });
 });

 describe('fallback mode display', () => {
@@ -60,6 +60,9 @@ export const Footer: React.FC = () => {

  const showMemoryUsage =
    config.getDebugMode() || settings.merged.ui.showMemoryUsage;
+  const isFullErrorVerbosity = settings.merged.ui.errorVerbosity === 'full';
+  const showErrorSummary =
+    !showErrorDetails && errorCount > 0 && (isFullErrorVerbosity || debugMode);
  const hideCWD = settings.merged.ui.footer.hideCWD;
  const hideSandboxStatus = settings.merged.ui.footer.hideSandboxStatus;
  const hideModelInfo = settings.merged.ui.footer.hideModelInfo;
@@ -180,7 +183,7 @@ export const Footer: React.FC = () => {
                </Text>
              </Box>
            )}
-            {!showErrorDetails && errorCount > 0 && (
+            {showErrorSummary && (
              <Box paddingLeft={1} flexDirection="row">
                <Text color={theme.ui.comment}>| </Text>
                <ConsoleSummaryDisplay errorCount={errorCount} />
@@ -146,6 +146,7 @@ export const HistoryItemDisplay: React.FC<HistoryItemDisplayProps> = ({
                }
              : undefined
          }
+          creditBalance={itemForDisplay.creditBalance}
        />
      )}
      {itemForDisplay.type === 'model_stats' && (
@@ -895,7 +895,9 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
        completion.isPerfectMatch &&
        keyMatchers[Command.SUBMIT](key) &&
        recentUnsafePasteTime === null &&
-        (!completion.showSuggestions || completion.activeSuggestionIndex <= 0)
+        (!completion.showSuggestions ||
+          (completion.activeSuggestionIndex <= 0 &&
+            !hasUserNavigatedSuggestions.current))
      ) {
        handleSubmit(buffer.text);
        return true;
@@ -0,0 +1,228 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { renderWithProviders } from '../../test-utils/render.js';
+import { waitFor } from '../../test-utils/async.js';
+import { act } from 'react';
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { OverageMenuDialog } from './OverageMenuDialog.js';
+
+const writeKey = (stdin: { write: (data: string) => void }, key: string) => {
+  act(() => {
+    stdin.write(key);
+  });
+};
+
+describe('OverageMenuDialog', () => {
+  const mockOnChoice = vi.fn();
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  describe('rendering', () => {
+    it('should match snapshot with fallback available', async () => {
+      const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+        <OverageMenuDialog
+          failedModel="gemini-2.5-pro"
+          fallbackModel="gemini-3-flash-preview"
+          resetTime="2:00 PM"
+          creditBalance={500}
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      expect(lastFrame()).toMatchSnapshot();
+      unmount();
+    });
+
+    it('should match snapshot without fallback', async () => {
+      const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+        <OverageMenuDialog
+          failedModel="gemini-2.5-pro"
+          creditBalance={500}
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      expect(lastFrame()).toMatchSnapshot();
+      unmount();
+    });
+
+    it('should display the credit balance', async () => {
+      const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+        <OverageMenuDialog
+          failedModel="gemini-2.5-pro"
+          creditBalance={200}
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      const output = lastFrame() ?? '';
+      expect(output).toContain('200');
+      expect(output).toContain('AI Credits available');
+      unmount();
+    });
+
+    it('should display the model name', async () => {
+      const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+        <OverageMenuDialog
+          failedModel="gemini-2.5-pro"
+          creditBalance={100}
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      const output = lastFrame() ?? '';
+      expect(output).toContain('gemini-2.5-pro');
+      expect(output).toContain('Usage limit reached');
+      unmount();
+    });
+
+    it('should display reset time when provided', async () => {
+      const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+        <OverageMenuDialog
+          failedModel="gemini-2.5-pro"
+          resetTime="3:45 PM"
+          creditBalance={100}
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      const output = lastFrame() ?? '';
+      expect(output).toContain('3:45 PM');
+      expect(output).toContain('Access resets at');
+      unmount();
+    });
+
+    it('should not display reset time when not provided', async () => {
+      const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+        <OverageMenuDialog
+          failedModel="gemini-2.5-pro"
+          creditBalance={100}
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      const output = lastFrame() ?? '';
+      expect(output).not.toContain('Access resets at');
+      unmount();
+    });
+
+    it('should display slash command hints', async () => {
+      const { lastFrame, unmount, waitUntilReady } = renderWithProviders(
+        <OverageMenuDialog
+          failedModel="gemini-2.5-pro"
+          creditBalance={100}
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      const output = lastFrame() ?? '';
+      expect(output).toContain('/stats');
+      expect(output).toContain('/model');
+      expect(output).toContain('/auth');
+      unmount();
+    });
+  });
+
+  describe('onChoice handling', () => {
+    it('should call onChoice with use_credits when selected', async () => {
+      // use_credits is the first item, so just press Enter
+      const { unmount, stdin, waitUntilReady } = renderWithProviders(
+        <OverageMenuDialog
+          failedModel="gemini-2.5-pro"
+          creditBalance={100}
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      writeKey(stdin, '\r');
+
+      await waitFor(() => {
+        expect(mockOnChoice).toHaveBeenCalledWith('use_credits');
+      });
+      unmount();
+    });
+
+    it('should call onChoice with manage when selected', async () => {
+      // manage is the second item: Down + Enter
+      const { unmount, stdin, waitUntilReady } = renderWithProviders(
+        <OverageMenuDialog
+          failedModel="gemini-2.5-pro"
+          creditBalance={100}
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      writeKey(stdin, '\x1b[B'); // Down arrow
+      writeKey(stdin, '\r');
+
+      await waitFor(() => {
+        expect(mockOnChoice).toHaveBeenCalledWith('manage');
+      });
+      unmount();
+    });
+
+    it('should call onChoice with use_fallback when selected', async () => {
+      // With fallback: items are [use_credits, manage, use_fallback, stop]
+      // use_fallback is the third item: Down x2 + Enter
+      const { unmount, stdin, waitUntilReady } = renderWithProviders(
+        <OverageMenuDialog
+          failedModel="gemini-2.5-pro"
+          fallbackModel="gemini-3-flash-preview"
+          creditBalance={100}
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      writeKey(stdin, '\x1b[B'); // Down arrow
+      writeKey(stdin, '\x1b[B'); // Down arrow
+      writeKey(stdin, '\r');
+
+      await waitFor(() => {
+        expect(mockOnChoice).toHaveBeenCalledWith('use_fallback');
+      });
+      unmount();
+    });
+
+    it('should call onChoice with stop when selected', async () => {
+      // Without fallback: items are [use_credits, manage, stop]
+      // stop is the third item: Down x2 + Enter
+      const { unmount, stdin, waitUntilReady } = renderWithProviders(
+        <OverageMenuDialog
+          failedModel="gemini-2.5-pro"
+          creditBalance={100}
+          onChoice={mockOnChoice}
+        />,
+      );
+      await waitUntilReady();
+
+      writeKey(stdin, '\x1b[B'); // Down arrow
+      writeKey(stdin, '\x1b[B'); // Down arrow
+      writeKey(stdin, '\r');
+
+      await waitFor(() => {
+        expect(mockOnChoice).toHaveBeenCalledWith('stop');
+      });
+      unmount();
+    });
+  });
+});
@@ -0,0 +1,113 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type React from 'react';
+import { Box, Text } from 'ink';
+import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
+import { theme } from '../semantic-colors.js';
+
+/** Available choices in the overage menu dialog */
+export type OverageMenuChoice =
+  | 'use_credits'
+  | 'use_fallback'
+  | 'manage'
+  | 'stop';
+
+interface OverageMenuDialogProps {
+  /** The model that hit the quota limit */
+  failedModel: string;
+  /** The fallback model to offer (omit if none available) */
+  fallbackModel?: string;
+  /** Time when access resets (human-readable) */
+  resetTime?: string;
+  /** Available G1 AI credit balance */
+  creditBalance: number;
+  /** Callback when user makes a selection */
+  onChoice: (choice: OverageMenuChoice) => void;
+}
+
+export function OverageMenuDialog({
+  failedModel,
+  fallbackModel,
+  resetTime,
+  creditBalance,
+  onChoice,
+}: OverageMenuDialogProps): React.JSX.Element {
+  const items: Array<{
+    label: string;
+    value: OverageMenuChoice;
+    key: string;
+  }> = [
+    {
+      label: 'Use AI Credits - Continue this request (Overage)',
+      value: 'use_credits',
+      key: 'use_credits',
+    },
+    {
+      label: 'Manage - View balance and purchase more credits',
+      value: 'manage',
+      key: 'manage',
+    },
+  ];
+
+  if (fallbackModel) {
+    items.push({
+      label: `Switch to ${fallbackModel}`,
+      value: 'use_fallback',
+      key: 'use_fallback',
+    });
+  }
+
+  items.push({
+    label: 'Stop - Abort request',
+    value: 'stop',
+    key: 'stop',
+  });
+
+  return (
+    <Box borderStyle="round" flexDirection="column" padding={1}>
+      <Box marginBottom={1} flexDirection="column">
+        <Text color={theme.status.warning}>
+          Usage limit reached for {failedModel}.
+        </Text>
+        {resetTime && <Text>Access resets at {resetTime}.</Text>}
+        <Text>
+          <Text bold color={theme.text.accent}>
+            /stats
+          </Text>{' '}
+          model for usage details
+        </Text>
+        <Text>
+          <Text bold color={theme.text.accent}>
+            /model
+          </Text>{' '}
+          to switch models.
+        </Text>
+        <Text>
+          <Text bold color={theme.text.accent}>
+            /auth
+          </Text>{' '}
+          to switch to API key.
+        </Text>
+      </Box>
+      <Box marginBottom={1}>
+        <Text>
+          You have{' '}
+          <Text bold color={theme.status.success}>
+            {creditBalance}
+          </Text>{' '}
+          AI Credits available.
+        </Text>
+      </Box>
+      <Box marginBottom={1}>
+        <Text>How would you like to proceed?</Text>
+      </Box>
+      <Box marginTop={1} marginBottom={1}>
+        <RadioButtonSelect items={items} onSelect={onChoice} />
+      </Box>
+    </Box>
+  );
+}
@@ -395,6 +395,7 @@ interface StatsDisplayProps {
  tier?: string;
  currentModel?: string;
  quotaStats?: QuotaStats;
+  creditBalance?: number;
 }

 export const StatsDisplay: React.FC<StatsDisplayProps> = ({
@@ -407,6 +408,7 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
  tier,
  currentModel,
  quotaStats,
+  creditBalance,
 }) => {
  const { stats } = useSessionStats();
  const { metrics } = stats;
@@ -488,6 +490,17 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
            <Text color={theme.text.primary}>{tier}</Text>
          </StatRow>
        )}
+        {showUserIdentity && creditBalance != null && creditBalance >= 0 && (
+          <StatRow title="Google AI Credits:">
+            <Text
+              color={
+                creditBalance > 0 ? theme.text.primary : theme.text.secondary
+              }
+            >
+              {creditBalance.toLocaleString()}
+            </Text>
+          </StatRow>
+        )}
        <StatRow title="Tool Calls:">
          <Text color={theme.text.primary}>
            {tools.totalCalls} ({' '}
@@ -51,6 +51,7 @@ describe('ToolConfirmationQueue', () => {
    storage: {
      getPlansDir: () => '/mock/temp/plans',
    },
+    getUseAlternateBuffer: () => false,
  } as unknown as Config;

  beforeEach(() => {
@@ -227,7 +228,7 @@ describe('ToolConfirmationQueue', () => {
    // availableContentHeight = Math.max(9 - 6, 4) = 4
    // MaxSizedBox in ToolConfirmationMessage will use 4
    // It should show truncation message
-    await waitFor(() => expect(lastFrame()).toContain('first 49 lines hidden'));
+    await waitFor(() => expect(lastFrame()).toContain('49 hidden (Ctrl+O)'));
    expect(lastFrame()).toMatchSnapshot();
    unmount();
  });
@@ -11,6 +11,50 @@ Enter to submit · Esc to cancel
 "
 `;

+exports[`AskUserDialog > Choice question placeholder > uses default placeholder when not provided 2`] = `
+"
+  ERROR  Cannot read properties of undefined (reading '$$typeof')
+
+ /Users/spencertang/Workspace/gemini-cli/node_modules/react/cjs/react.developme
+ nt.js:1208:15
+
+ 1205:     };
+ 1206:     exports.useContext = function (Context) {
+ 1207:       var dispatcher = resolveDispatcher();
+ 1208:       Context.$$typeof === REACT_CONSUMER_TYPE &&
+ 1209:         console.error(
+ 1210           "Calling useContext(Context.Consumer) is not supported and will
+ :   cause bugs. Did you mean to call useContext(Context) instead?"
+ 1211:         );
+
+ -process.env.NODE_ENV.expo 
+  ts.useContext            (/Users/spencertang/Workspace/gemini-cli/node_module
+                           s/react/cjs/react.development.js:1208:15)
+ - useTerminalCapabilities (src/ui/hooks/useTerminalCapabilities.ts:15:19)
+ - useAlternateBuffer (src/ui/hooks/useAlternateBuffer.ts:15:24)
+ - ChoiceQuestionView (src/ui/components/AskUserDialog.tsx:484:29)
+ -Object.react-stack-bot 
+  om-frame              (/Users/spencertang/Workspace/gemini-cli/node_modules/r
+                        eact-reconciler/cjs/react-reconciler.development.js:158
+                        59:20)
+ -renderWithHo 
+  ks          (/Users/spencertang/Workspace/gemini-cli/node_modules/react-recon
+              ciler/cjs/react-reconciler.development.js:3221:22)
+ -updateFunctionCom 
+  onent            (/Users/spencertang/Workspace/gemini-cli/node_modules/react-
+                   reconciler/cjs/react-reconciler.development.js:6475:19)
+ -beginWor 
+          (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconcile
+          r/cjs/react-reconciler.development.js:8009:18)
+ -runWithFiberIn 
+  EV            (/Users/spencertang/Workspace/gemini-cli/node_modules/react-rec
+                onciler/cjs/react-reconciler.development.js:1738:13)
+ -performUnitOfW 
+  rk            (/Users/spencertang/Workspace/gemini-cli/node_modules/react-rec
+                onciler/cjs/react-reconciler.development.js:12834:22)
+"
+`;
+
 exports[`AskUserDialog > Choice question placeholder > uses placeholder for "Other" option when provided 1`] = `
 "Select your preferred language:

@@ -22,6 +66,50 @@ Enter to submit · Esc to cancel
 "
 `;

+exports[`AskUserDialog > Choice question placeholder > uses placeholder for "Other" option when provided 2`] = `
+"
+  ERROR  Cannot read properties of undefined (reading '$$typeof')
+
+ /Users/spencertang/Workspace/gemini-cli/node_modules/react/cjs/react.developme
+ nt.js:1208:15
+
+ 1205:     };
+ 1206:     exports.useContext = function (Context) {
+ 1207:       var dispatcher = resolveDispatcher();
+ 1208:       Context.$$typeof === REACT_CONSUMER_TYPE &&
+ 1209:         console.error(
+ 1210           "Calling useContext(Context.Consumer) is not supported and will
+ :   cause bugs. Did you mean to call useContext(Context) instead?"
+ 1211:         );
+
+ -process.env.NODE_ENV.expo 
+  ts.useContext            (/Users/spencertang/Workspace/gemini-cli/node_module
+                           s/react/cjs/react.development.js:1208:15)
+ - useTerminalCapabilities (src/ui/hooks/useTerminalCapabilities.ts:15:19)
+ - useAlternateBuffer (src/ui/hooks/useAlternateBuffer.ts:15:24)
+ - ChoiceQuestionView (src/ui/components/AskUserDialog.tsx:484:29)
+ -Object.react-stack-bot 
+  om-frame              (/Users/spencertang/Workspace/gemini-cli/node_modules/r
+                        eact-reconciler/cjs/react-reconciler.development.js:158
+                        59:20)
+ -renderWithHo 
+  ks          (/Users/spencertang/Workspace/gemini-cli/node_modules/react-recon
+              ciler/cjs/react-reconciler.development.js:3221:22)
+ -updateFunctionCom 
+  onent            (/Users/spencertang/Workspace/gemini-cli/node_modules/react-
+                   reconciler/cjs/react-reconciler.development.js:6475:19)
+ -beginWor 
+          (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconcile
+          r/cjs/react-reconciler.development.js:8009:18)
+ -runWithFiberIn 
+  EV            (/Users/spencertang/Workspace/gemini-cli/node_modules/react-rec
+                onciler/cjs/react-reconciler.development.js:1738:13)
+ -performUnitOfW 
+  rk            (/Users/spencertang/Workspace/gemini-cli/node_modules/react-rec
+                onciler/cjs/react-reconciler.development.js:12834:22)
+"
+`;
+
 exports[`AskUserDialog > Scroll Arrows (useAlternateBuffer: false) > shows scroll arrows correctly when useAlternateBuffer is false 1`] = `
 "Choose an option

@@ -75,6 +163,48 @@ Enter to select · ↑/↓ to navigate · Esc to cancel
 "
 `;

+exports[`AskUserDialog > Scroll Arrows (useAlternateBuffer: true) > shows scroll arrows correctly when useAlternateBuffer is true 2`] = `
+"
+  ERROR  Cannot read properties of undefined (reading '$$typeof')
+
+ /Users/spencertang/Workspace/gemini-cli/node_modules/react/cjs/react.development.js:1208:15
+
+ 1205:     };
+ 1206:     exports.useContext = function (Context) {
+ 1207:       var dispatcher = resolveDispatcher();
+ 1208:       Context.$$typeof === REACT_CONSUMER_TYPE &&
+ 1209:         console.error(
+ 1210           "Calling useContext(Context.Consumer) is not supported and will cause bugs. Did you
+ :   mean to call useContext(Context) instead?"
+ 1211:         );
+
+ -process.env.NODE_ENV.exports 
+  useContext                  (/Users/spencertang/Workspace/gemini-cli/node_modules/react/cjs/react
+                              .development.js:1208:15)
+ - useTerminalCapabilities (src/ui/hooks/useTerminalCapabilities.ts:15:19)
+ - useAlternateBuffer (src/ui/hooks/useAlternateBuffer.ts:15:24)
+ - ChoiceQuestionView (src/ui/components/AskUserDialog.tsx:484:29)
+ -Object.react-stack-bott 
+  m-frame                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs
+                         /react-reconciler.development.js:15859:20)
+ -renderWithHoo 
+  s            (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/react-rec
+               onciler.development.js:3221:22)
+ -updateFunctionComp 
+  nent              (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/reac
+                    t-reconciler.development.js:6475:19)
+ -beginWor 
+          (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/react-reconcil
+          er.development.js:8009:18)
+ -runWithFiberIn 
+  EV            (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/react-re
+                conciler.development.js:1738:13)
+ -performUnitOfW 
+  rk            (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/react-re
+                conciler.development.js:12834:22)
+"
+`;
+
 exports[`AskUserDialog > Text type questions > renders text input for type: "text" 1`] = `
 "What should we name this component?

@@ -201,3 +331,45 @@ README → (not answered)
 Enter to submit · Tab/Shift+Tab to edit answers · Esc to cancel
 "
 `;
+
+exports[`AskUserDialog > shows warning for unanswered questions on Review tab 2`] = `
+"
+  ERROR  Cannot read properties of undefined (reading '$$typeof')
+
+ /Users/spencertang/Workspace/gemini-cli/node_modules/react/cjs/react.development.js:1208:15
+
+ 1205:     };
+ 1206:     exports.useContext = function (Context) {
+ 1207:       var dispatcher = resolveDispatcher();
+ 1208:       Context.$$typeof === REACT_CONSUMER_TYPE &&
+ 1209:         console.error(
+ 1210:           "Calling useContext(Context.Consumer) is not supported and will cause bugs. Did you mean to call
+      useContext(Context) instead?"
+ 1211:         );
+
+ -process.env.NODE_ENV.exports.useCo 
+  text                              (/Users/spencertang/Workspace/gemini-cli/node_modules/react/cjs/react.development.j
+                                    s:1208:15)
+ - useTerminalCapabilities (src/ui/hooks/useTerminalCapabilities.ts:15:19)
+ - useAlternateBuffer (src/ui/hooks/useAlternateBuffer.ts:15:24)
+ - ChoiceQuestionView (src/ui/components/AskUserDialog.tsx:484:29)
+ -Object.react-stack-botto 
+  -frame                  (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/react-reconciler.d
+                          evelopment.js:15859:20)
+ -renderWithHook 
+                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/react-reconciler.development
+                .js:3221:22)
+ -updateFunctionCompo 
+  ent                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/react-reconciler.develo
+                     pment.js:6475:19)
+ -beginWork 
+           (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/react-reconciler.development.js:8
+           009:18)
+ -runWithFiberInD 
+  V              (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/react-reconciler.developmen
+                 t.js:1738:13)
+ -performUnitOfWo 
+  k              (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/react-reconciler.developmen
+                 t.js:12834:22)
+"
+`;
@@ -35,7 +35,7 @@ Footer
 `;

 exports[`Composer > Snapshots > matches snapshot while streaming 1`] = `
-" LoadingIndicator: Thinking                                                            ShortcutsHint
+" LoadingIndicator: Thinking
 ────────────────────────────────────────────────────────────────────────────────────────────────────
 ApprovalModeIndicator
 InputPrompt:   Type your message or @path/to/file
@@ -6,6 +6,51 @@ Spinner Initializing...
 "
 `;

+exports[`ConfigInitDisplay > handles empty clients map 2`] = `
+"
+  ERROR  Cannot read properties of undefined (reading 'isKittyProtocolEnabled')
+
+ src/ui/contexts/KeypressContext.tsx:797:36
+
+ 794:     process.stdin.setEncoding('utf8'); // Make data events emit strings
+ 795:
+ 796:     let processor = nonKeyboardEventFilter(broadcast);
+ 797:     if (!terminalCapabilityManager.isKittyProtocolEnabled()) {
+ 798:       processor = bufferFastReturn(processor);
+ 799:     }
+ 800:     processor = bufferBackslashEnter(processor);
+
+ -  (src/ui/contexts/KeypressContext.tsx:797:36)
+ -Object.react-stack-bott 
+  m-frame                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs
+                         /react-reconciler.development.js:15945:20)
+ -runWithFiberIn 
+  EV            (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/react-re
+                conciler.development.js:1738:13)
+ -commitHookEffectList 
+  ount                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/re
+                      act-reconciler.development.js:9516:29)
+ -commitHookPassiveMount 
+  ffects                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/
+                        react-reconciler.development.js:9639:11)
+ -commitPassiveMountOn 
+  iber                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/re
+                      act-reconciler.development.js:11364:13)
+ -recursivelyTraversePassiveM 
+  untEffects                 (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler
+                             /cjs/react-reconciler.development.js:11338:11)
+ -commitPassiveMountOn 
+  iber                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/re
+                      act-reconciler.development.js:11479:11)
+ -recursivelyTraversePassiveM 
+  untEffects                 (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler
+                             /cjs/react-reconciler.development.js:11338:11)
+ -commitPassiveMountOn 
+  iber                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/re
+                      act-reconciler.development.js:11357:11)
+"
+`;
+
 exports[`ConfigInitDisplay > renders initial state 1`] = `
 "
 Spinner Initializing...
@@ -18,8 +63,98 @@ Spinner Connecting to MCP servers... (0/5) - Waiting for: s1, s2, s3, +2 more
 "
 `;

+exports[`ConfigInitDisplay > truncates list of waiting servers if too many 2`] = `
+"
+  ERROR  Cannot read properties of undefined (reading 'isKittyProtocolEnabled')
+
+ src/ui/contexts/KeypressContext.tsx:797:36
+
+ 794:     process.stdin.setEncoding('utf8'); // Make data events emit strings
+ 795:
+ 796:     let processor = nonKeyboardEventFilter(broadcast);
+ 797:     if (!terminalCapabilityManager.isKittyProtocolEnabled()) {
+ 798:       processor = bufferFastReturn(processor);
+ 799:     }
+ 800:     processor = bufferBackslashEnter(processor);
+
+ -  (src/ui/contexts/KeypressContext.tsx:797:36)
+ -Object.react-stack-bott 
+  m-frame                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs
+                         /react-reconciler.development.js:15945:20)
+ -runWithFiberIn 
+  EV            (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/react-re
+                conciler.development.js:1738:13)
+ -commitHookEffectList 
+  ount                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/re
+                      act-reconciler.development.js:9516:29)
+ -commitHookPassiveMount 
+  ffects                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/
+                        react-reconciler.development.js:9639:11)
+ -commitPassiveMountOn 
+  iber                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/re
+                      act-reconciler.development.js:11364:13)
+ -recursivelyTraversePassiveM 
+  untEffects                 (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler
+                             /cjs/react-reconciler.development.js:11338:11)
+ -commitPassiveMountOn 
+  iber                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/re
+                      act-reconciler.development.js:11479:11)
+ -recursivelyTraversePassiveM 
+  untEffects                 (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler
+                             /cjs/react-reconciler.development.js:11338:11)
+ -commitPassiveMountOn 
+  iber                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/re
+                      act-reconciler.development.js:11357:11)
+"
+`;
+
 exports[`ConfigInitDisplay > updates message on McpClientUpdate event 1`] = `
 "
 Spinner Connecting to MCP servers... (1/2) - Waiting for: server2
 "
 `;
+
+exports[`ConfigInitDisplay > updates message on McpClientUpdate event 2`] = `
+"
+  ERROR  Cannot read properties of undefined (reading 'isKittyProtocolEnabled')
+
+ src/ui/contexts/KeypressContext.tsx:797:36
+
+ 794:     process.stdin.setEncoding('utf8'); // Make data events emit strings
+ 795:
+ 796:     let processor = nonKeyboardEventFilter(broadcast);
+ 797:     if (!terminalCapabilityManager.isKittyProtocolEnabled()) {
+ 798:       processor = bufferFastReturn(processor);
+ 799:     }
+ 800:     processor = bufferBackslashEnter(processor);
+
+ -  (src/ui/contexts/KeypressContext.tsx:797:36)
+ -Object.react-stack-bott 
+  m-frame                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs
+                         /react-reconciler.development.js:15945:20)
+ -runWithFiberIn 
+  EV            (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/react-re
+                conciler.development.js:1738:13)
+ -commitHookEffectList 
+  ount                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/re
+                      act-reconciler.development.js:9516:29)
+ -commitHookPassiveMount 
+  ffects                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/
+                        react-reconciler.development.js:9639:11)
+ -commitPassiveMountOn 
+  iber                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/re
+                      act-reconciler.development.js:11364:13)
+ -recursivelyTraversePassiveM 
+  untEffects                 (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler
+                             /cjs/react-reconciler.development.js:11338:11)
+ -commitPassiveMountOn 
+  iber                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/re
+                      act-reconciler.development.js:11479:11)
+ -recursivelyTraversePassiveM 
+  untEffects                 (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler
+                             /cjs/react-reconciler.development.js:11338:11)
+ -commitPassiveMountOn 
+  iber                (/Users/spencertang/Workspace/gemini-cli/node_modules/react-reconciler/cjs/re
+                      act-reconciler.development.js:11357:11)
+"
+`;
@@ -0,0 +1,49 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`EmptyWalletDialog > rendering > should match snapshot with fallback available 1`] = `
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                  │
+│ Usage limit reached for gemini-2.5-pro.                                                          │
+│ Access resets at 2:00 PM.                                                                        │
+│ /stats model for usage details                                                                   │
+│ /model to switch models.                                                                         │
+│ /auth to switch to API key.                                                                      │
+│                                                                                                  │
+│ To continue using this model now, purchase more AI Credits.                                      │
+│                                                                                                  │
+│ Newly purchased AI credits may take a few minutes to update.                                     │
+│                                                                                                  │
+│ How would you like to proceed?                                                                   │
+│                                                                                                  │
+│                                                                                                  │
+│ ● 1. Get AI Credits - Open browser to purchase credits                                           │
+│   2. Switch to gemini-3-flash-preview                                                            │
+│   3. Stop - Abort request                                                                        │
+│                                                                                                  │
+│                                                                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
+"
+`;
+
+exports[`EmptyWalletDialog > rendering > should match snapshot without fallback 1`] = `
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                  │
+│ Usage limit reached for gemini-2.5-pro.                                                          │
+│ /stats model for usage details                                                                   │
+│ /model to switch models.                                                                         │
+│ /auth to switch to API key.                                                                      │
+│                                                                                                  │
+│ To continue using this model now, purchase more AI Credits.                                      │
+│                                                                                                  │
+│ Newly purchased AI credits may take a few minutes to update.                                     │
+│                                                                                                  │
+│ How would you like to proceed?                                                                   │
+│                                                                                                  │
+│                                                                                                  │
+│ ● 1. Get AI Credits - Open browser to purchase credits                                           │
+│   2. Stop - Abort request                                                                        │
+│                                                                                                  │
+│                                                                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
+"
+`;
@@ -74,7 +74,7 @@ Implementation Steps
 6. Add LDAP provider support in src/auth/providers/LDAPProvider.ts
 7. Create token refresh mechanism in src/auth/TokenManager.ts
 8. Add multi-factor authentication in src/auth/MFAService.ts
-... last 22 lines hidden ...
+... last 22 lines hidden (Ctrl+O to show) ...

 ● 1.  Yes, automatically accept edits
      Approves plan and allows tools to run automatically
@@ -112,7 +112,7 @@ exports[`<HistoryItemDisplay /> > gemini items (alternateBuffer=false) > should

 exports[`<HistoryItemDisplay /> > gemini items (alternateBuffer=false) > should render a truncated gemini item 1`] = `
 "✦ Example code block:
-   ... first 42 lines hidden ...
+   ... 42 hidden (Ctrl+O) ...
   43 Line 43
   44 Line 44
   45 Line 45
@@ -126,7 +126,7 @@ exports[`<HistoryItemDisplay /> > gemini items (alternateBuffer=false) > should

 exports[`<HistoryItemDisplay /> > gemini items (alternateBuffer=false) > should render a truncated gemini_content item 1`] = `
 "  Example code block:
-   ... first 42 lines hidden ...
+   ... 42 hidden (Ctrl+O) ...
   43 Line 43
   44 Line 44
   45 Line 45
@@ -49,7 +49,7 @@ exports[`MainContent > MainContent Tool Output Height Logic > 'Normal mode - Con
 ╭──────────────────────────────────────────────────────────────────────────────────────────────╮
 │ ⊷  Shell Command Running a long command...                                                   │
 │                                                                                              │
-│ ... first 11 lines hidden ...                                                                │
+│ ... first 11 lines hidden (Ctrl+O to show) ...                                               │
 │ Line 12                                                                                      │
 │ Line 13                                                                                      │
 │ Line 14                                                                                      │
@@ -0,0 +1,47 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`OverageMenuDialog > rendering > should match snapshot with fallback available 1`] = `
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                  │
+│ Usage limit reached for gemini-2.5-pro.                                                          │
+│ Access resets at 2:00 PM.                                                                        │
+│ /stats model for usage details                                                                   │
+│ /model to switch models.                                                                         │
+│ /auth to switch to API key.                                                                      │
+│                                                                                                  │
+│ You have 500 AI Credits available.                                                               │
+│                                                                                                  │
+│ How would you like to proceed?                                                                   │
+│                                                                                                  │
+│                                                                                                  │
+│ ● 1. Use AI Credits - Continue this request (Overage)                                            │
+│   2. Manage - View balance and purchase more credits                                             │
+│   3. Switch to gemini-3-flash-preview                                                            │
+│   4. Stop - Abort request                                                                        │
+│                                                                                                  │
+│                                                                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
+"
+`;
+
+exports[`OverageMenuDialog > rendering > should match snapshot without fallback 1`] = `
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                  │
+│ Usage limit reached for gemini-2.5-pro.                                                          │
+│ /stats model for usage details                                                                   │
+│ /model to switch models.                                                                         │
+│ /auth to switch to API key.                                                                      │
+│                                                                                                  │
+│ You have 500 AI Credits available.                                                               │
+│                                                                                                  │
+│ How would you like to proceed?                                                                   │
+│                                                                                                  │
+│                                                                                                  │
+│ ● 1. Use AI Credits - Continue this request (Overage)                                            │
+│   2. Manage - View balance and purchase more credits                                             │
+│   3. Stop - Abort request                                                                        │
+│                                                                                                  │
+│                                                                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
+"
+`;
@@ -6,7 +6,7 @@ exports[`ToolConfirmationQueue > calculates availableContentHeight based on avai
 │                                                                              │
 │ ?  replace edit file                                                         │
 │                                                                              │
-│ ... first 49 lines hidden ...                                                │
+│ ... 49 hidden (Ctrl+O) ...                                                   │
 │ 50 line                                                                      │
 │ Apply this change?                                                           │
 │                                                                              │
@@ -96,7 +96,7 @@ exports[`ToolConfirmationQueue > renders expansion hint when content is long and
 │                                                                              │
 │ ?  replace edit file                                                         │
 │                                                                              │
-│ ... first 49 lines hidden ...                                                │
+│ ... 49 hidden (Ctrl+O) ...                                                   │
 │ 50 line                                                                      │
 │ Apply this change?                                                           │
 │                                                                              │
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Spencer Tang	e4d1c07294	fix(policy): resolve type errors and add test for isSensitive plumbing	2026-02-27 18:55:23 -05:00
Spencer	99bc45b689	fix(policy): resolve regressions and refine sensitive tool plumbing	2026-02-27 23:06:07 +00:00
Spencer	903c9f79b3	merge origin/main and resolve regressions	2026-02-27 22:49:17 +00:00
Jenna Inouye	07f51c324e	Docs: Update model docs to remove Preview Features. (#20084 )	2026-02-27 22:28:06 +00:00
nityam	ba149afa0b	fix: merge duplicate imports in a2a-server package (2/4) (#19781 )	2026-02-27 21:13:30 +00:00
nityam	f6533c0250	fix: merge duplicate imports in sdk and test-utils packages (1/4) (#19777 )	2026-02-27 21:13:15 +00:00
nityam	5e3b1fe945	Enforce import/no-duplicates as error (#19797 )	2026-02-27 21:08:34 +00:00
Christian Gunderman	05ef2eb362	Promote stable tests to CI blocking. (#20581 )	2026-02-27 21:08:12 +00:00
Abhi	966b9059d0	feat(core): enable contiguous parallel admission for Kind.Agent tools (#20583 )	2026-02-27 21:08:10 +00:00
Francesco Camporeale	ca13458412	docs: fix spelling typos in installation guide (#20579 ) Co-authored-by: Jack Wotherspoon <jackwoth@google.com>	2026-02-27 20:36:38 +00:00
Spencer	c6ff82944f	refactor(policy): add isSensitive plumbing and tool Kind.Write	2026-02-27 20:32:20 +00:00
Spencer	20d884da2f	fix(core): reduce intrusive MCP errors and deduplicate diagnostics (#20232 )	2026-02-27 20:04:36 +00:00
Jenna Inouye	6a0f4d3bdd	Docs: FAQ update (#20585 )	2026-02-27 19:29:58 +00:00
Christian Gunderman	0b682538d2	Disable Gemini PR reviews on draft PRs. (#20362 ) Co-authored-by: Jacob Richman <jacob314@gmail.com>	2026-02-27 19:25:33 +00:00
Dmitry Lyalin	7f8ce8657c	Add low/full CLI error verbosity mode for cleaner UI (#20399 )	2026-02-27 19:15:10 +00:00
gemini-cli-robot	1c8951334a	Changelog for v0.30.1 (#20589 ) Co-authored-by: gemini-cli-robot <224641728+gemini-cli-robot@users.noreply.github.com> Co-authored-by: Sam Roberts <158088236+g-samroberts@users.noreply.github.com>	2026-02-27 19:11:32 +00:00
Christian Gunderman	b2b6092c24	Add slash command for promoting behavioral evals to CI blocking (#20575 ) Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>	2026-02-27 19:11:30 +00:00
Jacob Richman	e00e8f4728	fix(cli): Shell autocomplete polish (#20411 )	2026-02-27 19:03:37 +00:00
gemini-cli-robot	b2cbf518e8	Changelog for v0.31.0-preview.1 (#20590 ) Co-authored-by: gemini-cli-robot <224641728+gemini-cli-robot@users.noreply.github.com>	2026-02-27 19:01:52 +00:00
Abhi	c914fd0700	fix(cli): prevent sub-agent tool calls from leaking into UI (#20580 )	2026-02-27 19:00:19 +00:00
Jerop Kipruto	5d24d6a9e1	fix(ui): persist expansion in AskUser dialog when navigating options (#20559 )	2026-02-27 18:30:16 +00:00
Gaurav	ea48bd9414	feat: better error messages (#20577 ) Co-authored-by: Gal Zahavi <38544478+galz10@users.noreply.github.com>	2026-02-27 18:18:16 +00:00
Gaurav	b2d6844f9b	feat(billing): implement G1 AI credits overage flow with billing telemetry (#18590 )	2026-02-27 18:15:06 +00:00
Sehoon Shon	fdd844b405	fix(core): disable retries for code assist streaming requests (#20561 )	2026-02-27 18:04:43 +00:00
Adib234	23905bcd77	fix(plan): prevent agent from using ask_user for shell command confirmation (#20504 )	2026-02-27 17:51:47 +00:00
Dev Randalpura	ec39aa17c2	Moved markdown parsing logic to a separate util file (#20526 )	2026-02-27 17:43:18 +00:00
DeWitt Clinton	7a1f2f3288	Disable expensive and scheduled workflows on personal forks (#20449 )	2026-02-27 17:40:09 +00:00
Abhijit Balaji	59c0e73718	feat(cli): add temporary flag to disable workspace policies (#20523 )	2026-02-27 17:25:16 +00:00
Dmitry Lyalin	3b2632fe40	fix(cli): keep thought summary when loading phrases are off (#20497 ) Co-authored-by: Jacob Richman <jacob314@gmail.com>	2026-02-27 17:11:13 +00:00
Sehoon Shon	e709789067	fix(core): handle optional response fields from code assist API (#20345 )	2026-02-27 16:52:37 +00:00
Christian Gunderman	514d431049	Demote unreliable test. (#20571 )	2026-02-27 16:48:46 +00:00
Abhijit Balaji	32e777f838	fix(core): revert auto-save of policies to user space (#20531 )	2026-02-27 16:03:36 +00:00
Jacob Richman	14dd07be00	fix(cli): ensure dialogs stay scrolled to bottom in alternate buffer mode (#20527 )	2026-02-27 16:00:07 +00:00
Pyush Sinha	d7320f5425	refactor(core,cli): useAlternateBuffer read from config (#20346 ) Co-authored-by: Jacob Richman <jacob314@gmail.com>	2026-02-27 15:55:02 +00:00
Adib234	25ade7bcb7	feat(plan): update planning workflow to encourage multi-select with descriptions of options (#20491 )	2026-02-27 15:42:37 +00:00
Jacob Richman	ac4d0c20d8	fix(cli): hide shortcuts hint while model is thinking or the user has typed a prompt + add debounce to avoid flicker (#19389 )	2026-02-27 15:34:49 +00:00
Jacob Richman	4d9cc36146	Fix flicker showing message to press ctrl-O again to collapse. (#20414 ) Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>	2026-02-27 15:07:14 +00:00
Jerop Kipruto	66b8922d66	feat(ui): add 'ctrl+o' hint to truncated content message (#20529 )	2026-02-27 15:02:46 +00:00
christine betts	58df1c6237	Fix extension MCP server env var loading (#20374 )	2026-02-27 14:49:10 +00:00
Bryan Morgan	522e95439c	fix(core): apply retry logic to CodeAssistServer for all users (#20507 )	2026-02-27 09:26:53 -05:00