chore(release): v0.20.0

Co-authored-by: Gal Zahavi <38544478+galz10@users.noreply.github.com>
Co-authored-by: Jack Wotherspoon <jackwoth@google.com>
Co-authored-by: christine betts <chrstn@uw.edu>

.gemini/commands/frontend.toml

@@ -0,0 +1,54 @@
+description="Injects context of all relevant cli files"
+prompt = """
+The source code contains the content of absolutely every source code file in
+packages/cli. In addition to the source code, the following test files are
+included as they are test files that conform to the project's testing standards:
+`packages/cli/src/ui/components/InputPrompt.test.tsx` and `packages/cli/src/ui/App.test.tsx`.
+You should very rarely need to read any other files from packages/cli to resolve
+prompts.
+
+!{find packages/cli -path packages/cli/dist -prune -o -type f \\( -name "*.ts" -o -name "*.tsx" \\) ! -name "*.test.ts" ! -name "*.test.tsx" ! -name "*.d.ts" -exec echo "--- {} ---" \\; -exec cat {} \\; && echo "--- packages/cli/src/ui/components/InputPrompt.test.tsx ---" && cat packages/cli/src/ui/components/InputPrompt.test.tsx && echo "--- packages/cli/src/ui/App.test.tsx ---" && cat packages/cli/src/ui/App.test.tsx}
+
+**Pay extremely close attention to these files.** They define the project's
+core architecture, component patterns, and testing standards.
+
+In addition to the code context, you MUST strictly adhere to the following frontend-specific development guidelines while adding code to packages/cli.
+
+## Testing Standards
+*   **Async Testing**: ALWAYS use `waitFor` from `packages/cli/src/test-utils/async.ts` instead of `vi.waitFor` to prevent flakiness and `act` warnings. NEVER use fixed waits (e.g., `await delay(100)`).
+*   **State Changes**: Wrap all blocks that change component state in `act`.
+*   **Snapshots**: Use `toMatchSnapshot` to verify rendering.
+*   **Rendering**: Use `render` or `renderWithProviders` from `packages/cli/src/test-utils/render.tsx` instead of `ink-testing-library` directly.
+*   **Mocking**:
+    *   Reuse existing mocks/fakes where possible.
+    *   **Parameterized Tests**: Use parameterized tests with explicit types to reduce duplication and ensure type safety.
+    *   Avoid mocking the file system, os, or child_process if at all possible; if you have to mock the Mock critical dependencies (`fs`, `os`, `child_process`) do so ONLY at the top of the file.
+
+## React & Ink Architecture
+*   **Keyboard Handling**: You MUST use `useKeyPress.ts` from Gemini CLI for keyboard handling, NOT the standard ink library. This is critical for supporting slow terminals and multiple events per frame.
+    *   Handle multiple events gracefully (often requires a reducer pattern, see `text-buffer.ts`).
+*   **State Management**:
+    *   NEVER trigger side effects from within the body of a `setState` callback. Use a reducer or `useRef` if necessary.
+    *   Initialize state explicitly (e.g., use `undefined` rather than `true` if unknown).
+*   **Performance**:
+    *   Avoid synchronous file I/O in components.
+    *   Do not introduce excessive property drilling; leverage or extend existing providers.
+
+## Configuration & Settings
+*   **Settings vs Args**: Use settings for user-configurable options; do not add new CLI arguments.
+*   **Schema**: Add new settings to `packages/cli/src/config/settingsSchema.ts`.
+*   **Documentation**:
+    *   If `showInDialog: true`, document in `docs/get-started/configuration.md`.
+    *   Ensure `requiresRestart` is correctly set.
+
+## Keyboard Shortcuts
+*   **Registration**: Define new shortcuts in `packages/cli/src/config/keyBindings.ts`.
+*   **Documentation**: Document all new shortcuts in `docs/cli/keyboard-shortcuts.md`.
+*   **Compatibility**: Avoid function keys and common VSCode shortcuts. Be cautious with `Meta` key (Mac-limited support).
+
+## General
+*   **Logging**: Use `debugLogger` for errors. NEVER leave `console.log/warn/error` in the code.
+*   **TypeScript**: Avoid the non-null assertion operator (`!`).
+
+{{args}}. 
+ """

.gemini/commands/full-context.toml

@@ -0,0 +1,57 @@
+description="Injects context of all relevant cli files"
+prompt = """
+The following output contains the complete
+source code of the gemini cli library (`packages/cli`), and {packages/core} and representative test files
+(`packages/cli/src/ui/components/InputPrompt.test.tsx` and `packages/cli/src/ui/App.test.tsx`) that best conform to the project's testing standards.
+**Pay extremely close attention to these files.** They define the project's
+core architecture, component patterns, and testing standards.
+
+The source code contains the content of absolutely every source code file in
+packages/cli and packages/core. In addition to the source code, the following test files are
+included as they are test files that conform to the project's testing standards:
+`packages/cli/src/ui/components/InputPrompt.test.tsx` and `packages/cli/src/ui/App.test.tsx`.
+You should very rarely need to read any other files from packages/cli to resolve
+prompts.
+
+!{find packages/cli packages/core \\( -path packages/cli/dist -o -path packages/core/dist -o -name node_modules \\) -prune -o -type f \\( -name "*.ts" -o -name "*.tsx" \\) ! -name "*.test.ts" ! -name "*.test.tsx" ! -name "*.d.ts" -exec echo "--- {} ---" \\; -exec cat {} \\; && echo "--- packages/cli/src/ui/components/InputPrompt.test.tsx ---" && cat packages/cli/src/ui/components/InputPrompt.test.tsx && echo "--- packages/cli/src/ui/App.test.tsx ---" && cat packages/cli/src/ui/App.test.tsx}
+
+In addition to the code context, you MUST strictly adhere to the following frontend-specific development guidelines when writing code in packages/cli.
+
+## Testing Standards
+*   **Async Testing**: ALWAYS use `waitFor` from `packages/cli/src/test-utils/async.ts` instead of `vi.waitFor` to prevent flakiness and `act` warnings. NEVER use fixed waits (e.g., `await delay(100)`).
+*   **State Changes**: Wrap all blocks that change component state in `act`.
+*   **Snapshots**: Use `toMatchSnapshot` to verify rendering.
+*   **Rendering**: Use `render` or `renderWithProviders` from `packages/cli/src/test-utils/render.tsx` instead of `ink-testing-library` directly.
+*   **Mocking**:
+    *   Reuse existing mocks/fakes where possible.
+    *   **Parameterized Tests**: Use parameterized tests with explicit types to reduce duplication and ensure type safety.
+    *   Avoid mocking the file system, os, or child_process if at all possible; if you have to mock the Mock critical dependencies (`fs`, `os`, `child_process`) do so ONLY at the top of the file.
+
+## React & Ink Architecture
+*   **Keyboard Handling**: You MUST use `useKeyPress.ts` from Gemini CLI for keyboard handling, NOT the standard ink library. This is critical for supporting slow terminals and multiple events per frame.
+    *   Handle multiple events gracefully (often requires a reducer pattern, see `text-buffer.ts`).
+*   **State Management**:
+    *   NEVER trigger side effects from within the body of a `setState` callback. Use a reducer or `useRef` if necessary.
+    *   Initialize state explicitly (e.g., use `undefined` rather than `true` if unknown).
+*   **Performance**:
+    *   Avoid synchronous file I/O in components.
+    *   Do not introduce excessive property drilling; leverage or extend existing providers.
+
+## Configuration & Settings
+*   **Settings vs Args**: Use settings for user-configurable options; do not add new CLI arguments.
+*   **Schema**: Add new settings to `packages/cli/src/config/settingsSchema.ts`.
+*   **Documentation**:
+    *   If `showInDialog: true`, document in `docs/get-started/configuration.md`.
+    *   Ensure `requiresRestart` is correctly set.
+
+## Keyboard Shortcuts
+*   **Registration**: Define new shortcuts in `packages/cli/src/config/keyBindings.ts`.
+*   **Documentation**: Document all new shortcuts in `docs/cli/keyboard-shortcuts.md`.
+*   **Compatibility**: Avoid function keys and common VSCode shortcuts. Be cautious with `Meta` key (Mac-limited support).
+
+## General
+*   **Logging**: Use `debugLogger` for errors. NEVER leave `console.log/warn/error` in the code.
+*   **TypeScript**: Avoid the non-null assertion operator (`!`).
+
+{{args}}. 
+ """

.gemini/commands/review-frontend.toml

@@ -0,0 +1,140 @@
+description="Reviews a pull request based on issue number."
+prompt = """
+Please provide a detailed pull request review on GitHub issue: {{args}}.
+
+Follow these steps:
+
+1. Use `gh pr view {{args}}` to pull the information of the PR.
+2. Use `gh pr diff {{args}}` to view the diff of the PR.
+3. Understand the intent of the PR using the PR description.
+4. If PR description is not detailed enough to understand the intent of the PR,
+   make sure to note it in your review.
+5. Make sure the PR title follows Conventional Commits, here are the last five
+   commits to the repo as examples: !{git log --pretty=format:"%s" -n 5}
+6. Search the codebase if required.
+7. Write a concise review of the PR, keeping in mind to encourage strong code
+   quality and best practices. Pay particular attention to the Gemini MD file
+   in the repo.
+8. Consider ways the code may not be consistent with existing code in the repo.
+   In particular it is critical that the react code uses patterns consistent
+   with existing code in the repo.
+9. Evaluate all tests on the PR and make sure that they are doing the following:
+   * Using `waitFor` from @{packages/cli/src/test-utils/async.ts} rather than
+     using `vi.waitFor` for all `waitFor` calls within `packages/cli`. Even if
+     tests pass, using the wrong `waitFor` could result in flaky tests as `act`
+     warnings could show up if timing is slightly different.
+   * Using `act` to wrap all blocks in tests that change component state.
+   * Using `toMatchSnapshot` to verify that rendering works as expected rather
+     than matching against the raw content of the output.
+   * If snapshots were changed as part of the pull request, review the snapshots
+     changes to ensure they are intentional and comment if any look at all
+     suspicious. Too many snapshot changes that indicate bugs have been approved
+     in the past.
+   * Use `render` or `renderWithProviders` from
+     @{packages/cli/src/test-utils/render.tsx} rather than using `render` from
+     `ink-testing-library` directly. This is needed to ensure that we do not get
+     warnings about spurious `act` calls. If test cases specify providers
+     directly, consider whether the existing `renderWithProviders` should be
+     modified to support that use case.
+   * Ensure the test cases are using parameterized tests where that might reduce
+     the number of duplicated lines significantly.
+   * NEVER use fixed waits (e.g. 'await delay(100)'). Always use 'waitFor' with
+     a predicate to ensure tests are stable and fast.
+   * Ensure mocks are properly managed:
+     * Critical dependencies (fs, os, child_process) should only be mocked at
+       the top of the file. Ideally avoid mocking these dependencies altogether.
+     * Check to see if there are existing mocks or fakes that can be used rather
+       than creating new ones for the new tests added.
+     * Try to avoid mocking the file system whenever possible. If using the real
+       file system is difficult consider whether the test should be an
+       integration test rather than a unit test.
+     * `vi.restoreAllMocks()` should be called in `afterEach` to prevent test
+       pollution.
+     * Use `vi.useFakeTimers()` for tests involving time-based logic to avoid
+       flakiness.
+     * Avoid using `any` in tests; prefer proper types or `unknown` with
+       narrowing.
+     * When creating parameterized tests, give the parameters types to ensure
+       that the tests are type-safe.
+10. Evaluate all react logic carefully keeping in mind that the author of the PR
+    is not likely an expert on React. Key areas to audit carefully are:
+    * Whether `setState` calls trigger side effects from within the body of the
+      `setState` callback. If so, you *must* propose an alternate design using
+      reducers or other ways the code might be modified to not have to modify
+      state from within a `setState`. Make sure to comment about absolutely
+      every case like this as these cases have introduced multiple bugs in the
+      past. Typically these cases should be resolved using a reducer although
+      occassionally other techniques such as useRef are appropriate. Consider
+      suggesting that jacob314@ be tagged on the code review if the solution is
+      not 100% obvious.
+    * Whether code might introduce an infinite rendering loop in React.
+    * Whether keyboard handling is robust. Keyboard handling must go through
+      `useKeyPress.ts` from the Gemini CLI package rather than using the
+      standard ink library used by most keyboard handling. Unlike the standard
+      ink library, the keyboard handling library in Gemini CLI may report
+      multiple keyboard events one after another in the same React frame. This
+      is needed to support slow terminals but introduces complexity in all our
+      code that handles keyboard events. Handling this correctly often means
+      that reducers must be used or other mechanisms to ensure that multiple
+      state updates one after another are handled gracefully rather than
+      overriding values from the first update with the second update. Refer to
+      text-buffer.ts as a canonical example of using a reducer for this sort of
+      case.
+    * Ensure code does not use `console.log`, `console.warn`, or `console.error`
+      as these indicate debug logging that was accidentally left in the code.
+    * Avoid synchronous file I/O in React components as it will hang the UI.
+    * Ensure state initialization is explicit (e.g., use 'undefined' rather than
+      'true' as a default if the state is truly unknown initially).
+    * Carefully manage 'useEffect' dependencies. Prefer to use a reducer
+      whenever practical to resolve the issues. If that is not practical it is
+      ok to use 'useRef' to access the latest value of a prop or state inside an
+      effect without adding it to the dependency array if re-running the effect
+      is undesirable (common in event listeners).
+    * NEVER disable 'react-hooks/exhaustive-deps'. Fix the code to correctly
+      declare dependencies. Disabling this lint rule will almost always lead to
+      hard to detect bugs.
+    * Avoid making types nullable unless strictly necessary, as it hurts
+      readability.
+    * Do not introduce excessive property drilling. There are multiple providers
+      that can be leveraged to avoid property drilling. Make sure one of them
+      cannot be used. Do suggest a provider that might make sense to be extended
+      to include the new property or propose a new provider to add if the
+      property drilling is excessive. Only use providers for properties that are
+      consistent for the entire application.
+11. General Gemini CLI design principles:
+    * Make sure that settings are only used for options that a user might
+      consider changing.
+    * Do not add new command line arguments and suggest settings instead.
+    * New settings must be added to packages/cli/src/config/settingsSchema.ts.
+    * If a setting has 'showInDialog: true', it MUST be documented in
+      docs/get-started/configuration.md.
+    * Ensure 'requiresRestart' is correctly set for new settings.
+    * Use 'debugLogger' for rethrown errors to avoid duplicate logging.
+    * All new keyboard shortcuts MUST be documented in
+      docs/cli/keyboard-shortcuts.md.
+    * Ensure new keyboard shortcuts are defined in
+      packages/cli/src/config/keyBindings.ts.
+    * If new keyboard shortcuts are added, remind the user to test them in
+      VSCode, iTerm2, Ghostty, and Windows to ensure they work for all
+      users.
+    * Be careful of keybindings that require the meta key as only certain
+      meta key shortcuts are supported on Mac.
+    * Be skeptical of function keys and keyboard shortcuts that are commonly
+      bound in VSCode as they may conflict.
+12. TypeScript Best Practices:
+    * Use 'checkExhaustive' in the 'default' clause of 'switch' statements to
+      ensure all cases are handled.
+    * Avoid using the non-null assertion operator ('!') unless absolutely
+      necessary and you are confident the value is not null.
+13. If the change might at all impact the prompts sent to Gemini CLI, flagged
+    that the change could impact Gemini CLI quality and make sure anj-s has been
+    tagged on the code review.
+14. Discuss with me before making any comments on the issue. I will clarify
+    which possible issues you identified are problems, which ones you need to
+    investigate further, and which ones I do not care about.
+15. If I request you to add comments to the issue, use
+    `gh pr comment {{args}} --body {{review}}` to post the review to the PR.
+
+Remember to use the GitHub CLI (`gh`) with the Shell tool for all
+GitHub-related tasks.
+"""

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,7 +1,6 @@
 name: 'Bug Report'
 description: 'Report a bug to help us improve Gemini CLI'
 labels:
-  - 'kind/bug'
   - 'status/need-triage'
 body:
   - type: 'markdown'

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,8 +1,8 @@
 name: 'Feature Request'
 description: 'Suggest an idea for this project'
 labels:
-  - 'kind/enhancement'
   - 'status/need-triage'
+type: 'Feature'
 body:
   - type: 'markdown'
     attributes:

.github/ISSUE_TEMPLATE/website_issue.yml

@@ -1,8 +1,7 @@
 name: 'Website issue'
 description: 'Report an issue with the Gemini CLI Website and Gemini CLI Extensions Gallery'
 labels:
-  - 'area/website'
-  - 'status/need-triage'
+  - 'area/extensions'
 body:
   - type: 'markdown'
     attributes:

.github/actions/publish-release/action.yml

@@ -262,7 +262,8 @@ runs:
           --target "${{ steps.release_branch.outputs.BRANCH_NAME }}" \
           --title "Release ${{ inputs.release-tag }}" \
           --notes-start-tag "${{ inputs.previous-tag }}" \
-          --generate-notes
+          --generate-notes \
+          ${{ inputs.npm-tag != 'latest' && '--prerelease' || '' }}
 
     - name: '🧹 Clean up release branch'
       working-directory: '${{ inputs.working-directory }}'

.github/actions/push-docker/action.yml

@@ -75,4 +75,4 @@ runs:
         gh issue create \
           --title "Docker build failed" \
           --body "The docker build failed. See the full run for details: ${DETAILS_URL}" \
-          --label "kind/bug,release-failure"
+          --label "release-failure"

.github/actions/push-sandbox/action.yml

@@ -93,4 +93,4 @@ runs:
         gh issue create \
           --title "Docker build failed" \
           --body "The docker build failed. See the full run for details: ${DETAILS_URL}" \
-          --label "kind/bug,release-failure"
+          --label "release-failure"

.github/workflows/ci.yml

@@ -90,6 +90,12 @@ jobs:
       - name: 'Run Prettier'
         run: 'node scripts/lint.js --prettier'
 
+      - name: 'Build docs prerequisites'
+        run: 'npm run predocs:settings'
+
+      - name: 'Verify settings docs'
+        run: 'npm run docs:settings -- --check'
+
       - name: 'Run sensitive keyword linter'
         run: 'node scripts/lint.js --sensitive-keywords'
 
@@ -102,7 +108,7 @@ jobs:
       - name: 'Link Checker'
         uses: 'lycheeverse/lychee-action@885c65f3dc543b57c898c8099f4e08c8afd178a2' # ratchet: lycheeverse/lychee-action@v2.6.1
         with:
-          args: '--verbose ./**/*.md'
+          args: '--verbose --accept 200,503 ./**/*.md'
           fail: true
   test_linux:
     name: 'Test (Linux)'

.github/workflows/gemini-automated-issue-triage.yml

@@ -45,7 +45,9 @@ jobs:
             (github.event.comment.author_association == 'OWNER' || github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'COLLABORATOR')
           ))
         )
-      )
+      ) &&
+      !contains(github.event.issue.labels.*.name, 'area/') &&
+      !contains(github.event.issue.labels.*.name, 'priority/')
     timeout-minutes: 5
     runs-on: 'ubuntu-latest'
     steps:
@@ -67,14 +69,24 @@ jobs:
             core.setOutput('labels', issue.labels.map(label => label.name).join(','));
             return issue;
 
-      - name: 'Check for triage label on manual trigger'
+      - name: 'Manual Trigger Pre-flight Checks'
         if: |-
-          github.event_name == 'workflow_dispatch' && !contains(steps.get_issue_data.outputs.labels, 'status/need-triage')
+          github.event_name == 'workflow_dispatch'
         env:
           ISSUE_NUMBER_INPUT: '${{ github.event.inputs.issue_number }}'
+          LABELS: '${{ steps.get_issue_data.outputs.labels }}'
         run: |
-          echo "Issue #${ISSUE_NUMBER_INPUT} does not have the 'status/need-triage' label. Stopping workflow."
-          exit 1
+          if ! echo "${LABELS}" | grep -q 'status/need-triage'; then
+            echo "Issue #${ISSUE_NUMBER_INPUT} does not have the 'status/need-triage' label. Stopping workflow."
+            exit 1
+          fi
+
+          if echo "${LABELS}" | grep -q 'area/' || echo "${LABELS}" | grep -q 'priority/'; then
+            echo "Issue #${ISSUE_NUMBER_INPUT} already has 'area/' or 'priority/' labels. Stopping workflow."
+            exit 1
+          fi
+
+          echo "Manual triage checks passed."
 
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
@@ -97,7 +109,22 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
             });
-            const labelNames = labels.map(label => label.name);
+            const allowedLabels = [
+              'priority/p0',
+              'priority/p1',
+              'priority/p2',
+              'priority/p3',
+              'priority/unknown',
+              'area/agent',
+              'area/enterprise',
+              'area/non-interactive',
+              'area/core',
+              'area/security',
+              'area/platform',
+              'area/extensions',
+              'area/unknown'
+            ];
+            const labelNames = labels.map(label => label.name).filter(name => allowedLabels.includes(name));
             core.setOutput('available_labels', labelNames.join(','));
             core.info(`Found ${labelNames.length} labels: ${labelNames.join(', ')}`);
             return labelNames;
@@ -126,9 +153,6 @@ jobs:
           settings: |-
             {
               "maxSessionTurns": 25,
-              "coreTools": [
-                "run_shell_command(echo)"
-              ],
               "telemetry": {
                 "enabled": true,
                 "target": "gcp"
@@ -137,128 +161,134 @@ jobs:
           prompt: |-
             ## Role
 
-            You are an issue triage assistant. Analyze the current GitHub issue
-            and identify the most appropriate existing labels by only using the provided data. Use the available
-            tools to gather information; do not ask for information to be
-            provided. Do not remove the following labels titled maintainer,  help wanted or good first issue.
+            You are an issue triage assistant. Your role is to analyze a GitHub issue and determine the single most appropriate area/ label and the single most appropriate priority/ label based on the definitions provided.
 
             ## Steps
-
-            1. You are only able to use the echo command. Review the available labels in the environment variable: "${AVAILABLE_LABELS}".
-            2. Review the issue title and body provided in the environment variables: "${ISSUE_TITLE}" and "${ISSUE_BODY}".
-            3. Select the most relevant labels from the existing labels, focusing on kind/*, area/*, sub-area/* and priority/*. For area/* and kind/* limit yourself to only the single most applicable label in each case.
-            4. If the issue already has area/ label, dont try to change it. Similarly, if the issue already has a kind/ label don't change it. And if the issue already has a priority/ label do not change it for example:
-               If an issue has area/core and kind/bug  you will only add a priority/ label.
-               Instead if an issue has no labels, you will could add one lable of each kind.
-            5. For each issue please check if CLI version is present, this is usually in the output of the /about command and will look like 0.1.5 for anything more than 6 versions older than the most recent should add the status/need-retesting label.
-            6. If you see that the issue doesn't look like it has sufficient information recommend the status/need-information label and leave a comment politely requesting the relevant information, eg.. if repro steps are missing request for repro steps. if version information is missing request for version information into the explanation section below.
-            7. Output the appropriate labels for this issue in JSON format with explanation, for example:
-               ```
-               {"labels_to_set": ["kind/bug", "priority/p0"], "explanation": "This is a critical bug report affecting main functionality"}
-               ```
-            8. If the issue cannot be classified using the available labels, output:
-               ```
-               {"labels_to_set": [], "explanation": "Unable to classify this issue with available labels"}
-               ```
-            9. Use Area definitions mentioned below to help you narrow down issues.
-            10. If you think an issue might be a Priority/P0 do not apply the priority/p0 label. Instead apply a status/manual-triage label and include a note in your explanation.
-            11. If you are uncertain and have not been able to apply one each of kind/, area/ and priority/ , apply the status/manual-triage label.
+            1. Review the issue title and body: ${{ env.ISSUE_TITLE }} and ${{ env.ISSUE_BODY }}.
+            2. Review the available labels: ${{ env.AVAILABLE_LABELS }}.
+            3. Select exactly one area/ label that best matches the issue based on Reference 1: Area Definitions.
+            4. Select exactly one priority/ label that best matches the issue based on Reference 2: Priority Definitions.
+            5. Fallback Logic:
+                - If you cannot confidently determine the correct area/ label from the definitions, you must use area/unknown.
+                - If you cannot confidently determine the correct priority/ label from the definitions, you must use priority/unknown.
+            6. Output your two selected labels in JSON format and nothing else. Example:
+                {"labels_to_set": ["area/core", "priority/p1"]}
 
             ## Guidelines
+            - Your output must contain exactly one area/ label and exactly one priority/ label.
+            - Triage only the current issue based on its title and body.
+            - Output only valid JSON format.
+            - Do not include any explanation or additional text, just the JSON.
 
-            - Only use labels that already exist in the repository
-            - Do not add comments or modify the issue content
-            - Triage only the current issue
-            - Identify only one area/ label
-            - Identify only one kind/ label
-            - Identify all applicable sub-area/* and priority/* labels based on the issue content. It's ok to have multiple of these
-            - Once you categorize the issue if it needs information bump down the priority by 1 eg.. a p0 would become a p1 a p1 would become a p2. P2 and P3 can stay as is in this scenario
-            - Reference all shell variables as "${VAR}" (with quotes and braces)
-            - Output only valid JSON format
-            - Do not include any explanation or additional text, just the JSON
+            Reference 1: Area Definitions
+            area/agent
+            - Description: Issues related to the "brain" of the CLI. This includes the core agent logic, model quality, tool/function calling, and memory.
+            - Example Issues:
+              "I am not getting a reasonable or expected response."
+              "The model is not calling the tool I expected."
+              "The web search tool is not working as expected."
+              "Feature request for a new built-in tool (e.g., read file, write file)."
+              "The generated code is poor quality or incorrect."
+              "The model seems stuck in a loop."
+              "The response from the model is malformed (e.g., broken JSON, bad formatting)."
+              "Concerns about unnecessary token consumption."
+              "Issues with how memory or chat history is managed."
+              "Issues with sub-agents."
+              "Model is switching from one to another unexpectedly."
 
-            Categorization Guidelines:
-            P0: Critical / Blocker
-            - A P0 bug is a catastrophic failure that demands immediate attention.
-            - To be a P0 it means almost all users are running into this issue and it is blocking users from being able to use the product.
-            - You would see this in the form of many comments from different developers on the bug.
-            - It represents a complete showstopper for a significant portion of users or for the development process itself.
-            Impact:
-            - Blocks development or testing for the entire team.
-            - Major security vulnerability that could compromise user data or system integrity.
-            - Causes data loss or corruption with no workaround.
-            - Crashes the application or makes a core feature completely unusable for all or most users in a production environment. Will it cause severe quality degration? Is it preventing contributors from contributing to the repository or is it a release blocker?
-            Qualifier: Is the main function of the software broken?
-            Example: The gemini auth login command fails with an unrecoverable error, preventing any user from authenticating and using the rest of the CLI.
-            P1: High
-            - A P1 bug is a serious issue that significantly degrades the user experience or impacts a core feature.
-            - While not a complete blocker, it's a major problem that needs a fast resolution. Feature requests are almost never P1.
-            - Once again this would be affecting many users.
-            - You would see this in the form of comments from different developers on the bug.
-            Impact:
-            - A core feature is broken or behaving incorrectly for a large number of users or large number of use cases.
-            - Review the bug details and comments to try figure out if this issue affects a large set of use cases or if it's a narrow set of use cases.
-            - Severe performance degradation making the application frustratingly slow.
-            - No straightforward workaround exists, or the workaround is difficult and non-obvious.
-            Qualifier: Is a key feature unusable or giving very wrong results?
-            Example: Gemini CLI enters a loop when making read-many-files tool call. I am unable to break out of the loop and gemini doesn't follow instructions subsequently.
-            P2: Medium
-            - A P2 bug is a moderately impactful issue. It's a noticeable problem but doesn't prevent the use of the software's main functionality.
-            Impact:
-            - Affects a non-critical feature or a smaller, specific subset of users.
-            - An inconvenient but functional workaround is available and easy to execute.
-            - Noticeable UI/UX problems that don't break functionality but look unprofessional (e.g., elements are misaligned or overlapping).
-            Qualifier: Is it an annoying but non-blocking problem?
-            Example: An error message is unclear or contains a typo, causing user confusion but not halting their workflow.
-            P3: Low
-            - A P3 bug is a minor, low-impact issue that is trivial or cosmetic. It has little to no effect on the overall functionality of the application.
-            Impact:
-            - Minor cosmetic issues like color inconsistencies, typos in documentation, or slight alignment problems on a non-critical page.
-            - An edge-case bug that is very difficult to reproduce and affects a tiny fraction of users.
-            Qualifier: Is it a "nice-to-fix" issue?
-            Example: Spelling mistakes etc.
-            Things you should know:
-            - If users are talking about issues where the model gets downgraded from pro to flash then i want you to categorize that as a performance issue
-            - This product is designed to use different models eg.. using pro, downgrading to flash etc. when users report that they dont expect the model to change those would be categorized as feature requests.
-            Definition of Areas
-            area/ux:
-            - Issues concerning user-facing elements like command usability, interactive features, help docs, and perceived performance.
-            - I am seeing my screen flicker when using Gemini CLI
-            - I am seeing the output malformed
-            - Theme changes aren't taking effect
-            - My keyboard inputs arent' being recognzied
-            area/platform:
-            - Issues related to installation, packaging, OS compatibility (Windows, macOS, Linux), and the underlying CLI framework.
-            area/background: Issues related to long-running background tasks, daemons, and autonomous or proactive agent features.
-            area/models:
-            - i am not getting a response that is reasonable or expected. this can include things like
-            - I am calling a tool and the tool is not performing as expected.
-            - i am expecting a tool to be called and it is not getting called ,
-            - Including experience when using
-            - built-in tools (e.g., web search, code interpreter, read file, writefile, etc..),
-            - Function calling issues should be under this area
-            - i am getting responses from the model that are malformed.
-            - Issues concerning Gemini quality of response and inference,
-            - Issues talking about unnecessary token consumption.
-            - Issues talking about Model getting stuck in a loop be watchful as this could be the root cause for issues that otherwise seem like model performance issues.
-            - Memory compression
-            - unexpected responses,
-            - poor quality of generated code
-            area/tools:
-            - These are primarily issues related to Model Context Protocol
-            - These are issues that mention MCP support
-            - feature requests asking for support for new tools.
-            area/core: Issues with fundamental components like command parsing, configuration management, session state, and the main API client logic. Introducing multi-modality
-            area/contribution: Issues related to improving the developer contribution experience, such as CI/CD pipelines, build scripts, and test automation infrastructure.
-            area/authentication: Issues related to user identity, login flows, API key handling, credential storage, and access token management, unable to sign in selecting wrong authentication path etc..
-            area/security-privacy: Issues concerning vulnerability patching, dependency security, data sanitization, privacy controls, and preventing unauthorized data access.
-            area/extensibility: Issues related to the plugin system, extension APIs, or making the CLI's functionality available in other applications, github actions, ide support etc..
-            area/performance: Issues focused on model performance
-            - Issues with running out of capacity,
-            - 429 errors etc..
-            - could also pertain to latency,
-            - other general software performance like, memory usage, CPU consumption, and algorithmic efficiency.
-            - Switching models from one to the other unexpectedly.
+            area/enterprise
+            - Description: Issues specific to enterprise-level features, including telemetry, policy, and licenses.
+            - Example Issues:
+              "Usage data is not appearing in our telemetry dashboard."
+              "A user is able to perform an action that should be blocked by an admin policy."
+              "Questions about billing, licensing tiers, or enterprise quotas."
+
+            area/non-interactive
+            - Description: Issues related to using the CLI in automated or non-interactive environments (headless mode).
+            - Example Issues:
+              "Problems using the CLI as an SDK in another surface."
+              "The CLI is behaving differently when run from a shell script vs. an interactive terminal."
+              "GitHub action is failing."
+              "I am having trouble running the CLI in headless mode"
+
+            area/core
+            - Description: Issues with the fundamental CLI app itself. This includes the user interface (UI/UX), installation, OS compatibility, and performance.
+            - Example Issues:
+              "I am seeing my screen flicker when using the CLI."
+              "The output in my terminal is malformed or unreadable."
+              "Theme changes are not taking effect."
+              "Keyboard inputs (e.g., arrow keys, Ctrl+C) are not being recognized."
+              "The CLI failed to install or update."
+              "An issue specific to running on Windows, macOS, or Linux."
+              "Problems with command parsing, flags, or argument handling."
+              "High CPU or memory usage by the CLI process."
+              "Issues related to multi-modality (e.g., handling image inputs)."
+              "Problems with the IDE integration connection or installation"
+
+            area/security
+            - Description: Issues related to user authentication, authorization, data security, and privacy.
+            - Example Issues:
+              "I am unable to sign in."
+              "The login flow is selecting the wrong authentication path"
+              "Problems with API key handling or credential storage."
+              "A report of a security vulnerability"
+              "Concerns about data sanitization or potential data leaks."
+              "Issues or requests related to privacy controls."
+              "Preventing unauthorized data access."
+
+            area/platform
+            - Description: Issues related to CI/CD, release management, testing, eval infrastructure, capacity, quota management, and sandbox environments.
+            - Example Issues:
+              "I am getting a 429 'Resource Exhausted' or 500-level server error."
+              "General slowness or high latency from the service."
+              "The build script is broken on the main branch."
+              "Tests are failing in the CI/CD pipeline."
+              "Issues with the release management or publishing process."
+              "User is running out of capacity."
+              "Problems specific to the sandbox or staging environments."
+              "Questions about quota limits or requests for increases."
+
+            area/extensions
+            - Description: Issues related to the extension ecosystem, including the marketplace and website.
+            - Example Issues:
+              "Bugs related to the extension marketplace website."
+              "Issues with a specific extension."
+              "Feature request for the extension ecosystem."
+
+            area/unknown
+            - Description: Issues that do not clearly fit into any other defined area/ category, or where information is too limited to make a determination. Use this when no other area is appropriate.
+
+            Reference 2: Priority Definitions
+            priority/p0: Critical / Blocker
+            - Definition: A catastrophic failure that makes the CLI unusable for most users or poses a severe security risk. This includes installation failures, authentication failures, persistent crashes, or critical security vulnerabilities.
+            - Key Questions:
+              - Is the CLI failing to install or run?
+              - Does it fail to authenticate or connect to the Gemini API, making all commands useless?
+              - Is it consistently crashing on basic, common commands?
+              - Does this represent a critical security vulnerability?
+
+            priority/p1: High
+            - Definition: A severe issue where a core feature (e.g., text generation, code generation, file processing) is unusable, failing, has severe performance degradation, or providing fundamentally incorrect output formatting (e.g., truncated text, broken JSON). Affects many users, and there is no reasonable workaround.
+            - Key Questions:
+              - Is a core feature failing for a specific, large user group (e.g., all Windows users, all users of a specific shell)?
+              - Is the CLI failing to process a supported input or misinterpreting critical flags?
+              - Is the CLI's output formatting consistently broken, making the response unusable?
+              - Is a core command or feature extremely slow, making it impractical to use?
+
+            priority/p2: Medium
+            - Definition: A moderately impactful issue causing inconvenience or a non-optimal experience, but a reasonable workaround exists. This also includes failures in non-core features.
+            - Key Questions:
+              - Is a command or flag behaving incorrectly, but the user can achieve their goal via other means?
+              - Is there a significant, non-blocking UI/UX problem in the terminal (e.g., broken progress indicators, bad terminal coloring)?
+
+            priority/p3: Low
+            - Definition: A minor, low-impact issue with minimal effect on functionality. This includes most cosmetic defects, typos in documentation, or unclear help text.
+            - Key Questions:
+              - Is this a typo in the README.md, gemini --help text, or other documentation?
+              - Is this a minor cosmetic issue (e.g., text alignment in output, an extra newline) that doesn't affect usability?
+
+            priority/unknown
+            - Description: Issues that do not clearly fit into any other defined priority/ category, or where information is too limited to make a determination. Use this when no other priority is appropriate.
 
       - name: 'Apply Labels to Issue'
         if: |-
@@ -270,52 +300,61 @@ jobs:
         uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
         with:
           github-token: '${{ steps.generate_token.outputs.token }}'
-          script: |-
-            // Strip code block markers if present
-            const rawLabels = process.env.LABELS_OUTPUT;
-            core.info(`Raw labels JSON: ${rawLabels}`);
+          script: |
+            const rawOutput = process.env.LABELS_OUTPUT;
+            core.info(`Raw output from model: ${rawOutput}`);
             let parsedLabels;
             try {
-              const jsonMatch = rawLabels.match(/```json\s*([\s\S]*?)\s*```/);
-              if (!jsonMatch || !jsonMatch[1]) {
-                throw new Error("Could not find a ```json ... ``` block in the output.");
+              // First, try to parse the raw output as JSON.
+              parsedLabels = JSON.parse(rawOutput);
+            } catch (jsonError) {
+              // If that fails, check for a markdown code block.
+              core.warning(`Direct JSON parsing failed: ${jsonError.message}. Trying to extract from a markdown block.`);
+              const jsonMatch = rawOutput.match(/```json\s*([\s\S]*?)\s*```/);
+              if (jsonMatch && jsonMatch[1]) {
+                try {
+                  parsedLabels = JSON.parse(jsonMatch[1].trim());
+                } catch (markdownError) {
+                  core.setFailed(`Failed to parse JSON even after extracting from markdown block: ${markdownError.message}\nRaw output: ${rawOutput}`);
+                  return;
+                }
+              } else {
+                core.setFailed(`Output is not valid JSON and does not contain a JSON markdown block.\nRaw output: ${rawOutput}`);
+                return;
               }
-              const jsonString = jsonMatch[1].trim();
-              parsedLabels = JSON.parse(jsonString);
-              core.info(`Parsed labels JSON: ${JSON.stringify(parsedLabels)}`);
-            } catch (err) {
-              core.setFailed(`Failed to parse labels JSON from Gemini output: ${err.message}\nRaw output: ${rawLabels}`);
-              return;
             }
 
             const issueNumber = parseInt(process.env.ISSUE_NUMBER);
-            const explanation = parsedLabels.explanation || '';
-            const labelsToSet = parsedLabels.labels_to_set || [];
-            labelsToSet.push('status/bot-triaged');
+            const labelsToAdd = parsedLabels.labels_to_set || [];
 
-            // Set labels based on triage result
-            if (labelsToSet.length > 0) {
-              await github.rest.issues.setLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issueNumber,
-                labels: labelsToSet
-              });
-              const explanationInfo = explanation ? ` - ${explanation}` : '';
-              core.info(`Successfully set labels for #${issueNumber}: ${labelsToSet.join(', ')}${explanationInfo}`);
-            } else {
-              // If no labels to set, leave the issue as is
-              const explanationInfo = explanation ? ` - ${explanation}` : '';
-              core.info(`No labels to set for #${issueNumber}, leaving as is${explanationInfo}`);
+            if (labelsToAdd.length !== 2) {
+              core.setFailed(`Expected exactly 2 labels (one area/ and one priority/), but got ${labelsToAdd.length}. Labels: ${labelsToAdd.join(', ')}`);
+              return;
             }
 
-            if (explanation) {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issueNumber,
-                body: explanation,
-              });
+            // Set labels based on triage result
+            await github.rest.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: issueNumber,
+              labels: labelsToAdd
+            });
+            core.info(`Successfully added labels for #${issueNumber}: ${labelsToAdd.join(', ')}`);
+
+            // Remove the 'status/need-triage' label
+            try {
+                await github.rest.issues.removeLabel({
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    issue_number: issueNumber,
+                    name: 'status/need-triage'
+                });
+                core.info(`Successfully removed 'status/need-triage' label.`);
+            } catch (error) {
+                // If the label doesn't exist, the API call will throw a 404. We can ignore this.
+                if (error.status !== 404) {
+                    core.warning(`Failed to remove 'status/need-triage': ${error.message}`);
+                }
             }
 
       - name: 'Post Issue Analysis Failure Comment'

.github/workflows/links.yml

@@ -20,4 +20,4 @@ jobs:
         id: 'lychee'
         uses: 'lycheeverse/lychee-action@885c65f3dc543b57c898c8099f4e08c8afd178a2' # ratchet: lycheeverse/lychee-action@v2.6.1
         with:
-          args: '--verbose --no-progress ./**/*.md'
+          args: '--verbose --no-progress --accept 200,503 ./**/*.md'

.github/workflows/release-manual.yml

@@ -132,4 +132,4 @@ jobs:
           gh issue create \
             --title 'Manual Release Failed for ${RELEASE_TAG} on $(date +'%Y-%m-%d')' \
             --body 'The manual release workflow failed. See the full run for details: ${DETAILS_URL}' \
-            --label 'kind/bug,release-failure,priority/p0'
+            --label 'release-failure,priority/p0'

.github/workflows/release-nightly.yml

@@ -157,4 +157,4 @@ jobs:
           gh issue create \
             --title "Nightly Release Failed for ${RELEASE_TAG} on $(date +'%Y-%m-%d')" \
             --body "The nightly-release workflow failed. See the full run for details: ${DETAILS_URL}" \
-            --label 'kind/bug,release-failure,priority/p0'
+            --label 'release-failure,priority/p0'

.github/workflows/release-patch-1-create-pr.yml

@@ -1,5 +1,8 @@
 name: 'Release: Patch (1) Create PR'
 
+run-name: >-
+  Release Patch (1) Create PR | S:${{ inputs.channel }} | C:${{ inputs.commit }} ${{ inputs.original_pr && format('| PR:#{0}', inputs.original_pr) || '' }}
+
 on:
   workflow_dispatch:
     inputs:
@@ -96,12 +99,12 @@ jobs:
               --channel="${PATCH_CHANNEL}" \
               --pullRequestNumber="${ORIGINAL_PR}" \
               --dry-run="${DRY_RUN}"
-            echo "EXIT_CODE=$?" >> "$GITHUB_OUTPUT"
           } 2>&1 | tee >(
             echo "LOG_CONTENT<<EOF" >> "$GITHUB_ENV"
             cat >> "$GITHUB_ENV"
             echo "EOF" >> "$GITHUB_ENV"
           )
+          echo "EXIT_CODE=${PIPESTATUS[0]}" >> "$GITHUB_OUTPUT"
 
       - name: 'Comment on Original PR'
         if: 'always() && inputs.original_pr'
@@ -115,6 +118,7 @@ jobs:
           GITHUB_RUN_ID: '${{ github.run_id }}'
           LOG_CONTENT: '${{ env.LOG_CONTENT }}'
           TARGET_REF: '${{ github.event.inputs.ref }}'
+          ENVIRONMENT: '${{ github.event.inputs.environment }}'
         continue-on-error: true
         run: |
           git checkout "${TARGET_REF}"

.github/workflows/release-patch-2-trigger.yml

@@ -1,5 +1,10 @@
 name: 'Release: Patch (2) Trigger'
 
+run-name: >-
+  Release Patch (2) Trigger |
+  ${{ github.event.pull_request.number && format('PR #{0}', github.event.pull_request.number) || 'Manual' }} |
+  ${{ github.event.pull_request.head.ref || github.event.inputs.ref }}
+
 on:
   pull_request:
     types:

.github/workflows/release-patch-3-release.yml

@@ -1,5 +1,8 @@
 name: 'Release: Patch (3) Release'
 
+run-name: >-
+  Release Patch (3) Release | T:${{ inputs.type }} | R:${{ inputs.release_ref }} ${{ inputs.original_pr && format('| PR:#{0}', inputs.original_pr) || '' }}
+
 on:
   workflow_dispatch:
     inputs:
@@ -202,7 +205,7 @@ jobs:
           gh issue create \
             --title 'Patch Release Failed for ${RELEASE_TAG} on $(date +'%Y-%m-%d')' \
             --body 'The patch-release workflow failed. See the full run for details: ${DETAILS_URL}' \
-            --label 'kind/bug,release-failure,priority/p0'
+            --label 'release-failure,priority/p0'
 
       - name: 'Comment Success on Original PR'
         if: '${{ success() && github.event.inputs.original_pr }}'

.github/workflows/release-promote.yml

@@ -92,6 +92,9 @@ jobs:
           fi
           NIGHTLY_COMMAND="node scripts/get-release-version.js --type=promote-nightly"
           STABLE_JSON=$(${STABLE_COMMAND})
+          STABLE_VERSION=$(echo "${STABLE_JSON}" | jq -r .releaseVersion)
+          PREVIEW_COMMAND+=" --stable-base-version=${STABLE_VERSION}"
+          NIGHTLY_COMMAND+=" --stable-base-version=${STABLE_VERSION}"
           PREVIEW_JSON=$(${PREVIEW_COMMAND})
           NIGHTLY_JSON=$(${NIGHTLY_COMMAND})
           echo "STABLE_JSON_COMMAND=${STABLE_COMMAND}"
@@ -100,14 +103,14 @@ jobs:
           echo "STABLE_JSON: ${STABLE_JSON}"
           echo "PREVIEW_JSON: ${PREVIEW_JSON}"
           echo "NIGHTLY_JSON: ${NIGHTLY_JSON}"
-          echo "STABLE_VERSION=$(echo "${STABLE_JSON}" | jq -r .releaseVersion)" >> "${GITHUB_OUTPUT}"
+          echo "STABLE_VERSION=${STABLE_VERSION}" >> "${GITHUB_OUTPUT}"
           # shellcheck disable=SC1083
           echo "STABLE_SHA=$(git rev-parse "$(echo "${PREVIEW_JSON}" | jq -r .previousReleaseTag)"^{commit})" >> "${GITHUB_OUTPUT}"
           echo "PREVIOUS_STABLE_TAG=$(echo "${STABLE_JSON}" | jq -r .previousReleaseTag)" >> "${GITHUB_OUTPUT}"
           echo "PREVIEW_VERSION=$(echo "${PREVIEW_JSON}" | jq -r .releaseVersion)" >> "${GITHUB_OUTPUT}"
           # shellcheck disable=SC1083
           REF="${REF_INPUT}"
-          SHA=$(git ls-remote origin "$REF" | awk '{print $1}')
+          SHA=$(git ls-remote origin "$REF" | awk -v ref="$REF" '$2 == "refs/heads/"ref || $2 == "refs/tags/"ref || $2 == ref {print $1}' | head -n 1)
           if [ -z "$SHA" ]; then
             if [[ "$REF" =~ ^[0-9a-f]{7,40}$ ]]; then
               SHA="$REF"
@@ -258,7 +261,7 @@ jobs:
           gh issue create \
             --title 'Promote Release Failed for ${RELEASE_TAG} on $(date +'%Y-%m-%d')' \
             --body 'The promote-release workflow failed during preview publish. See the full run for details: ${DETAILS_URL}' \
-            --label 'kind/bug,release-failure,priority/p0'
+            --label 'release-failure,priority/p0'
 
   publish-stable:
     name: 'Publish stable'
@@ -324,7 +327,7 @@ jobs:
           gh issue create \
             --title 'Promote Release Failed for ${RELEASE_TAG} on $(date +'%Y-%m-%d')' \
             --body 'The promote-release workflow failed during stable publish. See the full run for details: ${DETAILS_URL}' \
-            --label 'kind/bug,release-failure,priority/p0'
+            --label 'release-failure,priority/p0'
 
   nightly-pr:
     name: 'Create Nightly PR'
@@ -400,4 +403,4 @@ jobs:
           gh issue create \
             --title 'Promote Release Failed for ${RELEASE_TAG} on $(date +'%Y-%m-%d')' \
             --body 'The promote-release workflow failed during nightly PR creation. See the full run for details: ${DETAILS_URL}' \
-            --label 'kind/bug,release-failure,priority/p0'
+            --label 'release-failure,priority/p0'

.github/workflows/release-sandbox.yml

@@ -46,4 +46,4 @@ jobs:
           gh issue create \
             --title 'Sandbox Release Failed on $(date +'%Y-%m-%d')' \
             --body 'The sandbox-release workflow failed. See the full run for details: ${DETAILS_URL}' \
-            --label 'kind/bug,release-failure,priority/p0'
+            --label 'release-failure,priority/p0'

.github/workflows/smoke-test.yml

@@ -47,4 +47,4 @@ jobs:
           gh issue create \
             --title 'Smoke test failed on ${REF} @ $(date +'%Y-%m-%d')' \
             --body 'Smoke test build failed. See the full run for details: ${DETAILS_URL}' \
-            --label 'kind/bug,priority/p0'
+            --label 'priority/p0'

.gitignore

@@ -17,7 +17,6 @@
 # Dependency directory
 node_modules
 bower_components
-package-lock.json
 
 # Editors
 .idea

.prettierignore

@@ -18,3 +18,4 @@ eslint.config.js
 gha-creds-*.json
 junit.xml
 Thumbs.db
+.pytest_cache

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# How to Contribute
+# How to contribute
 
 We would love to accept your patches and contributions to this project. This
 document includes:
@@ -53,11 +53,22 @@ All submissions, including submissions by project members, require review. We
 use [GitHub pull requests](https://docs.github.com/articles/about-pull-requests)
 for this purpose.
 
-### Self assigning issues
+If your pull request involves changes to `packages/cli` (the frontend), we
+recommend running our automated frontend review tool. **Note: This tool is
+currently experimental.** It helps detect common React anti-patterns, testing
+issues, and other frontend-specific best practices that are easy to miss.
 
-If you're looking for an issue to work on, check out our list of issues that are
-labeled
-["help wanted"](https://github.com/google-gemini/gemini-cli/issues?q=is%3Aissue+state%3Aopen+label%3A%22help+wanted%22).
+To run the review tool, enter the following command from within Gemini CLI:
+
+```text
+/review-frontend <PR_NUMBER>
+```
+
+Replace `<PR_NUMBER>` with your pull request number. Authors are encouraged to
+run this on their own PRs for self-review, and reviewers should use it to
+augment their manual review process.
+
+### Self assigning issues
 
 To assign an issue to yourself, simply add a comment with the text `/assign`.
 The comment must contain only that text and nothing else. This command will

GEMINI.md

@@ -363,12 +363,38 @@ performance.
 - State updates should be structured to enable granular updates
 - Side effects should be isolated and dependencies clearly defined
 
+## Documentation guidelines
+
+When working in the `/docs` directory, follow the guidelines in this section:
+
+- **Role:** You are an expert technical writer and AI assistant for contributors
+  to Gemini CLI. Produce professional, accurate, and consistent documentation to
+  guide users of Gemini CLI.
+- **Technical Accuracy:** Do not invent facts, commands, code, API names, or
+  output. All technical information specific to Gemini CLI must be based on code
+  found within this directory and its subdirectories.
+- **Style Authority:** Your source for writing guidance and style is the
+  "Documentation contribution process" section in the root directory's
+  `CONTRIBUTING.md` file, as well as any guidelines provided this section.
+- **Information Architecture Consideration:** Before proposing documentation
+  changes, consider the information architecture. If a change adds significant
+  new content to existing documents, evaluate if creating a new, more focused
+  page or changes to `sidebar.json` would provide a better user experience.
+- **Proactive User Consideration:** The user experience should be a primary
+  concern when making changes to documentation. Aim to fill gaps in existing
+  knowledge whenever possible while keeping documentation concise and easy for
+  users to understand. If changes might hinder user understanding or
+  accessibility, proactively raise these concerns and propose alternatives.
+
 ## Comments policy
 
 Only write high-value comments if at all. Avoid talking to the user through
 comments.
 
-## General style requirements
+## General requirements
 
-Use hyphens instead of underscores in flag names (e.g. `my-flag` instead of
-`my_flag`).
+- If there is something you do not understand or is ambiguous, seek confirmation
+  or clarification from the user before making changes based on assumptions.
+- Use hyphens instead of underscores in flag names (e.g. `my-flag` instead of
+  `my_flag`).
+- Always refer to Gemini CLI as `Gemini CLI`, never `the Gemini CLI`.

README.md

@@ -4,6 +4,7 @@
 [![Gemini CLI E2E](https://github.com/google-gemini/gemini-cli/actions/workflows/e2e.yml/badge.svg)](https://github.com/google-gemini/gemini-cli/actions/workflows/e2e.yml)
 [![Version](https://img.shields.io/npm/v/@google/gemini-cli)](https://www.npmjs.com/package/@google/gemini-cli)
 [![License](https://img.shields.io/github/license/google-gemini/gemini-cli)](https://github.com/google-gemini/gemini-cli/blob/main/LICENSE)
+[![View Code Wiki](https://www.gstatic.com/_/boq-sdlc-agents-ui/_/r/YUi5dj2UWvE.svg)](https://codewiki.google/github.com/google-gemini/gemini-cli)
 
 ![Gemini CLI Screenshot](./docs/assets/gemini-screenshot.png)
 
@@ -79,9 +80,9 @@ npm install -g @google/gemini-cli@latest
 
 ### Nightly
 
-- New releases will be published each week at UTC 0000 each day, This will be
-  all changes from the main branch as represented at time of release. It should
-  be assumed there are pending validations and issues. Use `nightly` tag.
+- New releases will be published each day at UTC 0000. This will be all changes
+  from the main branch as represented at time of release. It should be assumed
+  there are pending validations and issues. Use `nightly` tag.
 
 ```bash
 npm install -g @google/gemini-cli@nightly

docs/architecture.md

@@ -37,7 +37,7 @@ input:
     - **Interaction:** `packages/core` invokes these tools based on requests
       from the Gemini model.
 
-## Interaction Flow
+## Interaction flow
 
 A typical interaction with the Gemini CLI follows this flow:
 
@@ -69,7 +69,7 @@ A typical interaction with the Gemini CLI follows this flow:
 7.  **Display to user:** The CLI package formats and displays the response to
     the user in the terminal.
 
-## Key Design Principles
+## Key design principles
 
 - **Modularity:** Separating the CLI (frontend) from the Core (backend) allows
   for independent development and potential future extensions (e.g., different

docs/changelogs/index.md

@@ -3,6 +3,158 @@
 Wondering what's new in Gemini CLI? This document provides key highlights and
 notable changes to Gemini CLI.
 
+## v0.15.0 - Gemini CLI weekly update - 2025-11-03
+
+- **🎉 Seamless scrollable UI & mouse support:** We’ve given Gemini CLI a major
+  facelift to make your terminal experience smoother and much more polished. You
+  now get a flicker-free display with sticky headers that keep important context
+  visible and a stable input prompt that doesn't jump around. We even added
+  mouse support so you can click right where you need to type!
+  ([gif](https://imgur.com/a/O6qc7bx),
+  [@jacob314](https://github.com/jacob314)).
+  - **Announcement:**
+    [https://developers.googleblog.com/en/making-the-terminal-beautiful-one-pixel-at-a-time/](https://developers.googleblog.com/en/making-the-terminal-beautiful-one-pixel-at-a-time/)
+- **🎉 New partner extensions:**
+  - **Arize:** Seamlessly instrument AI applications with Arize AX and grant
+    direct access to Arize support:
+
+    `gemini extensions install https://github.com/Arize-ai/arize-tracing-assistant`
+
+  - **Chronosphere:** Retrieve logs, metrics, traces, events, and specific
+    entities:
+
+    `gemini extensions install https://github.com/chronosphereio/chronosphere-mcp`
+
+  - **Transmit:** Comprehensive context, validation, and automated fixes for
+    creating production-ready authentication and identity workflows:
+
+    `gemini extensions install https://github.com/TransmitSecurity/transmit-security-journey-builder`
+
+- **Todo planning:** Complex questions now get broken down into todo lists that
+  the model can manage and check off. ([gif](https://imgur.com/a/EGDfNlZ),
+  [pr](https://github.com/google-gemini/gemini-cli/pull/12905) by
+  [@anj-s](https://github.com/anj-s))
+- **Disable GitHub extensions:** Users can now prevent the installation and
+  loading of extensions from GitHub.
+  ([pr](https://github.com/google-gemini/gemini-cli/pull/12838) by
+  [@kevinjwang1](https://github.com/kevinjwang1)).
+- **Extensions restart:** Users can now explicitly restart extensions using the
+  `/extensions restart` command.
+  ([pr](https://github.com/google-gemini/gemini-cli/pull/12739) by
+  [@jakemac53](https://github.com/jakemac53)).
+- **Better Angular support:** Angular workflows should now be more seamless
+  ([pr](https://github.com/google-gemini/gemini-cli/pull/10252) by
+  [@MarkTechson](https://github.com/MarkTechson)).
+- **Validate command:** Users can now check that local extensions are formatted
+  correctly. ([pr](https://github.com/google-gemini/gemini-cli/pull/12186) by
+  [@kevinjwang1](https://github.com/kevinjwang1)).
+
+## v0.12.0 - Gemini CLI weekly update - 2025-10-27
+
+![Codebase investigator subagent in Gemini CLI.](https://i.imgur.com/4J1njsx.png)
+
+- **🎉 New partner extensions:**
+  - **🤗 Hugging Face extension:** Access the Hugging Face hub.
+    ([gif](https://drive.google.com/file/d/1LEzIuSH6_igFXq96_tWev11svBNyPJEB/view?usp=sharing&resourcekey=0-LtPTzR1woh-rxGtfPzjjfg))
+
+    `gemini extensions install https://github.com/huggingface/hf-mcp-server`
+
+  - **Monday.com extension**: Analyze your sprints, update your task boards,
+    etc.
+    ([gif](https://drive.google.com/file/d/1cO0g6kY1odiBIrZTaqu5ZakaGZaZgpQv/view?usp=sharing&resourcekey=0-xEr67SIjXmAXRe1PKy7Jlw))
+
+    `gemini extensions install https://github.com/mondaycom/mcp`
+
+  - **Data Commons extension:** Query public datasets or ground responses on
+    data from Data Commons
+    ([gif](https://drive.google.com/file/d/1cuj-B-vmUkeJnoBXrO_Y1CuqphYc6p-O/view?usp=sharing&resourcekey=0-0adXCXDQEd91ZZW63HbW-Q)).
+
+    `gemini extensions install https://github.com/gemini-cli-extensions/datacommons`
+
+- **Model selection:** Choose the Gemini model for your session with `/model`.
+  ([pic](https://imgur.com/a/ABFcWWw),
+  [pr](https://github.com/google-gemini/gemini-cli/pull/8940) by
+  [@abhipatel12](https://github.com/abhipatel12)).
+- **Model routing:** Gemini CLI will now intelligently pick the best model for
+  the task. Simple queries will be sent to Flash while complex analytical or
+  creative tasks will still use the power of Pro. This ensures your quota will
+  last for a longer period of time. You can always opt-out of this via `/model`.
+  ([pr](https://github.com/google-gemini/gemini-cli/pull/9262) by
+  [@abhipatel12](https://github.com/abhipatel12)).
+  - Discussion:
+    [https://github.com/google-gemini/gemini-cli/discussions/12375](https://github.com/google-gemini/gemini-cli/discussions/12375)
+- **Codebase investigator subagent:** We now have a new built-in subagent that
+  will explore your workspace and resolve relevant information to improve
+  overall performance.
+  ([pr](https://github.com/google-gemini/gemini-cli/pull/9988) by
+  [@abhipatel12](https://github.com/abhipatel12),
+  [pr](https://github.com/google-gemini/gemini-cli/pull/10282) by
+  [@silviojr](https://github.com/silviojr)).
+  - Enable, disable, or limit turns in `/settings`, plus advanced configs in
+    `settings.json` ([pic](https://imgur.com/a/yJiggNO),
+    [pr](https://github.com/google-gemini/gemini-cli/pull/10844) by
+    [@silviojr](https://github.com/silviojr)).
+- **Explore extensions with `/extension`:** Users can now open the extensions
+  page in their default browser directly from the CLI using the `/extension`
+  explore command. ([pr](https://github.com/google-gemini/gemini-cli/pull/11846)
+  by [@JayadityaGit](https://github.com/JayadityaGit)).
+- **Configurable compression:** Users can modify the compression threshold in
+  `/settings`. The default has been made more proactive
+  ([pr](https://github.com/google-gemini/gemini-cli/pull/12317) by
+  [@scidomino](https://github.com/scidomino)).
+- **API key authentication:** Users can now securely enter and store their
+  Gemini API key via a new dialog, eliminating the need for environment
+  variables and repeated entry.
+  ([pr](https://github.com/google-gemini/gemini-cli/pull/11760) by
+  [@galz10](https://github.com/galz10)).
+- **Sequential approval:** Users can now approve multiple tool calls
+  sequentially during execution.
+  ([pr](https://github.com/google-gemini/gemini-cli/pull/11593) by
+  [@joshualitt](https://github.com/joshualitt)).
+
+## v0.11.0 - Gemini CLI weekly update - 2025-10-20
+
+![Gemini CLI and Jules](https://storage.googleapis.com/gweb-developer-goog-blog-assets/images/Jules_Extension_-_Blog_Header_O346JNt.original.png)
+
+- 🎉 **Gemini CLI Jules Extension:** Use Gemini CLI to orchestrate Jules. Spawn
+  remote workers, delegate tedious tasks, or check in on running jobs!
+  - Install:
+    `gemini extensions install https://github.com/gemini-cli-extensions/jules`
+  - Announcement:
+    [https://developers.googleblog.com/en/introducing-the-jules-extension-for-gemini-cli/](https://developers.googleblog.com/en/introducing-the-jules-extension-for-gemini-cli/)
+- **Stream JSON output:** Stream real-time JSONL events with
+  `--output-format stream-json` to monitor AI agent progress when run
+  headlessly. ([gif](https://imgur.com/a/0UCE81X),
+  [pr](https://github.com/google-gemini/gemini-cli/pull/10883) by
+  [@anj-s](https://github.com/anj-s))
+- **Markdown toggle:** Users can now switch between rendered and raw markdown
+  display using `alt+m `or` ctrl+m`. ([gif](https://imgur.com/a/lDNdLqr),
+  [pr](https://github.com/google-gemini/gemini-cli/pull/10383) by
+  [@srivatsj](https://github.com/srivatsj))
+- **Queued message editing:** Users can now quickly edit queued messages by
+  pressing the up arrow key when the input is empty.
+  ([gif](https://imgur.com/a/ioRslLd),
+  [pr](https://github.com/google-gemini/gemini-cli/pull/10392) by
+  [@akhil29](https://github.com/akhil29))
+- **JSON web fetch**: Non-HTML content like JSON APIs or raw source code are now
+  properly shown to the model (previously only supported HTML)
+  ([gif](https://imgur.com/a/Q58U4qJ),
+  [pr](https://github.com/google-gemini/gemini-cli/pull/11284) by
+  [@abhipatel12](https://github.com/abhipatel12))
+- **Non-interactive MCP commands:** Users can now run MCP slash commands in
+  non-interactive mode `gemini "/some-mcp-prompt"`.
+  ([pr](https://github.com/google-gemini/gemini-cli/pull/10194) by
+  [@capachino](https://github.com/capachino))
+- **Removal of deprecated flags:** We’ve finally removed a number of deprecated
+  flags to cleanup Gemini CLI’s invocation profile:
+  - `--all-files` / `-a` in favor of `@` from within Gemini CLI.
+    ([pr](https://github.com/google-gemini/gemini-cli/pull/11228) by
+    [@allenhutchison](https://github.com/allenhutchison))
+  - `--telemetry-*` flags in favor of
+    [environment variables](https://github.com/google-gemini/gemini-cli/pull/11318)
+    ([pr](https://github.com/google-gemini/gemini-cli/pull/11318) by
+    [@allenhutchison](https://github.com/allenhutchison))
+
 ## v0.10.0 - Gemini CLI weekly update - 2025-10-13
 
 - **Polish:** The team has been heads down bug fixing and investing heavily into

docs/cli/authentication.md

@@ -1,3 +1,3 @@
-# Authentication Setup
+# Authentication setup
 
 See: [Getting Started - Authentication Setup](../get-started/authentication.md).

docs/cli/checkpointing.md

@@ -6,19 +6,19 @@ AI-powered tools. This allows you to safely experiment with and apply code
 changes, knowing you can instantly revert back to the state before the tool was
 run.
 
-## How It Works
+## How it works
 
 When you approve a tool that modifies the file system (like `write_file` or
 `replace`), the CLI automatically creates a "checkpoint." This checkpoint
 includes:
 
-1.  **A Git Snapshot:** A commit is made in a special, shadow Git repository
+1.  **A Git snapshot:** A commit is made in a special, shadow Git repository
     located in your home directory (`~/.gemini/history/<project_hash>`). This
     snapshot captures the complete state of your project files at that moment.
     It does **not** interfere with your own project's Git repository.
-2.  **Conversation History:** The entire conversation you've had with the agent
+2.  **Conversation history:** The entire conversation you've had with the agent
     up to that point is saved.
-3.  **The Tool Call:** The specific tool call that was about to be executed is
+3.  **The tool call:** The specific tool call that was about to be executed is
     also stored.
 
 If you want to undo the change or simply go back, you can use the `/restore`
@@ -35,24 +35,14 @@ repository while the conversation history and tool calls are saved in a JSON
 file in your project's temporary directory, typically located at
 `~/.gemini/tmp/<project_hash>/checkpoints`.
 
-## Enabling the Feature
+## Enabling the feature
 
-The Checkpointing feature is disabled by default. To enable it, you can either
-use a command-line flag or edit your `settings.json` file.
+The Checkpointing feature is disabled by default. To enable it, you need to edit
+your `settings.json` file.
 
-### Using the Command-Line Flag
-
-You can enable checkpointing for the current session by using the
-`--checkpointing` flag when starting the Gemini CLI:
-
-```bash
-gemini --checkpointing
-```
-
-### Using the `settings.json` File
-
-To enable checkpointing by default for all sessions, you need to edit your
-`settings.json` file.
+> **Note:** The `--checkpointing` command-line flag was removed in version
+> 0.11.0. Checkpointing can now only be enabled through the `settings.json`
+> configuration file.
 
 Add the following key to your `settings.json`:
 
@@ -66,12 +56,12 @@ Add the following key to your `settings.json`:
 }
 ```
 
-## Using the `/restore` Command
+## Using the `/restore` command
 
 Once enabled, checkpoints are created automatically. To manage them, you use the
 `/restore` command.
 
-### List Available Checkpoints
+### List available checkpoints
 
 To see a list of all saved checkpoints for the current project, simply run:
 
@@ -84,7 +74,7 @@ typically composed of a timestamp, the name of the file being modified, and the
 name of the tool that was about to be run (e.g.,
 `2025-06-22T10-00-00_000Z-my-file.txt-write_file`).
 
-### Restore a Specific Checkpoint
+### Restore a specific checkpoint
 
 To restore your project to a specific checkpoint, use the checkpoint file from
 the list:

docs/cli/commands.md

@@ -1,4 +1,4 @@
-# CLI Commands
+# CLI commands
 
 Gemini CLI supports several built-in commands to help you manage your session,
 customize the interface, and control its behavior. These commands are prefixed
@@ -26,12 +26,13 @@ Slash commands provide meta-level control over the CLI itself.
       - **Description:** Saves the current conversation history. You must add a
         `<tag>` for identifying the conversation state.
       - **Usage:** `/chat save <tag>`
-      - **Details on Checkpoint Location:** The default locations for saved chat
+      - **Details on checkpoint location:** The default locations for saved chat
         checkpoints are:
         - Linux/macOS: `~/.gemini/tmp/<project_hash>/`
         - Windows: `C:\Users\<YourUsername>\.gemini\tmp\<project_hash>\`
-        - When you run `/chat list`, the CLI only scans these specific
-          directories to find available checkpoints.
+        - **Behavior:** Chats are saved into a project-specific directory,
+          determined by where you run the CLI. Consequently, saved chats are
+          only accessible when working within that same project.
         - **Note:** These checkpoints are for manually saving and resuming
           conversation states. For automatic checkpoints created before file
           modifications, see the
@@ -39,8 +40,14 @@ Slash commands provide meta-level control over the CLI itself.
     - **`resume`**
       - **Description:** Resumes a conversation from a previous save.
       - **Usage:** `/chat resume <tag>`
+      - **Note:** You can only resume chats that were saved within the current
+        project. To resume a chat from a different project, you must run the
+        Gemini CLI from that project's directory.
     - **`list`**
       - **Description:** Lists available tags for chat state resumption.
+      - **Note:** This command only lists chats saved within the current
+        project. Because chat history is project-scoped, chats saved in other
+        project directories will not be displayed.
     - **`delete`**
       - **Description:** Deletes a saved conversation checkpoint.
       - **Usage:** `/chat delete <tag>`
@@ -121,6 +128,9 @@ Slash commands provide meta-level control over the CLI itself.
       - **Description:** Restarts all MCP servers and re-discovers their
         available tools.
 
+- [**`/model`**](./model.md)
+  - **Description:** Opens a dialog to choose your Gemini model.
+
 - **`/memory`**
   - **Description:** Manage the AI's instructional context (hierarchical memory
     loaded from `GEMINI.md` files).
@@ -151,17 +161,34 @@ Slash commands provide meta-level control over the CLI itself.
     edits made by a tool. If run without a tool call ID, it will list available
     checkpoints to restore from.
   - **Usage:** `/restore [tool_call_id]`
-  - **Note:** Only available if the CLI is invoked with the `--checkpointing`
-    option or configured via [settings](../get-started/configuration.md). See
+  - **Note:** Only available if checkpointing is configured via
+    [settings](../get-started/configuration.md). See
     [Checkpointing documentation](../cli/checkpointing.md) for more details.
+- **`/resume`**
+  - **Description:** Browse and resume previous conversation sessions. Opens an
+    interactive session browser where you can search, filter, and select from
+    automatically saved conversations.
+  - **Features:**
+    - **Session Browser:** Interactive interface showing all saved sessions with
+      timestamps, message counts, and first user message for context
+    - **Search:** Use `/` to search through conversation content across all
+      sessions
+    - **Sorting:** Sort sessions by date or message count
+    - **Management:** Delete unwanted sessions directly from the browser
+    - **Resume:** Select any session to resume and continue the conversation
+  - **Note:** All conversations are automatically saved as you chat - no manual
+    saving required. See [Session Management](../cli/session-management.md) for
+    complete details.
 
-- **`/settings`**
+- [**`/settings`**](./settings.md)
   - **Description:** Open the settings editor to view and modify Gemini CLI
     settings.
   - **Details:** This command provides a user-friendly interface for changing
     settings that control the behavior and appearance of Gemini CLI. It is
     equivalent to manually editing the `.gemini/settings.json` file, but with
-    validation and guidance to prevent errors.
+    validation and guidance to prevent errors. See the
+    [settings documentation](./settings.md) for a full list of available
+    settings.
   - **Usage:** Simply run `/settings` and the editor will open. You can then
     browse or search for specific settings, view their current values, and
     modify them as desired. Changes to some settings are applied immediately,
@@ -229,13 +256,13 @@ Slash commands provide meta-level control over the CLI itself.
     file, making it simpler for them to provide project-specific instructions to
     the Gemini agent.
 
-### Custom Commands
+### Custom commands
 
 Custom commands allow you to create personalized shortcuts for your most-used
 prompts. For detailed instructions on how to create, manage, and use them,
 please see the dedicated [Custom Commands documentation](./custom-commands.md).
 
-## Input Prompt Shortcuts
+## Input prompt shortcuts
 
 These shortcuts apply directly to the input prompt for text manipulation.
 
@@ -293,7 +320,7 @@ your prompt to Gemini. These commands include git-aware filtering.
 - If the `read_many_files` tool encounters an error (e.g., permission issues),
   this will also be reported.
 
-## Shell mode & passthrough commands (`!`)
+## Shell mode and passthrough commands (`!`)
 
 The `!` prefix lets you interact with your system's shell directly from within
 Gemini CLI.
@@ -321,7 +348,7 @@ Gemini CLI.
 - **Caution for all `!` usage:** Commands you execute in shell mode have the
   same permissions and impact as if you ran them directly in your terminal.
 
-- **Environment Variable:** When a command is executed via `!` or in shell mode,
+- **Environment variable:** When a command is executed via `!` or in shell mode,
   the `GEMINI_CLI=1` environment variable is set in the subprocess's
   environment. This allows scripts or tools to detect if they are being run from
   within the Gemini CLI.

docs/cli/configuration.md

@@ -1,4 +1,4 @@
-# Gemini CLI Configuration
+# Gemini CLI configuration
 
 Gemini CLI offers several ways to configure its behavior, including environment
 variables, command-line arguments, and settings files. This document outlines
@@ -144,7 +144,7 @@ contain other project-specific files related to Gemini CLI's operation, such as:
     be ignored if `--allowed-mcp-server-names` is set.
   - **Default**: No MCP servers excluded.
   - **Example:** `"excludeMCPServers": ["myNodeServer"]`.
-  - **Security Note:** This uses simple string matching on MCP server names,
+  - **Security note:** This uses simple string matching on MCP server names,
     which can be modified. If you're a system administrator looking to prevent
     users from bypassing this, consider configuring the `mcpServers` at the
     system settings level such that the user will not be able to configure any
@@ -423,7 +423,7 @@ contain other project-specific files related to Gemini CLI's operation, such as:
 }
 ```
 
-## Shell History
+## Shell history
 
 The CLI keeps a history of shell commands you run. To avoid conflicts between
 different projects, this history is stored in a project-specific directory
@@ -434,7 +434,7 @@ within your user's home folder.
     path.
   - The history is stored in a file named `shell_history`.
 
-## Environment Variables & `.env` Files
+## Environment variables and `.env` files
 
 Environment variables are a common way to configure applications, especially for
 sensitive information like API keys or for settings that might change between
@@ -449,7 +449,7 @@ loading order is:
     the home directory.
 3.  If still not found, it looks for `~/.env` (in the user's home directory).
 
-**Environment Variable Exclusion:** Some environment variables (like `DEBUG` and
+**Environment variable exclusion:** Some environment variables (like `DEBUG` and
 `DEBUG_MODE`) are automatically excluded from being loaded from project `.env`
 files to prevent interference with gemini-cli behavior. Variables from
 `.gemini/.env` files are never excluded. You can customize this behavior using
@@ -464,6 +464,18 @@ the `excludedProjectEnvVars` setting in your `settings.json` file.
   - Specifies the default Gemini model to use.
   - Overrides the hardcoded default
   - Example: `export GEMINI_MODEL="gemini-2.5-flash"`
+- **`GEMINI_CLI_CUSTOM_HEADERS`**:
+  - Adds extra HTTP headers to Gemini API and Code Assist requests.
+  - Accepts a comma-separated list of `Name: value` pairs.
+  - Example:
+    `export GEMINI_CLI_CUSTOM_HEADERS="X-My-Header: foo, X-Trace-ID: abc123"`.
+- **`GEMINI_API_KEY_AUTH_MECHANISM`**:
+  - Specifies how the API key should be sent for authentication when using
+    `AuthType.USE_GEMINI` or `AuthType.USE_VERTEX_AI`.
+  - Valid values are `x-goog-api-key` (default) or `bearer`.
+  - If set to `bearer`, the API key will be sent in the
+    `Authorization: Bearer <key>` header.
+  - Example: `export GEMINI_API_KEY_AUTH_MECHANISM="bearer"`
 - **`GOOGLE_API_KEY`**:
   - Your Google Cloud API key.
   - Required for using Vertex AI in express mode.
@@ -474,7 +486,7 @@ the `excludedProjectEnvVars` setting in your `settings.json` file.
   - Required for using Code Assist or Vertex AI.
   - If using Vertex AI, ensure you have the necessary permissions in this
     project.
-  - **Cloud Shell Note:** When running in a Cloud Shell environment, this
+  - **Cloud shell note:** When running in a Cloud Shell environment, this
     variable defaults to a special project allocated for Cloud Shell users. If
     you have `GOOGLE_CLOUD_PROJECT` set in your global environment in Cloud
     Shell, it will be overridden by this default. To use a different project in
@@ -494,6 +506,9 @@ the `excludedProjectEnvVars` setting in your `settings.json` file.
 - **`GEMINI_SANDBOX`**:
   - Alternative to the `sandbox` setting in `settings.json`.
   - Accepts `true`, `false`, `docker`, `podman`, or a custom command string.
+- **`HTTP_PROXY` / `HTTPS_PROXY`**:
+  - Specifies the proxy server to use for outgoing HTTP/HTTPS requests.
+  - Example: `export HTTPS_PROXY="http://proxy.example.com:8080"`
 - **`SEATBELT_PROFILE`** (macOS specific):
   - Switches the Seatbelt (`sandbox-exec`) profile on macOS.
   - `permissive-open`: (Default) Restricts writes to the project folder (and a
@@ -532,7 +547,7 @@ the `excludedProjectEnvVars` setting in your `settings.json` file.
     relative. `~` is supported for the home directory. **Note: This will
     overwrite the file if it already exists.**
 
-## Command-Line Arguments
+## Command-line arguments
 
 Arguments passed directly when running the CLI can override other configurations
 for that specific session.
@@ -574,8 +589,6 @@ for that specific session.
 - **`--telemetry-log-prompts`**:
   - Enables logging of prompts for telemetry. See [telemetry](./telemetry.md)
     for more information.
-- **`--checkpointing`**:
-  - Enables [checkpointing](./checkpointing.md).
 - **`--extensions <extension_name ...>`** (**`-e <extension_name ...>`**):
   - Specifies a list of extensions to use for the session. If not provided, all
     available extensions are used.
@@ -583,9 +596,6 @@ for that specific session.
   - Example: `gemini -e my-extension -e my-other-extension`
 - **`--list-extensions`** (**`-l`**):
   - Lists all available extensions and exits.
-- **`--proxy`**:
-  - Sets the proxy for the CLI.
-  - Example: `--proxy http://localhost:7890`.
 - **`--include-directories <dir1,dir2,...>`**:
   - Includes additional directories in the workspace for multi-directory
     support.
@@ -596,7 +606,7 @@ for that specific session.
 - **`--version`**:
   - Displays the version of the CLI.
 
-## Context Files (Hierarchical Instructional Context)
+## Context files (hierarchical instructional context)
 
 While not strictly configuration for the CLI's _behavior_, context files
 (defaulting to `GEMINI.md` but configurable via the `contextFileName` setting)
@@ -612,7 +622,7 @@ context.
   that you want the Gemini model to be aware of during your interactions. The
   system is designed to manage this instructional context hierarchically.
 
-### Example Context File Content (e.g., `GEMINI.md`)
+### Example context file content (e.g., `GEMINI.md`)
 
 Here's a conceptual example of what a context file at the root of a TypeScript
 project might contain:
@@ -653,23 +663,23 @@ more relevant and precise your context files are, the better the AI can assist
 you. Project-specific context files are highly encouraged to establish
 conventions and context.
 
-- **Hierarchical Loading and Precedence:** The CLI implements a sophisticated
+- **Hierarchical loading and precedence:** The CLI implements a sophisticated
   hierarchical memory system by loading context files (e.g., `GEMINI.md`) from
   several locations. Content from files lower in this list (more specific)
   typically overrides or supplements content from files higher up (more
   general). The exact concatenation order and final context can be inspected
   using the `/memory show` command. The typical loading order is:
-  1.  **Global Context File:**
+  1.  **Global context file:**
       - Location: `~/.gemini/<contextFileName>` (e.g., `~/.gemini/GEMINI.md` in
         your user home directory).
       - Scope: Provides default instructions for all your projects.
-  2.  **Project Root & Ancestors Context Files:**
+  2.  **Project root and ancestors context files:**
       - Location: The CLI searches for the configured context file in the
         current working directory and then in each parent directory up to either
         the project root (identified by a `.git` folder) or your home directory.
       - Scope: Provides context relevant to the entire project or a significant
         portion of it.
-  3.  **Sub-directory Context Files (Contextual/Local):**
+  3.  **Sub-directory context files (contextual/local):**
       - Location: The CLI also scans for the configured context file in
         subdirectories _below_ the current working directory (respecting common
         ignore patterns like `node_modules`, `.git`, etc.). The breadth of this
@@ -677,15 +687,15 @@ conventions and context.
         with a `memoryDiscoveryMaxDirs` field in your `settings.json` file.
       - Scope: Allows for highly specific instructions relevant to a particular
         component, module, or subsection of your project.
-- **Concatenation & UI Indication:** The contents of all found context files are
-  concatenated (with separators indicating their origin and path) and provided
-  as part of the system prompt to the Gemini model. The CLI footer displays the
-  count of loaded context files, giving you a quick visual cue about the active
-  instructional context.
-- **Importing Content:** You can modularize your context files by importing
+- **Concatenation and UI indication:** The contents of all found context files
+  are concatenated (with separators indicating their origin and path) and
+  provided as part of the system prompt to the Gemini model. The CLI footer
+  displays the count of loaded context files, giving you a quick visual cue
+  about the active instructional context.
+- **Importing content:** You can modularize your context files by importing
   other Markdown files using the `@path/to/file.md` syntax. For more details,
   see the [Memory Import Processor documentation](../core/memport.md).
-- **Commands for Memory Management:**
+- **Commands for memory management:**
   - Use `/memory refresh` to force a re-scan and reload of all context files
     from all configured locations. This updates the AI's instructional context.
   - Use `/memory show` to display the combined instructional context currently
@@ -732,7 +742,7 @@ sandbox image:
 BUILD_SANDBOX=1 gemini -s
 ```
 
-## Usage Statistics
+## Usage statistics
 
 To help us improve the Gemini CLI, we collect anonymized usage statistics. This
 data helps us understand how the CLI is used, identify common issues, and
@@ -740,22 +750,22 @@ prioritize new features.
 
 **What we collect:**
 
-- **Tool Calls:** We log the names of the tools that are called, whether they
+- **Tool calls:** We log the names of the tools that are called, whether they
   succeed or fail, and how long they take to execute. We do not collect the
   arguments passed to the tools or any data returned by them.
-- **API Requests:** We log the Gemini model used for each request, the duration
+- **API requests:** We log the Gemini model used for each request, the duration
   of the request, and whether it was successful. We do not collect the content
   of the prompts or responses.
-- **Session Information:** We collect information about the configuration of the
+- **Session information:** We collect information about the configuration of the
   CLI, such as the enabled tools and the approval mode.
 
 **What we DON'T collect:**
 
-- **Personally Identifiable Information (PII):** We do not collect any personal
+- **Personally identifiable information (PII):** We do not collect any personal
   information, such as your name, email address, or API keys.
-- **Prompt and Response Content:** We do not log the content of your prompts or
+- **Prompt and response content:** We do not log the content of your prompts or
   the responses from the Gemini model.
-- **File Content:** We do not log the content of any files that are read or
+- **File content:** We do not log the content of any files that are read or
   written by the CLI.
 
 **How to opt out:**

docs/cli/custom-commands.md

@@ -1,4 +1,4 @@
-# Custom Commands
+# Custom commands
 
 Custom commands let you save and reuse your favorite or most frequently used
 prompts as personal shortcuts within Gemini CLI. You can create commands that
@@ -9,9 +9,9 @@ all your projects, streamlining your workflow and ensuring consistency.
 
 Gemini CLI discovers commands from two locations, loaded in a specific order:
 
-1.  **User Commands (Global):** Located in `~/.gemini/commands/`. These commands
+1.  **User commands (global):** Located in `~/.gemini/commands/`. These commands
     are available in any project you are working on.
-2.  **Project Commands (Local):** Located in
+2.  **Project commands (local):** Located in
     `<your-project-root>/.gemini/commands/`. These commands are specific to the
     current project and can be checked into version control to be shared with
     your team.
@@ -30,7 +30,7 @@ separator (`/` or `\`) being converted to a colon (`:`).
 - A file at `<project>/.gemini/commands/git/commit.toml` becomes the namespaced
   command `/git:commit`.
 
-## TOML File Format (v1)
+## TOML file format (v1)
 
 Your command definition files must be written in the TOML format and use the
 `.toml` file extension.
@@ -60,7 +60,7 @@ replace that placeholder with the text the user typed after the command name.
 
 The behavior of this injection depends on where it is used:
 
-**A. Raw injection (outside Shell commands)**
+**A. Raw injection (outside shell commands)**
 
 When used in the main body of the prompt, the arguments are injected exactly as
 the user typed them.
@@ -77,7 +77,7 @@ prompt = "Please provide a code fix for the issue described here: {{args}}."
 The model receives:
 `Please provide a code fix for the issue described here: "Button is misaligned".`
 
-**B. Using arguments in Shell commands (inside `!{...}` blocks)**
+**B. Using arguments in shell commands (inside `!{...}` blocks)**
 
 When you use `{{args}}` inside a shell injection block (`!{...}`), the arguments
 are automatically **shell-escaped** before replacement. This allows you to
@@ -156,7 +156,7 @@ When you run `/changelog 1.2.0 added "New feature"`, the final text sent to the
 model will be the original prompt followed by two newlines and the command you
 typed.
 
-### 3. Executing Shell commands with `!{...}`
+### 3. Executing shell commands with `!{...}`
 
 You can make your commands dynamic by executing shell commands directly within
 your `prompt` and injecting their output. This is ideal for gathering context
@@ -302,7 +302,7 @@ Your response should include:
 """
 ```
 
-**3. Run the Command:**
+**3. Run the command:**
 
 That's it! You can now run your command in the CLI. First, you might add a file
 to the context, and then invoke your command:

docs/cli/enterprise.md

@@ -1,11 +1,11 @@
-# Gemini CLI for the Enterprise
+# Gemini CLI for the enterprise
 
 This document outlines configuration patterns and best practices for deploying
 and managing Gemini CLI in an enterprise environment. By leveraging system-level
 settings, administrators can enforce security policies, manage tool access, and
 ensure a consistent experience for all users.
 
-> **A Note on Security:** The patterns described in this document are intended
+> **A note on security:** The patterns described in this document are intended
 > to help administrators create a more controlled and secure environment for
 > using Gemini CLI. However, they should not be considered a foolproof security
 > boundary. A determined user with sufficient privileges on their local machine
@@ -14,7 +14,7 @@ ensure a consistent experience for all users.
 > managed environment, not to defend against a malicious actor with local
 > administrative rights.
 
-## Centralized Configuration: The System Settings File
+## Centralized configuration: The system settings file
 
 The most powerful tools for enterprise administration are the system-wide
 settings files. These files allow you to define a baseline configuration
@@ -33,11 +33,11 @@ settings (like `theme`) is:
 This means the System Overrides file has the final say. For settings that are
 arrays (`includeDirectories`) or objects (`mcpServers`), the values are merged.
 
-**Example of Merging and Precedence:**
+**Example of merging and precedence:**
 
 Here is how settings from different levels are combined.
 
-- **System Defaults `system-defaults.json`:**
+- **System defaults `system-defaults.json`:**
 
   ```json
   {
@@ -89,7 +89,7 @@ Here is how settings from different levels are combined.
   }
   ```
 
-- **System Overrides `settings.json`:**
+- **System overrides `settings.json`:**
   ```json
   {
     "ui": {
@@ -108,7 +108,7 @@ Here is how settings from different levels are combined.
 
 This results in the following merged configuration:
 
-- **Final Merged Configuration:**
+- **Final merged configuration:**
   ```json
   {
     "ui": {
@@ -159,7 +159,7 @@ This results in the following merged configuration:
 By using the system settings file, you can enforce the security and
 configuration patterns described below.
 
-## Restricting Tool Access
+## Restricting tool access
 
 You can significantly enhance security by controlling which tools the Gemini
 model can use. This is achieved through the `tools.core` and `tools.exclude`
@@ -197,12 +197,12 @@ environment to a blocklist.
 }
 ```
 
-**Security Note:** Blocklisting with `excludeTools` is less secure than
+**Security note:** Blocklisting with `excludeTools` is less secure than
 allowlisting with `coreTools`, as it relies on blocking known-bad commands, and
 clever users may find ways to bypass simple string-based blocks. **Allowlisting
 is the recommended approach.**
 
-### Disabling YOLO Mode
+### Disabling YOLO mode
 
 To ensure that users cannot bypass the confirmation prompt for tool execution,
 you can disable YOLO mode at the policy level. This adds a critical layer of
@@ -222,14 +222,14 @@ approval.
 This setting is highly recommended in an enterprise environment to prevent
 unintended tool execution.
 
-## Managing Custom Tools (MCP Servers)
+## Managing custom tools (MCP servers)
 
 If your organization uses custom tools via
 [Model-Context Protocol (MCP) servers](../core/tools-api.md), it is crucial to
 understand how server configurations are managed to apply security policies
 effectively.
 
-### How MCP Server Configurations are Merged
+### How MCP server configurations are merged
 
 Gemini CLI loads `settings.json` files from three levels: System, Workspace, and
 User. When it comes to the `mcpServers` object, these configurations are
@@ -246,12 +246,12 @@ This means a user **cannot** override the definition of a server that is already
 defined in the system-level settings. However, they **can** add new servers with
 unique names.
 
-### Enforcing a Catalog of Tools
+### Enforcing a catalog of tools
 
 The security of your MCP tool ecosystem depends on a combination of defining the
 canonical servers and adding their names to an allowlist.
 
-### Restricting Tools Within an MCP Server
+### Restricting tools within an MCP server
 
 For even greater security, especially when dealing with third-party MCP servers,
 you can restrict which specific tools from a server are exposed to the model.
@@ -280,7 +280,7 @@ third-party MCP server, even if the server offers other tools like
 }
 ```
 
-#### More Secure Pattern: Define and Add to Allowlist in System Settings
+#### More secure pattern: Define and add to allowlist in system settings
 
 To create a secure, centrally-managed catalog of tools, the system administrator
 **must** do both of the following in the system-level `settings.json` file:
@@ -293,7 +293,7 @@ To create a secure, centrally-managed catalog of tools, the system administrator
     any servers that are not on this list. If this setting is omitted, the CLI
     will merge and allow any server defined by the user.
 
-**Example System `settings.json`:**
+**Example system `settings.json`:**
 
 1. Add the _names_ of all approved servers to an allowlist. This will prevent
    users from adding their own servers.
@@ -322,12 +322,12 @@ Any server a user defines will either be overridden by the system definition (if
 it has the same name) or blocked because its name is not in the `mcp.allowed`
 list.
 
-### Less Secure Pattern: Omitting the Allowlist
+### Less secure pattern: Omitting the allowlist
 
 If the administrator defines the `mcpServers` object but fails to also specify
 the `mcp.allowed` allowlist, users may add their own servers.
 
-**Example System `settings.json`:**
+**Example system `settings.json`:**
 
 This configuration defines servers but does not enforce the allowlist. The
 administrator has NOT included the "mcp.allowed" setting.
@@ -347,7 +347,7 @@ In this scenario, a user can add their own server in their local
 results, the user's server will be added to the list of available tools and
 allowed to run.
 
-## Enforcing Sandboxing for Security
+## Enforcing sandboxing for security
 
 To mitigate the risk of potentially harmful operations, you can enforce the use
 of sandboxing for all tool execution. The sandbox isolates tool execution in a
@@ -363,19 +363,18 @@ containerized environment.
 }
 ```
 
-You can also specify a custom, hardened Docker image for the sandbox using the
-`--sandbox-image` command-line argument or by building a custom
-`sandbox.Dockerfile` as described in the
+You can also specify a custom, hardened Docker image for the sandbox by building
+a custom `sandbox.Dockerfile` as described in the
 [Sandboxing documentation](./sandbox.md).
 
-## Controlling Network Access via Proxy
+## Controlling network access via proxy
 
 In corporate environments with strict network policies, you can configure Gemini
 CLI to route all outbound traffic through a corporate proxy. This can be set via
 an environment variable, but it can also be enforced for custom tools via the
 `mcpServers` configuration.
 
-**Example (for an MCP Server):**
+**Example (for an MCP server):**
 
 ```json
 {
@@ -392,7 +391,7 @@ an environment variable, but it can also be enforced for custom tools via the
 }
 ```
 
-## Telemetry and Auditing
+## Telemetry and auditing
 
 For auditing and monitoring purposes, you can configure Gemini CLI to send
 telemetry data to a central location. This allows you to track tool usage and
@@ -435,7 +434,7 @@ prompted to switch to the enforced method. In non-interactive mode, the CLI will
 exit with an error if the configured authentication method does not match the
 enforced one.
 
-## Putting It All Together: Example System `settings.json`
+## Putting it all together: Example system `settings.json`
 
 Here is an example of a system `settings.json` file that combines several of the
 patterns discussed above to create a secure, controlled environment for Gemini

docs/cli/gemini-ignore.md

@@ -1,4 +1,4 @@
-# Ignoring Files
+# Ignoring files
 
 This document provides an overview of the Gemini Ignore (`.geminiignore`)
 feature of the Gemini CLI.
@@ -13,8 +13,8 @@ Git).
 
 When you add a path to your `.geminiignore` file, tools that respect this file
 will exclude matching files and directories from their operations. For example,
-when you use the [`read_many_files`](../tools/multi-file.md) command, any paths
-in your `.geminiignore` file will be automatically excluded.
+when you use the `@` command to share files, any paths in your `.geminiignore`
+file will be automatically excluded.
 
 For the most part, `.geminiignore` follows the conventions of `.gitignore`
 files:

docs/cli/gemini-md.md

@@ -1,4 +1,4 @@
-# Provide Context with GEMINI.md Files
+# Provide context with GEMINI.md files
 
 Context files, which use the default name `GEMINI.md`, are a powerful feature
 for providing instructional context to the Gemini model. You can use these files

docs/cli/generation-settings.md

@@ -0,0 +1,210 @@
+# Advanced Model Configuration
+
+This guide details the Model Configuration system within the Gemini CLI.
+Designed for researchers, AI quality engineers, and advanced users, this system
+provides a rigorous framework for managing generative model hyperparameters and
+behaviors.
+
+> **Warning**: This is a power-user feature. Configuration values are passed
+> directly to the model provider with minimal validation. Incorrect settings
+> (e.g., incompatible parameter combinations) may result in runtime errors from
+> the API.
+
+## 1. System Overview
+
+The Model Configuration system (`ModelConfigService`) enables deterministic
+control over model generation. It decouples the requested model identifier
+(e.g., a CLI flag or agent request) from the underlying API configuration. This
+allows for:
+
+- **Precise Hyperparameter Tuning**: Direct control over `temperature`, `topP`,
+  `thinkingBudget`, and other SDK-level parameters.
+- **Environment-Specific Behavior**: Distinct configurations for different
+  operating contexts (e.g., testing vs. production).
+- **Agent-Scoped Customization**: Applying specific settings only when a
+  particular agent is active.
+
+The system operates on two core primitives: **Aliases** and **Overrides**.
+
+## 2. Configuration Primitives
+
+These settings are located under the `modelConfigs` key in your configuration
+file.
+
+### Aliases (`customAliases`)
+
+Aliases are named, reusable configuration presets. Users should define their own
+aliases (or override system defaults) in the `customAliases` map.
+
+- **Inheritance**: An alias can `extends` another alias (including system
+  defaults like `chat-base`), inheriting its `modelConfig`. Child aliases can
+  overwrite or augment inherited settings.
+- **Abstract Aliases**: An alias is not required to specify a concrete `model`
+  if it serves purely as a base for other aliases.
+
+**Example Hierarchy**:
+
+```json
+"modelConfigs": {
+  "customAliases": {
+    "base": {
+      "modelConfig": {
+        "generateContentConfig": { "temperature": 0.0 }
+      }
+    },
+    "chat-base": {
+      "extends": "base",
+      "modelConfig": {
+        "generateContentConfig": { "temperature": 0.7 }
+      }
+    }
+  }
+}
+```
+
+### Overrides (`overrides`)
+
+Overrides are conditional rules that inject configuration based on the runtime
+context. They are evaluated dynamically for each model request.
+
+- **Match Criteria**: Overrides apply when the request context matches the
+  specified `match` properties.
+  - `model`: Matches the requested model name or alias.
+  - `overrideScope`: Matches the distinct scope of the request (typically the
+    agent name, e.g., `codebaseInvestigator`).
+
+**Example Override**:
+
+```json
+"modelConfigs": {
+  "overrides": [
+    {
+      "match": {
+        "overrideScope": "codebaseInvestigator"
+      },
+      "modelConfig": {
+        "generateContentConfig": { "temperature": 0.1 }
+      }
+    }
+  ]
+}
+```
+
+## 3. Resolution Strategy
+
+The `ModelConfigService` resolves the final configuration through a two-step
+process:
+
+### Step 1: Alias Resolution
+
+The requested model string is looked up in the merged map of system `aliases`
+and user `customAliases`.
+
+1.  If found, the system recursively resolves the `extends` chain.
+2.  Settings are merged from parent to child (child wins).
+3.  This results in a base `ResolvedModelConfig`.
+4.  If not found, the requested string is treated as the raw model name.
+
+### Step 2: Override Application
+
+The system evaluates the `overrides` list against the request context (`model`
+and `overrideScope`).
+
+1.  **Filtering**: All matching overrides are identified.
+2.  **Sorting**: Matches are prioritized by **specificity** (the number of
+    matched keys in the `match` object).
+    - Specific matches (e.g., `model` + `overrideScope`) override broad matches
+      (e.g., `model` only).
+    - Tie-breaking: If specificity is equal, the order of definition in the
+      `overrides` array is preserved (last one wins).
+3.  **Merging**: The configurations from the sorted overrides are merged
+    sequentially onto the base configuration.
+
+## 4. Configuration Reference
+
+The configuration follows the `ModelConfigServiceConfig` interface.
+
+### `ModelConfig` Object
+
+Defines the actual parameters for the model.
+
+| Property                | Type     | Description                                                        |
+| :---------------------- | :------- | :----------------------------------------------------------------- |
+| `model`                 | `string` | The identifier of the model to be called (e.g., `gemini-2.5-pro`). |
+| `generateContentConfig` | `object` | The configuration object passed to the `@google/genai` SDK.        |
+
+### `GenerateContentConfig` (Common Parameters)
+
+Directly maps to the SDK's `GenerateContentConfig`. Common parameters include:
+
+- **`temperature`**: (`number`) Controls output randomness. Lower values (0.0)
+  are deterministic; higher values (>0.7) are creative.
+- **`topP`**: (`number`) Nucleus sampling probability.
+- **`maxOutputTokens`**: (`number`) Limit on generated response length.
+- **`thinkingConfig`**: (`object`) Configuration for models with reasoning
+  capabilities (e.g., `thinkingBudget`, `includeThoughts`).
+
+## 5. Practical Examples
+
+### Defining a Deterministic Baseline
+
+Create an alias for tasks requiring high precision, extending the standard chat
+configuration but enforcing zero temperature.
+
+```json
+"modelConfigs": {
+  "customAliases": {
+    "precise-mode": {
+      "extends": "chat-base",
+      "modelConfig": {
+        "generateContentConfig": {
+          "temperature": 0.0,
+          "topP": 1.0
+        }
+      }
+    }
+  }
+}
+```
+
+### Agent-Specific Parameter Injection
+
+Enforce extended thinking budgets for a specific agent without altering the
+global default, e.g. for the `codebaseInvestigator`.
+
+```json
+"modelConfigs": {
+  "overrides": [
+    {
+      "match": {
+        "overrideScope": "codebaseInvestigator"
+      },
+      "modelConfig": {
+        "generateContentConfig": {
+          "thinkingConfig": { "thinkingBudget": 4096 }
+        }
+      }
+    }
+  ]
+}
+```
+
+### Experimental Model Evaluation
+
+Route traffic for a specific alias to a preview model for A/B testing, without
+changing client code.
+
+```json
+"modelConfigs": {
+  "overrides": [
+    {
+      "match": {
+        "model": "gemini-2.5-pro"
+      },
+      "modelConfig": {
+        "model": "gemini-2.5-pro-experimental-001"
+      }
+    }
+  ]
+}
+```

docs/cli/headless.md

@@ -1,4 +1,4 @@
-# Headless Mode
+# Headless mode
 
 Headless mode allows you to run Gemini CLI programmatically from command line
 scripts and automation tools without any interactive UI. This is ideal for
@@ -45,9 +45,9 @@ The headless mode provides a headless interface to Gemini CLI that:
 - Enables automation and scripting workflows
 - Provides consistent exit codes for error handling
 
-## Basic Usage
+## Basic usage
 
-### Direct Prompts
+### Direct prompts
 
 Use the `--prompt` (or `-p`) flag to run in headless mode:
 
@@ -55,7 +55,7 @@ Use the `--prompt` (or `-p`) flag to run in headless mode:
 gemini --prompt "What is machine learning?"
 ```
 
-### Stdin Input
+### Stdin input
 
 Pipe input to Gemini CLI from your terminal:
 
@@ -63,7 +63,7 @@ Pipe input to Gemini CLI from your terminal:
 echo "Explain this code" | gemini
 ```
 
-### Combining with File Input
+### Combining with file input
 
 Read from files and process with Gemini:
 
@@ -71,9 +71,9 @@ Read from files and process with Gemini:
 cat README.md | gemini --prompt "Summarize this documentation"
 ```
 
-## Output Formats
+## Output formats
 
-### Text Output (Default)
+### Text output (default)
 
 Standard human-readable output:
 
@@ -87,12 +87,12 @@ Response format:
 The capital of France is Paris.
 ```
 
-### JSON Output
+### JSON output
 
 Returns structured data including response, statistics, and metadata. This
 format is ideal for programmatic processing and automation scripts.
 
-#### Response Schema
+#### Response schema
 
 The JSON output follows this high-level structure:
 
@@ -140,7 +140,7 @@ The JSON output follows this high-level structure:
 }
 ```
 
-#### Example Usage
+#### Example usage
 
 ```bash
 gemini -p "What is the capital of France?" --output-format json
@@ -218,14 +218,14 @@ Response:
 }
 ```
 
-### Streaming JSON Output
+### Streaming JSON output
 
 Returns real-time events as newline-delimited JSON (JSONL). Each significant
 action (initialization, messages, tool calls, results) emits immediately as it
 occurs. This format is ideal for monitoring long-running operations, building
 UIs with live progress, and creating automation pipelines that react to events.
 
-#### When to Use Streaming JSON
+#### When to use streaming JSON
 
 Use `--output-format stream-json` when you need:
 
@@ -237,7 +237,7 @@ Use `--output-format stream-json` when you need:
   timestamps
 - **Pipeline integration** - Stream events to logging/monitoring systems
 
-#### Event Types
+#### Event types
 
 The streaming format emits 6 event types:
 
@@ -248,7 +248,7 @@ The streaming format emits 6 event types:
 5. **`error`** - Non-fatal errors and warnings
 6. **`result`** - Final session outcome with aggregated stats
 
-#### Basic Usage
+#### Basic usage
 
 ```bash
 # Stream events to console
@@ -261,7 +261,7 @@ gemini --output-format stream-json --prompt "Analyze this code" > events.jsonl
 gemini --output-format stream-json --prompt "List files" | jq -r '.type'
 ```
 
-#### Example Output
+#### Example output
 
 Each line is a complete JSON event:
 
@@ -274,7 +274,7 @@ Each line is a complete JSON event:
 {"type":"result","status":"success","stats":{"total_tokens":250,"input_tokens":50,"output_tokens":200,"duration_ms":3000,"tool_calls":1},"timestamp":"2025-10-10T12:00:05.000Z"}
 ```
 
-### File Redirection
+### File redirection
 
 Save output to files or pipe to other commands:
 
@@ -292,7 +292,7 @@ gemini -p "Explain microservices" | wc -w
 gemini -p "List programming languages" | grep -i "python"
 ```
 
-## Configuration Options
+## Configuration options
 
 Key command-line options for headless usage:
 

docs/cli/index.md

@@ -7,14 +7,17 @@ overview of Gemini CLI, see the [main documentation page](../index.md).
 ## Basic features
 
 - **[Commands](./commands.md):** A reference for all built-in slash commands
-  (e.g., `/help`, `/chat`, `/tools`).
-- **[Custom Commands](./custom-commands.md):** Create your own commands and
+- **[Custom commands](./custom-commands.md):** Create your own commands and
   shortcuts for frequently used prompts.
-- **[Headless Mode](./headless.md):** Use Gemini CLI programmatically for
+- **[Headless mode](./headless.md):** Use Gemini CLI programmatically for
   scripting and automation.
+- **[Model selection](./model.md):** Configure the Gemini AI model used by the
+  CLI.
+- **[Settings](./settings.md):** Configure various aspects of the CLI's behavior
+  and appearance.
 - **[Themes](./themes.md):** Customizing the CLI's appearance with different
   themes.
-- **[Keyboard Shortcuts](./keyboard-shortcuts.md):** A reference for all
+- **[Keyboard shortcuts](./keyboard-shortcuts.md):** A reference for all
   keyboard shortcuts to improve your workflow.
 - **[Tutorials](./tutorials.md):** Step-by-step guides for common tasks.
 
@@ -22,18 +25,18 @@ overview of Gemini CLI, see the [main documentation page](../index.md).
 
 - **[Checkpointing](./checkpointing.md):** Automatically save and restore
   snapshots of your session and files.
-- **[Enterprise Configuration](./enterprise.md):** Deploying and manage Gemini
+- **[Enterprise configuration](./enterprise.md):** Deploying and manage Gemini
   CLI in an enterprise environment.
 - **[Sandboxing](./sandbox.md):** Isolate tool execution in a secure,
   containerized environment.
 - **[Telemetry](./telemetry.md):** Configure observability to monitor usage and
   performance.
-- **[Token Caching](./token-caching.md):** Optimize API costs by caching tokens.
-- **[Trusted Folders](./trusted-folders.md):** A security feature to control
+- **[Token caching](./token-caching.md):** Optimize API costs by caching tokens.
+- **[Trusted folders](./trusted-folders.md):** A security feature to control
   which projects can use the full capabilities of the CLI.
-- **[Ignoring Files (.geminiignore)](./gemini-ignore.md):** Exclude specific
+- **[Ignoring files (.geminiignore)](./gemini-ignore.md):** Exclude specific
   files and directories from being accessed by tools.
-- **[Context Files (GEMINI.md)](./gemini-md.md):** Provide persistent,
+- **[Context files (GEMINI.md)](./gemini-md.md):** Provide persistent,
   hierarchical context to the model.
 
 ## Non-interactive mode
@@ -55,4 +58,4 @@ gemini -p "What is fine tuning?"
 ```
 
 For comprehensive documentation on headless usage, scripting, automation, and
-advanced examples, see the **[Headless Mode](./headless.md)** guide.
+advanced examples, see the **[Headless mode](./headless.md)** guide.

docs/cli/keyboard-shortcuts.md

@@ -1,78 +1,143 @@
-# Gemini CLI Keyboard Shortcuts
+# Gemini CLI keyboard shortcuts
 
-This document lists the available keyboard shortcuts in the Gemini CLI.
+Gemini CLI ships with a set of default keyboard shortcuts for editing input,
+navigating history, and controlling the UI. Use this reference to learn the
+available combinations.
 
-## General
+<!-- KEYBINDINGS-AUTOGEN:START -->
 
-| Shortcut | Description                                                                                                           |
-| -------- | --------------------------------------------------------------------------------------------------------------------- |
-| `Esc`    | Close dialogs and suggestions.                                                                                        |
-| `Ctrl+C` | Cancel the ongoing request and clear the input. Press twice to exit the application.                                  |
-| `Ctrl+D` | Exit the application if the input is empty. Press twice to confirm.                                                   |
-| `Ctrl+L` | Clear the screen.                                                                                                     |
-| `Ctrl+S` | Allows long responses to print fully, disabling truncation. Use your terminal's scrollback to view the entire output. |
-| `Ctrl+T` | Toggle the display of the todo list.                                                                                  |
-| `Ctrl+Y` | Toggle auto-approval (YOLO mode) for all tool calls.                                                                  |
-| `F12`    | Toggle the display of the debug console.                                                                              |
+#### Basic Controls
 
-## Input Prompt
+| Action                                       | Keys    |
+| -------------------------------------------- | ------- |
+| Confirm the current selection or choice.     | `Enter` |
+| Dismiss dialogs or cancel the current focus. | `Esc`   |
 
-| Shortcut                                           | Description                                                                                                                         |
-| -------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `!`                                                | Toggle shell mode when the input is empty.                                                                                          |
-| `\` (at end of line) + `Enter`                     | Insert a newline.                                                                                                                   |
-| `Down Arrow`                                       | Navigate down through the input history.                                                                                            |
-| `Enter`                                            | Submit the current prompt.                                                                                                          |
-| `Meta+Delete` / `Ctrl+Delete`                      | Delete the word to the right of the cursor.                                                                                         |
-| `Tab`                                              | Autocomplete the current suggestion if one exists.                                                                                  |
-| `Up Arrow`                                         | Navigate up through the input history.                                                                                              |
-| `Ctrl+A` / `Home`                                  | Move the cursor to the beginning of the line.                                                                                       |
-| `Ctrl+B` / `Left Arrow`                            | Move the cursor one character to the left.                                                                                          |
-| `Ctrl+C`                                           | Clear the input prompt                                                                                                              |
-| `Esc` (double press)                               | Clear the input prompt.                                                                                                             |
-| `Ctrl+D` / `Delete`                                | Delete the character to the right of the cursor.                                                                                    |
-| `Ctrl+E` / `End`                                   | Move the cursor to the end of the line.                                                                                             |
-| `Ctrl+F` / `Right Arrow`                           | Move the cursor one character to the right.                                                                                         |
-| `Ctrl+H` / `Backspace`                             | Delete the character to the left of the cursor.                                                                                     |
-| `Ctrl+K`                                           | Delete from the cursor to the end of the line.                                                                                      |
-| `Ctrl+Left Arrow` / `Meta+Left Arrow` / `Meta+B`   | Move the cursor one word to the left.                                                                                               |
-| `Ctrl+N`                                           | Navigate down through the input history.                                                                                            |
-| `Ctrl+P`                                           | Navigate up through the input history.                                                                                              |
-| `Ctrl+Right Arrow` / `Meta+Right Arrow` / `Meta+F` | Move the cursor one word to the right.                                                                                              |
-| `Ctrl+U`                                           | Delete from the cursor to the beginning of the line.                                                                                |
-| `Ctrl+V`                                           | Paste clipboard content. If the clipboard contains an image, it will be saved and a reference to it will be inserted in the prompt. |
-| `Ctrl+W` / `Meta+Backspace` / `Ctrl+Backspace`     | Delete the word to the left of the cursor.                                                                                          |
-| `Ctrl+X` / `Meta+Enter`                            | Open the current input in an external editor.                                                                                       |
+#### Cursor Movement
 
-## Suggestions
+| Action                                    | Keys                   |
+| ----------------------------------------- | ---------------------- |
+| Move the cursor to the start of the line. | `Ctrl + A`<br />`Home` |
+| Move the cursor to the end of the line.   | `Ctrl + E`<br />`End`  |
 
-| Shortcut        | Description                            |
-| --------------- | -------------------------------------- |
-| `Down Arrow`    | Navigate down through the suggestions. |
-| `Tab` / `Enter` | Accept the selected suggestion.        |
-| `Up Arrow`      | Navigate up through the suggestions.   |
+#### Editing
 
-## Radio Button Select
+| Action                                           | Keys                                      |
+| ------------------------------------------------ | ----------------------------------------- |
+| Delete from the cursor to the end of the line.   | `Ctrl + K`                                |
+| Delete from the cursor to the start of the line. | `Ctrl + U`                                |
+| Clear all text in the input field.               | `Ctrl + C`                                |
+| Delete the previous word.                        | `Ctrl + Backspace`<br />`Cmd + Backspace` |
 
-| Shortcut           | Description                                                                                                   |
-| ------------------ | ------------------------------------------------------------------------------------------------------------- |
-| `Down Arrow` / `j` | Move selection down.                                                                                          |
-| `Enter`            | Confirm selection.                                                                                            |
-| `Up Arrow` / `k`   | Move selection up.                                                                                            |
-| `1-9`              | Select an item by its number.                                                                                 |
-| (multi-digit)      | For items with numbers greater than 9, press the digits in quick succession to select the corresponding item. |
+#### Screen Control
 
-## IDE Integration
+| Action                                       | Keys       |
+| -------------------------------------------- | ---------- |
+| Clear the terminal screen and redraw the UI. | `Ctrl + L` |
 
-| Shortcut | Description                       |
-| -------- | --------------------------------- |
-| `Ctrl+G` | See context CLI received from IDE |
+#### Scrolling
 
-## Meta+key combos on mac
+| Action                   | Keys                 |
+| ------------------------ | -------------------- |
+| Scroll content up.       | `Shift + Up Arrow`   |
+| Scroll content down.     | `Shift + Down Arrow` |
+| Scroll to the top.       | `Home`               |
+| Scroll to the bottom.    | `End`                |
+| Scroll up by one page.   | `Page Up`            |
+| Scroll down by one page. | `Page Down`          |
 
-On Mac, all Meta+char combos should work normally except for these three which
-are mapped to special functionality.
+#### History & Search
 
-- `meta+b`: "∫" back one word
-- `meta+f`: "ƒ" forward one word
-- `meta+m`: "µ" toggle markup view
+| Action                                       | Keys                  |
+| -------------------------------------------- | --------------------- |
+| Show the previous entry in history.          | `Ctrl + P (no Shift)` |
+| Show the next entry in history.              | `Ctrl + N (no Shift)` |
+| Start reverse search through history.        | `Ctrl + R`            |
+| Insert the selected reverse-search match.    | `Enter (no Ctrl)`     |
+| Accept a suggestion while reverse searching. | `Tab`                 |
+
+#### Navigation
+
+| Action                           | Keys                                        |
+| -------------------------------- | ------------------------------------------- |
+| Move selection up in lists.      | `Up Arrow (no Shift)`                       |
+| Move selection down in lists.    | `Down Arrow (no Shift)`                     |
+| Move up within dialog options.   | `Up Arrow (no Shift)`<br />`K (no Shift)`   |
+| Move down within dialog options. | `Down Arrow (no Shift)`<br />`J (no Shift)` |
+
+#### Suggestions & Completions
+
+| Action                                  | Keys                                               |
+| --------------------------------------- | -------------------------------------------------- |
+| Accept the inline suggestion.           | `Tab`<br />`Enter (no Ctrl)`                       |
+| Move to the previous completion option. | `Up Arrow (no Shift)`<br />`Ctrl + P (no Shift)`   |
+| Move to the next completion option.     | `Down Arrow (no Shift)`<br />`Ctrl + N (no Shift)` |
+| Expand an inline suggestion.            | `Right Arrow`                                      |
+| Collapse an inline suggestion.          | `Left Arrow`                                       |
+
+#### Text Input
+
+| Action                               | Keys                                                                                        |
+| ------------------------------------ | ------------------------------------------------------------------------------------------- |
+| Submit the current prompt.           | `Enter (no Ctrl, no Shift, no Cmd, not Paste)`                                              |
+| Insert a newline without submitting. | `Ctrl + Enter`<br />`Cmd + Enter`<br />`Paste + Enter`<br />`Shift + Enter`<br />`Ctrl + J` |
+
+#### External Tools
+
+| Action                                         | Keys       |
+| ---------------------------------------------- | ---------- |
+| Open the current prompt in an external editor. | `Ctrl + X` |
+| Paste from the clipboard.                      | `Ctrl + V` |
+
+#### App Controls
+
+| Action                                                            | Keys       |
+| ----------------------------------------------------------------- | ---------- |
+| Toggle detailed error information.                                | `F12`      |
+| Toggle the full TODO list.                                        | `Ctrl + T` |
+| Toggle IDE context details.                                       | `Ctrl + G` |
+| Toggle Markdown rendering.                                        | `Cmd + M`  |
+| Toggle copy mode when the terminal is using the alternate buffer. | `Ctrl + S` |
+| Expand a height-constrained response to show additional lines.    | `Ctrl + S` |
+| Toggle focus between the shell and Gemini input.                  | `Ctrl + F` |
+
+#### Session Control
+
+| Action                                       | Keys       |
+| -------------------------------------------- | ---------- |
+| Cancel the current request or quit the CLI.  | `Ctrl + C` |
+| Exit the CLI when the input buffer is empty. | `Ctrl + D` |
+
+<!-- KEYBINDINGS-AUTOGEN:END -->
+
+## Additional context-specific shortcuts
+
+- `Ctrl+Y`: Toggle YOLO (auto-approval) mode for tool calls.
+- `Shift+Tab`: Toggle Auto Edit (auto-accept edits) mode.
+- `Option+M` (macOS): Entering `µ` with Option+M also toggles Markdown
+  rendering, matching `Cmd+M`.
+- `!` on an empty prompt: Enter or exit shell mode.
+- `\` (at end of a line) + `Enter`: Insert a newline without leaving single-line
+  mode.
+- `Ctrl+Delete` / `Meta+Delete`: Delete the word to the right of the cursor.
+- `Ctrl+B` or `Left Arrow`: Move the cursor one character to the left while
+  editing text.
+- `Ctrl+F` or `Right Arrow`: Move the cursor one character to the right; with an
+  embedded shell attached, `Ctrl+F` still toggles focus.
+- `Ctrl+D` or `Delete`: Remove the character immediately to the right of the
+  cursor.
+- `Ctrl+H` or `Backspace`: Remove the character immediately to the left of the
+  cursor.
+- `Ctrl+Left Arrow` / `Meta+Left Arrow` / `Meta+B`: Move one word to the left.
+- `Ctrl+Right Arrow` / `Meta+Right Arrow` / `Meta+F`: Move one word to the
+  right.
+- `Ctrl+W`: Delete the word to the left of the cursor (in addition to
+  `Ctrl+Backspace` / `Cmd+Backspace`).
+- `Ctrl+Z` / `Ctrl+Shift+Z`: Undo or redo the most recent text edit.
+- `Meta+Enter`: Open the current input in an external editor (alias for
+  `Ctrl+X`).
+- `Esc` pressed twice quickly: Clear the current input buffer.
+- `Up Arrow` / `Down Arrow`: When the cursor is at the top or bottom of a
+  single-line input, navigate backward or forward through prompt history.
+- `Number keys (1-9, multi-digit)` inside selection dialogs: Jump directly to
+  the numbered radio option and confirm when the full number is entered.

docs/cli/model-routing.md

@@ -0,0 +1,41 @@
+## Model routing
+
+Gemini CLI includes a model routing feature that automatically switches to a
+fallback model in case of a model failure. This feature is enabled by default
+and provides resilience when the primary model is unavailable.
+
+## How it works
+
+Model routing is not based on prompt complexity, but is a fallback mechanism.
+Here's how it works:
+
+1.  **Model failure:** If the currently selected model fails to respond (for
+    example, due to a server error or other issue), the CLI will initiate the
+    fallback process.
+
+2.  **User consent:** The CLI will prompt you to ask if you want to switch to
+    the fallback model. This is handled by the `fallbackModelHandler`.
+
+3.  **Fallback activation:** If you consent, the CLI will activate the fallback
+    mode by calling `config.setFallbackMode(true)`.
+
+4.  **Model switch:** On the next request, the CLI will use the
+    `DEFAULT_GEMINI_FLASH_MODEL` as the fallback model. This is handled by the
+    `resolveModel` function in
+    `packages/cli/src/zed-integration/zedIntegration.ts` which checks if
+    `isInFallbackMode()` is true.
+
+### Model selection precedence
+
+The model used by Gemini CLI is determined by the following order of precedence:
+
+1.  **`--model` command-line flag:** A model specified with the `--model` flag
+    when launching the CLI will always be used.
+2.  **`GEMINI_MODEL` environment variable:** If the `--model` flag is not used,
+    the CLI will use the model specified in the `GEMINI_MODEL` environment
+    variable.
+3.  **`model.name` in `settings.json`:** If neither of the above are set, the
+    model specified in the `model.name` property of your `settings.json` file
+    will be used.
+4.  **Default model:** If none of the above are set, the default model will be
+    used. The default model is `auto`

docs/cli/model.md

@@ -0,0 +1,58 @@
+# Gemini CLI model selection (`/model` command)
+
+Select your Gemini CLI model. The `/model` command opens a dialog where you can
+configure the model used by Gemini CLI, giving you more control over your
+results.
+
+## How to use the `/model` command
+
+Use the following command in Gemini CLI:
+
+```
+/model
+```
+
+Running this command will open a dialog with your model options:
+
+| Option             | Description                                                   | Models                                                                                     |
+| ------------------ | ------------------------------------------------------------- | ------------------------------------------------------------------------------------------ |
+| Auto (recommended) | Let the system choose the best model for your task.           | gemini-3-pro-preview (if enabled), gemini-2.5-pro, gemini-2.5-flash, gemini-2.5-flash-lite |
+| Pro                | For complex tasks that require deep reasoning and creativity. | gemini-3-pro-preview (if enabled), gemini-2.5-pro                                          |
+| Flash              | For tasks that need a balance of speed and reasoning.         | gemini-2.5-flash                                                                           |
+| Flash-Lite         | For simple tasks that need to be done quickly.                | gemini-2.5-flash-lite                                                                      |
+
+### Gemini 3 Pro 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 Pro on Gemini CLI](../get-started/gemini-3.md).
+
+To enable Gemini 3 Pro (if available), enable
+[**Preview features** by using the `settings` command](../cli/settings.md). Once
+enabled, Gemini CLI will attempt to use Gemini 3 Pro when you select **Auto** or
+**Pro**. Both **Auto** and **Pro** will try to use Gemini 3 Pro before falling
+back to Gemini 2.5 Pro.
+
+You can also use the `--model` flag to specify a particular Gemini model on
+startup. For more details, refer to the
+[configuration documentation](./configuration.md).
+
+Changes to these settings will be applied to all subsequent interactions with
+Gemini CLI.
+
+## Best practices for model selection
+
+- **Default to Auto (recommended).** For most users, the _Auto (recommended)_
+  model provides a balance between speed and performance, automatically
+  selecting the correct model based on the complexity of the task. Example:
+  Developing a web application could include a mix of complex tasks (building
+  architecture and scaffolding the project) and simple tasks (generating CSS).
+
+- **Switch to Pro if you aren't getting the results you want.** If you think you
+  need your model to be a little "smarter," use Pro. Pro will provide you with
+  the highest levels of reasoning and creativity. Example: A complex or
+  multi-stage debugging task.
+
+- **Switch to Flash or Flash-Lite if you need faster results.** If you need a
+  simple response quickly, Flash or Flash-Lite is the best option. Example:
+  Converting a JSON object to a YAML string.

docs/cli/sandbox.md

@@ -87,7 +87,7 @@ Built-in profiles (set via `SEATBELT_PROFILE` env var):
 - `restrictive-open`: Strict restrictions, network allowed
 - `restrictive-closed`: Maximum restrictions
 
-### Custom Sandbox Flags
+### Custom sandbox flags
 
 For container-based sandboxing, you can inject custom flags into the `docker` or
 `podman` command using the `SANDBOX_FLAGS` environment variable. This is useful

docs/cli/session-management.md

@@ -0,0 +1,158 @@
+# Session Management
+
+Gemini CLI includes robust session management features that automatically save
+your conversation history. This allows you to interrupt your work and resume
+exactly where you left off, review past interactions, and manage your
+conversation history effectively.
+
+## Automatic Saving
+
+Every time you interact with Gemini CLI, your session is automatically saved.
+This happens in the background without any manual intervention.
+
+- **What is saved:** The complete conversation history, including:
+  - Your prompts and the model's responses.
+  - All tool executions (inputs and outputs).
+  - Token usage statistics (input/output/cached, etc.).
+  - Assistant thoughts/reasoning summaries (when available).
+- **Location:** Sessions are stored in `~/.gemini/tmp/<project_hash>/chats/`.
+- **Scope:** Sessions are project-specific. Switching directories to a different
+  project will switch to that project's session history.
+
+## Resuming Sessions
+
+You can resume a previous session to continue the conversation with all prior
+context restored.
+
+### From the Command Line
+
+When starting the CLI, you can use the `--resume` (or `-r`) flag:
+
+- **Resume latest:**
+
+  ```bash
+  gemini --resume
+  ```
+
+  This immediately loads the most recent session.
+
+- **Resume by index:** First, list available sessions (see
+  [Listing Sessions](#listing-sessions)), then use the index number:
+
+  ```bash
+  gemini --resume 1
+  ```
+
+- **Resume by ID:** You can also provide the full session UUID:
+  ```bash
+  gemini --resume a1b2c3d4-e5f6-7890-abcd-ef1234567890
+  ```
+
+### From the Interactive Interface
+
+While the CLI is running, you can use the `/resume` slash command to open the
+**Session Browser**:
+
+```text
+/resume
+```
+
+This opens an interactive interface where you can:
+
+- **Browse:** Scroll through a list of your past sessions.
+- **Preview:** See details like the session date, message count, and the first
+  user prompt.
+- **Search:** Press `/` to enter search mode, then type to filter sessions by ID
+  or content.
+- **Select:** Press `Enter` to resume the selected session.
+
+## Managing Sessions
+
+### Listing Sessions
+
+To see a list of all available sessions for the current project from the command
+line:
+
+```bash
+gemini --list-sessions
+```
+
+Output example:
+
+```text
+Available sessions for this project (3):
+
+  1. Fix bug in auth (2 days ago) [a1b2c3d4]
+  2. Refactor database schema (5 hours ago) [e5f67890]
+  3. Update documentation (Just now) [abcd1234]
+```
+
+### Deleting Sessions
+
+You can remove old or unwanted sessions to free up space or declutter your
+history.
+
+**From the Command Line:** Use the `--delete-session` flag with an index or ID:
+
+```bash
+gemini --delete-session 2
+```
+
+**From the Session Browser:**
+
+1.  Open the browser with `/resume`.
+2.  Navigate to the session you want to remove.
+3.  Press `x`.
+
+## Configuration
+
+You can configure how Gemini CLI manages your session history in your
+`settings.json` file.
+
+### Session Retention
+
+To prevent your history from growing indefinitely, you can enable automatic
+cleanup policies.
+
+```json
+{
+  "general": {
+    "sessionRetention": {
+      "enabled": true,
+      "maxAge": "30d", // Keep sessions for 30 days
+      "maxCount": 50 // Keep the 50 most recent sessions
+    }
+  }
+}
+```
+
+- **`enabled`**: (boolean) Master switch for session cleanup. Default is
+  `false`.
+- **`maxAge`**: (string) Duration to keep sessions (e.g., "24h", "7d", "4w").
+  Sessions older than this will be deleted.
+- **`maxCount`**: (number) Maximum number of sessions to retain. The oldest
+  sessions exceeding this count will be deleted.
+- **`minRetention`**: (string) Minimum retention period (safety limit). Defaults
+  to `"1d"`; sessions newer than this period are never deleted by automatic
+  cleanup.
+
+### Session Limits
+
+You can also limit the length of individual sessions to prevent context windows
+from becoming too large and expensive.
+
+```json
+{
+  "model": {
+    "maxSessionTurns": 100
+  }
+}
+```
+
+- **`maxSessionTurns`**: (number) The maximum number of turns (user + model
+  exchanges) allowed in a single session. Set to `-1` for unlimited (default).
+
+  **Behavior when limit is reached:**
+  - **Interactive Mode:** The CLI shows an informational message and stops
+    sending requests to the model. You must manually start a new session.
+  - **Non-Interactive Mode:** The CLI exits with an error.

docs/cli/settings.md

@@ -0,0 +1,112 @@
+# Gemini CLI settings (`/settings` command)
+
+Control your Gemini CLI experience with the `/settings` command. The `/settings`
+command opens a dialog to view and edit all your Gemini CLI settings, including
+your UI experience, keybindings, and accessibility features.
+
+Your Gemini CLI settings are stored in a `settings.json` file. In addition to
+using the `/settings` command, you can also edit them in one of the following
+locations:
+
+- **User settings**: `~/.gemini/settings.json`
+- **Workspace settings**: `your-project/.gemini/settings.json`
+
+Note: Workspace settings override user settings.
+
+## Settings reference
+
+Here is a list of all the available settings, grouped by category and ordered as
+they appear in the UI.
+
+### General
+
+| UI Label                        | Setting                            | Description                                                                  | Default     |
+| ------------------------------- | ---------------------------------- | ---------------------------------------------------------------------------- | ----------- |
+| Preview Features (e.g., models) | `general.previewFeatures`          | Enable preview features (e.g., preview models).                              | `false`     |
+| Vim Mode                        | `general.vimMode`                  | Enable Vim keybindings.                                                      | `false`     |
+| Disable Auto Update             | `general.disableAutoUpdate`        | Disable automatic updates.                                                   | `false`     |
+| Enable Prompt Completion        | `general.enablePromptCompletion`   | Enable AI-powered prompt completion suggestions while typing.                | `false`     |
+| Debug Keystroke Logging         | `general.debugKeystrokeLogging`    | Enable debug logging of keystrokes to the console.                           | `false`     |
+| Session Retention               | `general.sessionRetention`         | Settings for automatic session cleanup. This feature is disabled by default. | `undefined` |
+| Enable Session Cleanup          | `general.sessionRetention.enabled` | Enable automatic session cleanup.                                            | `false`     |
+
+### Output
+
+| UI Label      | Setting         | Description                                            | Default |
+| ------------- | --------------- | ------------------------------------------------------ | ------- |
+| Output Format | `output.format` | The format of the CLI output. Can be `text` or `json`. | `text`  |
+
+### UI
+
+| UI Label                       | Setting                                  | Description                                                          | Default |
+| ------------------------------ | ---------------------------------------- | -------------------------------------------------------------------- | ------- |
+| Hide Window Title              | `ui.hideWindowTitle`                     | Hide the window title bar.                                           | `false` |
+| Show Status in Title           | `ui.showStatusInTitle`                   | Show Gemini CLI status and thoughts in the terminal window title.    | `false` |
+| Hide Tips                      | `ui.hideTips`                            | Hide helpful tips in the UI.                                         | `false` |
+| Hide Banner                    | `ui.hideBanner`                          | Hide the application banner.                                         | `false` |
+| Hide Context Summary           | `ui.hideContextSummary`                  | Hide the context summary (GEMINI.md, MCP servers) above the input.   | `false` |
+| Hide CWD                       | `ui.footer.hideCWD`                      | Hide the current working directory path in the footer.               | `false` |
+| Hide Sandbox Status            | `ui.footer.hideSandboxStatus`            | Hide the sandbox status indicator in the footer.                     | `false` |
+| Hide Model Info                | `ui.footer.hideModelInfo`                | Hide the model name and context usage in the footer.                 | `false` |
+| Hide Context Window Percentage | `ui.footer.hideContextPercentage`        | Hides the context window remaining percentage.                       | `true`  |
+| Hide Footer                    | `ui.hideFooter`                          | Hide the footer from the UI.                                         | `false` |
+| Show Memory Usage              | `ui.showMemoryUsage`                     | Display memory usage information in the UI.                          | `false` |
+| Show Line Numbers              | `ui.showLineNumbers`                     | Show line numbers in the chat.                                       | `false` |
+| Show Citations                 | `ui.showCitations`                       | Show citations for generated text in the chat.                       | `false` |
+| Use Full Width                 | `ui.useFullWidth`                        | Use the entire width of the terminal for output.                     | `true`  |
+| Use Alternate Screen Buffer    | `ui.useAlternateBuffer`                  | Use an alternate screen buffer for the UI, preserving shell history. | `true`  |
+| Disable Loading Phrases        | `ui.accessibility.disableLoadingPhrases` | Disable loading phrases for accessibility.                           | `false` |
+| Screen Reader Mode             | `ui.accessibility.screenReader`          | Render output in plain-text to be more screen reader accessible.     | `false` |
+
+### IDE
+
+| UI Label | Setting       | Description                  | Default |
+| -------- | ------------- | ---------------------------- | ------- |
+| IDE Mode | `ide.enabled` | Enable IDE integration mode. | `false` |
+
+### Model
+
+| UI Label                | Setting                      | Description                                                                            | Default |
+| ----------------------- | ---------------------------- | -------------------------------------------------------------------------------------- | ------- |
+| Max Session Turns       | `model.maxSessionTurns`      | Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.      | `-1`    |
+| Compression Threshold   | `model.compressionThreshold` | The fraction of context usage at which to trigger context compression (e.g. 0.2, 0.3). | `0.2`   |
+| Skip Next Speaker Check | `model.skipNextSpeakerCheck` | Skip the next speaker check.                                                           | `true`  |
+
+### Context
+
+| UI Label                             | Setting                                           | Description                                                                                                                                     | Default |
+| ------------------------------------ | ------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| Memory Discovery Max Dirs            | `context.discoveryMaxDirs`                        | Maximum number of directories to search for memory.                                                                                             | `200`   |
+| Load Memory From Include Directories | `context.loadMemoryFromIncludeDirectories`        | Controls how /memory refresh loads GEMINI.md files. When true, include directories are scanned; when false, only the current directory is used. | `false` |
+| Respect .gitignore                   | `context.fileFiltering.respectGitIgnore`          | Respect .gitignore files when searching.                                                                                                        | `true`  |
+| Respect .geminiignore                | `context.fileFiltering.respectGeminiIgnore`       | Respect .geminiignore files when searching.                                                                                                     | `true`  |
+| Enable Recursive File Search         | `context.fileFiltering.enableRecursiveFileSearch` | Enable recursive file search functionality when completing @ references in the prompt.                                                          | `true`  |
+| Disable Fuzzy Search                 | `context.fileFiltering.disableFuzzySearch`        | Disable fuzzy search when searching for files.                                                                                                  | `false` |
+
+### Tools
+
+| UI Label                         | Setting                              | Description                                                                                                     | Default |
+| -------------------------------- | ------------------------------------ | --------------------------------------------------------------------------------------------------------------- | ------- |
+| Enable Interactive Shell         | `tools.shell.enableInteractiveShell` | Use node-pty for an interactive shell experience. Fallback to child_process still applies.                      | `true`  |
+| Show Color                       | `tools.shell.showColor`              | Show color in shell output.                                                                                     | `false` |
+| Auto Accept                      | `tools.autoAccept`                   | Automatically accept and execute tool calls that are considered safe (e.g., read-only operations).              | `false` |
+| Use Ripgrep                      | `tools.useRipgrep`                   | Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance. | `true`  |
+| Enable Tool Output Truncation    | `tools.enableToolOutputTruncation`   | Enable truncation of large tool outputs.                                                                        | `true`  |
+| Tool Output Truncation Threshold | `tools.truncateToolOutputThreshold`  | Truncate tool output if it is larger than this many characters. Set to -1 to disable.                           | `10000` |
+| Tool Output Truncation Lines     | `tools.truncateToolOutputLines`      | The number of lines to keep when truncating tool output.                                                        | `100`   |
+| Enable Message Bus Integration   | `tools.enableMessageBusIntegration`  | Enable policy-based tool confirmation via message bus integration.                                              | `false` |
+
+### Security
+
+| UI Label                   | Setting                        | Description                                        | Default |
+| -------------------------- | ------------------------------ | -------------------------------------------------- | ------- |
+| Disable YOLO Mode          | `security.disableYoloMode`     | Disable YOLO mode, even if enabled by a flag.      | `false` |
+| Blocks extensions from Git | `security.blockGitExtensions`  | Blocks installing and loading extensions from Git. | `false` |
+| Folder Trust               | `security.folderTrust.enabled` | Setting to track whether Folder trust is enabled.  | `false` |
+
+### Experimental
+
+| UI Label                            | Setting                                                 | Description                                                  | Default |
+| ----------------------------------- | ------------------------------------------------------- | ------------------------------------------------------------ | ------- |
+| Enable Codebase Investigator        | `experimental.codebaseInvestigatorSettings.enabled`     | Enable the Codebase Investigator agent.                      | `true`  |
+| Codebase Investigator Max Num Turns | `experimental.codebaseInvestigatorSettings.maxNumTurns` | Maximum number of turns for the Codebase Investigator agent. | `10`    |

docs/cli/telemetry.md

@@ -3,27 +3,27 @@
 Learn how to enable and setup OpenTelemetry for Gemini CLI.
 
 - [Observability with OpenTelemetry](#observability-with-opentelemetry)
-  - [Key Benefits](#key-benefits)
-  - [OpenTelemetry Integration](#opentelemetry-integration)
+  - [Key benefits](#key-benefits)
+  - [OpenTelemetry integration](#opentelemetry-integration)
   - [Configuration](#configuration)
-  - [Google Cloud Telemetry](#google-cloud-telemetry)
+  - [Google Cloud telemetry](#google-cloud-telemetry)
     - [Prerequisites](#prerequisites)
-    - [Direct Export (Recommended)](#direct-export-recommended)
-    - [Collector-Based Export (Advanced)](#collector-based-export-advanced)
-  - [Local Telemetry](#local-telemetry)
-    - [File-based Output (Recommended)](#file-based-output-recommended)
-    - [Collector-Based Export (Advanced)](#collector-based-export-advanced-1)
-  - [Logs and Metrics](#logs-and-metrics)
+    - [Direct export (recommended)](#direct-export-recommended)
+    - [Collector-based export (advanced)](#collector-based-export-advanced)
+  - [Local telemetry](#local-telemetry)
+    - [File-based output (recommended)](#file-based-output-recommended)
+    - [Collector-based export (advanced)](#collector-based-export-advanced-1)
+  - [Logs and metrics](#logs-and-metrics)
     - [Logs](#logs)
       - [Sessions](#sessions)
       - [Tools](#tools)
       - [Files](#files)
       - [API](#api)
-      - [Model Routing](#model-routing)
-      - [Chat and Streaming](#chat-and-streaming)
+      - [Model routing](#model-routing)
+      - [Chat and streaming](#chat-and-streaming)
       - [Resilience](#resilience)
       - [Extensions](#extensions)
-      - [Agent Runs](#agent-runs)
+      - [Agent runs](#agent-runs)
       - [IDE](#ide)
       - [UI](#ui)
     - [Metrics](#metrics)
@@ -31,40 +31,40 @@ Learn how to enable and setup OpenTelemetry for Gemini CLI.
         - [Sessions](#sessions-1)
         - [Tools](#tools-1)
         - [API](#api-1)
-        - [Token Usage](#token-usage)
+        - [Token usage](#token-usage)
         - [Files](#files-1)
-        - [Chat and Streaming](#chat-and-streaming-1)
-        - [Model Routing](#model-routing-1)
-        - [Agent Runs](#agent-runs-1)
+        - [Chat and streaming](#chat-and-streaming-1)
+        - [Model routing](#model-routing-1)
+        - [Agent runs](#agent-runs-1)
         - [UI](#ui-1)
         - [Performance](#performance)
-      - [GenAI Semantic Convention](#genai-semantic-convention)
+      - [GenAI semantic convention](#genai-semantic-convention)
 
-## Key Benefits
+## Key benefits
 
-- **🔍 Usage Analytics**: Understand interaction patterns and feature adoption
+- **🔍 Usage analytics**: Understand interaction patterns and feature adoption
   across your team
-- **⚡ Performance Monitoring**: Track response times, token consumption, and
+- **⚡ Performance monitoring**: Track response times, token consumption, and
   resource utilization
-- **🐛 Real-time Debugging**: Identify bottlenecks, failures, and error patterns
+- **🐛 Real-time debugging**: Identify bottlenecks, failures, and error patterns
   as they occur
-- **📊 Workflow Optimization**: Make informed decisions to improve
+- **📊 Workflow optimization**: Make informed decisions to improve
   configurations and processes
-- **🏢 Enterprise Governance**: Monitor usage across teams, track costs, ensure
+- **🏢 Enterprise governance**: Monitor usage across teams, track costs, ensure
   compliance, and integrate with existing monitoring infrastructure
 
-## OpenTelemetry Integration
+## OpenTelemetry integration
 
 Built on **[OpenTelemetry]** — the vendor-neutral, industry-standard
 observability framework — Gemini CLI's observability system provides:
 
-- **Universal Compatibility**: Export to any OpenTelemetry backend (Google
+- **Universal compatibility**: Export to any OpenTelemetry backend (Google
   Cloud, Jaeger, Prometheus, Datadog, etc.)
-- **Standardized Data**: Use consistent formats and collection methods across
+- **Standardized data**: Use consistent formats and collection methods across
   your toolchain
-- **Future-Proof Integration**: Connect with existing and future observability
+- **Future-proof integration**: Connect with existing and future observability
   infrastructure
-- **No Vendor Lock-in**: Switch between backends without changing your
+- **No vendor lock-in**: Switch between backends without changing your
   instrumentation
 
 [OpenTelemetry]: https://opentelemetry.io/
@@ -72,26 +72,26 @@ observability framework — Gemini CLI's observability system provides:
 ## Configuration
 
 All telemetry behavior is controlled through your `.gemini/settings.json` file.
-These settings can be overridden by environment variables or CLI flags.
+Environment variables can be used to override the settings in the file.
 
-| Setting        | Environment Variable             | CLI Flag                                                 | Description                                       | Values            | Default                 |
-| -------------- | -------------------------------- | -------------------------------------------------------- | ------------------------------------------------- | ----------------- | ----------------------- |
-| `enabled`      | `GEMINI_TELEMETRY_ENABLED`       | `--telemetry` / `--no-telemetry`                         | Enable or disable telemetry                       | `true`/`false`    | `false`                 |
-| `target`       | `GEMINI_TELEMETRY_TARGET`        | `--telemetry-target <local\|gcp>`                        | Where to send telemetry data                      | `"gcp"`/`"local"` | `"local"`               |
-| `otlpEndpoint` | `GEMINI_TELEMETRY_OTLP_ENDPOINT` | `--telemetry-otlp-endpoint <URL>`                        | OTLP collector endpoint                           | URL string        | `http://localhost:4317` |
-| `otlpProtocol` | `GEMINI_TELEMETRY_OTLP_PROTOCOL` | `--telemetry-otlp-protocol <grpc\|http>`                 | OTLP transport protocol                           | `"grpc"`/`"http"` | `"grpc"`                |
-| `outfile`      | `GEMINI_TELEMETRY_OUTFILE`       | `--telemetry-outfile <path>`                             | Save telemetry to file (overrides `otlpEndpoint`) | file path         | -                       |
-| `logPrompts`   | `GEMINI_TELEMETRY_LOG_PROMPTS`   | `--telemetry-log-prompts` / `--no-telemetry-log-prompts` | Include prompts in telemetry logs                 | `true`/`false`    | `true`                  |
-| `useCollector` | `GEMINI_TELEMETRY_USE_COLLECTOR` | -                                                        | Use external OTLP collector (advanced)            | `true`/`false`    | `false`                 |
+| Setting        | Environment Variable             | Description                                       | Values            | Default                 |
+| -------------- | -------------------------------- | ------------------------------------------------- | ----------------- | ----------------------- |
+| `enabled`      | `GEMINI_TELEMETRY_ENABLED`       | Enable or disable telemetry                       | `true`/`false`    | `false`                 |
+| `target`       | `GEMINI_TELEMETRY_TARGET`        | Where to send telemetry data                      | `"gcp"`/`"local"` | `"local"`               |
+| `otlpEndpoint` | `GEMINI_TELEMETRY_OTLP_ENDPOINT` | OTLP collector endpoint                           | URL string        | `http://localhost:4317` |
+| `otlpProtocol` | `GEMINI_TELEMETRY_OTLP_PROTOCOL` | OTLP transport protocol                           | `"grpc"`/`"http"` | `"grpc"`                |
+| `outfile`      | `GEMINI_TELEMETRY_OUTFILE`       | Save telemetry to file (overrides `otlpEndpoint`) | file path         | -                       |
+| `logPrompts`   | `GEMINI_TELEMETRY_LOG_PROMPTS`   | Include prompts in telemetry logs                 | `true`/`false`    | `true`                  |
+| `useCollector` | `GEMINI_TELEMETRY_USE_COLLECTOR` | Use external OTLP collector (advanced)            | `true`/`false`    | `false`                 |
 
 **Note on boolean environment variables:** For the boolean settings (`enabled`,
 `logPrompts`, `useCollector`), setting the corresponding environment variable to
 `true` or `1` will enable the feature. Any other value will disable it.
 
 For detailed information about all configuration options, see the
-[Configuration Guide](../get-started/configuration.md).
+[Configuration guide](../get-started/configuration.md).
 
-## Google Cloud Telemetry
+## Google Cloud telemetry
 
 ### Prerequisites
 
@@ -130,7 +130,7 @@ Before using either method below, complete these steps:
      --project="$OTLP_GOOGLE_CLOUD_PROJECT"
    ```
 
-### Direct Export (Recommended)
+### Direct export (recommended)
 
 Sends telemetry directly to Google Cloud services. No collector needed.
 
@@ -150,7 +150,7 @@ Sends telemetry directly to Google Cloud services. No collector needed.
      - Metrics: https://console.cloud.google.com/monitoring/metrics-explorer
      - Traces: https://console.cloud.google.com/traces/list
 
-### Collector-Based Export (Advanced)
+### Collector-based export (advanced)
 
 For custom processing, filtering, or routing, use an OpenTelemetry collector to
 forward data to Google Cloud.
@@ -184,11 +184,11 @@ forward data to Google Cloud.
    - Open `~/.gemini/tmp/<projectHash>/otel/collector-gcp.log` to view local
      collector logs.
 
-## Local Telemetry
+## Local telemetry
 
 For local development and debugging, you can capture telemetry data locally:
 
-### File-based Output (Recommended)
+### File-based output (recommended)
 
 1. Enable telemetry in your `.gemini/settings.json`:
    ```json
@@ -204,7 +204,7 @@ For local development and debugging, you can capture telemetry data locally:
 2. Run Gemini CLI and send prompts.
 3. View logs and metrics in the specified file (e.g., `.gemini/telemetry.log`).
 
-### Collector-Based Export (Advanced)
+### Collector-based export (advanced)
 
 1. Run the automation script:
    ```bash
@@ -220,13 +220,14 @@ For local development and debugging, you can capture telemetry data locally:
 3. View traces at http://localhost:16686 and logs/metrics in the collector log
    file.
 
-## Logs and Metrics
+## Logs and metrics
 
 The following section describes the structure of logs and metrics generated for
 Gemini CLI.
 
-The `session.id`, `installation.id`, and `user.email` are included as common
-attributes on all logs and metrics.
+The `session.id`, `installation.id`, and `user.email` (available only when
+authenticated with a Google account) are included as common attributes on all
+logs and metrics.
 
 ### Logs
 
@@ -251,6 +252,9 @@ Captures startup configuration and user prompt submissions.
     - `debug_mode` (boolean)
     - `mcp_servers` (string)
     - `mcp_servers_count` (int)
+    - `extensions` (string)
+    - `extension_ids` (string)
+    - `extension_count` (int)
     - `mcp_tools` (string, if applicable)
     - `mcp_tools_count` (int, if applicable)
     - `output_format` ("text", "json", or "stream-json")
@@ -278,6 +282,8 @@ Captures tool executions, output truncation, and Smart Edit behavior.
     - `prompt_id` (string)
     - `tool_type` ("native" or "mcp")
     - `mcp_server_name` (string, if applicable)
+    - `extension_name` (string, if applicable)
+    - `extension_id` (string, if applicable)
     - `content_length` (int, if applicable)
     - `metadata` (if applicable)
 
@@ -355,6 +361,7 @@ Captures Gemini API requests, responses, and errors.
     - `response_text` (string, optional)
     - `prompt_id` (string)
     - `auth_type` (string)
+    - `finish_reasons` (array of strings)
 
 - `gemini_cli.api_error`: API request failed.
   - **Attributes**:
@@ -371,9 +378,7 @@ Captures Gemini API requests, responses, and errors.
   - **Attributes**:
     - `model` (string)
 
-#### Model Routing
-
-Tracks model selections via slash commands and router decisions.
+#### Model routing
 
 - `gemini_cli.slash_command`: A slash command was executed.
   - **Attributes**:
@@ -394,9 +399,7 @@ Tracks model selections via slash commands and router decisions.
     - `failed` (boolean)
     - `error_message` (string, optional)
 
-#### Chat and Streaming
-
-Observes streaming integrity, compression, and retry behavior.
+#### Chat and streaming
 
 - `gemini_cli.chat_compression`: Chat context was compressed.
   - **Attributes**:
@@ -482,9 +485,7 @@ Tracks extension lifecycle and settings changes.
     - `extension_source` (string)
     - `status` (string)
 
-#### Agent Runs
-
-Tracks agent lifecycle and outcomes.
+#### Agent runs
 
 - `gemini_cli.agent.start`: Agent run started.
   - **Attributes**:
@@ -560,7 +561,7 @@ Tracks API request volume and latency.
     - `model`
   - Note: Overlaps with `gen_ai.client.operation.duration` (GenAI conventions).
 
-##### Token Usage
+##### Token usage
 
 Tracks tokens used by model and type.
 
@@ -588,7 +589,7 @@ Counts file operations with basic context.
     - `function_name`
     - `type` ("added" or "removed")
 
-##### Chat and Streaming
+##### Chat and streaming
 
 Resilience counters for compression, invalid chunks, and retries.
 
@@ -607,7 +608,7 @@ Resilience counters for compression, invalid chunks, and retries.
 - `gemini_cli.chat.content_retry_failure.count` (Counter, Int): Counts requests
   where all content retries failed.
 
-##### Model Routing
+##### Model routing
 
 Routing latency/failures and slash-command selections.
 
@@ -628,7 +629,7 @@ Routing latency/failures and slash-command selections.
     - `routing.decision_source` (string)
     - `routing.error_message` (string)
 
-##### Agent Runs
+##### Agent runs
 
 Agent lifecycle metrics: runs, durations, and turns.
 
@@ -720,7 +721,7 @@ Optional performance monitoring for startup, CPU/memory, and phase timing.
     - `current_value` (number)
     - `baseline_value` (number)
 
-#### GenAI Semantic Convention
+#### GenAI semantic convention
 
 The following metrics comply with [OpenTelemetry GenAI semantic conventions] for
 standardized observability across GenAI applications:

docs/cli/themes.md

@@ -4,19 +4,19 @@ Gemini CLI supports a variety of themes to customize its color scheme and
 appearance. You can change the theme to suit your preferences via the `/theme`
 command or `"theme":` configuration setting.
 
-## Available Themes
+## Available themes
 
 Gemini CLI comes with a selection of pre-defined themes, which you can list
 using the `/theme` command within Gemini CLI:
 
-- **Dark Themes:**
+- **Dark themes:**
   - `ANSI`
   - `Atom One`
   - `Ayu`
   - `Default`
   - `Dracula`
   - `GitHub`
-- **Light Themes:**
+- **Light themes:**
   - `ANSI Light`
   - `Ayu Light`
   - `Default Light`
@@ -24,7 +24,7 @@ using the `/theme` command within Gemini CLI:
   - `Google Code`
   - `Xcode`
 
-### Changing Themes
+### Changing themes
 
 1.  Enter `/theme` into Gemini CLI.
 2.  A dialog or selection prompt appears, listing the available themes.
@@ -36,7 +36,7 @@ using the `/theme` command within Gemini CLI:
 by a file path), you must remove the `"theme"` setting from the file before you
 can change the theme using the `/theme` command.
 
-### Theme Persistence
+### Theme persistence
 
 Selected themes are saved in Gemini CLI's
 [configuration](../get-started/configuration.md) so your preference is
@@ -44,13 +44,13 @@ remembered across sessions.
 
 ---
 
-## Custom Color Themes
+## Custom color themes
 
 Gemini CLI allows you to create your own custom color themes by specifying them
 in your `settings.json` file. This gives you full control over the color palette
 used in the CLI.
 
-### How to Define a Custom Theme
+### How to define a custom theme
 
 Add a `customThemes` block to your user, project, or system `settings.json`
 file. Each custom theme is defined as an object with a unique name and a set of
@@ -88,7 +88,12 @@ color keys. For example:
 - `DiffRemoved` (optional, for removed lines in diffs)
 - `DiffModified` (optional, for modified lines in diffs)
 
-**Required Properties:**
+You can also override individual UI text roles by adding a nested `text` object.
+This object supports the keys `primary`, `secondary`, `link`, `accent`, and
+`response`. When `text.response` is provided it takes precedence over
+`text.primary` for rendering model responses in chat.
+
+**Required properties:**
 
 - `name` (must match the key in the `customThemes` object and be a string)
 - `type` (must be the string `"custom"`)
@@ -112,7 +117,7 @@ for a full list of supported names.
 You can define multiple custom themes by adding more entries to the
 `customThemes` object.
 
-### Loading Themes from a File
+### Loading themes from a file
 
 In addition to defining custom themes in `settings.json`, you can also load a
 theme directly from a JSON file by specifying the file path in your
@@ -157,17 +162,17 @@ custom theme defined in `settings.json`.
 }
 ```
 
-**Security Note:** For your safety, Gemini CLI will only load theme files that
+**Security note:** For your safety, Gemini CLI will only load theme files that
 are located within your home directory. If you attempt to load a theme from
 outside your home directory, a warning will be displayed and the theme will not
 be loaded. This is to prevent loading potentially malicious theme files from
 untrusted sources.
 
-### Example Custom Theme
+### Example custom theme
 
 <img src="../assets/theme-custom.png" alt="Custom theme example" width="600" />
 
-### Using Your Custom Theme
+### Using your custom theme
 
 - Select your custom theme using the `/theme` command in Gemini CLI. Your custom
   theme will appear in the theme selection dialog.
@@ -179,7 +184,7 @@ untrusted sources.
 
 ---
 
-## Dark Themes
+## Dark themes
 
 ### ANSI
 
@@ -205,7 +210,7 @@ untrusted sources.
 
 <img src="/assets/theme-github.png" alt="GitHub theme" width="600">
 
-## Light Themes
+## Light themes
 
 ### ANSI Light
 

docs/cli/token-caching.md

@@ -1,4 +1,4 @@
-# Token Caching and Cost Optimization
+# Token caching and cost optimization
 
 Gemini CLI automatically optimizes API costs through token caching when using
 API key authentication (Gemini API key or Vertex AI). This feature reuses

docs/cli/trusted-folders.md

@@ -5,7 +5,7 @@ which projects can use the full capabilities of the Gemini CLI. It prevents
 potentially malicious code from running by asking you to approve a folder before
 the CLI loads any project-specific configurations from it.
 
-## Enabling the Feature
+## Enabling the feature
 
 The Trusted Folders feature is **disabled by default**. To use it, you must
 first enable it in your settings.
@@ -22,7 +22,7 @@ Add the following to your user `settings.json` file:
 }
 ```
 
-## How It Works: The Trust Dialog
+## How it works: The trust dialog
 
 Once the feature is enabled, the first time you run the Gemini CLI from a
 folder, a dialog will automatically appear, prompting you to make a choice:
@@ -38,58 +38,58 @@ folder, a dialog will automatically appear, prompting you to make a choice:
 Your choice is saved in a central file (`~/.gemini/trustedFolders.json`), so you
 will only be asked once per folder.
 
-## Why Trust Matters: The Impact of an Untrusted Workspace
+## Why trust matters: The impact of an untrusted workspace
 
 When a folder is **untrusted**, the Gemini CLI runs in a restricted "safe mode"
 to protect you. In this mode, the following features are disabled:
 
-1.  **Workspace Settings are Ignored**: The CLI will **not** load the
+1.  **Workspace settings are ignored**: The CLI will **not** load the
     `.gemini/settings.json` file from the project. This prevents the loading of
     custom tools and other potentially dangerous configurations.
 
-2.  **Environment Variables are Ignored**: The CLI will **not** load any `.env`
+2.  **Environment variables are ignored**: The CLI will **not** load any `.env`
     files from the project.
 
-3.  **Extension Management is Restricted**: You **cannot install, update, or
+3.  **Extension management is restricted**: You **cannot install, update, or
     uninstall** extensions.
 
-4.  **Tool Auto-Acceptance is Disabled**: You will always be prompted before any
+4.  **Tool auto-acceptance is disabled**: You will always be prompted before any
     tool is run, even if you have auto-acceptance enabled globally.
 
-5.  **Automatic Memory Loading is Disabled**: The CLI will not automatically
+5.  **Automatic memory loading is disabled**: The CLI will not automatically
     load files into context from directories specified in local settings.
 
-6.  **MCP Servers Do Not Connect**: The CLI will not attempt to connect to any
+6.  **MCP servers do not connect**: The CLI will not attempt to connect to any
     [Model Context Protocol (MCP)](../tools/mcp-server.md) servers.
 
-7.  **Custom Commands are Not Loaded**: The CLI will not load any custom
+7.  **Custom commands are not loaded**: The CLI will not load any custom
     commands from .toml files, including both project-specific and global user
     commands.
 
 Granting trust to a folder unlocks the full functionality of the Gemini CLI for
 that workspace.
 
-## Managing Your Trust Settings
+## Managing your trust settings
 
 If you need to change a decision or see all your settings, you have a couple of
 options:
 
-- **Change the Current Folder's Trust**: Run the `/permissions` command from
+- **Change the current folder's trust**: Run the `/permissions` command from
   within the CLI. This will bring up the same interactive dialog, allowing you
   to change the trust level for the current folder.
 
-- **View All Trust Rules**: To see a complete list of all your trusted and
+- **View all trust rules**: To see a complete list of all your trusted and
   untrusted folder rules, you can inspect the contents of the
   `~/.gemini/trustedFolders.json` file in your home directory.
 
-## The Trust Check Process (Advanced)
+## The trust check process (advanced)
 
 For advanced users, it's helpful to know the exact order of operations for how
 trust is determined:
 
-1.  **IDE Trust Signal**: If you are using the
+1.  **IDE trust signal**: If you are using the
     [IDE Integration](../ide-integration/index.md), the CLI first asks the IDE
     if the workspace is trusted. The IDE's response takes highest priority.
 
-2.  **Local Trust File**: If the IDE is not connected, the CLI checks the
+2.  **Local trust file**: If the IDE is not connected, the CLI checks the
     central `~/.gemini/trustedFolders.json` file.

docs/cli/tutorials.md

@@ -8,7 +8,7 @@ This page contains tutorials for interacting with Gemini CLI.
 > and understand the tools it provides. Your use of third-party servers is at
 > your own risk.
 
-This tutorial demonstrates how to set up a MCP server, using the
+This tutorial demonstrates how to set up an MCP server, using the
 [GitHub MCP server](https://github.com/github/github-mcp-server) as an example.
 The GitHub MCP server provides tools for interacting with GitHub repositories,
 such as creating issues and commenting on pull requests.

docs/cli/uninstall.md

@@ -35,7 +35,7 @@ _PowerShell_
 Remove-Item -Path (Join-Path $env:LocalAppData "npm-cache\_npx") -Recurse -Force
 ```
 
-## Method 2: Using npm (Global Install)
+## Method 2: Using npm (global install)
 
 If you installed the CLI globally (e.g., `npm install -g @google/gemini-cli`),
 use the `npm uninstall` command with the `-g` flag to remove it.

docs/core/index.md

@@ -1,4 +1,4 @@
-# Gemini CLI Core
+# Gemini CLI core
 
 Gemini CLI's core package (`packages/core`) is the backend portion of Gemini
 CLI, handling communication with the Gemini API, managing tools, and processing
@@ -11,6 +11,8 @@ requests sent from `packages/cli`. For a general overview of Gemini CLI, see the
   registered, and used by the core.
 - **[Memory Import Processor](./memport.md):** Documentation for the modular
   GEMINI.md import feature using @file.md syntax.
+- **[Policy Engine](./policy-engine.md):** Use the Policy Engine for
+  fine-grained control over tool execution.
 
 ## Role of the core
 

docs/core/memport.md

@@ -27,21 +27,21 @@ More content here.
 @./shared/configuration.md
 ```
 
-## Supported Path Formats
+## Supported path formats
 
-### Relative Paths
+### Relative paths
 
 - `@./file.md` - Import from the same directory
 - `@../file.md` - Import from parent directory
 - `@./components/file.md` - Import from subdirectory
 
-### Absolute Paths
+### Absolute paths
 
 - `@/absolute/path/to/file.md` - Import using absolute path
 
 ## Examples
 
-### Basic Import
+### Basic import
 
 ```markdown
 # My GEMINI.md
@@ -55,7 +55,7 @@ Welcome to my project!
 @./features/overview.md
 ```
 
-### Nested Imports
+### Nested imports
 
 The imported files can themselves contain imports, creating a nested structure:
 
@@ -73,9 +73,9 @@ The imported files can themselves contain imports, creating a nested structure:
 @./shared/title.md
 ```
 
-## Safety Features
+## Safety features
 
-### Circular Import Detection
+### Circular import detection
 
 The processor automatically detects and prevents circular imports:
 
@@ -89,37 +89,37 @@ The processor automatically detects and prevents circular imports:
 @./file-a.md <!-- This will be detected and prevented -->
 ```
 
-### File Access Security
+### File access security
 
 The `validateImportPath` function ensures that imports are only allowed from
 specified directories, preventing access to sensitive files outside the allowed
 scope.
 
-### Maximum Import Depth
+### Maximum import depth
 
 To prevent infinite recursion, there's a configurable maximum import depth
 (default: 5 levels).
 
-## Error Handling
+## Error handling
 
-### Missing Files
+### Missing files
 
 If a referenced file doesn't exist, the import will fail gracefully with an
 error comment in the output.
 
-### File Access Errors
+### File access errors
 
 Permission issues or other file system errors are handled gracefully with
 appropriate error messages.
 
-## Code Region Detection
+## Code region detection
 
 The import processor uses the `marked` library to detect code blocks and inline
 code spans, ensuring that `@` imports inside these regions are properly ignored.
 This provides robust handling of nested code blocks and complex Markdown
 structures.
 
-## Import Tree Structure
+## Import tree structure
 
 The processor returns an import tree that shows the hierarchy of imported files,
 similar to Claude's `/memory` feature. This helps users debug problems with
@@ -143,7 +143,7 @@ Memory Files
 The tree preserves the order that files were imported and shows the complete
 import chain for debugging purposes.
 
-## Comparison to Claude Code's `/memory` (`claude.md`) Approach
+## Comparison to Claude Code's `/memory` (`claude.md`) approach
 
 Claude Code's `/memory` feature (as seen in `claude.md`) produces a flat, linear
 document by concatenating all included files, always marking file boundaries
@@ -154,7 +154,7 @@ for reconstructing the hierarchy if needed.
 > [!NOTE] The import tree is mainly for clarity during development and has
 > limited relevance to LLM consumption.
 
-## API Reference
+## API reference
 
 ### `processImports(content, basePath, debugMode?, importState?)`
 
@@ -225,7 +225,7 @@ directory if no `.git` is found)
 
 ## Troubleshooting
 
-### Common Issues
+### Common issues
 
 1. **Import not working**: Check that the file exists and the path is correct
 2. **Circular import warnings**: Review your import structure for circular
@@ -235,7 +235,7 @@ directory if no `.git` is found)
 4. **Path resolution issues**: Use absolute paths if relative paths aren't
    resolving correctly
 
-### Debug Mode
+### Debug mode
 
 Enable debug mode to see detailed logging of the import process:
 

docs/core/policy-engine.md

@@ -0,0 +1,246 @@
+# Policy engine
+
+:::note This feature is currently in testing. To enable it, set
+`tools.enableMessageBusIntegration` to `true` in your `settings.json` file. :::
+
+The Gemini CLI includes a powerful policy engine that provides fine-grained
+control over tool execution. It allows users and administrators to define rules
+that determine whether a tool call should be allowed, denied, or require user
+confirmation.
+
+## Core concepts
+
+The policy engine operates on a set of rules. Each rule is a combination of
+conditions and a resulting decision. When a large language model wants to
+execute a tool, the policy engine evaluates all rules to find the
+highest-priority rule that matches the tool call.
+
+A rule consists of the following main components:
+
+- **Conditions**: Criteria that a tool call must meet for the rule to apply.
+  This can include the tool's name, the arguments provided to it, or the current
+  approval mode.
+- **Decision**: The action to take if the rule matches (`allow`, `deny`, or
+  `ask_user`).
+- **Priority**: A number that determines the rule's precedence. Higher numbers
+  win.
+
+For example, this rule will ask for user confirmation before executing any `git`
+command.
+
+```toml
+[[rule]]
+toolName = "run_shell_command"
+commandPrefix = "git "
+decision = "ask_user"
+priority = 100
+```
+
+### Conditions
+
+Conditions are the criteria that a tool call must meet for a rule to apply. The
+primary conditions are the tool's name and its arguments.
+
+#### Tool Name
+
+The `toolName` in the rule must match the name of the tool being called.
+
+- **Wildcards**: For Model-hosting-protocol (MCP) servers, you can use a
+  wildcard. A `toolName` of `my-server__*` will match any tool from the
+  `my-server` MCP.
+
+#### Arguments pattern
+
+If `argsPattern` is specified, the tool's arguments are converted to a stable
+JSON string, which is then tested against the provided regular expression. If
+the arguments don't match the pattern, the rule does not apply.
+
+### Decisions
+
+There are three possible decisions a rule can enforce:
+
+- `allow`: The tool call is executed automatically without user interaction.
+- `deny`: The tool call is blocked and is not executed.
+- `ask_user`: The user is prompted to approve or deny the tool call. (In
+  non-interactive mode, this is treated as `deny`.)
+
+### Priority system and tiers
+
+The policy engine uses a sophisticated priority system to resolve conflicts when
+multiple rules match a single tool call. The core principle is simple: **the
+rule with the highest priority wins**.
+
+To provide a clear hierarchy, policies are organized into three tiers. Each tier
+has a designated number that forms the base of the final priority calculation.
+
+| Tier    | Base | Description                                                                |
+| :------ | :--- | :------------------------------------------------------------------------- |
+| Default | 1    | Built-in policies that ship with the Gemini CLI.                           |
+| User    | 2    | Custom policies defined by the user.                                       |
+| Admin   | 3    | Policies managed by an administrator (e.g., in an enterprise environment). |
+
+Within a TOML policy file, you assign a priority value from **0 to 999**. The
+engine transforms this into a final priority using the following formula:
+
+`final_priority = tier_base + (toml_priority / 1000)`
+
+This system guarantees that:
+
+- Admin policies always override User and Default policies.
+- User policies always override Default policies.
+- You can still order rules within a single tier with fine-grained control.
+
+For example:
+
+- A `priority: 50` rule in a Default policy file becomes `1.050`.
+- A `priority: 100` rule in a User policy file becomes `2.100`.
+- A `priority: 20` rule in an Admin policy file becomes `3.020`.
+
+### Approval modes
+
+Approval modes allow the policy engine to apply different sets of rules based on
+the CLI's operational mode. A rule can be associated with one or more modes
+(e.g., `yolo`, `autoEdit`). The rule will only be active if the CLI is running
+in one of its specified modes. If a rule has no modes specified, it is always
+active.
+
+## Rule matching
+
+When a tool call is made, the engine checks it against all active rules,
+starting from the highest priority. The first rule that matches determines the
+outcome.
+
+A rule matches a tool call if all of its conditions are met:
+
+1.  **Tool name**: The `toolName` in the rule must match the name of the tool
+    being called.
+    - **Wildcards**: For Model-hosting-protocol (MCP) servers, you can use a
+      wildcard. A `toolName` of `my-server__*` will match any tool from the
+      `my-server` MCP.
+2.  **Arguments pattern**: If `argsPattern` is specified, the tool's arguments
+    are converted to a stable JSON string, which is then tested against the
+    provided regular expression. If the arguments don't match the pattern, the
+    rule does not apply.
+
+## Configuration
+
+Policies are defined in `.toml` files. The CLI loads these files from Default,
+User, and (if configured) Admin directories.
+
+### TOML rule schema
+
+Here is a breakdown of the fields available in a TOML policy rule:
+
+```toml
+[[rule]]
+# A unique name for the tool, or an array of names.
+toolName = "run_shell_command"
+
+# (Optional) The name of an MCP server. Can be combined with toolName
+# to form a composite name like "mcpName__toolName".
+mcpName = "my-custom-server"
+
+# (Optional) A regex to match against the tool's arguments.
+argsPattern = '"command":"(git|npm)'
+
+# (Optional) A string or array of strings that a shell command must start with.
+# This is syntactic sugar for `toolName = "run_shell_command"` and an `argsPattern`.
+commandPrefix = "git "
+
+# (Optional) A regex to match against the entire shell command.
+# This is also syntactic sugar for `toolName = "run_shell_command"`.
+# Note: This pattern is tested against the JSON representation of the arguments (e.g., `{"command":"<your_command>"}`), so anchors like `^` or `$` will apply to the full JSON string, not just the command text.
+# You cannot use commandPrefix and commandRegex in the same rule.
+commandRegex = "^git (commit|push)"
+
+# The decision to take. Must be "allow", "deny", or "ask_user".
+decision = "ask_user"
+
+# The priority of the rule, from 0 to 999.
+priority = 10
+
+# (Optional) An array of approval modes where this rule is active.
+modes = ["autoEdit"]
+```
+
+### Using arrays (lists)
+
+To apply the same rule to multiple tools or command prefixes, you can provide an
+array of strings for the `toolName` and `commandPrefix` fields.
+
+**Example:**
+
+This single rule will apply to both the `write_file` and `replace` tools.
+
+```toml
+[[rule]]
+toolName = ["write_file", "replace"]
+decision = "ask_user"
+priority = 10
+```
+
+### Special syntax for `run_shell_command`
+
+To simplify writing policies for `run_shell_command`, you can use
+`commandPrefix` or `commandRegex` instead of the more complex `argsPattern`.
+
+- `commandPrefix`: Matches if the `command` argument starts with the given
+  string.
+- `commandRegex`: Matches if the `command` argument matches the given regular
+  expression.
+
+**Example:**
+
+This rule will ask for user confirmation before executing any `git` command.
+
+```toml
+[[rule]]
+toolName = "run_shell_command"
+commandPrefix = "git "
+decision = "ask_user"
+priority = 100
+```
+
+### Special syntax for MCP tools
+
+You can create rules that target tools from Model-hosting-protocol (MCP) servers
+using the `mcpName` field or a wildcard pattern.
+
+**1. Using `mcpName`**
+
+To target a specific tool from a specific server, combine `mcpName` and
+`toolName`.
+
+```toml
+# Allows the `search` tool on the `my-jira-server` MCP
+[[rule]]
+mcpName = "my-jira-server"
+toolName = "search"
+decision = "allow"
+priority = 200
+```
+
+**2. Using a wildcard**
+
+To create a rule that applies to _all_ tools on a specific MCP server, specify
+only the `mcpName`.
+
+```toml
+# Denies all tools from the `untrusted-server` MCP
+[[rule]]
+mcpName = "untrusted-server"
+decision = "deny"
+priority = 500
+```
+
+## Default policies
+
+The Gemini CLI ships with a set of default policies to provide a safe
+out-of-the-box experience.
+
+- **Read-only tools** (like `read_file`, `glob`) are generally **allowed**.
+- **Write tools** (like `write_file`, `run_shell_command`) default to
+  **`ask_user`**.
+- In **`yolo`** mode, a high-priority rule allows all tools.
+- In **`autoEdit`** mode, rules allow certain write operations to happen without
+  prompting.

docs/core/tools-api.md

@@ -1,11 +1,11 @@
-# Gemini CLI Core: Tools API
+# Gemini CLI core: Tools API
 
 The Gemini CLI core (`packages/core`) features a robust system for defining,
 registering, and executing tools. These tools extend the capabilities of the
 Gemini model, allowing it to interact with the local environment, fetch web
 content, and perform various actions beyond simple text generation.
 
-## Core Concepts
+## Core concepts
 
 - **Tool (`tools.ts`):** An interface and base class (`BaseTool`) that defines
   the contract for all tools. Each tool must have:
@@ -32,38 +32,37 @@ content, and perform various actions beyond simple text generation.
   - `returnDisplay`: A user-friendly string (often Markdown) or a special object
     (like `FileDiff`) for display in the CLI.
 
-- **Returning Rich Content:** Tools are not limited to returning simple text.
+- **Returning rich content:** Tools are not limited to returning simple text.
   The `llmContent` can be a `PartListUnion`, which is an array that can contain
   a mix of `Part` objects (for images, audio, etc.) and `string`s. This allows a
   single tool execution to return multiple pieces of rich content.
 
-- **Tool Registry (`tool-registry.ts`):** A class (`ToolRegistry`) responsible
+- **Tool registry (`tool-registry.ts`):** A class (`ToolRegistry`) responsible
   for:
-  - **Registering Tools:** Holding a collection of all available built-in tools
+  - **Registering tools:** Holding a collection of all available built-in tools
     (e.g., `ReadFileTool`, `ShellTool`).
-  - **Discovering Tools:** It can also discover tools dynamically:
-    - **Command-based Discovery:** If `tools.discoveryCommand` is configured in
+  - **Discovering tools:** It can also discover tools dynamically:
+    - **Command-based discovery:** If `tools.discoveryCommand` is configured in
       settings, this command is executed. It's expected to output JSON
       describing custom tools, which are then registered as `DiscoveredTool`
       instances.
-    - **MCP-based Discovery:** If `mcp.serverCommand` is configured, the
+    - **MCP-based discovery:** If `mcp.serverCommand` is configured, the
       registry can connect to a Model Context Protocol (MCP) server to list and
       register tools (`DiscoveredMCPTool`).
-  - **Providing Schemas:** Exposing the `FunctionDeclaration` schemas of all
+  - **Providing schemas:** Exposing the `FunctionDeclaration` schemas of all
     registered tools to the Gemini model, so it knows what tools are available
     and how to use them.
-  - **Retrieving Tools:** Allowing the core to get a specific tool by name for
+  - **Retrieving tools:** Allowing the core to get a specific tool by name for
     execution.
 
-## Built-in Tools
+## Built-in tools
 
 The core comes with a suite of pre-defined tools, typically found in
 `packages/core/src/tools/`. These include:
 
-- **File System Tools:**
+- **File system tools:**
   - `LSTool` (`ls.ts`): Lists directory contents.
-  - `ReadFileTool` (`read-file.ts`): Reads the content of a single file. It
-    takes an `absolute_path` parameter, which must be an absolute path.
+  - `ReadFileTool` (`read-file.ts`): Reads the content of a single file.
   - `WriteFileTool` (`write-file.ts`): Writes content to a file.
   - `GrepTool` (`grep.ts`): Searches for patterns in files.
   - `GlobTool` (`glob.ts`): Finds files matching glob patterns.
@@ -71,26 +70,26 @@ The core comes with a suite of pre-defined tools, typically found in
     requiring confirmation).
   - `ReadManyFilesTool` (`read-many-files.ts`): Reads and concatenates content
     from multiple files or glob patterns (used by the `@` command in CLI).
-- **Execution Tools:**
+- **Execution tools:**
   - `ShellTool` (`shell.ts`): Executes arbitrary shell commands (requires
     careful sandboxing and user confirmation).
-- **Web Tools:**
+- **Web tools:**
   - `WebFetchTool` (`web-fetch.ts`): Fetches content from a URL.
   - `WebSearchTool` (`web-search.ts`): Performs a web search.
-- **Memory Tools:**
+- **Memory tools:**
   - `MemoryTool` (`memoryTool.ts`): Interacts with the AI's memory.
 
 Each of these tools extends `BaseTool` and implements the required methods for
 its specific functionality.
 
-## Tool Execution Flow
+## Tool execution flow
 
-1.  **Model Request:** The Gemini model, based on the user's prompt and the
+1.  **Model request:** The Gemini model, based on the user's prompt and the
     provided tool schemas, decides to use a tool and returns a `FunctionCall`
     part in its response, specifying the tool name and arguments.
-2.  **Core Receives Request:** The core parses this `FunctionCall`.
-3.  **Tool Retrieval:** It looks up the requested tool in the `ToolRegistry`.
-4.  **Parameter Validation:** The tool's `validateToolParams()` method is
+2.  **Core receives request:** The core parses this `FunctionCall`.
+3.  **Tool retrieval:** It looks up the requested tool in the `ToolRegistry`.
+4.  **Parameter validation:** The tool's `validateToolParams()` method is
     called.
 5.  **Confirmation (if needed):**
     - The tool's `shouldConfirmExecute()` method is called.
@@ -100,27 +99,27 @@ its specific functionality.
 6.  **Execution:** If validated and confirmed (or if no confirmation is needed),
     the core calls the tool's `execute()` method with the provided arguments and
     an `AbortSignal` (for potential cancellation).
-7.  **Result Processing:** The `ToolResult` from `execute()` is received by the
+7.  **Result processing:** The `ToolResult` from `execute()` is received by the
     core.
-8.  **Response to Model:** The `llmContent` from the `ToolResult` is packaged as
+8.  **Response to model:** The `llmContent` from the `ToolResult` is packaged as
     a `FunctionResponse` and sent back to the Gemini model so it can continue
     generating a user-facing response.
-9.  **Display to User:** The `returnDisplay` from the `ToolResult` is sent to
+9.  **Display to user:** The `returnDisplay` from the `ToolResult` is sent to
     the CLI to show the user what the tool did.
 
-## Extending with Custom Tools
+## Extending with custom tools
 
 While direct programmatic registration of new tools by users isn't explicitly
 detailed as a primary workflow in the provided files for typical end-users, the
 architecture supports extension through:
 
-- **Command-based Discovery:** Advanced users or project administrators can
+- **Command-based discovery:** Advanced users or project administrators can
   define a `tools.discoveryCommand` in `settings.json`. This command, when run
   by the Gemini CLI core, should output a JSON array of `FunctionDeclaration`
   objects. The core will then make these available as `DiscoveredTool`
   instances. The corresponding `tools.callCommand` would then be responsible for
   actually executing these custom tools.
-- **MCP Server(s):** For more complex scenarios, one or more MCP servers can be
+- **MCP server(s):** For more complex scenarios, one or more MCP servers can be
   set up and configured via the `mcpServers` setting in `settings.json`. The
   Gemini CLI core can then discover and use tools exposed by these servers. As
   mentioned, if you have multiple MCP servers, the tool names will be prefixed

docs/examples/proxy-script.md

@@ -1,4 +1,4 @@
-# Example Proxy Script
+# Example proxy script
 
 The following is an example of a proxy script that can be used with the
 `GEMINI_SANDBOX_PROXY_COMMAND` environment variable. This script only allows

docs/extensions/extension-releasing.md

@@ -1,4 +1,4 @@
-# Extension Releasing
+# Extension releasing
 
 There are two primary ways of releasing extensions to users:
 
@@ -15,11 +15,9 @@ if you need to ship platform specific binary files.
 
 This is the most flexible and simple option. All you need to do is create a
 publicly accessible git repo (such as a public github repository) and then users
-can install your extension using `gemini extensions install <your-repo-uri>`, or
-for a GitHub repository they can use the simplified
-`gemini extensions install <org>/<repo>` format. They can optionally depend on a
-specific ref (branch/tag/commit) using the `--ref=<some-ref>` argument, this
-defaults to the default branch.
+can install your extension using `gemini extensions install <your-repo-uri>`.
+They can optionally depend on a specific ref (branch/tag/commit) using the
+`--ref=<some-ref>` argument, this defaults to the default branch.
 
 Whenever commits are pushed to the ref that a user depends on, they will be
 prompted to update the extension. Note that this also allows for easy rollbacks,
@@ -66,7 +64,7 @@ If you plan on doing cherry picks, you may want to avoid having your default
 branch be the stable branch to avoid force-pushing to the default branch which
 should generally be avoided.
 
-## Releasing through Github releases
+## Releasing through GitHub releases
 
 Gemini CLI extensions can be distributed through
 [GitHub Releases](https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases).
@@ -107,9 +105,9 @@ To ensure Gemini CLI can automatically find the correct release asset for each
 platform, you must follow this naming convention. The CLI will search for assets
 in the following order:
 
-1.  **Platform and Architecture-Specific:**
+1.  **Platform and architecture-Specific:**
     `{platform}.{arch}.{name}.{extension}`
-2.  **Platform-Specific:** `{platform}.{name}.{extension}`
+2.  **Platform-specific:** `{platform}.{name}.{extension}`
 3.  **Generic:** If only one asset is provided, it will be used as a generic
     fallback.
 

docs/extensions/getting-started-extensions.md

@@ -1,4 +1,4 @@
-# Getting Started with Gemini CLI Extensions
+# Getting started with Gemini CLI extensions
 
 This guide will walk you through creating your first Gemini CLI extension.
 You'll learn how to set up a new extension, add a custom tool via an MCP server,
@@ -10,7 +10,7 @@ file.
 Before you start, make sure you have the Gemini CLI installed and a basic
 understanding of Node.js and TypeScript.
 
-## Step 1: Create a New Extension
+## Step 1: Create a new extension
 
 The easiest way to start is by using one of the built-in templates. We'll use
 the `mcp-server` example as our foundation.
@@ -32,7 +32,7 @@ my-first-extension/
 └── tsconfig.json
 ```
 
-## Step 2: Understand the Extension Files
+## Step 2: Understand the extension files
 
 Let's look at the key files in your new extension.
 
@@ -124,7 +124,7 @@ These are standard configuration files for a TypeScript project. The
 `package.json` file defines dependencies and a `build` script, and
 `tsconfig.json` configures the TypeScript compiler.
 
-## Step 3: Build and Link Your Extension
+## Step 3: Build and link your extension
 
 Before you can use the extension, you need to compile the TypeScript code and
 link the extension to your Gemini CLI installation for local development.
@@ -158,7 +158,7 @@ link the extension to your Gemini CLI installation for local development.
 Now, restart your Gemini CLI session. The new `fetch_posts` tool will be
 available. You can test it by asking: "fetch posts".
 
-## Step 4: Add a Custom Command
+## Step 4: Add a custom command
 
 Custom commands provide a way to create shortcuts for complex prompts. Let's add
 a command that searches for a pattern in your code.
@@ -186,7 +186,7 @@ a command that searches for a pattern in your code.
 After saving the file, restart the Gemini CLI. You can now run
 `/fs:grep-code "some pattern"` to use your new command.
 
-## Step 5: Add a Custom `GEMINI.md`
+## Step 5: Add a custom `GEMINI.md`
 
 You can provide persistent context to the model by adding a `GEMINI.md` file to
 your extension. This is useful for giving the model instructions on how to
@@ -222,7 +222,7 @@ need this for extensions built to expose commands and prompts.
 Restart the CLI again. The model will now have the context from your `GEMINI.md`
 file in every session where the extension is active.
 
-## Step 6: Releasing Your Extension
+## Step 6: Releasing your extension
 
 Once you are happy with your extension, you can share it with others. The two
 primary ways of releasing extensions are via a Git repository or through GitHub

docs/extensions/index.md

@@ -1,4 +1,4 @@
-# Gemini CLI Extensions
+# Gemini CLI extensions
 
 _This documentation is up-to-date with the v0.4.0 release._
 
@@ -42,19 +42,23 @@ installed on your machine. See
 for help.
 
 ```
-gemini extensions install https://github.com/gemini-cli-extensions/security
+gemini extensions install <source> [--ref <ref>] [--auto-update] [--pre-release] [--consent]
 ```
 
-This will install the Gemini CLI Security extension, which offers support for a
-`/security:analyze` command.
+- `<source>`: The github URL or local path of the extension to install.
+- `--ref`: The git ref to install from.
+- `--auto-update`: Enable auto-update for this extension.
+- `--pre-release`: Enable pre-release versions for this extension.
+- `--consent`: Acknowledge the security risks of installing an extension and
+  skip the confirmation prompt.
 
 ### Uninstalling an extension
 
-To uninstall, run `gemini extensions uninstall extension-name`, so, in the case
-of the install example:
+To uninstall one or more extensions, run
+`gemini extensions uninstall <name...>`:
 
 ```
-gemini extensions uninstall gemini-cli-security
+gemini extensions uninstall gemini-cli-security gemini-cli-another-extension
 ```
 
 ### Disabling an extension
@@ -62,27 +66,31 @@ gemini extensions uninstall gemini-cli-security
 Extensions are, by default, enabled across all workspaces. You can disable an
 extension entirely or for specific workspace.
 
-For example, `gemini extensions disable extension-name` will disable the
-extension at the user level, so it will be disabled everywhere.
-`gemini extensions disable extension-name --scope=workspace` will only disable
-the extension in the current workspace.
+```
+gemini extensions disable <name> [--scope <scope>]
+```
+
+- `<name>`: The name of the extension to disable.
+- `--scope`: The scope to disable the extension in (`user` or `workspace`).
 
 ### Enabling an extension
 
-You can enable extensions using `gemini extensions enable extension-name`. You
-can also enable an extension for a specific workspace using
-`gemini extensions enable extension-name --scope=workspace` from within that
-workspace.
+You can enable extensions using `gemini extensions enable <name>`. You can also
+enable an extension for a specific workspace using
+`gemini extensions enable <name> --scope=workspace` from within that workspace.
 
-This is useful if you have an extension disabled at the top-level and only
-enabled in specific places.
+```
+gemini extensions enable <name> [--scope <scope>]
+```
+
+- `<name>`: The name of the extension to enable.
+- `--scope`: The scope to enable the extension in (`user` or `workspace`).
 
 ### Updating an extension
 
 For extensions installed from a local path or a git repository, you can
 explicitly update to the latest version (as reflected in the
-`gemini-extension.json` `version` field) with
-`gemini extensions update extension-name`.
+`gemini-extension.json` `version` field) with `gemini extensions update <name>`.
 
 You can update all extensions with:
 
@@ -90,10 +98,6 @@ You can update all extensions with:
 gemini extensions update --all
 ```
 
-## Extension creation
-
-We offer commands to make extension development easier.
-
 ### Create a boilerplate extension
 
 We offer several example extensions `context`, `custom-commands`,
@@ -104,9 +108,12 @@ To copy one of these examples into a development directory using the type of
 your choosing, run:
 
 ```
-gemini extensions new path/to/directory custom-commands
+gemini extensions new <path> [template]
 ```
 
+- `<path>`: The path to create the extension in.
+- `[template]`: The boilerplate template to use.
+
 ### Link a local extension
 
 The `gemini extensions link` command will create a symbolic link from the
@@ -116,9 +123,11 @@ This is useful so you don't have to run `gemini extensions update` every time
 you make changes you'd like to test.
 
 ```
-gemini extensions link path/to/directory
+gemini extensions link <path>
 ```
 
+- `<path>`: The path of the extension to link.
+
 ## How it works
 
 On startup, Gemini CLI looks for extensions in `<home>/.gemini/extensions`
@@ -179,6 +188,9 @@ precedence.
 
 ### Settings
 
+_Note: This is an experimental feature. We do not yet recommend extension
+authors introduce settings as part of their core flows._
+
 Extensions can define settings that the user will be prompted to provide upon
 installation. This is useful for things like API keys, URLs, or other
 configuration that the extension needs to function.

docs/faq.md

@@ -1,4 +1,4 @@
-# Frequently Asked Questions (FAQ)
+# Frequently asked questions (FAQ)
 
 This page provides answers to common questions and solutions to frequent
 problems encountered while using Gemini CLI.

docs/get-started/authentication.md

@@ -1,196 +1,198 @@
-# Gemini CLI Authentication Setup
+# Gemini CLI authentication setup
 
-Gemini CLI requires authentication using Google's services. Before using Gemini
-CLI, configure **one** of the following authentication methods:
+To use Gemini CLI, you'll need to authenticate with Google. This guide helps you
+quickly find the best way to sign in based on your account type and how you're
+using the CLI.
 
-- Interactive mode:
-  - Recommended: Login with Google
-  - Use Gemini API key
-  - Use Vertex AI
-- Headless (non-interactive) mode
-- Google Cloud Shell
+For most users, we recommend starting Gemini CLI and logging in with your
+personal Google account.
 
-## Quick Check: Running in Google Cloud Shell?
+## Choose your authentication method <a id="auth-methods"></a>
 
-If you are running the Gemini CLI within a Google Cloud Shell environment,
-authentication is typically automatic using your Cloud Shell credentials.
+Select the authentication method that matches your situation in the table below:
 
-## Authenticate in Interactive mode
+| User Type / Scenario                                                   | Recommended Authentication Method                                | Google Cloud Project Required                               |
+| :--------------------------------------------------------------------- | :--------------------------------------------------------------- | :---------------------------------------------------------- |
+| Individual Google accounts                                             | [Login with Google](#login-google)                               | No, with exceptions                                         |
+| Organization users with a company, school, or Google Workspace account | [Login with Google](#login-google)                               | [Yes](#set-gcp)                                             |
+| AI Studio user with a Gemini API key                                   | [Use Gemini API Key](#gemini-api)                                | No                                                          |
+| Google Cloud Vertex AI user                                            | [Vertex AI](#vertex-ai)                                          | [Yes](#set-gcp)                                             |
+| [Headless mode](#headless)                                             | [Use Gemini API Key](#gemini-api) or<br> [Vertex AI](#vertex-ai) | No (for Gemini API Key)<br> [Yes](#set-gcp) (for Vertex AI) |
 
-When you run Gemini CLI through the command-line, Gemini CLI will provide the
-following options:
+### What is my Google account type?
 
-```bash
-> 1. Login with Google
-> 2. Use Gemini API key
-> 3. Vertex AI
-```
+- **Individual Google accounts:** Includes all
+  [free tier accounts](../quota-and-pricing/#free-usage) such as Gemini Code
+  Assist for individuals, as well as paid subscriptions for
+  [Google AI Pro and Ultra](https://gemini.google/subscriptions/).
 
-The following sections provide instructions for each of these authentication
-options.
+- **Organization accounts:** Accounts using paid licenses through an
+  organization such as a company, school, or
+  [Google Workspace](https://workspace.google.com/). Includes
+  [Google AI Ultra for Business](https://support.google.com/a/answer/16345165)
+  subscriptions.
 
-### Recommended: Login with Google
+## (Recommended) Login with Google <a id="login-google"></a>
 
-If you are running Gemini CLI on your local machine, the simplest method is
-logging in with your Google account.
+If you run Gemini CLI on your local machine, the simplest authentication method
+is logging in with your Google account. This method requires a web browser on a
+machine that can communicate with the terminal running Gemini CLI (e.g., your
+local machine).
 
-> **Important:** Use this method if you are a **Google AI Pro** or **Google AI
-> Ultra** subscriber.
+> **Important:** If you are a **Google AI Pro** or **Google AI Ultra**
+> subscriber, use the Google account associated with your subscription.
 
-1. Select **Login with Google**. Gemini CLI will open a login prompt using your
-   web browser.
+To authenticate and use Gemini CLI:
 
-   If you are a **Google AI Pro** or **Google AI Ultra** subscriber, login with
-   the Google account associated with your subscription.
+1. Start the CLI:
 
-2. Follow the on-screen instructions. Your credentials will be cached locally
-   for future sessions.
+   ```bash
+   gemini
+   ```
 
-   > **Note:** This method requires a web browser on a machine that can
-   > communicate with the terminal running the CLI (e.g., your local machine).
-   > The browser will be redirected to a `localhost` URL that the CLI listens on
-   > during setup.
+2. Select **Login with Google**. Gemini CLI opens a login prompt using your web
+   browser. Follow the on-screen instructions. Your credentials will be cached
+   locally for future sessions.
 
-#### (Optional) Set your Google Cloud Project
+### Do I need to set my Google Cloud project?
 
-When you log in using a Google account, you may be prompted to select a
-`GOOGLE_CLOUD_PROJECT`.
+Most individual Google accounts (free and paid) don't require a Google Cloud
+project for authentication. However, you'll need to set a Google Cloud project
+when you meet at least one of the following conditions:
 
-This can be necessary if you are:
+- You are using a company, school, or Google Workspace account.
+- You are using a Gemini Code Assist license from the Google Developer Program.
+- You are using a license from a Gemini Code Assist subscription.
 
-- Using a Google Workspace account.
-- Using a Gemini Code Assist license from the Google Developer Program.
-- Using a license from a Gemini Code Assist subscription.
-- Using the product outside the
-  [supported regions](https://developers.google.com/gemini-code-assist/resources/available-locations)
-  for free individual usage.
-- A Google account holder under the age of 18.
+For instructions, see [Set your Google Cloud Project](#set-gcp).
 
-If you fall into one of these categories, you must:
-
-1.  Have a Google Cloud Project ID.
-2.  [Enable the Gemini for Cloud API](https://cloud.google.com/gemini/docs/discover/set-up-gemini#enable-api).
-3.  [Configure necessary IAM access permissions](https://cloud.google.com/gemini/docs/discover/set-up-gemini#grant-iam).
-
-To set the project ID, you can export either the `GOOGLE_CLOUD_PROJECT` or
-`GOOGLE_CLOUD_PROJECT_ID` environment variable. The CLI checks for
-`GOOGLE_CLOUD_PROJECT` first, then falls back to `GOOGLE_CLOUD_PROJECT_ID` :
-
-```bash
-# Replace YOUR_PROJECT_ID with your actual Google Cloud Project ID
-# Using the standard variable:
-export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
-
-# Or, using the fallback variable:
-export GOOGLE_CLOUD_PROJECT_ID="YOUR_PROJECT_ID"
-```
-
-To make this setting persistent, see
-[Persisting Environment Variables](#persisting-environment-variables).
-
-### Use Gemini API Key
+## Use Gemini API key <a id="gemini-api"></a>
 
 If you don't want to authenticate using your Google account, you can use an API
 key from Google AI Studio.
 
-1.  Obtain your API key from
-    [Google AI Studio](https://aistudio.google.com/app/apikey).
-2.  Set the `GEMINI_API_KEY` environment variable:
+To authenticate and use Gemini CLI with a Gemini API key:
 
-    ```bash
-    # Replace YOUR_GEMINI_API_KEY with the key from AI Studio
-    export GEMINI_API_KEY="YOUR_GEMINI_API_KEY"
-    ```
+1. Obtain your API key from
+   [Google AI Studio](https://aistudio.google.com/app/apikey).
 
-To make this setting persistent, see
-[Persisting Environment Variables](#persisting-environment-variables).
+2. Set the `GEMINI_API_KEY` environment variable to your key. For example:
+
+   ```bash
+   # Replace YOUR_GEMINI_API_KEY with the key from AI Studio
+   export GEMINI_API_KEY="YOUR_GEMINI_API_KEY"
+   ```
+
+   To make this setting persistent, see
+   [Persisting Environment Variables](#persisting-vars).
+
+3. Start the CLI:
+
+   ```bash
+   gemini
+   ```
+
+4. Select **Use Gemini API key**.
 
 > **Warning:** Treat API keys, especially for services like Gemini, as sensitive
 > credentials. Protect them to prevent unauthorized access and potential misuse
 > of the service under your account.
 
-### Use Vertex AI
+## Use Vertex AI <a id="vertex-ai"></a>
 
-If you intend to use Google Cloud's Vertex AI platform, you have several
-authentication options:
+To use Gemini CLI with Google Cloud's Vertex AI platform, choose from the
+following authentication options:
 
-- Application Default Credentials (ADC) and `gcloud`.
-- A Service Account JSON key.
-- A Google Cloud API key.
+- A. Application Default Credentials (ADC) using `gcloud`.
+- B. Service account JSON key.
+- C. Google Cloud API key.
 
-#### First: Set required environment variables
+Regardless of your authentication method for Vertex AI, you'll need to set
+`GOOGLE_CLOUD_PROJECT` to your Google Cloud project ID with the Vertex AI API
+enabled, and `GOOGLE_CLOUD_LOCATION` to the location of your Vertex AI resources
+or the location where you want to run your jobs.
 
-Regardless of your method of authentication, you'll typically need to set the
-following variables: `GOOGLE_CLOUD_PROJECT` (or `GOOGLE_CLOUD_PROJECT_ID`) and
-`GOOGLE_CLOUD_LOCATION`.
-
-To set these variables:
+For example:
 
 ```bash
 # Replace with your project ID and desired location (e.g., us-central1)
-# You can use GOOGLE_CLOUD_PROJECT_ID as a fallback for GOOGLE_CLOUD_PROJECT
 export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
 export GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"
 ```
 
-#### A. Vertex AI - Application Default Credentials (ADC) using `gcloud`
+To make any Vertex AI environment variable settings persistent, see
+[Persisting Environment Variables](#persisting-vars).
 
-Consider this method of authentication if you have Google Cloud CLI installed.
+#### A. Vertex AI - application default credentials (ADC) using `gcloud`
+
+Consider this authentication method if you have Google Cloud CLI installed.
 
 > **Note:** If you have previously set `GOOGLE_API_KEY` or `GEMINI_API_KEY`, you
 > must unset them to use ADC:
+>
+> ```bash
+> unset GOOGLE_API_KEY GEMINI_API_KEY
+> ```
 
-```bash
-unset GOOGLE_API_KEY GEMINI_API_KEY
-```
+1. Verify you have a Google Cloud project and Vertex AI API is enabled.
 
-1.  Ensure you have a Google Cloud project and Vertex AI API is enabled.
-2.  Log in to Google Cloud:
+2. Log in to Google Cloud:
 
-    ```bash
-    gcloud auth application-default login
-    ```
+   ```bash
+   gcloud auth application-default login
+   ```
 
-    See
-    [Set up Application Default Credentials](https://cloud.google.com/docs/authentication/provide-credentials-adc)
-    for details.
+3. [Configure your Google Cloud Project](#set-gcp).
 
-3.  Ensure `GOOGLE_CLOUD_PROJECT` (or `GOOGLE_CLOUD_PROJECT_ID`) and
-    `GOOGLE_CLOUD_LOCATION` are set.
+4. Start the CLI:
 
-#### B. Vertex AI - Service Account JSON key
+   ```bash
+   gemini
+   ```
 
-Consider this method of authentication in non-interactive environments, CI/CD,
-or if your organization restricts user-based ADC or API key creation.
+5. Select **Vertex AI**.
+
+#### B. Vertex AI - service account JSON key
+
+Consider this method of authentication in non-interactive environments, CI/CD
+pipelines, or if your organization restricts user-based ADC or API key creation.
 
 > **Note:** If you have previously set `GOOGLE_API_KEY` or `GEMINI_API_KEY`, you
 > must unset them:
-
-```bash
-unset GOOGLE_API_KEY GEMINI_API_KEY
-```
+>
+> ```bash
+> unset GOOGLE_API_KEY GEMINI_API_KEY
+> ```
 
 1.  [Create a service account and key](https://cloud.google.com/iam/docs/keys-create-delete)
     and download the provided JSON file. Assign the "Vertex AI User" role to the
     service account.
+
 2.  Set the `GOOGLE_APPLICATION_CREDENTIALS` environment variable to the JSON
-    file's absolute path:
+    file's absolute path. For example:
 
     ```bash
     # Replace /path/to/your/keyfile.json with the actual path
     export GOOGLE_APPLICATION_CREDENTIALS="/path/to/your/keyfile.json"
     ```
 
-3.  Ensure `GOOGLE_CLOUD_PROJECT` (or `GOOGLE_CLOUD_PROJECT_ID`) and
-    `GOOGLE_CLOUD_LOCATION` are set.
+3.  [Configure your Google Cloud Project](#set-gcp).
 
-> **Warning:** Protect your service account key file as it provides access to
-> your resources.
+4.  Start the CLI:
+
+    ```bash
+    gemini
+    ```
+
+5.  Select **Vertex AI**.
+    > **Warning:** Protect your service account key file as it gives access to
+    > your resources.
 
 #### C. Vertex AI - Google Cloud API key
 
 1.  Obtain a Google Cloud API key:
     [Get an API Key](https://cloud.google.com/vertex-ai/generative-ai/docs/start/api-keys?usertype=newuser).
+
 2.  Set the `GOOGLE_API_KEY` environment variable:
 
     ```bash
@@ -200,17 +202,59 @@ unset GOOGLE_API_KEY GEMINI_API_KEY
 
     > **Note:** If you see errors like
     > `"API keys are not supported by this API..."`, your organization might
-    > restrict API key usage for this service. Try the
-    > [Service Account JSON Key](#b-vertex-ai-service-account-json-key) or
-    > [ADC](#a-vertex-ai-application-default-credentials-adc-using-gcloud)
-    > methods instead.
+    > restrict API key usage for this service. Try the other Vertex AI
+    > authentication methods instead.
 
-To make any of these Vertex AI environment variable settings persistent, see
-[Persisting Environment Variables](#persisting-environment-variables).
+3.  [Configure your Google Cloud Project](#set-gcp).
 
-## Persisting Environment Variables
+4.  Start the CLI:
 
-To avoid setting environment variables in every terminal session, you can:
+    ```bash
+    gemini
+    ```
+
+5.  Select **Vertex AI**.
+
+## Set your Google Cloud project <a id="set-gcp"></a>
+
+> **Important:** Most individual Google accounts (free and paid) don't require a
+> Google Cloud project for authentication.
+
+When you sign in using your Google account, you may need to configure a Google
+Cloud project for Gemini CLI to use. This applies when you meet at least one of
+the following conditions:
+
+- You are using a Company, School, or Google Workspace account.
+- You are using a Gemini Code Assist license from the Google Developer Program.
+- You are using a license from a Gemini Code Assist subscription.
+
+To configure Gemini CLI to use a Google Cloud project, do the following:
+
+1.  [Find your Google Cloud Project ID](https://support.google.com/googleapi/answer/7014113).
+
+2.  [Enable the Gemini for Cloud API](https://cloud.google.com/gemini/docs/discover/set-up-gemini#enable-api).
+
+3.  [Configure necessary IAM access permissions](https://cloud.google.com/gemini/docs/discover/set-up-gemini#grant-iam).
+
+4.  Configure your environment variables. Set either the `GOOGLE_CLOUD_PROJECT`
+    or `GOOGLE_CLOUD_PROJECT_ID` variable to the project ID to use with Gemini
+    CLI. Gemini CLI checks for `GOOGLE_CLOUD_PROJECT` first, then falls back to
+    `GOOGLE_CLOUD_PROJECT_ID`.
+
+    For example, to set the `GOOGLE_CLOUD_PROJECT_ID` variable:
+
+    ```bash
+    # Replace YOUR_PROJECT_ID with your actual Google Cloud project ID
+    export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
+    ```
+
+    To make this setting persistent, see
+    [Persisting Environment Variables](#persisting-vars).
+
+## Persisting environment variables <a id="persisting-vars"></a>
+
+To avoid setting environment variables for every terminal session, you can
+persist them with the following methods:
 
 1.  **Add your environment variables to your shell configuration file:** Append
     the `export ...` commands to your shell's startup file (e.g., `~/.bashrc`,
@@ -223,9 +267,9 @@ To avoid setting environment variables in every terminal session, you can:
     source ~/.bashrc
     ```
 
-    > **Warning:** Be advised that when you export API keys or service account
-    > paths in your shell configuration file, any process executed from the
-    > shell can potentially read them.
+    > **Warning:** Be aware that when you export API keys or service account
+    > paths in your shell configuration file, any process launched from that
+    > shell can read them.
 
 2.  **Use a `.env` file:** Create a `.gemini/.env` file in your project
     directory or home directory. Gemini CLI automatically loads variables from
@@ -242,27 +286,31 @@ To avoid setting environment variables in every terminal session, you can:
     EOF
     ```
 
-    Variables are loaded from the first file found, not merged.
+Variables are loaded from the first file found, not merged.
 
-## Non-interactive mode / headless environments
+## Running in Google Cloud environments <a id="cloud-env"></a>
 
-Non-interative mode / headless environments will use your existing
-authentication method, if an existing authentication credential is cached.
+When running Gemini CLI within certain Google Cloud environments, authentication
+is automatic.
 
-If you have not already logged in with an authentication credential (such as a
-Google account), you **must** configure authentication using environment
-variables:
+In a Google Cloud Shell environment, Gemini CLI typically authenticates
+automatically using your Cloud Shell credentials. In Compute Engine
+environments, Gemini CLI automatically uses Application Default Credentials
+(ADC) from the environment's metadata server.
 
-1.  **Gemini API Key:** Set `GEMINI_API_KEY`.
-2.  **Vertex AI:**
-    - Set `GOOGLE_GENAI_USE_VERTEXAI=true`.
-    - **With Google Cloud API Key:** Set `GOOGLE_API_KEY`.
-    - **With ADC:** Ensure ADC is configured (e.g., via a service account with
-      `GOOGLE_APPLICATION_CREDENTIALS`) and set `GOOGLE_CLOUD_PROJECT` (or
-      `GOOGLE_CLOUD_PROJECT_ID`) and `GOOGLE_CLOUD_LOCATION`.
+If automatic authentication fails, use one of the interactive methods described
+on this page.
 
-The CLI will exit with an error in non-interactive mode if no suitable
-environment variables are found.
+## Running in headless mode <a id="headless"></a>
+
+[Headless mode](../cli/headless) will use your existing authentication method,
+if an existing authentication credential is cached.
+
+If you have not already logged in with an authentication credential, you must
+configure authentication using environment variables:
+
+- [Use Gemini API Key](#gemini-api)
+- [Vertex AI](#vertex-ai)
 
 ## What's next?
 

docs/get-started/configuration-v1.md

@@ -1,6 +1,6 @@
-# Gemini CLI Configuration
+# Gemini CLI configuration
 
-**Note on Deprecated Configuration Format**
+**Note on deprecated configuration format**
 
 This document describes the legacy v1 format for the `settings.json` file. This
 format is now deprecated.
@@ -132,7 +132,7 @@ contain other project-specific files related to Gemini CLI's operation, such as:
     }
     ```
 
-### Troubleshooting File Search Performance
+### Troubleshooting file search performance
 
 If you are experiencing performance issues with file searching (e.g., with `@`
 completions), especially in projects with a very large number of files, here are
@@ -144,12 +144,12 @@ a few things you can try in order of recommendation:
     the total number of files crawled is the most effective way to improve
     performance.
 
-2.  **Disable Fuzzy Search:** If ignoring files is not enough, you can disable
+2.  **Disable fuzzy search:** If ignoring files is not enough, you can disable
     fuzzy search by setting `disableFuzzySearch` to `true` in your
     `settings.json` file. This will use a simpler, non-fuzzy matching algorithm,
     which can be faster.
 
-3.  **Disable Recursive File Search:** As a last resort, you can disable
+3.  **Disable recursive file search:** As a last resort, you can disable
     recursive file search entirely by setting `enableRecursiveFileSearch` to
     `false`. This will be the fastest option as it avoids a recursive crawl of
     your project. However, it means you will need to type the full path to files
@@ -194,7 +194,7 @@ a few things you can try in order of recommendation:
     `--allowed-mcp-server-names` is set.
   - **Default:** All MCP servers are available for use by the Gemini model.
   - **Example:** `"allowMCPServers": ["myPythonServer"]`.
-  - **Security Note:** This uses simple string matching on MCP server names,
+  - **Security note:** This uses simple string matching on MCP server names,
     which can be modified. If you're a system administrator looking to prevent
     users from bypassing this, consider configuring the `mcpServers` at the
     system settings level such that the user will not be able to configure any
@@ -208,7 +208,7 @@ a few things you can try in order of recommendation:
     be ignored if `--allowed-mcp-server-names` is set.
   - **Default**: No MCP servers excluded.
   - **Example:** `"excludeMCPServers": ["myNodeServer"]`.
-  - **Security Note:** This uses simple string matching on MCP server names,
+  - **Security note:** This uses simple string matching on MCP server names,
     which can be modified. If you're a system administrator looking to prevent
     users from bypassing this, consider configuring the `mcpServers` at the
     system settings level such that the user will not be able to configure any
@@ -538,7 +538,7 @@ a few things you can try in order of recommendation:
 }
 ```
 
-## Shell History
+## Shell history
 
 The CLI keeps a history of shell commands you run. To avoid conflicts between
 different projects, this history is stored in a project-specific directory
@@ -549,7 +549,7 @@ within your user's home folder.
     path.
   - The history is stored in a file named `shell_history`.
 
-## Environment Variables & `.env` Files
+## Environment variables and `.env` files
 
 Environment variables are a common way to configure applications, especially for
 sensitive information like API keys or for settings that might change between
@@ -566,7 +566,7 @@ loading order is:
     the home directory.
 3.  If still not found, it looks for `~/.env` (in the user's home directory).
 
-**Environment Variable Exclusion:** Some environment variables (like `DEBUG` and
+**Environment variable exclusion:** Some environment variables (like `DEBUG` and
 `DEBUG_MODE`) are automatically excluded from being loaded from project `.env`
 files to prevent interference with gemini-cli behavior. Variables from
 `.gemini/.env` files are never excluded. You can customize this behavior using
@@ -591,7 +591,7 @@ the `excludedProjectEnvVars` setting in your `settings.json` file.
   - Required for using Code Assist or Vertex AI.
   - If using Vertex AI, ensure you have the necessary permissions in this
     project.
-  - **Cloud Shell Note:** When running in a Cloud Shell environment, this
+  - **Cloud Shell note:** When running in a Cloud Shell environment, this
     variable defaults to a special project allocated for Cloud Shell users. If
     you have `GOOGLE_CLOUD_PROJECT` set in your global environment in Cloud
     Shell, it will be overridden by this default. To use a different project in
@@ -611,6 +611,9 @@ the `excludedProjectEnvVars` setting in your `settings.json` file.
 - **`GEMINI_SANDBOX`**:
   - Alternative to the `sandbox` setting in `settings.json`.
   - Accepts `true`, `false`, `docker`, `podman`, or a custom command string.
+- **`HTTP_PROXY` / `HTTPS_PROXY`**:
+  - Specifies the proxy server to use for outgoing HTTP/HTTPS requests.
+  - Example: `export HTTPS_PROXY="http://proxy.example.com:8080"`
 - **`SEATBELT_PROFILE`** (macOS specific):
   - Switches the Seatbelt (`sandbox-exec`) profile on macOS.
   - `permissive-open`: (Default) Restricts writes to the project folder (and a
@@ -636,7 +639,7 @@ the `excludedProjectEnvVars` setting in your `settings.json` file.
   - Specifies the endpoint for the code assist server.
   - This is useful for development and testing.
 
-## Command-Line Arguments
+## Command-line arguments
 
 Arguments passed directly when running the CLI can override other configurations
 for that specific session.
@@ -692,8 +695,6 @@ for that specific session.
 - **`--telemetry-log-prompts`**:
   - Enables logging of prompts for telemetry. See
     [telemetry](../cli/telemetry.md) for more information.
-- **`--checkpointing`**:
-  - Enables [checkpointing](../cli/checkpointing.md).
 - **`--extensions <extension_name ...>`** (**`-e <extension_name ...>`**):
   - Specifies a list of extensions to use for the session. If not provided, all
     available extensions are used.
@@ -701,9 +702,6 @@ for that specific session.
   - Example: `gemini -e my-extension -e my-other-extension`
 - **`--list-extensions`** (**`-l`**):
   - Lists all available extensions and exits.
-- **`--proxy`**:
-  - Sets the proxy for the CLI.
-  - Example: `--proxy http://localhost:7890`.
 - **`--include-directories <dir1,dir2,...>`**:
   - Includes additional directories in the workspace for multi-directory
     support.
@@ -716,7 +714,7 @@ for that specific session.
 - **`--version`**:
   - Displays the version of the CLI.
 
-## Context Files (Hierarchical Instructional Context)
+## Context files (hierarchical instructional context)
 
 While not strictly configuration for the CLI's _behavior_, context files
 (defaulting to `GEMINI.md` but configurable via the `contextFileName` setting)
@@ -732,7 +730,7 @@ context.
   that you want the Gemini model to be aware of during your interactions. The
   system is designed to manage this instructional context hierarchically.
 
-### Example Context File Content (e.g., `GEMINI.md`)
+### Example context file content (e.g., `GEMINI.md`)
 
 Here's a conceptual example of what a context file at the root of a TypeScript
 project might contain:
@@ -773,23 +771,23 @@ more relevant and precise your context files are, the better the AI can assist
 you. Project-specific context files are highly encouraged to establish
 conventions and context.
 
-- **Hierarchical Loading and Precedence:** The CLI implements a sophisticated
+- **Hierarchical loading and precedence:** The CLI implements a sophisticated
   hierarchical memory system by loading context files (e.g., `GEMINI.md`) from
   several locations. Content from files lower in this list (more specific)
   typically overrides or supplements content from files higher up (more
   general). The exact concatenation order and final context can be inspected
   using the `/memory show` command. The typical loading order is:
-  1.  **Global Context File:**
+  1.  **Global context file:**
       - Location: `~/.gemini/<contextFileName>` (e.g., `~/.gemini/GEMINI.md` in
         your user home directory).
       - Scope: Provides default instructions for all your projects.
-  2.  **Project Root & Ancestors Context Files:**
+  2.  **Project root and ancestors context files:**
       - Location: The CLI searches for the configured context file in the
         current working directory and then in each parent directory up to either
         the project root (identified by a `.git` folder) or your home directory.
       - Scope: Provides context relevant to the entire project or a significant
         portion of it.
-  3.  **Sub-directory Context Files (Contextual/Local):**
+  3.  **Sub-directory context files (contextual/local):**
       - Location: The CLI also scans for the configured context file in
         subdirectories _below_ the current working directory (respecting common
         ignore patterns like `node_modules`, `.git`, etc.). The breadth of this
@@ -797,15 +795,15 @@ conventions and context.
         with a `memoryDiscoveryMaxDirs` field in your `settings.json` file.
       - Scope: Allows for highly specific instructions relevant to a particular
         component, module, or subsection of your project.
-- **Concatenation & UI Indication:** The contents of all found context files are
-  concatenated (with separators indicating their origin and path) and provided
-  as part of the system prompt to the Gemini model. The CLI footer displays the
-  count of loaded context files, giving you a quick visual cue about the active
-  instructional context.
-- **Importing Content:** You can modularize your context files by importing
+- **Concatenation and UI indication:** The contents of all found context files
+  are concatenated (with separators indicating their origin and path) and
+  provided as part of the system prompt to the Gemini model. The CLI footer
+  displays the count of loaded context files, giving you a quick visual cue
+  about the active instructional context.
+- **Importing content:** You can modularize your context files by importing
   other Markdown files using the `@path/to/file.md` syntax. For more details,
   see the [Memory Import Processor documentation](../core/memport.md).
-- **Commands for Memory Management:**
+- **Commands for memory management:**
   - Use `/memory refresh` to force a re-scan and reload of all context files
     from all configured locations. This updates the AI's instructional context.
   - Use `/memory show` to display the combined instructional context currently
@@ -852,7 +850,7 @@ sandbox image:
 BUILD_SANDBOX=1 gemini -s
 ```
 
-## Usage Statistics
+## Usage statistics
 
 To help us improve the Gemini CLI, we collect anonymized usage statistics. This
 data helps us understand how the CLI is used, identify common issues, and
@@ -860,22 +858,22 @@ prioritize new features.
 
 **What we collect:**
 
-- **Tool Calls:** We log the names of the tools that are called, whether they
+- **Tool calls:** We log the names of the tools that are called, whether they
   succeed or fail, and how long they take to execute. We do not collect the
   arguments passed to the tools or any data returned by them.
-- **API Requests:** We log the Gemini model used for each request, the duration
+- **API requests:** We log the Gemini model used for each request, the duration
   of the request, and whether it was successful. We do not collect the content
   of the prompts or responses.
-- **Session Information:** We collect information about the configuration of the
+- **Session information:** We collect information about the configuration of the
   CLI, such as the enabled tools and the approval mode.
 
 **What we DON'T collect:**
 
-- **Personally Identifiable Information (PII):** We do not collect any personal
+- **Personally identifiable information (PII):** We do not collect any personal
   information, such as your name, email address, or API keys.
-- **Prompt and Response Content:** We do not log the content of your prompts or
+- **Prompt and response content:** We do not log the content of your prompts or
   the responses from the Gemini model.
-- **File Content:** We do not log the content of any files that are read or
+- **File content:** We do not log the content of any files that are read or
   written by the CLI.
 
 **How to opt out:**

docs/get-started/deployment.md

@@ -1,6 +1,6 @@
 Note: This page will be replaced by [installation.md](installation.md).
 
-# Gemini CLI Installation, Execution, and Deployment
+# Gemini CLI installation, execution, and deployment
 
 Install and run Gemini CLI. This document provides an overview of Gemini CLI's
 installation methods and deployment architecture.
@@ -44,7 +44,7 @@ downloading the Gemini CLI package from the NPM registry.
 For security and isolation, Gemini CLI can be run inside a container. This is
 the default way that the CLI executes tools that might have side effects.
 
-- **Directly from the Registry:** You can run the published sandbox image
+- **Directly from the registry:** You can run the published sandbox image
   directly. This is useful for environments where you only have Docker and want
   to run the CLI.
   ```bash
@@ -63,7 +63,7 @@ the default way that the CLI executes tools that might have side effects.
 Contributors to the project will want to run the CLI directly from the source
 code.
 
-- **Development Mode:** This method provides hot-reloading and is useful for
+- **Development mode:** This method provides hot-reloading and is useful for
   active development.
   ```bash
   # From the root of the repository

docs/get-started/examples.md

@@ -1,4 +1,4 @@
-# Gemini CLI Examples
+# Gemini CLI examples
 
 Not sure where to get started with Gemini CLI? This document covers examples on
 how to use Gemini CLI for a variety of tasks.
@@ -57,7 +57,7 @@ Gemini CLI will return an explanation based on the actual source code:
 The `chalk` library is a popular npm package for styling terminal output with
 colors. After analyzing the source code, here's how it works:
 
-- **Core Functionality:** The main file sets up a chainable API. Each color or
+- **Core functionality:** The main file sets up a chainable API. Each color or
   modifier (like `bold` or `italic`) is a getter that appends the corresponding
   ANSI escape code to an internal stack.
 
@@ -65,7 +65,7 @@ colors. After analyzing the source code, here's how it works:
   getters. The `red` getter adds the red color code, and the `bold` getter adds
   the bold code.
 
-- **Output Generation:** When the chain is treated as a string (e.g., in
+- **Output generation:** When the chain is treated as a string (e.g., in
   `console.log`), a final `toString()` method is called. This method joins all
   the stored ANSI codes, wraps them around the input string ('Hello'), and adds
   a reset code at the end. This produces the final, styled string that the

docs/get-started/gemini-3.md

@@ -0,0 +1,110 @@
+# Gemini 3 Pro on Gemini CLI (join the waitlist)
+
+We’re excited to bring Gemini 3 Pro to Gemini CLI. For Google AI Ultra users
+(Google AI Ultra for Business is not currently supported) and paid Gemini and
+Vertex API key holders, Gemini 3 Pro is already available and ready to enable.
+For everyone else, we're gradually expanding access
+[through a waitlist](https://goo.gle/geminicli-waitlist-signup). Sign up for the
+waitlist now to access Gemini 3 Pro once approved.
+
+**Note:** Please wait until you have been approved to use Gemini 3 Pro to enable
+**preview features**. If enabled early, the CLI will fallback to Gemini 2.5 Pro.
+
+## Do I need to join the waitlist?
+
+The following users will be **automatically granted access** to Gemini 3 Pro on
+Gemini CLI:
+
+- Google AI Ultra subscribers (excluding Google AI Ultra for Business, which is
+  on the roadmap).
+- Gemini API key users
+  [with access to Gemini 3](https://ai.google.dev/gemini-api/docs/rate-limits).
+- Vertex API key users
+  [with access to Gemini 3](https://docs.cloud.google.com/vertex-ai/generative-ai/docs/quotas).
+
+For **Gemini Code Assist Enterprise users**, access is coming soon.
+
+Users not automatically granted access through one of these account types will
+need to join the waitlist. This includes Google AI Pro, Gemini Code Assist
+standard, and free tier users.
+
+Note: Whether you’re automatically granted access or accepted from the waitlist,
+you’ll still need to enable Gemini 3 Pro
+[using the `/settings` command](../cli/settings.md).
+
+## How to join the waitlist
+
+Users not automatically granted access will need to join the waitlist. Follow
+these instructions to sign up:
+
+- Install Gemini CLI.
+- Authenticate using the **Login with Google** option. You’ll see a banner that
+  says “Gemini 3 is now available.” If you do not see this banner, update your
+  installation of Gemini CLI to the most recent version.
+- Fill out this Google form:
+  [Access Gemini 3 in Gemini CLI](https://goo.gle/geminicli-waitlist-signup).
+  Provide the email address of the account you used to authenticate with Gemini
+  CLI.
+
+Users will be onboarded in batches, subject to availability. When you’ve been
+granted access to Gemini 3 Pro, you’ll receive an acceptance email to your
+submitted email address.
+
+## How to use Gemini 3 Pro with Gemini CLI
+
+Once you receive your acceptance email–or if you are automatically granted
+access–you still need to enable Gemini 3 Pro within Gemini CLI.
+
+To enable Gemini 3 Pro, use the `/settings` command in Gemini CLI and set
+**Preview Features** to `true`.
+
+For more information, see [Gemini CLI Settings](../cli/settings.md).
+
+### Usage limits and fallback
+
+Gemini CLI will tell you when you reach your Gemini 3 Pro daily usage limit.
+When you encounter that limit, you’ll be given the option to switch to Gemini
+2.5 Pro, upgrade for higher limits, or stop. You’ll also be told when your usage
+limit resets and Gemini 3 Pro can be used again.
+
+Similarly, when you reach your daily usage limit for Gemini 2.5 Pro, you’ll see
+a message prompting fallback to Gemini 2.5 Flash.
+
+### Capacity errors
+
+There may be times when the Gemini 3 Pro model is overloaded. When that happens,
+Gemini CLI will ask you to decide whether you want to keep trying Gemini 3 Pro
+or fallback to Gemini 2.5 Pro.
+
+**Note:** The **Keep trying** option uses exponential backoff, in which Gemini
+CLI waits longer between each retry, when the system is busy. If the retry
+doesn't happen immediately, please wait a few minutes for the request to
+process.
+
+## Model selection and routing types
+
+When using Gemini CLI, you may want to control how your requests are routed
+between models. By default, Gemini CLI uses **Auto** routing.
+
+When using Gemini 3 Pro, you may want to use Auto routing or Pro routing to
+manage your usage limits:
+
+- **Auto routing:** Auto routing first determines whether a prompt involves a
+  complex or simple operation. For simple prompts, it will automatically use
+  Gemini 2.5 Flash. For complex prompts, if Gemini 3 Pro is enabled, it will use
+  Gemini 3 Pro; otherwise, it will use Gemini 2.5 Pro.
+- **Pro routing:** If you want to ensure your task is processed by the most
+  capable model, use `/model` and select **Pro**. Gemini CLI will prioritize the
+  most capable model available, including Gemini 3 Pro if it has been enabled.
+
+To learn more about selecting a model and routing, refer to
+[Gemini CLI Model Selection](../cli/model.md).
+
+## Need help?
+
+If you need help, we recommend searching for an existing
+[GitHub issue](https://github.com/google-gemini/gemini-cli/issues). If you
+cannot find a GitHub issue that matches your concern, you can
+[create a new issue](https://github.com/google-gemini/gemini-cli/issues/new/choose).
+For comments and feedback, consider opening a
+[GitHub discussion](https://github.com/google-gemini/gemini-cli/discussions).

docs/get-started/index.md

@@ -1,4 +1,4 @@
-# Get Started with Gemini CLI
+# Get started with Gemini CLI
 
 Welcome to Gemini CLI! This guide will help you install, configure, and start
 using the Gemini CLI to enhance your workflow right from your terminal.
@@ -28,19 +28,24 @@ For more installation options, see [Gemini CLI Installation](./installation.md).
 
 ## Authenticate
 
-To begin using Gemini CLI, you must authenticate with a Google service. The most
-straightforward authentication method uses your existing Google account:
+To begin using Gemini CLI, you must authenticate with a Google service. In most
+cases, you can log in with your existing Google account:
 
 1. Run Gemini CLI after installation:
+
    ```bash
    gemini
    ```
+
 2. When asked "How would you like to authenticate for this project?" select **1.
    Login with Google**.
+
 3. Select your Google account.
+
 4. Click on **Sign in**.
 
-For other authentication options and information, see
+Certain account types may require you to configure a Google Cloud project. For
+more information, including other authentication methods, see
 [Gemini CLI Authentication Setup](./authentication.md).
 
 ## Configure
@@ -63,3 +68,4 @@ To explore the power of Gemini CLI, see [Gemini CLI examples](./examples.md).
 
 - Find out more about [Gemini CLI's tools](../tools/index.md).
 - Review [Gemini CLI's commands](../cli/commands.md).
+- Learn how to [get started with Gemini 3](./gemini-3.md).

docs/get-started/installation.md

@@ -1,4 +1,4 @@
-# Gemini CLI Installation, Execution, and Deployment
+# Gemini CLI installation, execution, and deployment
 
 Install and run Gemini CLI. This document provides an overview of Gemini CLI's
 installation methods and deployment architecture.
@@ -42,7 +42,7 @@ downloading the Gemini CLI package from the NPM registry.
 For security and isolation, Gemini CLI can be run inside a container. This is
 the default way that the CLI executes tools that might have side effects.
 
-- **Directly from the Registry:** You can run the published sandbox image
+- **Directly from the registry:** You can run the published sandbox image
   directly. This is useful for environments where you only have Docker and want
   to run the CLI.
   ```bash
@@ -61,13 +61,13 @@ the default way that the CLI executes tools that might have side effects.
 Contributors to the project will want to run the CLI directly from the source
 code.
 
-- **Development Mode:** This method provides hot-reloading and is useful for
+- **Development mode:** This method provides hot-reloading and is useful for
   active development.
   ```bash
   # From the root of the repository
   npm run start
   ```
-- **Production-like mode (Linked package):** This method simulates a global
+- **Production-like mode (linked package):** This method simulates a global
   installation by linking your local package. It's useful for testing a local
   build in a production workflow.
 

docs/ide-integration/ide-companion-spec.md

@@ -1,4 +1,4 @@
-# Gemini CLI Companion Plugin: Interface Specification
+# Gemini CLI companion plugin: Interface specification
 
 > Last Updated: September 15, 2025
 
@@ -9,11 +9,11 @@ awareness) are provided by the official extension
 This specification is for contributors who wish to bring similar functionality
 to other editors like JetBrains IDEs, Sublime Text, etc.
 
-## I. The Communication Interface
+## I. The communication interface
 
 Gemini CLI and the IDE plugin communicate through a local communication channel.
 
-### 1. Transport Layer: MCP over HTTP
+### 1. Transport layer: MCP over HTTP
 
 The plugin **MUST** run a local HTTP server that implements the **Model Context
 Protocol (MCP)**.
@@ -25,24 +25,24 @@ Protocol (MCP)**.
 - **Port:** The server **MUST** listen on a dynamically assigned port (i.e.,
   listen on port `0`).
 
-### 2. Discovery Mechanism: The Port File
+### 2. Discovery mechanism: The port file
 
 For Gemini CLI to connect, it needs to discover which IDE instance it's running
 in and what port your server is using. The plugin **MUST** facilitate this by
 creating a "discovery file."
 
-- **How the CLI Finds the File:** The CLI determines the Process ID (PID) of the
+- **How the CLI finds the file:** The CLI determines the Process ID (PID) of the
   IDE it's running in by traversing the process tree. It then looks for a
   discovery file that contains this PID in its name.
-- **File Location:** The file must be created in a specific directory:
+- **File location:** The file must be created in a specific directory:
   `os.tmpdir()/gemini/ide/`. Your plugin must create this directory if it
   doesn't exist.
-- **File Naming Convention:** The filename is critical and **MUST** follow the
+- **File naming convention:** The filename is critical and **MUST** follow the
   pattern: `gemini-ide-server-${PID}-${PORT}.json`
   - `${PID}`: The process ID of the parent IDE process. Your plugin must
     determine this PID and include it in the filename.
   - `${PORT}`: The port your MCP server is listening on.
-- **File Content & Workspace Validation:** The file **MUST** contain a JSON
+- **File content and workspace validation:** The file **MUST** contain a JSON
   object with the following structure:
 
   ```json
@@ -79,7 +79,7 @@ creating a "discovery file."
   server (e.g., `Authorization: Bearer a-very-secret-token`). Your server
   **MUST** validate this token on every request and reject any that are
   unauthorized.
-- **Tie-Breaking with Environment Variables (Recommended):** For the most
+- **Tie-breaking with environment variables (recommended):** For the most
   reliable experience, your plugin **SHOULD** both create the discovery file and
   set the `GEMINI_CLI_IDE_SERVER_PORT` environment variable in the integrated
   terminal. The file serves as the primary discovery mechanism, but the
@@ -88,18 +88,18 @@ creating a "discovery file."
   `GEMINI_CLI_IDE_SERVER_PORT` variable to identify and connect to the correct
   window's server.
 
-## II. The Context Interface
+## II. The context interface
 
 To enable context awareness, the plugin **MAY** provide the CLI with real-time
 information about the user's activity in the IDE.
 
-### `ide/contextUpdate` Notification
+### `ide/contextUpdate` notification
 
 The plugin **MAY** send an `ide/contextUpdate`
 [notification](https://modelcontextprotocol.io/specification/2025-06-18/basic/index#notifications)
 to the CLI whenever the user's context changes.
 
-- **Triggering Events:** This notification should be sent (with a recommended
+- **Triggering events:** This notification should be sent (with a recommended
   debounce of 50ms) when:
   - A file is opened, closed, or focused.
   - The user's cursor position or text selection changes in the active file.
@@ -136,16 +136,16 @@ to the CLI whenever the user's context changes.
   Virtual files (e.g., unsaved files without a path, editor settings pages)
   **MUST** be excluded.
 
-### How the CLI Uses This Context
+### How the CLI uses this context
 
 After receiving the `IdeContext` object, the CLI performs several normalization
 and truncation steps before sending the information to the model.
 
-- **File Ordering:** The CLI uses the `timestamp` field to determine the most
+- **File ordering:** The CLI uses the `timestamp` field to determine the most
   recently used files. It sorts the `openFiles` list based on this value.
   Therefore, your plugin **MUST** provide an accurate Unix timestamp for when a
   file was last focused.
-- **Active File:** The CLI considers only the most recent file (after sorting)
+- **Active file:** The CLI considers only the most recent file (after sorting)
   to be the "active" file. It will ignore the `isActive` flag on all other files
   and clear their `cursor` and `selectedText` fields. Your plugin should focus
   on setting `isActive: true` and providing cursor/selection details only for
@@ -156,14 +156,14 @@ and truncation steps before sending the information to the model.
 While the CLI handles the final truncation, it is highly recommended that your
 plugin also limits the amount of context it sends.
 
-## III. The Diffing Interface
+## III. The diffing interface
 
 To enable interactive code modifications, the plugin **MAY** expose a diffing
 interface. This allows the CLI to request that the IDE open a diff view, showing
 proposed changes to a file. The user can then review, edit, and ultimately
 accept or reject these changes directly within the IDE.
 
-### `openDiff` Tool
+### `openDiff` tool
 
 The plugin **MUST** register an `openDiff` tool on its MCP server.
 
@@ -194,7 +194,7 @@ The plugin **MUST** register an `openDiff` tool on its MCP server.
   The actual outcome of the diff (acceptance or rejection) is communicated
   asynchronously via notifications.
 
-### `closeDiff` Tool
+### `closeDiff` tool
 
 The plugin **MUST** register a `closeDiff` tool on its MCP server.
 
@@ -219,7 +219,7 @@ The plugin **MUST** register a `closeDiff` tool on its MCP server.
     **MUST** have `isError: true` and include a `TextContent` block in the
     `content` array describing the error.
 
-### `ide/diffAccepted` Notification
+### `ide/diffAccepted` notification
 
 When the user accepts the changes in a diff view (e.g., by clicking an "Apply"
 or "Save" button), the plugin **MUST** send an `ide/diffAccepted` notification
@@ -238,7 +238,7 @@ to the CLI.
   }
   ```
 
-### `ide/diffRejected` Notification
+### `ide/diffRejected` notification
 
 When the user rejects the changes (e.g., by closing the diff view without
 accepting), the plugin **MUST** send an `ide/diffRejected` notification to the
@@ -254,14 +254,14 @@ CLI.
   }
   ```
 
-## IV. The Lifecycle Interface
+## IV. The lifecycle interface
 
 The plugin **MUST** manage its resources and the discovery file correctly based
 on the IDE's lifecycle.
 
-- **On Activation (IDE startup/plugin enabled):**
+- **On activation (IDE startup/plugin enabled):**
   1.  Start the MCP server.
   2.  Create the discovery file.
-- **On Deactivation (IDE shutdown/plugin disabled):**
+- **On deactivation (IDE shutdown/plugin disabled):**
   1.  Stop the MCP server.
   2.  Delete the discovery file.

docs/ide-integration/index.md

@@ -1,28 +1,28 @@
-# IDE Integration
+# IDE integration
 
 Gemini CLI can integrate with your IDE to provide a more seamless and
 context-aware experience. This integration allows the CLI to understand your
 workspace better and enables powerful features like native in-editor diffing.
 
-Currently, the only supported IDE is
-[Visual Studio Code](https://code.visualstudio.com/) and other editors that
+Currently, the supported IDEs are [Antigravity](https://antigravity.google),
+[Visual Studio Code](https://code.visualstudio.com/), and other editors that
 support VS Code extensions. To build support for other editors, see the
 [IDE Companion Extension Spec](./ide-companion-spec.md).
 
 ## Features
 
-- **Workspace Context:** The CLI automatically gains awareness of your workspace
+- **Workspace context:** The CLI automatically gains awareness of your workspace
   to provide more relevant and accurate responses. This context includes:
   - The **10 most recently accessed files** in your workspace.
   - Your active cursor position.
   - Any text you have selected (up to a 16KB limit; longer selections will be
     truncated).
 
-- **Native Diffing:** When Gemini suggests code modifications, you can view the
+- **Native diffing:** When Gemini suggests code modifications, you can view the
   changes directly within your IDE's native diff viewer. This allows you to
   review, edit, and accept or reject the suggested changes seamlessly.
 
-- **VS Code Commands:** You can access Gemini CLI features directly from the VS
+- **VS Code commands:** You can access Gemini CLI features directly from the VS
   Code Command Palette (`Cmd+Shift+P` or `Ctrl+Shift+P`):
   - `Gemini CLI: Run`: Starts a new Gemini CLI session in the integrated
     terminal.
@@ -32,18 +32,18 @@ support VS Code extensions. To build support for other editors, see the
   - `Gemini CLI: View Third-Party Notices`: Displays the third-party notices for
     the extension.
 
-## Installation and Setup
+## Installation and setup
 
 There are three ways to set up the IDE integration:
 
-### 1. Automatic Nudge (Recommended)
+### 1. Automatic nudge (recommended)
 
 When you run Gemini CLI inside a supported editor, it will automatically detect
 your environment and prompt you to connect. Answering "Yes" will automatically
 run the necessary setup, which includes installing the companion extension and
 enabling the connection.
 
-### 2. Manual Installation from CLI
+### 2. Manual installation from CLI
 
 If you previously dismissed the prompt or want to install the extension
 manually, you can run the following command inside Gemini CLI:
@@ -54,13 +54,13 @@ manually, you can run the following command inside Gemini CLI:
 
 This will find the correct extension for your IDE and install it.
 
-### 3. Manual Installation from a Marketplace
+### 3. Manual installation from a marketplace
 
 You can also install the extension directly from a marketplace.
 
 - **For Visual Studio Code:** Install from the
   [VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=google.gemini-cli-vscode-ide-companion).
-- **For VS Code Forks:** To support forks of VS Code, the extension is also
+- **For VS Code forks:** To support forks of VS Code, the extension is also
   published on the
   [Open VSX Registry](https://open-vsx.org/extension/google/gemini-cli-vscode-ide-companion).
   Follow your editor's instructions for installing extensions from this
@@ -75,7 +75,7 @@ You can also install the extension directly from a marketplace.
 
 ## Usage
 
-### Enabling and Disabling
+### Enabling and disabling
 
 You can control the IDE integration from within the CLI:
 
@@ -91,7 +91,7 @@ You can control the IDE integration from within the CLI:
 When enabled, Gemini CLI will automatically attempt to connect to the IDE
 companion extension.
 
-### Checking the Status
+### Checking the status
 
 To check the connection status and see the context the CLI has received from the
 IDE, run:
@@ -106,7 +106,7 @@ recently opened files it is aware of.
 > [!NOTE] The file list is limited to 10 recently accessed files within your
 > workspace and only includes local files on disk.)
 
-### Working with Diffs
+### Working with diffs
 
 When you ask Gemini to modify a file, it can open a diff view directly in your
 editor.
@@ -131,14 +131,14 @@ accepting them.
 If you select ‘Yes, allow always’ in the CLI, changes will no longer show up in
 the IDE as they will be auto-accepted.
 
-## Using with Sandboxing
+## Using with sandboxing
 
 If you are using Gemini CLI within a sandbox, please be aware of the following:
 
 - **On macOS:** The IDE integration requires network access to communicate with
   the IDE companion extension. You must use a Seatbelt profile that allows
   network access.
-- **In a Docker Container:** If you run Gemini CLI inside a Docker (or Podman)
+- **In a Docker container:** If you run Gemini CLI inside a Docker (or Podman)
   container, the IDE integration can still connect to the VS Code extension
   running on your host machine. The CLI is configured to automatically find the
   IDE server on `host.docker.internal`. No special configuration is usually
@@ -150,7 +150,7 @@ If you are using Gemini CLI within a sandbox, please be aware of the following:
 If you encounter issues with IDE integration, here are some common error
 messages and how to resolve them.
 
-### Connection Errors
+### Connection errors
 
 - **Message:**
   `🔴 Disconnected: Failed to connect to IDE companion extension in [IDE Name]. Please ensure the extension is running. To install the extension, run /ide install.`
@@ -170,7 +170,7 @@ messages and how to resolve them.
   - **Solution:** Run `/ide enable` to try and reconnect. If the issue
     continues, open a new terminal window or restart your IDE.
 
-### Configuration Errors
+### Configuration errors
 
 - **Message:**
   `🔴 Disconnected: Directory mismatch. Gemini CLI is running in a different location than the open workspace in [IDE Name]. Please run the CLI from one of the following directories: [List of directories]`
@@ -184,14 +184,14 @@ messages and how to resolve them.
   - **Cause:** You have no workspace open in your IDE.
   - **Solution:** Open a workspace in your IDE and restart the CLI.
 
-### General Errors
+### General errors
 
 - **Message:**
   `IDE integration is not supported in your current environment. To use this feature, run Gemini CLI in one of these supported IDEs: [List of IDEs]`
   - **Cause:** You are running Gemini CLI in a terminal or environment that is
     not a supported IDE.
   - **Solution:** Run Gemini CLI from the integrated terminal of a supported
-    IDE, like VS Code.
+    IDE, like Antigravity or VS Code.
 
 - **Message:**
   `No installer is available for IDE. Please install the Gemini CLI Companion extension manually from the marketplace.`

docs/index.md

@@ -1,10 +1,10 @@
 # Welcome to Gemini CLI documentation
 
 This documentation provides a comprehensive guide to installing, using, and
-developing Gemini CLI. This tool lets you interact with Gemini models through a
-command-line interface.
+developing Gemini CLI, a tool that lets you interact with Gemini models through
+a command-line interface.
 
-## Overview
+## Gemini CLI overview
 
 Gemini CLI brings the capabilities of Gemini models to your terminal in an
 interactive Read-Eval-Print Loop (REPL) environment. Gemini CLI consists of a
@@ -18,88 +18,118 @@ file system operations, running shells, and web fetching, which are managed by
 
 This documentation is organized into the following sections:
 
+### Overview
+
+- **[Architecture overview](./architecture.md):** Understand the high-level
+  design of Gemini CLI, including its components and how they interact.
+- **[Contribution guide](../CONTRIBUTING.md):** Information for contributors and
+  developers, including setup, building, testing, and coding conventions.
+
 ### Get started
 
-- **[Gemini CLI Quickstart](./get-started/index.md):** Let's get started with
+- **[Gemini CLI quickstart](./get-started/index.md):** Let's get started with
   Gemini CLI.
-- **[Installation](./get-started/installation.md):** Install and run Gemini CLI.
-- **[Authentication](./get-started/authentication.md):** Authenticate Gemini
+- **[Gemini 3 Pro on Gemini CLI](./get-started/gemini-3.md):** Learn how to
+  enable and use Gemini 3.
+- **[Authentication](./get-started/authentication.md):** Authenticate to Gemini
   CLI.
-- **[Configuration](./get-started/configuration.md):** Information on
-  configuring the CLI.
+- **[Configuration](./get-started/configuration.md):** Learn how to configure
+  the CLI.
+- **[Installation](./get-started/installation.md):** Install and run Gemini CLI.
 - **[Examples](./get-started/examples.md):** Example usage of Gemini CLI.
 
 ### CLI
 
-- **[CLI overview](./cli/index.md):** Overview of the command-line interface.
+- **[Introduction: Gemini CLI](./cli/index.md):** Overview of the command-line
+  interface.
 - **[Commands](./cli/commands.md):** Description of available CLI commands.
-- **[Enterprise](./cli/enterprise.md):** Gemini CLI for enterprise.
-- **[Themes](./cli/themes.md):** Themes for Gemini CLI.
-- **[Token Caching](./cli/token-caching.md):** Token caching and optimization.
-- **[Tutorials](./cli/tutorials.md):** Tutorials for Gemini CLI.
 - **[Checkpointing](./cli/checkpointing.md):** Documentation for the
   checkpointing feature.
+- **[Custom commands](./cli/custom-commands.md):** Create your own commands and
+  shortcuts for frequently used prompts.
+- **[Enterprise](./cli/enterprise.md):** Gemini CLI for enterprise.
+- **[Headless mode](./cli/headless.md):** Use Gemini CLI programmatically for
+  scripting and automation.
+- **[Keyboard shortcuts](./cli/keyboard-shortcuts.md):** A reference for all
+  keyboard shortcuts to improve your workflow.
+- **[Model selection](./cli/model.md):** Select the model used to process your
+  commands with `/model`.
+- **[Sandbox](./cli/sandbox.md):** Isolate tool execution in a secure,
+  containerized environment.
+- **[Settings](./cli/settings.md):** Configure various aspects of the CLI's
+  behavior and appearance with `/settings`.
 - **[Telemetry](./cli/telemetry.md):** Overview of telemetry in the CLI.
+- **[Themes](./cli/themes.md):** Themes for Gemini CLI.
+- **[Token caching](./cli/token-caching.md):** Token caching and optimization.
 - **[Trusted Folders](./cli/trusted-folders.md):** An overview of the Trusted
   Folders security feature.
+- **[Tutorials](./cli/tutorials.md):** Tutorials for Gemini CLI.
+- **[Uninstall](./cli/uninstall.md):** Methods for uninstalling the Gemini CLI.
 
 ### Core
 
-- **[Gemini CLI core overview](./core/index.md):** Information about Gemini CLI
-  core.
+- **[Introduction: Gemini CLI core](./core/index.md):** Information about Gemini
+  CLI core.
 - **[Memport](./core/memport.md):** Using the Memory Import Processor.
 - **[Tools API](./core/tools-api.md):** Information on how the core manages and
   exposes tools.
+- **[Policy Engine](./core/policy-engine.md):** Use the Policy Engine for
+  fine-grained control over tool execution.
 
 ### Tools
 
-- **[Gemini CLI tools overview](./tools/index.md):** Information about Gemini
-  CLI's tools.
-- **[File System Tools](./tools/file-system.md):** Documentation for the
+- **[Introduction: Gemini CLI tools](./tools/index.md):** Information about
+  Gemini CLI's tools.
+- **[File system tools](./tools/file-system.md):** Documentation for the
   `read_file` and `write_file` tools.
-- **[MCP servers](./tools/mcp-server.md):** Using MCP servers with Gemini CLI.
-- **[Multi-File Read Tool](./tools/multi-file.md):** Documentation for the
-  `read_many_files` tool.
-- **[Shell Tool](./tools/shell.md):** Documentation for the `run_shell_command`
+- **[Shell tool](./tools/shell.md):** Documentation for the `run_shell_command`
   tool.
-- **[Web Fetch Tool](./tools/web-fetch.md):** Documentation for the `web_fetch`
+- **[Web fetch tool](./tools/web-fetch.md):** Documentation for the `web_fetch`
   tool.
-- **[Web Search Tool](./tools/web-search.md):** Documentation for the
+- **[Web search tool](./tools/web-search.md):** Documentation for the
   `google_web_search` tool.
-- **[Memory Tool](./tools/memory.md):** Documentation for the `save_memory`
+- **[Memory tool](./tools/memory.md):** Documentation for the `save_memory`
   tool.
-- **[Todo Tool](./tools/todos.md):** Documentation for the `write_todos` tool.
+- **[Todo tool](./tools/todos.md):** Documentation for the `write_todos` tool.
+- **[MCP servers](./tools/mcp-server.md):** Using MCP servers with Gemini CLI.
 
 ### Extensions
 
-- **[Extensions](./extensions/index.md):** How to extend the CLI with new
-  functionality.
-- **[Get Started with Extensions](./extensions/getting-started-extensions.md):**
+- **[Introduction: Extensions](./extensions/index.md):** How to extend the CLI
+  with new functionality.
+- **[Get Started with extensions](./extensions/getting-started-extensions.md):**
   Learn how to build your own extension.
-- **[Extension Releasing](./extensions/extension-releasing.md):** How to release
+- **[Extension releasing](./extensions/extension-releasing.md):** How to release
   Gemini CLI extensions.
 
 ### IDE integration
 
-- **[IDE Integration](./ide-integration/index.md):** Connect the CLI to your
-  editor.
-- **[IDE Companion Extension Spec](./ide-integration/ide-companion-spec.md):**
+- **[Introduction to IDE integration](./ide-integration/index.md):** Connect the
+  CLI to your editor.
+- **[IDE companion extension spec](./ide-integration/ide-companion-spec.md):**
   Spec for building IDE companion extensions.
 
-### About the Gemini CLI project
+### Development
 
-- **[Architecture Overview](./architecture.md):** Understand the high-level
-  design of Gemini CLI, including its components and how they interact.
-- **[Contributing & Development Guide](../CONTRIBUTING.md):** Information for
-  contributors and developers, including setup, building, testing, and coding
-  conventions.
 - **[NPM](./npm.md):** Details on how the project's packages are structured.
-- **[Troubleshooting Guide](./troubleshooting.md):** Find solutions to common
-  problems.
-- **[FAQ](./faq.md):** Frequently asked questions.
-- **[Terms of Service and Privacy Notice](./tos-privacy.md):** Information on
-  the terms of service and privacy notices applicable to your use of Gemini CLI.
 - **[Releases](./releases.md):** Information on the project's releases and
   deployment cadence.
+- **[Changelog](./changelogs/index.md):** Highlights and notable changes to
+  Gemini CLI.
+- **[Integration tests](./integration-tests.md):** Information about the
+  integration testing framework used in this project.
+- **[Issue and PR automation](./issue-and-pr-automation.md):** A detailed
+  overview of the automated processes we use to manage and triage issues and
+  pull requests.
+
+### Support
+
+- **[FAQ](./faq.md):** Frequently asked questions.
+- **[Troubleshooting guide](./troubleshooting.md):** Find solutions to common
+  problems.
+- **[Quota and pricing](./quota-and-pricing.md):** Learn about the free tier and
+  paid options.
+- **[Terms of service and privacy notice](./tos-privacy.md):** Information on
+  the terms of service and privacy notices applicable to your use of Gemini CLI.
 
 We hope this documentation helps you make the most of Gemini CLI!

docs/integration-tests.md

@@ -1,4 +1,4 @@
-# Integration Tests
+# Integration tests
 
 This document provides information about the integration testing framework used
 in this project.
@@ -72,6 +72,9 @@ these responses.
 REGENERATE_MODEL_GOLDENS="true" npm run test:e2e
 ```
 
+**WARNING**: Make sure you run **await rig.cleanup()** at the end of your test,
+else the golden files will not be updated.
+
 ### Deflaking a test
 
 Before adding a **new** integration test, you should test it at least 5 times
@@ -83,7 +86,7 @@ with the deflake script or workflow to make sure that it is not flaky.
 npm run deflake -- --runs=5 --command="npm run test:e2e -- -- --test-name-pattern '<your-new-test-name>'"
 ```
 
-#### Deflake Workflow
+#### Deflake workflow
 
 ```bash
 gh workflow run deflake.yml --ref <your-branch> -f test_name_pattern="<your-test-name-pattern>"

docs/issue-and-pr-automation.md

@@ -1,4 +1,4 @@
-# Automation and Triage Processes
+# Automation and triage processes
 
 This document provides a detailed overview of the automated processes we use to
 manage and triage issues and pull requests. Our goal is to provide prompt
@@ -6,7 +6,7 @@ feedback and ensure that contributions are reviewed and integrated efficiently.
 Understanding this automation will help you as a contributor know what to expect
 and how to best interact with our repository bots.
 
-## Guiding Principle: Issues and Pull Requests
+## Guiding principle: Issues and pull requests
 
 First and foremost, almost every Pull Request (PR) should be linked to a
 corresponding Issue. The issue describes the "what" and the "why" (the bug or
@@ -16,12 +16,12 @@ automation is built around this principle.
 
 ---
 
-## Detailed Automation Workflows
+## Detailed automation workflows
 
 Here is a breakdown of the specific automation workflows that run in our
 repository.
 
-### 1. When you open an Issue: `Automated Issue Triage`
+### 1. When you open an issue: `Automated Issue Triage`
 
 This is the first bot you will interact with when you create an issue. Its job
 is to perform an initial analysis and apply the correct labels.
@@ -48,7 +48,7 @@ is to perform an initial analysis and apply the correct labels.
   - If the `status/need-information` label is added, please provide the
     requested details in a comment.
 
-### 2. When you open a Pull Request: `Continuous Integration (CI)`
+### 2. When you open a pull request: `Continuous Integration (CI)`
 
 This workflow ensures that all changes meet our quality standards before they
 can be merged.
@@ -70,7 +70,7 @@ can be merged.
   - If a check fails (a red "X" ❌), click the "Details" link next to the failed
     check to view the logs, identify the problem, and push a fix.
 
-### 3. Ongoing Triage for Pull Requests: `PR Auditing and Label Sync`
+### 3. Ongoing triage for pull requests: `PR Auditing and Label Sync`
 
 This workflow runs periodically to ensure all open PRs are correctly linked to
 issues and have consistent labels.
@@ -93,7 +93,7 @@ issues and have consistent labels.
   - This will ensure your PR is correctly categorized and moves through the
     review process smoothly.
 
-### 4. Ongoing Triage for Issues: `Scheduled Issue Triage`
+### 4. Ongoing triage for issues: `Scheduled Issue Triage`
 
 This is a fallback workflow to ensure that no issue gets missed by the triage
 process.
@@ -110,7 +110,7 @@ process.
     ensure every issue is eventually categorized, even if the initial triage
     fails.
 
-### 5. Release Automation
+### 5. Release automation
 
 This workflow handles the process of packaging and publishing new versions of
 the Gemini CLI.

docs/local-development.md

@@ -1,9 +1,9 @@
-# Local Development Guide
+# Local development guide
 
 This guide provides instructions for setting up and using local development
 features, such as development tracing.
 
-## Development Tracing
+## Development tracing
 
 Development traces (dev traces) are OpenTelemetry (OTel) traces that help you
 debug your code by instrumenting interesting events like model calls, tool
@@ -15,7 +15,7 @@ behaviour and debugging issues. They are disabled by default.
 To enable dev traces, set the `GEMINI_DEV_TRACING=true` environment variable
 when running Gemini CLI.
 
-### Viewing Dev Traces
+### Viewing dev traces
 
 You can view dev traces using either Jaeger or the Genkit Developer UI.
 
@@ -23,7 +23,7 @@ You can view dev traces using either Jaeger or the Genkit Developer UI.
 
 Genkit provides a web-based UI for viewing traces and other telemetry data.
 
-1.  **Start the Genkit Telemetry Server:**
+1.  **Start the Genkit telemetry server:**
 
     Run the following command to start the Genkit server:
 
@@ -37,7 +37,7 @@ Genkit provides a web-based UI for viewing traces and other telemetry data.
     Genkit Developer UI: http://localhost:4000
     ```
 
-2.  **Run Gemini CLI with Dev Tracing:**
+2.  **Run Gemini CLI with dev tracing:**
 
     In a separate terminal, run your Gemini CLI command with the
     `GEMINI_DEV_TRACING` environment variable:
@@ -46,7 +46,7 @@ Genkit provides a web-based UI for viewing traces and other telemetry data.
     GEMINI_DEV_TRACING=true gemini
     ```
 
-3.  **View the Traces:**
+3.  **View the traces:**
 
     Open the Genkit Developer UI URL in your browser and navigate to the
     **Traces** tab to view the traces.
@@ -84,7 +84,7 @@ You can view dev traces in the Jaeger UI. To get started, follow these steps:
 For more detailed information on telemetry, see the
 [telemetry documentation](./cli/telemetry.md).
 
-### Instrumenting Code with Dev Traces
+### Instrumenting code with dev traces
 
 You can add dev traces to your own code for more detailed instrumentation. This
 is useful for debugging and understanding the flow of execution.

docs/npm.md

@@ -1,4 +1,4 @@
-# Package Overview
+# Package overview
 
 This monorepo contains two main packages: `@google/gemini-cli` and
 `@google/gemini-cli-core`.
@@ -25,7 +25,7 @@ Node.js package with its own dependencies. This allows it to be used as a
 standalone package in other projects, if needed. All transpiled js code in the
 `dist` folder is included in the package.
 
-## NPM Workspaces
+## NPM workspaces
 
 This project uses
 [NPM Workspaces](https://docs.npmjs.com/cli/v10/using-npm/workspaces) to manage
@@ -33,7 +33,7 @@ the packages within this monorepo. This simplifies development by allowing us to
 manage dependencies and run scripts across multiple packages from the root of
 the project.
 
-### How it Works
+### How it works
 
 The root `package.json` file defines the workspaces for this project:
 
@@ -46,17 +46,17 @@ The root `package.json` file defines the workspaces for this project:
 This tells NPM that any folder inside the `packages` directory is a separate
 package that should be managed as part of the workspace.
 
-### Benefits of Workspaces
+### Benefits of workspaces
 
-- **Simplified Dependency Management**: Running `npm install` from the root of
+- **Simplified dependency management**: Running `npm install` from the root of
   the project will install all dependencies for all packages in the workspace
   and link them together. This means you don't need to run `npm install` in each
   package's directory.
-- **Automatic Linking**: Packages within the workspace can depend on each other.
+- **Automatic linking**: Packages within the workspace can depend on each other.
   When you run `npm install`, NPM will automatically create symlinks between the
   packages. This means that when you make changes to one package, the changes
   are immediately available to other packages that depend on it.
-- **Simplified Script Execution**: You can run scripts in any package from the
+- **Simplified script execution**: You can run scripts in any package from the
   root of the project using the `--workspace` flag. For example, to run the
   `build` script in the `cli` package, you can run
   `npm run build --workspace @google/gemini-cli`.

docs/quota-and-pricing.md

@@ -1,18 +1,17 @@
-# Gemini CLI: Quotas and Pricing
+# Gemini CLI: Quotas and pricing
 
-Gemini CLI offers a generous free tier that covers the use cases for many
-individual developers. For enterprise / professional usage, or if you need
-higher limits, there are multiple possible avenues depending on what type of
-account you use to authenticate.
+Gemini CLI offers a generous free tier that covers many individual developers'
+use cases. For enterprise or professional usage, or if you need higher limits,
+several options are available depending on your authentication account type.
 
-See [privacy and terms](./tos-privacy.md) for details on Privacy policy and
+See [privacy and terms](./tos-privacy.md) for details on the Privacy Policy and
 Terms of Service.
 
-> [!NOTE] Published prices are list price; additional negotiated commercial
+> **Note:** Published prices are list price; additional negotiated commercial
 > discounting may apply.
 
-This article outlines the specific quotas and pricing applicable to the Gemini
-CLI when using different authentication methods.
+This article outlines the specific quotas and pricing applicable to Gemini CLI
+when using different authentication methods.
 
 Generally, there are three categories to choose from:
 
@@ -22,7 +21,7 @@ Generally, there are three categories to choose from:
 - Pay-As-You-Go: The most flexible option for professional use, long-running
   tasks, or when you need full control over your usage.
 
-## Free Usage
+## Free usage
 
 Your journey begins with a generous free tier, perfect for experimentation and
 light use.
@@ -42,7 +41,7 @@ Assist for individuals. This includes:
 Learn more at
 [Gemini Code Assist for Individuals Limits](https://developers.google.com/gemini-code-assist/resources/quotas#quotas-for-agent-mode-gemini-cli).
 
-### Log in with Gemini API Key (Unpaid)
+### Log in with Gemini API Key (unpaid)
 
 If you are using a Gemini API key, you can also benefit from a free tier. This
 includes:
@@ -70,11 +69,9 @@ Learn more at
 If you use up your initial number of requests, you can continue to benefit from
 Gemini CLI by upgrading to one of the following subscriptions:
 
-- [Google AI Pro and AI Ultra](https://cloud.google.com/products/gemini/pricing)
-  by signing up at
-  [Set up Gemini Code Assist](https://goo.gle/set-up-gemini-code-assist). This
-  is recommended for individual developers. Quotas and pricing are based on a
-  fixed price subscription.
+- [Google AI Pro and AI Ultra](https://gemini.google/subscriptions/). This is
+  recommended for individual developers. Quotas and pricing are based on a fixed
+  price subscription.
 
   For predictable costs, you can log in with Google.
 
@@ -82,10 +79,11 @@ Gemini CLI by upgrading to one of the following subscriptions:
   [Gemini Code Assist Quotas and Limits](https://developers.google.com/gemini-code-assist/resources/quotas)
 
 - [Purchase a Gemini Code Assist Subscription through Google Cloud ](https://cloud.google.com/gemini/docs/codeassist/overview)
-  by signing up in the Google Cloud console. Learn more at [Set up Gemini Code
-  Assist] (https://cloud.google.com/gemini/docs/discover/set-up-gemini) Quotas
-  and pricing are based on a fixed price subscription with assigned license
-  seats. For predictable costs, you can sign in with Google.
+  by signing up in the Google Cloud console. Learn more at
+  [Set up Gemini Code Assist](https://cloud.google.com/gemini/docs/discover/set-up-gemini).
+
+  Quotas and pricing are based on a fixed price subscription with assigned
+  license seats. For predictable costs, you can sign in with Google.
 
   This includes:
   - Gemini Code Assist Standard edition:
@@ -99,7 +97,7 @@ Gemini CLI by upgrading to one of the following subscriptions:
 
   [Learn more about Gemini Code Assist Standard and Enterprise license limits](https://developers.google.com/gemini-code-assist/resources/quotas#quotas-for-agent-mode-gemini-cli).
 
-## Pay As You Go
+## Pay as you go
 
 If you hit your daily request limits or exhaust your Gemini Pro quota even after
 upgrading, the most flexible solution is to switch to a pay-as-you-go model,
@@ -129,7 +127,7 @@ It’s important to highlight that when using an API key, you pay per token/call
 This can be more expensive for many small calls with few tokens, but it's the
 only way to ensure your workflow isn't interrupted by quota limits.
 
-## Gemini for Workspace plans
+## Gemini for workspace plans
 
 These plans currently apply only to the use of Gemini web-based products
 provided by Google-based experiences (for example, the Gemini web app or the
@@ -137,7 +135,7 @@ Flow video editor). These plans do not apply to the API usage which powers the
 Gemini CLI. Supporting these plans is under active consideration for future
 support.
 
-## Tips to Avoid High Costs
+## Tips to avoid high costs
 
 When using a Pay as you Go API key, be mindful of your usage to avoid unexpected
 costs.

docs/release-confidence.md

@@ -1,21 +1,21 @@
-# Release Confidence Strategy
+# Release confidence strategy
 
 This document outlines the strategy for gaining confidence in every release of
 the Gemini CLI. It serves as a checklist and quality gate for release manager to
 ensure we are shipping a high-quality product.
 
-## The Goal
+## The goal
 
 To answer the question, "Is this release _truly_ ready for our users?" with a
 high degree of confidence, based on a holistic evaluation of automated signals,
 manual verification, and data.
 
-## Level 1: Automated Gates (Must Pass)
+## Level 1: Automated gates (must pass)
 
 These are the baseline requirements. If any of these fail, the release is a
 no-go.
 
-### 1. CI/CD Health
+### 1. CI/CD health
 
 All workflows in `.github/workflows/ci.yml` must pass on the `main` branch (for
 nightly) or the release branch (for preview/stable).
@@ -31,7 +31,7 @@ nightly) or the release branch (for preview/stable).
     pass.
   - **Build:** The project must build and bundle successfully.
 
-### 2. End-to-End (E2E) Tests
+### 2. End-to-end (E2E) tests
 
 All workflows in `.github/workflows/e2e.yml` must pass.
 
@@ -39,7 +39,7 @@ All workflows in `.github/workflows/e2e.yml` must pass.
 - **Sandboxing:** Tests must pass with both `sandbox:none` and `sandbox:docker`
   on Linux.
 
-### 3. Post-Deployment Smoke Tests
+### 3. Post-deployment smoke tests
 
 After a release is published to npm, the `smoke-test.yml` workflow runs. This
 must pass to confirm the package is installable and the binary is executable.
@@ -48,11 +48,11 @@ must pass to confirm the package is installable and the binary is executable.
   correct version without error.
 - **Platform:** Currently runs on `ubuntu-latest`.
 
-## Level 2: Manual Verification & Dogfooding
+## Level 2: Manual verification and dogfooding
 
 Automated tests cannot catch everything, especially UX issues.
 
-### 1. Dogfooding via `preview` Tag
+### 1. Dogfooding via `preview` tag
 
 The weekly release cadence promotes code from `main` -> `nightly` -> `preview`
 -> `stable`.
@@ -66,7 +66,7 @@ The weekly release cadence promotes code from `main` -> `nightly` -> `preview`
 - **Goal:** To catch regressions and UX issues in day-to-day usage before they
   reach the broad user base.
 
-### 2. Critical User Journey (CUJ) Checklist
+### 2. Critical user journey (CUJ) checklist
 
 Before promoting a `preview` release to `stable`, a release manager must
 manually run through this checklist.
@@ -84,15 +84,15 @@ manually run through this checklist.
     - [ ] API Key
     - [ ] Vertex AI
 
-- **Basic Prompting:**
+- **Basic prompting:**
   - [ ] Run `gemini "Tell me a joke"` and verify a sensible response.
   - [ ] Run in interactive mode: `gemini`. Ask a follow-up question to test
         context.
 
-- **Piped Input:**
+- **Piped input:**
   - [ ] Run `echo "Summarize this" | gemini` and verify it processes stdin.
 
-- **Context Management:**
+- **Context management:**
   - [ ] In interactive mode, use `@file` to add a local file to context. Ask a
         question about it.
 
@@ -100,20 +100,20 @@ manually run through this checklist.
   - [ ] In interactive mode run `/settings` and make modifications
   - [ ] Validate that setting is changed
 
-- **Function Calling:**
+- **Function calling:**
   - [ ] In interactive mode, ask gemini to "create a file named hello.md with
         the content 'hello world'" and verify the file is created correctly.
 
 If any of these CUJs fail, the release is a no-go until a patch is applied to
 the `preview` channel.
 
-### 3. Pre-Launch Bug Bash (Tier 1 & 2 Launches)
+### 3. Pre-Launch bug bash (tier 1 and 2 launches)
 
 For high-impact releases, an organized bug bash is required to ensure a higher
 level of quality and to catch issues across a wider range of environments and
 use cases.
 
-**Definition of Tiers:**
+**Definition of tiers:**
 
 - **Tier 1:** Industry-Moving News 🚀
 - **Tier 2:** Important News for Our Users 📣
@@ -125,7 +125,7 @@ use cases.
 A bug bash must be scheduled at least **72 hours in advance** of any Tier 1 or
 Tier 2 launch.
 
-**Rule of Thumb:**
+**Rule of thumb:**
 
 A bug bash should be considered for any release that involves:
 
@@ -134,22 +134,22 @@ A bug bash should be considered for any release that involves:
 - Media relations or press outreach
 - A "Turbo" launch event
 
-## Level 3: Telemetry & Data Review
+## Level 3: Telemetry and data review
 
-### Dashboard Health
+### Dashboard health
 
 - [ ] Go to `go/gemini-cli-dash`.
 - [ ] Navigate to the "Tool Call" tab.
 - [ ] Validate that there are no spikes in errors for the release you would like
       to promote.
 
-### Model Evaluation
+### Model evaluation
 
 - [ ] Navigate to `go/gemini-cli-offline-evals-dash`.
 - [ ] Make sure that the release you want to promote's recurring run is within
       average eval runs.
 
-## The "Go/No-Go" Decision
+## The "go/no-go" decision
 
 Before triggering the `Release: Promote` workflow to move `preview` to `stable`:
 

docs/releases.md

@@ -1,4 +1,4 @@
-# Gemini CLI Releases
+# Gemini CLI releases
 
 ## `dev` vs `prod` environment
 
@@ -22,7 +22,7 @@ More information can be found about these systems in the
 | Core       | @google/gemini-cli-core       | @google-gemini/gemini-cli-core A2A Server |
 | A2A Server | @google/gemini-cli-a2a-server | @google-gemini/gemini-cli-a2a-server      |
 
-## Release Cadence and Tags
+## Release cadence and tags
 
 We will follow https://semver.org/ as closely as possible but will call out when
 or if we have to deviate from it. Our weekly releases will be minor version
@@ -66,24 +66,24 @@ npm install -g @google/gemini-cli@latest
 npm install -g @google/gemini-cli@nightly
 ```
 
-## Weekly Release Promotion
+## Weekly release promotion
 
 Each Tuesday, the on-call engineer will trigger the "Promote Release" workflow.
 This single action automates the entire weekly release process:
 
-1.  **Promotes Preview to Stable:** The workflow identifies the latest `preview`
+1.  **Promotes preview to stable:** The workflow identifies the latest `preview`
     release and promotes it to `stable`. This becomes the new `latest` version
     on npm.
-2.  **Promotes Nightly to Preview:** The latest `nightly` release is then
+2.  **Promotes nightly to preview:** The latest `nightly` release is then
     promoted to become the new `preview` version.
-3.  **Prepares for next Nightly:** A pull request is automatically created and
+3.  **Prepares for next nightly:** A pull request is automatically created and
     merged to bump the version in `main` in preparation for the next nightly
     release.
 
 This process ensures a consistent and reliable release cadence with minimal
 manual intervention.
 
-### Source of Truth for Versioning
+### Source of truth for versioning
 
 To ensure the highest reliability, the release promotion process uses the **NPM
 registry as the single source of truth** for determining the current version of
@@ -92,16 +92,16 @@ each release channel (`stable`, `preview`, and `nightly`).
 1.  **Fetch from NPM:** The workflow begins by querying NPM's `dist-tags`
     (`latest`, `preview`, `nightly`) to get the exact version strings for the
     packages currently available to users.
-2.  **Cross-Check for Integrity:** For each version retrieved from NPM, the
+2.  **Cross-check for integrity:** For each version retrieved from NPM, the
     workflow performs a critical integrity check:
     - It verifies that a corresponding **git tag** exists in the repository.
-    - It verifies that a corresponding **GitHub Release** has been created.
-3.  **Halt on Discrepancy:** If either the git tag or the GitHub Release is
+    - It verifies that a corresponding **GitHub release** has been created.
+3.  **Halt on discrepancy:** If either the git tag or the GitHub Release is
     missing for a version listed on NPM, the workflow will immediately fail.
     This strict check prevents promotions from a broken or incomplete previous
     release and alerts the on-call engineer to a release state inconsistency
     that must be manually resolved.
-4.  **Calculate Next Version:** Only after these checks pass does the workflow
+4.  **Calculate next version:** Only after these checks pass does the workflow
     proceed to calculate the next semantic version based on the trusted version
     numbers retrieved from NPM.
 
@@ -109,14 +109,14 @@ This NPM-first approach, backed by integrity checks, makes the release process
 highly robust and prevents the kinds of versioning discrepancies that can arise
 from relying solely on git history or API outputs.
 
-## Manual Releases
+## Manual releases
 
 For situations requiring a release outside of the regular nightly and weekly
 promotion schedule, and NOT already covered by patching process, you can use the
 `Release: Manual` workflow. This workflow provides a direct way to publish a
 specific version from any branch, tag, or commit SHA.
 
-### How to Create a Manual Release
+### How to create a manual release
 
 1.  Navigate to the **Actions** tab of the repository.
 2.  Select the **Release: Manual** workflow from the list.
@@ -144,7 +144,7 @@ The workflow will then proceed to test (if not skipped), build, and publish the
 release. If the workflow fails during a non-dry run, it will automatically
 create a GitHub issue with the failure details.
 
-## Rollback/Rollforward
+## Rollback/rollforward
 
 In the event that a release has a critical regression, you can quickly roll back
 to a previous stable version or roll forward to a new patch by changing the npm
@@ -154,7 +154,7 @@ way to do this.
 This is the preferred method for both rollbacks and rollforwards, as it does not
 require a full release cycle.
 
-### How to Change a Release Tag
+### How to change a release tag
 
 1.  Navigate to the **Actions** tab of the repository.
 2.  Select the **Release: Change Tags** workflow from the list.
@@ -181,13 +181,13 @@ channel to the specified version.
 If a critical bug that is already fixed on `main` needs to be patched on a
 `stable` or `preview` release, the process is now highly automated.
 
-### How to Patch
+### How to patch
 
-#### 1. Create the Patch Pull Request
+#### 1. Create the patch pull request
 
 There are two ways to create a patch pull request:
 
-**Option A: From a GitHub Comment (Recommended)**
+**Option A: From a GitHub comment (recommended)**
 
 After a pull request containing the fix has been merged, a maintainer can add a
 comment on that same PR with the following format:
@@ -212,7 +212,7 @@ The `Release: Patch from Comment` workflow will automatically find the merge
 commit SHA and trigger the `Release: Patch (1) Create PR` workflow. If the PR is
 not yet merged, it will post a comment indicating the failure.
 
-**Option B: Manually Triggering the Workflow**
+**Option B: Manually triggering the workflow**
 
 Navigate to the **Actions** tab and run the **Release: Patch (1) Create PR**
 workflow.
@@ -229,17 +229,17 @@ This workflow will automatically:
 4.  Cherry-pick your specified commit into the hotfix branch.
 5.  Create a pull request from the hotfix branch back to the release branch.
 
-#### 2. Review and Merge
+#### 2. Review and merge
 
 Review the automatically created pull request(s) to ensure the cherry-pick was
 successful and the changes are correct. Once approved, merge the pull request.
 
-**Security Note:** The `release/*` branches are protected by branch protection
+**Security note:** The `release/*` branches are protected by branch protection
 rules. A pull request to one of these branches requires at least one review from
 a code owner before it can be merged. This ensures that no unauthorized code is
 released.
 
-#### 2.5. Adding Multiple Commits to a Hotfix (Advanced)
+#### 2.5. Adding multiple commits to a hotfix (advanced)
 
 If you need to include multiple fixes in a single patch release, you can add
 additional commits to the hotfix branch after the initial patch PR has been
@@ -280,7 +280,7 @@ This approach allows you to group related fixes into a single patch release
 while maintaining full control over what gets included and how conflicts are
 resolved.
 
-#### 3. Automatic Release
+#### 3. Automatic release
 
 Upon merging the pull request, the `Release: Patch (2) Trigger` workflow is
 automatically triggered. It will then start the `Release: Patch (3) Release`
@@ -293,21 +293,21 @@ workflow, which will:
 This fully automated process ensures that patches are created and released
 consistently and reliably.
 
-#### Troubleshooting: Older Branch Workflows
+#### Troubleshooting: Older branch workflows
 
 **Issue**: If the patch trigger workflow fails with errors like "Resource not
 accessible by integration" or references to non-existent workflow files (e.g.,
 `patch-release.yml`), this indicates the hotfix branch contains an outdated
 version of the workflow files.
 
-**Root Cause**: When a PR is merged, GitHub Actions runs the workflow definition
+**Root cause**: When a PR is merged, GitHub Actions runs the workflow definition
 from the **source branch** (the hotfix branch), not from the target branch (the
 release branch). If the hotfix branch was created from an older release branch
 that predates workflow improvements, it will use the old workflow logic.
 
 **Solutions**:
 
-**Option 1: Manual Trigger (Quick Fix)** Manually trigger the updated workflow
+**Option 1: Manual trigger (quick fix)** Manually trigger the updated workflow
 from the branch with the latest workflow code:
 
 ```bash
@@ -337,7 +337,7 @@ gh workflow run release-patch-2-trigger.yml --ref main \
 the latest workflow improvements (usually `main`, but could be a feature branch
 if testing updates).
 
-**Option 2: Update the Hotfix Branch** Merge the latest main branch into your
+**Option 2: Update the hotfix branch** Merge the latest main branch into your
 hotfix branch to get the updated workflows:
 
 ```bash
@@ -348,7 +348,7 @@ git push
 
 Then close and reopen the PR to retrigger the workflow with the updated version.
 
-**Option 3: Direct Release Trigger** Skip the trigger workflow entirely and
+**Option 3: Direct release trigger** Skip the trigger workflow entirely and
 directly run the release workflow:
 
 ```bash
@@ -367,7 +367,7 @@ We also run a Google cloud build called
 docker to match your release. This will also be moved to GH and combined with
 the main release file once service account permissions are sorted out.
 
-## Release Validation
+## Release validation
 
 After pushing a new release smoke testing should be performed to ensure that the
 packages are working as expected. This can be done by installing the packages
@@ -384,7 +384,7 @@ correctly.
   is recommended to ensure that the packages are working as expected. We'll
   codify this more in the future.
 
-## Local Testing and Validation: Changes to the Packaging and Publishing Process
+## Local testing and validation: Changes to the packaging and publishing process
 
 If you need to test the release process without actually publishing to NPM or
 creating a public GitHub release, you can trigger the workflow manually from the
@@ -428,7 +428,7 @@ tarballs will be created in the root of each package's directory (e.g.,
 By performing a dry run, you can be confident that your changes to the packaging
 process are correct and that the packages will be published successfully.
 
-## Release Deep Dive
+## Release deep dive
 
 The release process creates two distinct types of artifacts for different
 distribution channels: standard packages for the NPM registry and a single,
@@ -436,14 +436,14 @@ self-contained executable for GitHub Releases.
 
 Here are the key stages:
 
-**Stage 1: Pre-Release Sanity Checks and Versioning**
+**Stage 1: Pre-release sanity checks and versioning**
 
 - **What happens:** Before any files are moved, the process ensures the project
   is in a good state. This involves running tests, linting, and type-checking
   (`npm run preflight`). The version number in the root `package.json` and
   `packages/cli/package.json` is updated to the new release version.
 
-**Stage 2: Building the Source Code for NPM**
+**Stage 2: Building the source code for NPM**
 
 - **What happens:** The TypeScript source code in `packages/core/src` and
   `packages/cli/src` is compiled into standard JavaScript.
@@ -454,7 +454,7 @@ Here are the key stages:
   into plain JavaScript that can be run by Node.js. The `core` package is built
   first as the `cli` package depends on it.
 
-**Stage 3: Publishing Standard Packages to NPM**
+**Stage 3: Publishing standard packages to NPM**
 
 - **What happens:** The `npm publish` command is run for the
   `@google/gemini-cli-core` and `@google/gemini-cli` packages.
@@ -463,12 +463,12 @@ Here are the key stages:
   `npm` will handle installing the `@google/gemini-cli-core` dependency
   automatically. The code in these packages is not bundled into a single file.
 
-**Stage 4: Assembling and Creating the GitHub Release Asset**
+**Stage 4: Assembling and creating the GitHub release asset**
 
 This stage happens _after_ the NPM publish and creates the single-file
 executable that enables `npx` usage directly from the GitHub repository.
 
-1.  **The JavaScript Bundle is Created:**
+1.  **The JavaScript bundle is created:**
     - **What happens:** The built JavaScript from both `packages/core/dist` and
       `packages/cli/dist`, along with all third-party JavaScript dependencies,
       are bundled by `esbuild` into a single, executable JavaScript file (e.g.,
@@ -479,7 +479,7 @@ executable that enables `npx` usage directly from the GitHub repository.
       run the CLI without a full `npm install`, as all dependencies (including
       the `core` package) are included directly.
 
-2.  **The `bundle` Directory is Assembled:**
+2.  **The `bundle` directory is assembled:**
     - **What happens:** A temporary `bundle` folder is created at the project
       root. The single `gemini.js` executable is placed inside it, along with
       other essential files.
@@ -491,7 +491,7 @@ executable that enables `npx` usage directly from the GitHub repository.
     - **Why:** This creates a clean, self-contained directory with everything
       needed to run the CLI and understand its license and usage.
 
-3.  **The GitHub Release is Created:**
+3.  **The GitHub release is created:**
     - **What happens:** The contents of the `bundle` directory, including the
       `gemini.js` executable, are attached as assets to a new GitHub Release.
     - **Why:** This makes the single-file version of the CLI available for
@@ -499,12 +499,12 @@ executable that enables `npx` usage directly from the GitHub repository.
       `npx https://github.com/google-gemini/gemini-cli` command, which downloads
       and runs this specific bundled asset.
 
-**Summary of Artifacts**
+**Summary of artifacts**
 
 - **NPM:** Publishes standard, un-bundled Node.js packages. The primary artifact
   is the code in `packages/cli/dist`, which depends on
   `@google/gemini-cli-core`.
-- **GitHub Release:** Publishes a single, bundled `gemini.js` file that contains
+- **GitHub release:** Publishes a single, bundled `gemini.js` file that contains
   all dependencies, for easy execution via `npx`.
 
 This dual-artifact process ensures that both traditional `npm` users and those

docs/sidebar.json

@@ -7,22 +7,26 @@
         "slug": "docs"
       },
       {
-        "label": "Architecture Overview",
+        "label": "Architecture overview",
         "slug": "docs/architecture"
       },
       {
-        "label": "Contribution Guide",
+        "label": "Contribution guide",
         "slug": "docs/contributing"
       }
     ]
   },
   {
-    "label": "Get Started",
+    "label": "Get started",
     "items": [
       {
-        "label": "Gemini CLI Quickstart",
+        "label": "Gemini CLI quickstart",
         "slug": "docs/get-started"
       },
+      {
+        "label": "Gemini 3 Pro on Gemini CLI",
+        "slug": "docs/get-started/gemini-3"
+      },
       {
         "label": "Authentication",
         "slug": "docs/get-started/authentication"
@@ -57,7 +61,7 @@
         "slug": "docs/cli/checkpointing"
       },
       {
-        "label": "Custom Commands",
+        "label": "Custom commands",
         "slug": "docs/cli/custom-commands"
       },
       {
@@ -65,17 +69,29 @@
         "slug": "docs/cli/enterprise"
       },
       {
-        "label": "Headless Mode",
+        "label": "Headless mode",
         "slug": "docs/cli/headless"
       },
       {
-        "label": "Keyboard Shortcuts",
+        "label": "Keyboard shortcuts",
         "slug": "docs/cli/keyboard-shortcuts"
       },
+      {
+        "label": "Model selection",
+        "slug": "docs/cli/model"
+      },
       {
         "label": "Sandbox",
         "slug": "docs/cli/sandbox"
       },
+      {
+        "label": "Session Management",
+        "slug": "docs/cli/session-management"
+      },
+      {
+        "label": "Settings",
+        "slug": "docs/cli/settings"
+      },
       {
         "label": "Telemetry",
         "slug": "docs/cli/telemetry"
@@ -85,7 +101,7 @@
         "slug": "docs/cli/themes"
       },
       {
-        "label": "Token Caching",
+        "label": "Token caching",
         "slug": "docs/cli/token-caching"
       },
       {
@@ -116,6 +132,10 @@
       {
         "label": "Memory Import Processor",
         "slug": "docs/core/memport"
+      },
+      {
+        "label": "Policy Engine",
+        "slug": "docs/core/policy-engine"
       }
     ]
   },
@@ -127,23 +147,19 @@
         "slug": "docs/tools"
       },
       {
-        "label": "File System",
+        "label": "File system",
         "slug": "docs/tools/file-system"
       },
-      {
-        "label": "Multi-File Read",
-        "slug": "docs/tools/multi-file"
-      },
       {
         "label": "Shell",
         "slug": "docs/tools/shell"
       },
       {
-        "label": "Web Fetch",
+        "label": "Web fetch",
         "slug": "docs/tools/web-fetch"
       },
       {
-        "label": "Web Search",
+        "label": "Web search",
         "slug": "docs/tools/web-search"
       },
       {
@@ -155,7 +171,7 @@
         "slug": "docs/tools/todos"
       },
       {
-        "label": "MCP Servers",
+        "label": "MCP servers",
         "slug": "docs/tools/mcp-server"
       }
     ]
@@ -168,24 +184,24 @@
         "slug": "docs/extensions"
       },
       {
-        "label": "Get Started with Extensions",
+        "label": "Get started with extensions",
         "slug": "docs/extensions/getting-started-extensions"
       },
       {
-        "label": "Extension Releasing",
+        "label": "Extension releasing",
         "slug": "docs/extensions/extension-releasing"
       }
     ]
   },
   {
-    "label": "IDE Integration",
+    "label": "IDE integration",
     "items": [
       {
         "label": "Introduction",
         "slug": "docs/ide-integration"
       },
       {
-        "label": "IDE Companion Spec",
+        "label": "IDE companion spec",
         "slug": "docs/ide-integration/ide-companion-spec"
       }
     ]
@@ -206,11 +222,11 @@
         "slug": "docs/changelogs"
       },
       {
-        "label": "Integration Tests",
+        "label": "Integration tests",
         "slug": "docs/integration-tests"
       },
       {
-        "label": "Issue and PR Automation",
+        "label": "Issue and PR automation",
         "slug": "docs/issue-and-pr-automation"
       }
     ]
@@ -227,11 +243,11 @@
         "slug": "docs/troubleshooting"
       },
       {
-        "label": "Quota and Pricing",
+        "label": "Quota and pricing",
         "slug": "docs/quota-and-pricing"
       },
       {
-        "label": "Terms of Service",
+        "label": "Terms of service",
         "slug": "docs/tos-privacy"
       }
     ]

docs/tools/file-system.md

@@ -184,7 +184,7 @@ context around the `old_string` to ensure it modifies the correct location.
   - If `old_string` is provided, it reads the `file_path` and attempts to find
     exactly one occurrence of `old_string`.
   - If one occurrence is found, it replaces it with `new_string`.
-  - **Enhanced Reliability (Multi-Stage Edit Correction):** To significantly
+  - **Enhanced reliability (multi-stage edit correction):** To significantly
     improve the success rate of edits, especially when the model-provided
     `old_string` might not be perfectly precise, the tool incorporates a
     multi-stage edit correction mechanism.

docs/tools/index.md

@@ -82,8 +82,6 @@ Gemini CLI's built-in tools can be broadly categorized as follows:
   from URLs.
 - **[Web Search Tool](./web-search.md) (`google_web_search`):** For searching
   the web.
-- **[Multi-File Read Tool](./multi-file.md) (`read_many_files`):** A specialized
-  tool for reading content from multiple files or directories.
 - **[Memory Tool](./memory.md) (`save_memory`):** For saving and recalling
   information across sessions.
 - **[Todo Tool](./todos.md) (`write_todos`):** For managing subtasks of complex

docs/tools/mcp-server.md

@@ -23,7 +23,7 @@ With an MCP server, you can extend the Gemini CLI's capabilities to perform
 actions beyond its built-in features, such as interacting with databases, APIs,
 custom scripts, or specialized workflows.
 
-## Core Integration Architecture
+## Core integration architecture
 
 The Gemini CLI integrates with MCP servers through a sophisticated discovery and
 execution system built into the core package (`packages/core/src/tools/`):
@@ -41,7 +41,7 @@ The discovery process is orchestrated by `discoverMcpTools()`, which:
    API
 5. **Registers tools** in the global tool registry with conflict resolution
 
-### Execution Layer (`mcp-tool.ts`)
+### Execution layer (`mcp-tool.ts`)
 
 Each discovered MCP tool is wrapped in a `DiscoveredMCPTool` instance that:
 
@@ -51,7 +51,7 @@ Each discovered MCP tool is wrapped in a `DiscoveredMCPTool` instance that:
 - **Processes responses** for both the LLM context and user display
 - **Maintains connection state** and handles timeouts
 
-### Transport Mechanisms
+### Transport mechanisms
 
 The Gemini CLI supports three MCP transport types:
 
@@ -72,7 +72,7 @@ through the top-level `mcpServers` object for specific server definitions, and
 through the `mcp` object for global settings that control server discovery and
 execution.
 
-#### Global MCP Settings (`mcp`)
+#### Global MCP settings (`mcp`)
 
 The `mcp` object in your `settings.json` allows you to define global rules for
 all MCP servers.
@@ -95,12 +95,12 @@ all MCP servers.
 }
 ```
 
-#### Server-Specific Configuration (`mcpServers`)
+#### Server-specific configuration (`mcpServers`)
 
 The `mcpServers` object is where you define each individual MCP server you want
 the CLI to connect to.
 
-### Configuration Structure
+### Configuration structure
 
 Add an `mcpServers` object to your `settings.json` file:
 
@@ -121,7 +121,7 @@ Add an `mcpServers` object to your `settings.json` file:
 }
 ```
 
-### Configuration Properties
+### Configuration properties
 
 Each server configuration supports the following properties:
 
@@ -157,13 +157,13 @@ Each server configuration supports the following properties:
   Service Account to impersonate. Used with
   `authProviderType: 'service_account_impersonation'`.
 
-### OAuth Support for Remote MCP Servers
+### OAuth support for remote MCP servers
 
 The Gemini CLI supports OAuth 2.0 authentication for remote MCP servers using
 SSE or HTTP transports. This enables secure access to MCP servers that require
 authentication.
 
-#### Automatic OAuth Discovery
+#### Automatic OAuth discovery
 
 For servers that support OAuth discovery, you can omit the OAuth configuration
 and let the CLI discover it automatically:
@@ -185,7 +185,7 @@ The CLI will automatically:
 - Perform dynamic client registration if supported
 - Handle the OAuth flow and token management
 
-#### Authentication Flow
+#### Authentication flow
 
 When connecting to an OAuth-enabled server:
 
@@ -196,7 +196,7 @@ When connecting to an OAuth-enabled server:
 5. **Tokens are stored** securely for future use
 6. **Connection retry** succeeds with valid tokens
 
-#### Browser Redirect Requirements
+#### Browser redirect requirements
 
 **Important:** OAuth authentication requires that your local machine can:
 
@@ -209,7 +209,7 @@ This feature will not work in:
 - Remote SSH sessions without X11 forwarding
 - Containerized environments without browser support
 
-#### Managing OAuth Authentication
+#### Managing OAuth authentication
 
 Use the `/mcp auth` command to manage OAuth authentication:
 
@@ -224,7 +224,7 @@ Use the `/mcp auth` command to manage OAuth authentication:
 /mcp auth serverName
 ```
 
-#### OAuth Configuration Properties
+#### OAuth configuration properties
 
 - **`enabled`** (boolean): Enable OAuth for this server
 - **`clientId`** (string): OAuth client identifier (optional with dynamic
@@ -239,7 +239,7 @@ Use the `/mcp auth` command to manage OAuth authentication:
 - **`tokenParamName`** (string): Query parameter name for tokens in SSE URLs
 - **`audiences`** (string[]): Audiences the token is valid for
 
-#### Token Management
+#### Token management
 
 OAuth tokens are automatically:
 
@@ -248,7 +248,7 @@ OAuth tokens are automatically:
 - **Validated** before each connection attempt
 - **Cleaned up** when invalid or expired
 
-#### Authentication Provider Type
+#### Authentication provider type
 
 You can specify the authentication provider type using the `authProviderType`
 property:
@@ -265,7 +265,7 @@ property:
     accessing IAP-protected services (this was specifically designed for Cloud
     Run services).
 
-#### Google Credentials
+#### Google credentials
 
 ```json
 {
@@ -281,7 +281,7 @@ property:
 }
 ```
 
-#### Service Account Impersonation
+#### Service account impersonation
 
 To authenticate with a server using Service Account Impersonation, you must set
 the `authProviderType` to `service_account_impersonation` and provide the
@@ -296,7 +296,7 @@ The CLI will use your local Application Default Credentials (ADC) to generate an
 OIDC ID token for the specified service account and audience. This token will
 then be used to authenticate with the MCP server.
 
-#### Setup Instructions
+#### Setup instructions
 
 1. **[Create](https://cloud.google.com/iap/docs/oauth-client-creation) or use an
    existing OAuth 2.0 client ID.** To use an existing OAuth 2.0 client ID,
@@ -318,9 +318,9 @@ then be used to authenticate with the MCP server.
 6. **[Enable](https://console.cloud.google.com/apis/library/iamcredentials.googleapis.com)
    the IAM Credentials API** for your project.
 
-### Example Configurations
+### Example configurations
 
-#### Python MCP Server (Stdio)
+#### Python MCP server (stdio)
 
 ```json
 {
@@ -339,7 +339,7 @@ then be used to authenticate with the MCP server.
 }
 ```
 
-#### Node.js MCP Server (Stdio)
+#### Node.js MCP server (stdio)
 
 ```json
 {
@@ -354,7 +354,7 @@ then be used to authenticate with the MCP server.
 }
 ```
 
-#### Docker-based MCP Server
+#### Docker-based MCP server
 
 ```json
 {
@@ -379,7 +379,7 @@ then be used to authenticate with the MCP server.
 }
 ```
 
-#### HTTP-based MCP Server
+#### HTTP-based MCP server
 
 ```json
 {
@@ -392,7 +392,7 @@ then be used to authenticate with the MCP server.
 }
 ```
 
-#### HTTP-based MCP Server with Custom Headers
+#### HTTP-based MCP Server with custom headers
 
 ```json
 {
@@ -410,7 +410,7 @@ then be used to authenticate with the MCP server.
 }
 ```
 
-#### MCP Server with Tool Filtering
+#### MCP server with tool filtering
 
 ```json
 {
@@ -426,7 +426,7 @@ then be used to authenticate with the MCP server.
 }
 ```
 
-### SSE MCP Server with SA Impersonation
+### SSE MCP server with SA impersonation
 
 ```json
 {
@@ -441,12 +441,12 @@ then be used to authenticate with the MCP server.
 }
 ```
 
-## Discovery Process Deep Dive
+## Discovery process deep dive
 
 When the Gemini CLI starts, it performs MCP server discovery through the
 following detailed process:
 
-### 1. Server Iteration and Connection
+### 1. Server iteration and connection
 
 For each configured server in `mcpServers`:
 
@@ -460,7 +460,7 @@ For each configured server in `mcpServers`:
 4. **Error handling:** Connection failures are logged and the server status is
    set to `DISCONNECTED`
 
-### 2. Tool Discovery
+### 2. Tool discovery
 
 Upon successful connection:
 
@@ -475,7 +475,7 @@ Upon successful connection:
    - Names longer than 63 characters are truncated with middle replacement
      (`___`)
 
-### 3. Conflict Resolution
+### 3. Conflict resolution
 
 When multiple servers expose tools with the same name:
 
@@ -486,7 +486,7 @@ When multiple servers expose tools with the same name:
 3. **Registry tracking:** The tool registry maintains mappings between server
    names and their tools
 
-### 4. Schema Processing
+### 4. Schema processing
 
 Tool parameter schemas undergo sanitization for Gemini API compatibility:
 
@@ -496,7 +496,7 @@ Tool parameter schemas undergo sanitization for Gemini API compatibility:
   compatibility)
 - **Recursive processing** applies to nested schemas
 
-### 5. Connection Management
+### 5. Connection management
 
 After discovery:
 
@@ -507,23 +507,23 @@ After discovery:
 - **Status updates:** Final server statuses are set to `CONNECTED` or
   `DISCONNECTED`
 
-## Tool Execution Flow
+## Tool execution flow
 
 When the Gemini model decides to use an MCP tool, the following execution flow
 occurs:
 
-### 1. Tool Invocation
+### 1. Tool invocation
 
 The model generates a `FunctionCall` with:
 
 - **Tool name:** The registered name (potentially prefixed)
 - **Arguments:** JSON object matching the tool's parameter schema
 
-### 2. Confirmation Process
+### 2. Confirmation process
 
 Each `DiscoveredMCPTool` implements sophisticated confirmation logic:
 
-#### Trust-based Bypass
+#### Trust-based bypass
 
 ```typescript
 if (this.trust) {
@@ -531,14 +531,14 @@ if (this.trust) {
 }
 ```
 
-#### Dynamic Allow-listing
+#### Dynamic allow-listing
 
 The system maintains internal allow-lists for:
 
 - **Server-level:** `serverName` → All tools from this server are trusted
 - **Tool-level:** `serverName.toolName` → This specific tool is trusted
 
-#### User Choice Handling
+#### User choice handling
 
 When confirmation is required, users can choose:
 
@@ -566,7 +566,7 @@ Upon confirmation (or trust bypass):
 3. **Response processing:** Results are formatted for both LLM context and user
    display
 
-### 4. Response Handling
+### 4. Response handling
 
 The execution result contains:
 
@@ -576,7 +576,7 @@ The execution result contains:
 
 ## How to interact with your MCP server
 
-### Using the `/mcp` Command
+### Using the `/mcp` command
 
 The `/mcp` command provides comprehensive information about your MCP server
 setup:
@@ -593,7 +593,7 @@ This displays:
 - **Available tools:** List of tools from each server with descriptions
 - **Discovery state:** Overall discovery process status
 
-### Example `/mcp` Output
+### Example `/mcp` output
 
 ```
 MCP Servers Status:
@@ -615,7 +615,7 @@ MCP Servers Status:
 Discovery State: COMPLETED
 ```
 
-### Tool Usage
+### Tool usage
 
 Once discovered, MCP tools are available to the Gemini model like built-in
 tools. The model will automatically:
@@ -625,27 +625,27 @@ tools. The model will automatically:
 3. **Execute tools** with proper parameters
 4. **Display results** in a user-friendly format
 
-## Status Monitoring and Troubleshooting
+## Status monitoring and troubleshooting
 
-### Connection States
+### Connection states
 
 The MCP integration tracks several states:
 
-#### Server Status (`MCPServerStatus`)
+#### Server status (`MCPServerStatus`)
 
 - **`DISCONNECTED`:** Server is not connected or has errors
 - **`CONNECTING`:** Connection attempt in progress
 - **`CONNECTED`:** Server is connected and ready
 
-#### Discovery State (`MCPDiscoveryState`)
+#### Discovery state (`MCPDiscoveryState`)
 
 - **`NOT_STARTED`:** Discovery hasn't begun
 - **`IN_PROGRESS`:** Currently discovering servers
 - **`COMPLETED`:** Discovery finished (with or without errors)
 
-### Common Issues and Solutions
+### Common issues and solutions
 
-#### Server Won't Connect
+#### Server won't connect
 
 **Symptoms:** Server shows `DISCONNECTED` status
 
@@ -657,7 +657,7 @@ The MCP integration tracks several states:
 4. **Review logs:** Look for error messages in the CLI output
 5. **Verify permissions:** Ensure the CLI can execute the server command
 
-#### No Tools Discovered
+#### No tools discovered
 
 **Symptoms:** Server connects but no tools are available
 
@@ -669,7 +669,7 @@ The MCP integration tracks several states:
 3. **Review server logs:** Check stderr output for server-side errors
 4. **Test tool listing:** Manually test your server's tool discovery endpoint
 
-#### Tools Not Executing
+#### Tools not executing
 
 **Symptoms:** Tools are discovered but fail during execution
 
@@ -680,7 +680,7 @@ The MCP integration tracks several states:
 3. **Error handling:** Check if your tool is throwing unhandled exceptions
 4. **Timeout issues:** Consider increasing the `timeout` setting
 
-#### Sandbox Compatibility
+#### Sandbox compatibility
 
 **Symptoms:** MCP servers fail when sandboxing is enabled
 
@@ -693,7 +693,7 @@ The MCP integration tracks several states:
 4. **Environment variables:** Verify required environment variables are passed
    through
 
-### Debugging Tips
+### Debugging tips
 
 1. **Enable debug mode:** Run the CLI with `--debug` for verbose output
 2. **Check stderr:** MCP server stderr is captured and logged (INFO messages
@@ -703,9 +703,9 @@ The MCP integration tracks several states:
    functionality
 5. **Use `/mcp` frequently:** Monitor server status during development
 
-## Important Notes
+## Important notes
 
-### Security Considerations
+### Security sonsiderations
 
 - **Trust settings:** The `trust` option bypasses all confirmation dialogs. Use
   cautiously and only for servers you completely control
@@ -716,7 +716,7 @@ The MCP integration tracks several states:
 - **Private data:** Using broadly scoped personal access tokens can lead to
   information leakage between repositories
 
-### Performance and Resource Management
+### Performance and resource management
 
 - **Connection persistence:** The CLI maintains persistent connections to
   servers that successfully register tools
@@ -727,7 +727,7 @@ The MCP integration tracks several states:
 - **Resource monitoring:** MCP servers run as separate processes and consume
   system resources
 
-### Schema Compatibility
+### Schema compatibility
 
 - **Property stripping:** The system automatically removes certain schema
   properties (`$schema`, `additionalProperties`) for Gemini API compatibility
@@ -740,7 +740,7 @@ This comprehensive integration makes MCP servers a powerful way to extend the
 Gemini CLI's capabilities while maintaining security, reliability, and ease of
 use.
 
-## Returning Rich Content from Tools
+## Returning rich content from tools
 
 MCP tools are not limited to returning simple text. You can return rich,
 multi-part content, including text, images, audio, and other binary data in a
@@ -751,7 +751,7 @@ All data returned from the tool is processed and sent to the model as context
 for its next generation, enabling it to reason about or summarize the provided
 information.
 
-### How It Works
+### How it works
 
 To return rich content, your tool's response must adhere to the MCP
 specification for a
@@ -769,7 +769,7 @@ supported block types include:
 - `resource` (embedded content)
 - `resource_link`
 
-### Example: Returning Text and an Image
+### Example: Returning text and an image
 
 Here is an example of a valid JSON response from an MCP tool that returns both a
 text description and an image:
@@ -805,13 +805,13 @@ When the Gemini CLI receives this response, it will:
 This enables you to build sophisticated tools that can provide rich, multi-modal
 context to the Gemini model.
 
-## MCP Prompts as Slash Commands
+## MCP prompts as slash commands
 
 In addition to tools, MCP servers can expose predefined prompts that can be
 executed as slash commands within the Gemini CLI. This allows you to create
 shortcuts for common or complex queries that can be easily invoked by name.
 
-### Defining Prompts on the Server
+### Defining prompts on the server
 
 Here's a small example of a stdio MCP server that defines prompts:
 
@@ -862,7 +862,7 @@ This can be included in `settings.json` under `mcpServers` with:
 }
 ```
 
-### Invoking Prompts
+### Invoking prompts
 
 Once a prompt is discovered, you can invoke it using its name as a slash
 command. The CLI will automatically handle parsing arguments.
@@ -883,7 +883,7 @@ substituting the arguments into the prompt template and returning the final
 prompt text. The CLI then sends this prompt to the model for execution. This
 provides a convenient way to automate and share common workflows.
 
-## Managing MCP Servers with `gemini mcp`
+## Managing MCP servers with `gemini mcp`
 
 While you can always configure MCP servers by manually editing your
 `settings.json` file, the Gemini CLI provides a convenient set of commands to
@@ -891,7 +891,7 @@ manage your server configurations programmatically. These commands streamline
 the process of adding, listing, and removing MCP servers without needing to
 directly edit JSON files.
 
-### Adding a Server (`gemini mcp add`)
+### Adding a server (`gemini mcp add`)
 
 The `add` command configures a new MCP server in your `settings.json`. Based on
 the scope (`-s, --scope`), it will be added to either the user config
@@ -908,7 +908,7 @@ gemini mcp add [options] <name> <commandOrUrl> [args...]
   `http`/`sse`).
 - `[args...]`: Optional arguments for a `stdio` command.
 
-**Options (Flags):**
+**Options (flags):**
 
 - `-s, --scope`: Configuration scope (user or project). [default: "project"]
 - `-t, --transport`: Transport type (stdio, sse, http). [default: "stdio"]
@@ -927,13 +927,13 @@ This is the default transport for running local servers.
 
 ```bash
 # Basic syntax
-gemini mcp add <name> <command> [args...]
+gemini mcp add [options] <name> <command> [args...]
 
 # Example: Adding a local server
-gemini mcp add -e API_KEY=123 my-stdio-server /path/to/server arg1 arg2 arg3
+gemini mcp add -e API_KEY=123 -e DEBUG=true my-stdio-server /path/to/server arg1 arg2 arg3
 
 # Example: Adding a local python server
-gemini mcp add python-server python server.py --port 8080
+gemini mcp add python-server python server.py -- --server-arg my-value
 ```
 
 #### Adding an HTTP server
@@ -966,10 +966,11 @@ gemini mcp add --transport sse sse-server https://api.example.com/sse/
 gemini mcp add --transport sse --header "Authorization: Bearer abc123" secure-sse https://api.example.com/sse/
 ```
 
-### Listing Servers (`gemini mcp list`)
+### Listing servers (`gemini mcp list`)
 
 To view all MCP servers currently configured, use the `list` command. It
-displays each server's name, configuration details, and connection status.
+displays each server's name, configuration details, and connection status. This
+command has no flags.
 
 **Command:**
 
@@ -977,7 +978,7 @@ displays each server's name, configuration details, and connection status.
 gemini mcp list
 ```
 
-**Example Output:**
+**Example output:**
 
 ```sh
 ✓ stdio-server: command: python3 server.py (stdio) - Connected
@@ -985,7 +986,7 @@ gemini mcp list
 ✗ sse-server: https://api.example.com/sse (sse) - Disconnected
 ```
 
-### Removing a Server (`gemini mcp remove`)
+### Removing a server (`gemini mcp remove`)
 
 To delete a server from your configuration, use the `remove` command with the
 server's name.
@@ -996,6 +997,10 @@ server's name.
 gemini mcp remove <name>
 ```
 
+**Options (flags):**
+
+- `-s, --scope`: Configuration scope (user or project). [default: "project"]
+
 **Example:**
 
 ```bash
@@ -1004,3 +1009,9 @@ gemini mcp remove my-server
 
 This will find and delete the "my-server" entry from the `mcpServers` object in
 the appropriate `settings.json` file based on the scope (`-s, --scope`).
+
+## Instructions
+
+Gemini CLI supports
+[MCP server instructions](https://modelcontextprotocol.io/specification/2025-06-18/schema#initializeresult),
+which will be appended to the system instructions.

docs/tools/memory.md

@@ -1,4 +1,4 @@
-# Memory Tool (`save_memory`)
+# Memory tool (`save_memory`)
 
 This document describes the `save_memory` tool for the Gemini CLI.
 

docs/tools/multi-file.md

@@ -1,109 +0,0 @@
-# Multi File Read Tool (`read_many_files`)
-
-This document describes the `read_many_files` tool for the Gemini CLI.
-
-## Description
-
-Use `read_many_files` to read content from multiple files specified by paths or
-glob patterns. The behavior of this tool depends on the provided files:
-
-- For text files, this tool concatenates their content into a single string.
-- For image (e.g., PNG, JPEG), PDF, audio (MP3, WAV), and video (MP4, MOV)
-  files, it reads and returns them as base64-encoded data, provided they are
-  explicitly requested by name or extension.
-
-`read_many_files` can be used to perform tasks such as getting an overview of a
-codebase, finding where specific functionality is implemented, reviewing
-documentation, or gathering context from multiple configuration files.
-
-**Note:** `read_many_files` looks for files following the provided paths or glob
-patterns. A directory path such as `"/docs"` will return an empty result; the
-tool requires a pattern such as `"/docs/*"` or `"/docs/*.md"` to identify the
-relevant files.
-
-### Arguments
-
-`read_many_files` takes the following arguments:
-
-- `paths` (list[string], required): An array of glob patterns or paths relative
-  to the tool's target directory (e.g., `["src/**/*.ts"]`,
-  `["README.md", "docs/*", "assets/logo.png"]`).
-- `exclude` (list[string], optional): Glob patterns for files/directories to
-  exclude (e.g., `["**/*.log", "temp/"]`). These are added to default excludes
-  if `useDefaultExcludes` is true.
-- `include` (list[string], optional): Additional glob patterns to include. These
-  are merged with `paths` (e.g., `["*.test.ts"]` to specifically add test files
-  if they were broadly excluded, or `["images/*.jpg"]` to include specific image
-  types).
-- `recursive` (boolean, optional): Whether to search recursively. This is
-  primarily controlled by `**` in glob patterns. Defaults to `true`.
-- `useDefaultExcludes` (boolean, optional): Whether to apply a list of default
-  exclusion patterns (e.g., `node_modules`, `.git`, non image/pdf binary files).
-  Defaults to `true`.
-- `respect_git_ignore` (boolean, optional): Whether to respect .gitignore
-  patterns when finding files. Defaults to true.
-
-## How to use `read_many_files` with the Gemini CLI
-
-`read_many_files` searches for files matching the provided `paths` and `include`
-patterns, while respecting `exclude` patterns and default excludes (if enabled).
-
-- For text files: it reads the content of each matched file (attempting to skip
-  binary files not explicitly requested as image/PDF) and concatenates it into a
-  single string, with a separator `--- {filePath} ---` between the content of
-  each file. Uses UTF-8 encoding by default.
-- The tool inserts a `--- End of content ---` after the last file.
-- For image and PDF files: if explicitly requested by name or extension (e.g.,
-  `paths: ["logo.png"]` or `include: ["*.pdf"]`), the tool reads the file and
-  returns its content as a base64 encoded string.
-- The tool attempts to detect and skip other binary files (those not matching
-  common image/PDF types or not explicitly requested) by checking for null bytes
-  in their initial content.
-
-Usage:
-
-```
-read_many_files(paths=["Your files or paths here."], include=["Additional files to include."], exclude=["Files to exclude."], recursive=False, useDefaultExcludes=false, respect_git_ignore=true)
-```
-
-## `read_many_files` examples
-
-Read all TypeScript files in the `src` directory:
-
-```
-read_many_files(paths=["src/**/*.ts"])
-```
-
-Read the main README, all Markdown files in the `docs` directory, and a specific
-logo image, excluding a specific file:
-
-```
-read_many_files(paths=["README.md", "docs/**/*.md", "assets/logo.png"], exclude=["docs/OLD_README.md"])
-```
-
-Read all JavaScript files but explicitly include test files and all JPEGs in an
-`images` folder:
-
-```
-read_many_files(paths=["**/*.js"], include=["**/*.test.js", "images/**/*.jpg"], useDefaultExcludes=False)
-```
-
-## Important notes
-
-- **Binary file handling:**
-  - **Image/PDF/Audio/Video files:** The tool can read common image types (PNG,
-    JPEG, etc.), PDF, audio (mp3, wav), and video (mp4, mov) files, returning
-    them as base64 encoded data. These files _must_ be explicitly targeted by
-    the `paths` or `include` patterns (e.g., by specifying the exact filename
-    like `video.mp4` or a pattern like `*.mov`).
-  - **Other binary files:** The tool attempts to detect and skip other types of
-    binary files by examining their initial content for null bytes. The tool
-    excludes these files from its output.
-- **Performance:** Reading a very large number of files or very large individual
-  files can be resource-intensive.
-- **Path specificity:** Ensure paths and glob patterns are correctly specified
-  relative to the tool's target directory. For image/PDF files, ensure the
-  patterns are specific enough to include them.
-- **Default excludes:** Be aware of the default exclusion patterns (like
-  `node_modules`, `.git`) and use `useDefaultExcludes=False` if you need to
-  override them, but do so cautiously.

docs/tools/shell.md

@@ -1,4 +1,4 @@
-# Shell Tool (`run_shell_command`)
+# Shell tool (`run_shell_command`)
 
 This document describes the `run_shell_command` tool for the Gemini CLI.
 
@@ -71,7 +71,7 @@ run_shell_command(command="npm run dev &", description="Start development server
 You can configure the behavior of the `run_shell_command` tool by modifying your
 `settings.json` file or by using the `/settings` command in the Gemini CLI.
 
-### Enabling Interactive Commands
+### Enabling interactive commands
 
 To enable interactive commands, you need to set the
 `tools.shell.enableInteractiveShell` setting to `true`. This will use `node-pty`
@@ -91,7 +91,7 @@ implementation, which does not support interactive commands.
 }
 ```
 
-### Showing Color in Output
+### Showing color in output
 
 To show color in the shell output, you need to set the `tools.shell.showColor`
 setting to `true`. **Note: This setting only applies when
@@ -109,7 +109,7 @@ setting to `true`. **Note: This setting only applies when
 }
 ```
 
-### Setting the Pager
+### Setting the pager
 
 You can set a custom pager for the shell output by setting the
 `tools.shell.pager` setting. The default pager is `cat`. **Note: This setting
@@ -127,7 +127,7 @@ only applies when `tools.shell.enableInteractiveShell` is enabled.**
 }
 ```
 
-## Interactive Commands
+## Interactive commands
 
 The `run_shell_command` tool now supports interactive commands by integrating a
 pseudo-terminal (pty). This allows you to run commands that require real-time
@@ -149,13 +149,13 @@ including complex TUIs, will be rendered correctly.
   background. The `Background PIDs` field will contain the process ID of the
   background process.
 
-## Environment Variables
+## Environment variables
 
 When `run_shell_command` executes a command, it sets the `GEMINI_CLI=1`
 environment variable in the subprocess's environment. This allows scripts or
 tools to detect if they are being run from within the Gemini CLI.
 
-## Command Restrictions
+## Command restrictions
 
 You can restrict the commands that can be executed by the `run_shell_command`
 tool by using the `tools.core` and `tools.exclude` settings in your
@@ -174,16 +174,16 @@ configuration file.
 
 The validation logic is designed to be secure and flexible:
 
-1.  **Command Chaining Disabled**: The tool automatically splits commands
+1.  **Command chaining disabled**: The tool automatically splits commands
     chained with `&&`, `||`, or `;` and validates each part separately. If any
     part of the chain is disallowed, the entire command is blocked.
-2.  **Prefix Matching**: The tool uses prefix matching. For example, if you
+2.  **Prefix matching**: The tool uses prefix matching. For example, if you
     allow `git`, you can run `git status` or `git log`.
-3.  **Blocklist Precedence**: The `tools.exclude` list is always checked first.
+3.  **Blocklist precedence**: The `tools.exclude` list is always checked first.
     If a command matches a blocked prefix, it will be denied, even if it also
     matches an allowed prefix in `tools.core`.
 
-### Command Restriction Examples
+### Command restriction examples
 
 **Allow only specific command prefixes**
 
@@ -251,7 +251,7 @@ To block all shell commands, add the `run_shell_command` wildcard to
 - `ls -l`: Blocked
 - `any other command`: Blocked
 
-## Security Note for `excludeTools`
+## Security note for `excludeTools`
 
 Command-specific restrictions in `excludeTools` for `run_shell_command` are
 based on simple string matching and can be easily bypassed. This feature is

docs/tools/todos.md

@@ -1,4 +1,4 @@
-# Todo Tool (`write_todos`)
+# Todo tool (`write_todos`)
 
 This document describes the `write_todos` tool for the Gemini CLI.
 
@@ -6,7 +6,8 @@ This document describes the `write_todos` tool for the Gemini CLI.
 
 The `write_todos` tool allows the Gemini agent to create and manage a list of
 subtasks for complex user requests. This provides you, the user, with greater
-visibility into the agent's plan and its current progress.
+visibility into the agent's plan and its current progress. It also helps with
+alignment where the agent is less likely to lose track of its current goal.
 
 ### Arguments
 
@@ -23,11 +24,11 @@ visibility into the agent's plan and its current progress.
 The agent uses this tool to break down complex multi-step requests into a clear
 plan.
 
-- **Progress Tracking:** The agent updates this list as it works, marking tasks
+- **Progress tracking:** The agent updates this list as it works, marking tasks
   as `completed` when done.
-- **Single Focus:** Only one task will be marked `in_progress` at a time,
+- **Single socus:** Only one task will be marked `in_progress` at a time,
   indicating exactly what the agent is currently working on.
-- **Dynamic Updates:** The plan may evolve as the agent discovers new
+- **Dynamic updates:** The plan may evolve as the agent discovers new
   information, leading to new tasks being added or unnecessary ones being
   cancelled.
 
@@ -49,8 +50,8 @@ write_todos({
 
 ## Important notes
 
-- **Enabling:** This tool is disabled by default. To use it, you must enable it
-  in your `settings.json` file by setting `"useWriteTodos": true`.
+- **Enabling:** This tool is enabled by default. You can disable it in your
+  `settings.json` file by setting `"useWriteTodos": false`.
 
-- **Intended Use:** This tool is primarily used by the agent for complex,
+- **Intended use:** This tool is primarily used by the agent for complex,
   multi-turn tasks. It is generally not used for simple, single-turn questions.

docs/tools/web-fetch.md

@@ -1,4 +1,4 @@
-# Web Fetch Tool (`web_fetch`)
+# Web fetch tool (`web_fetch`)
 
 This document describes the `web_fetch` tool for the Gemini CLI.
 

docs/tools/web-search.md

@@ -1,4 +1,4 @@
-# Web Search Tool (`google_web_search`)
+# Web search tool (`google_web_search`)
 
 This document describes the `google_web_search` tool.
 

docs/troubleshooting.md

@@ -10,13 +10,31 @@ topics on:
 
 ## Authentication or login errors
 
+- **Error:
+  `You must be a named user on your organization's Gemini Code Assist Standard edition subscription to use this service. Please contact your administrator to request an entitlement to Gemini Code Assist Standard edition.`**
+  - **Cause:** This error might occur if Gemini CLI detects the
+    `GOOGLE_CLOUD_PROJECT` or `GOOGLE_CLOUD_PROJECT_ID` environment variable is
+    defined. Setting these variables forces an organization subscription check.
+    This might be an issue if you are using an individual Google account not
+    linked to an organizational subscription.
+
+  - **Solution:**
+    - **Individual Users:** Unset the `GOOGLE_CLOUD_PROJECT` and
+      `GOOGLE_CLOUD_PROJECT_ID` environment variables. Check and remove these
+      variables from your shell configuration files (for example, `.bashrc`,
+      `.zshrc`) and any `.env` files. If this doesn't resolve the issue, try
+      using a different Google account.
+
+    - **Organizational Users:** Contact your Google Cloud administrator to be
+      added to your organization's Gemini Code Assist subscription.
+
 - **Error: `Failed to login. Message: Request contains an invalid argument`**
-  - Users with Google Workspace accounts or Google Cloud accounts associated
-    with their Gmail accounts may not be able to activate the free tier of the
-    Google Code Assist plan.
-  - For Google Cloud accounts, you can work around this by setting
-    `GOOGLE_CLOUD_PROJECT` to your project ID.
-  - Alternatively, you can obtain the Gemini API key from
+  - **Cause:** Users with Google Workspace accounts or Google Cloud accounts
+    associated with their Gmail accounts may not be able to activate the free
+    tier of the Google Code Assist plan.
+  - **Solution:** For Google Cloud accounts, you can work around this by setting
+    `GOOGLE_CLOUD_PROJECT` to your project ID. Alternatively, you can obtain the
+    Gemini API key from
     [Google AI Studio](http://aistudio.google.com/app/apikey), which also
     includes a separate free tier.
 
@@ -90,7 +108,7 @@ topics on:
     `advanced.excludedEnvVars` setting in your `settings.json` to exclude fewer
     variables.
 
-## Exit Codes
+## Exit codes
 
 The Gemini CLI uses specific exit codes to indicate the reason for termination.
 This is especially useful for scripting and automation.
@@ -103,7 +121,7 @@ This is especially useful for scripting and automation.
 | 52        | `FatalConfigError`         | A configuration file (`settings.json`) is invalid or contains errors.                               |
 | 53        | `FatalTurnLimitedError`    | The maximum number of conversational turns for the session was reached. (non-interactive mode only) |
 
-## Debugging Tips
+## Debugging tips
 
 - **CLI debugging:**
   - Use the `--verbose` flag (if available) with CLI commands for more detailed
@@ -129,7 +147,7 @@ This is especially useful for scripting and automation.
   - Always run `npm run preflight` before committing code. This can catch many
     common issues related to formatting, linting, and type errors.
 
-## Existing GitHub Issues similar to yours or creating new Issues
+## Existing GitHub issues similar to yours or creating new issues
 
 If you encounter an issue that was not covered here in this _Troubleshooting
 guide_, consider searching the Gemini CLI

eslint.config.js

@@ -29,7 +29,6 @@ export default tseslint.config(
     // Global ignores
     ignores: [
       'node_modules/*',
-      '.integration-tests/**',
       'eslint.config.js',
       'packages/**/dist/**',
       'bundle/**',
@@ -81,6 +80,11 @@ export default tseslint.config(
       },
     },
     languageOptions: {
+      parser: tseslint.parser,
+      parserOptions: {
+        projectService: true,
+        tsconfigRootDir: projectRoot,
+      },
       globals: {
         ...globals.node,
         ...globals.es2021,
@@ -118,6 +122,8 @@ export default tseslint.config(
           caughtErrorsIgnorePattern: '^_',
         },
       ],
+      // Prevent async errors from bypassing catch handlers
+      '@typescript-eslint/return-await': ['error', 'in-try-catch'],
       'import/no-internal-modules': [
         'error',
         {

integration-tests/extensions-install.test.ts

@@ -4,49 +4,50 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { expect, test } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { TestRig } from './test-helper.js';
 import { writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 
 const extension = `{
-  "name": "test-extension",
+  "name": "test-extension-install",
   "version": "0.0.1"
 }`;
 
 const extensionUpdate = `{
-  "name": "test-extension",
+  "name": "test-extension-install",
   "version": "0.0.2"
 }`;
 
-test('installs a local extension, verifies a command, and updates it', async () => {
-  const rig = new TestRig();
-  rig.setup('extension install test');
-  const testServerPath = join(rig.testDir!, 'gemini-extension.json');
-  writeFileSync(testServerPath, extension);
-  try {
-    await rig.runCommand(['extensions', 'uninstall', 'test-extension']);
-  } catch {
-    /* empty */
-  }
+describe('extension install', () => {
+  it('installs a local extension, verifies a command, and updates it', async () => {
+    const rig = new TestRig();
+    rig.setup('extension install test');
+    const testServerPath = join(rig.testDir!, 'gemini-extension.json');
+    writeFileSync(testServerPath, extension);
+    try {
+      const result = await rig.runCommand(
+        ['extensions', 'install', `${rig.testDir!}`],
+        { stdin: 'y\n' },
+      );
+      expect(result).toContain('test-extension-install');
 
-  const result = await rig.runCommand(
-    ['extensions', 'install', `${rig.testDir!}`],
-    { stdin: 'y\n' },
-  );
-  expect(result).toContain('test-extension');
-
-  const listResult = await rig.runCommand(['extensions', 'list']);
-  expect(listResult).toContain('test-extension');
-  writeFileSync(testServerPath, extensionUpdate);
-  const updateResult = await rig.runCommand([
-    'extensions',
-    'update',
-    `test-extension`,
-  ]);
-  expect(updateResult).toContain('0.0.2');
-
-  await rig.runCommand(['extensions', 'uninstall', 'test-extension']);
-
-  await rig.cleanup();
+      const listResult = await rig.runCommand(['extensions', 'list']);
+      expect(listResult).toContain('test-extension-install');
+      writeFileSync(testServerPath, extensionUpdate);
+      const updateResult = await rig.runCommand([
+        'extensions',
+        'update',
+        `test-extension-install`,
+      ]);
+      expect(updateResult).toContain('0.0.2');
+    } finally {
+      await rig.runCommand([
+        'extensions',
+        'uninstall',
+        'test-extension-install',
+      ]);
+      await rig.cleanup();
+    }
+  });
 });

integration-tests/extensions-reload.test.ts

@@ -0,0 +1,146 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { expect, it, describe } from 'vitest';
+import { TestRig } from './test-helper.js';
+import { TestMcpServer } from './test-mcp-server.js';
+import { writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { safeJsonStringify } from '@google/gemini-cli-core/src/utils/safeJsonStringify.js';
+import { env } from 'node:process';
+import { platform } from 'node:os';
+
+import stripAnsi from 'strip-ansi';
+
+const itIf = (condition: boolean) => (condition ? it : it.skip);
+
+describe('extension reloading', () => {
+  const sandboxEnv = env['GEMINI_SANDBOX'];
+
+  // Fails in sandbox mode, can't check for local extension updates.
+  itIf((!sandboxEnv || sandboxEnv === 'false') && platform() !== 'win32')(
+    'installs a local extension, updates it, checks it was reloaded properly',
+    async () => {
+      const serverA = new TestMcpServer();
+      const portA = await serverA.start({
+        hello: () => ({ content: [{ type: 'text', text: 'world' }] }),
+      });
+      const extension = {
+        name: 'test-extension',
+        version: '0.0.1',
+        mcpServers: {
+          'test-server': {
+            httpUrl: `http://localhost:${portA}/mcp`,
+          },
+        },
+      };
+
+      const rig = new TestRig();
+      rig.setup('extension reload test', {
+        settings: {
+          experimental: { extensionReloading: true },
+        },
+      });
+      const testServerPath = join(rig.testDir!, 'gemini-extension.json');
+      writeFileSync(testServerPath, safeJsonStringify(extension, 2));
+      // defensive cleanup from previous tests.
+      try {
+        await rig.runCommand(['extensions', 'uninstall', 'test-extension']);
+      } catch {
+        /* empty */
+      }
+
+      const result = await rig.runCommand(
+        ['extensions', 'install', `${rig.testDir!}`],
+        { stdin: 'y\n' },
+      );
+      expect(result).toContain('test-extension');
+
+      // Now create the update, but its not installed yet
+      const serverB = new TestMcpServer();
+      const portB = await serverB.start({
+        goodbye: () => ({ content: [{ type: 'text', text: 'world' }] }),
+      });
+      extension.version = '0.0.2';
+      extension.mcpServers['test-server'].httpUrl =
+        `http://localhost:${portB}/mcp`;
+      writeFileSync(testServerPath, safeJsonStringify(extension, 2));
+
+      // Start the CLI.
+      const run = await rig.runInteractive('--debug');
+      await run.expectText('You have 1 extension with an update available');
+      // See the outdated extension
+      await run.sendText('/extensions list');
+      await run.type('\r');
+      await run.expectText(
+        'test-extension (v0.0.1) - active (update available)',
+      );
+      // Wait for the UI to settle and retry the command until we see the update
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+
+      // Poll for the updated list
+      await rig.pollCommand(
+        () => run.sendKeys('\u0015/mcp list\r'),
+        () => {
+          const output = stripAnsi(run.output);
+          return (
+            output.includes(
+              'test-server (from test-extension) - Ready (1 tool)',
+            ) && output.includes('- hello')
+          );
+        },
+        30000, // 30s timeout
+      );
+
+      // Update the extension, expect the list to update, and mcp servers as well.
+      await run.sendKeys('\u0015/extensions update test-extension');
+      await run.expectText('/extensions update test-extension');
+      await run.sendKeys('\r');
+      await new Promise((resolve) => setTimeout(resolve, 500));
+      await run.sendKeys('\r');
+      await run.expectText(
+        ` * test-server (remote): http://localhost:${portB}/mcp`,
+      );
+      await run.type('\r'); // consent
+      await run.expectText(
+        'Extension "test-extension" successfully updated: 0.0.1 → 0.0.2',
+      );
+
+      // Poll for the updated extension version
+      await rig.pollCommand(
+        () => run.sendKeys('\u0015/extensions list\r'),
+        () =>
+          stripAnsi(run.output).includes(
+            'test-extension (v0.0.2) - active (updated)',
+          ),
+        30000,
+      );
+
+      // Poll for the updated mcp tool
+      await rig.pollCommand(
+        () => run.sendKeys('\u0015/mcp list\r'),
+        () => {
+          const output = stripAnsi(run.output);
+          return (
+            output.includes(
+              'test-server (from test-extension) - Ready (1 tool)',
+            ) && output.includes('- goodbye')
+          );
+        },
+        30000,
+      );
+
+      await run.sendText('/quit');
+      await run.sendKeys('\r');
+
+      // Clean things up.
+      await serverA.stop();
+      await serverB.stop();
+      await rig.runCommand(['extensions', 'uninstall', 'test-extension']);
+      await rig.cleanup();
+    },
+  );
+});

integration-tests/file-system.test.ts

@@ -98,7 +98,9 @@ describe('file-system', () => {
     await rig.setup('should correctly handle file paths with spaces');
     const fileName = 'my test file.txt';
 
-    const result = await rig.run(`write "hello" to "${fileName}"`);
+    const result = await rig.run(
+      `write "hello" to "${fileName}" and then stop. Do not perform any other actions.`,
+    );
 
     const foundToolCall = await rig.waitForToolCall('write_file');
     if (!foundToolCall) {
@@ -150,44 +152,53 @@ describe('file-system', () => {
 
   it.skip('should replace multiple instances of a string', async () => {
     const rig = new TestRig();
-    await rig.setup('should replace multiple instances of a string');
+    rig.setup('should replace multiple instances of a string');
     const fileName = 'ambiguous.txt';
     const fileContent = 'Hey there, \ntest line\ntest line';
     const expectedContent = 'Hey there, \nnew line\nnew line';
     rig.createFile(fileName, fileContent);
 
     const result = await rig.run(
-      `replace "test line" with "new line" in ${fileName}`,
+      `rewrite the file ${fileName} to replace all instances of "test line" with "new line"`,
     );
 
-    const foundToolCall = await rig.waitForAnyToolCall([
-      'replace',
-      'write_file',
-    ]);
+    const validTools = ['write_file', 'edit'];
+    const foundToolCall = await rig.waitForAnyToolCall(validTools);
     if (!foundToolCall) {
-      printDebugInfo(rig, result);
+      printDebugInfo(rig, result, {
+        'Tool call found': foundToolCall,
+        'Tool logs': rig.readToolLogs(),
+      });
     }
     expect(
       foundToolCall,
-      'Expected to find a replace or write_file tool call',
+      `Expected to find one of ${validTools.join(', ')} tool calls`,
     ).toBeTruthy();
 
     const toolLogs = rig.readToolLogs();
     const successfulEdit = toolLogs.some(
       (log) =>
-        (log.toolRequest.name === 'replace' ||
-          log.toolRequest.name === 'write_file') &&
-        log.toolRequest.success,
+        validTools.includes(log.toolRequest.name) && log.toolRequest.success,
     );
     if (!successfulEdit) {
       console.error(
-        'Expected a successful edit tool call, but none was found.',
+        `Expected a successful edit tool call (${validTools.join(', ')}), but none was found.`,
       );
       printDebugInfo(rig, result);
     }
-    expect(successfulEdit, 'Expected a successful edit tool call').toBeTruthy();
+    expect(
+      successfulEdit,
+      `Expected a successful edit tool call (${validTools.join(', ')})`,
+    ).toBeTruthy();
 
     const newFileContent = rig.readFile(fileName);
+    if (newFileContent !== expectedContent) {
+      printDebugInfo(rig, result, {
+        'Final file content': newFileContent,
+        'Expected file content': expectedContent,
+        'Tool logs': rig.readToolLogs(),
+      });
+    }
     expect(newFileContent).toBe(expectedContent);
   });
 

integration-tests/flicker.test.ts

@@ -6,26 +6,34 @@
 
 import { describe, it, expect } from 'vitest';
 import { TestRig } from './test-helper.js';
+import { join } from 'node:path';
 
 describe('Flicker Detector', () => {
-  // TODO: https://github.com/google-gemini/gemini-cli/issues/11170
-  it.skip('should not detect a flicker under the max height budget', async () => {
+  it('should not detect a flicker under the max height budget', async () => {
     const rig = new TestRig();
-    await rig.setup('flicker-detector-test');
+    rig.setup('flicker-detector-test', {
+      fakeResponsesPath: join(
+        import.meta.dirname,
+        'flicker-detector.max-height.responses',
+      ),
+    });
+    try {
+      const run = await rig.runInteractive();
+      const prompt = 'Tell me a fun fact.';
+      await run.type(prompt);
+      await run.type('\r');
 
-    const run = await rig.runInteractive();
-    const prompt = 'Tell me a fun fact.';
-    await run.type(prompt);
-    await run.type('\r');
+      const hasUserPromptEvent = await rig.waitForTelemetryEvent('user_prompt');
+      expect(hasUserPromptEvent).toBe(true);
 
-    const hasUserPromptEvent = await rig.waitForTelemetryEvent('user_prompt');
-    expect(hasUserPromptEvent).toBe(true);
+      const hasSessionCountMetric = await rig.waitForMetric('session.count');
+      expect(hasSessionCountMetric).toBe(true);
 
-    const hasSessionCountMetric = await rig.waitForMetric('session.count');
-    expect(hasSessionCountMetric).toBe(true);
-
-    // We expect NO flicker event to be found.
-    const flickerMetric = rig.readMetric('ui.flicker.count');
-    expect(flickerMetric).toBeNull();
+      // We expect NO flicker event to be found.
+      const flickerMetric = rig.readMetric('ui.flicker.count');
+      expect(flickerMetric).toBeNull();
+    } finally {
+      await rig.cleanup();
+    }
   });
 });

integration-tests/globalSetup.ts

@@ -12,6 +12,7 @@ if (process.env['NO_COLOR'] !== undefined) {
 import { mkdir, readdir, rm } from 'node:fs/promises';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { canUseRipgrep } from '../packages/core/src/tools/ripGrep.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const rootDir = join(__dirname, '..');
@@ -32,6 +33,12 @@ export async function setup() {
   // construct the path before the HOME env var is set.
   process.env['GEMINI_CONFIG_DIR'] = join(runDir, '.gemini');
 
+  // Download ripgrep to avoid race conditions in parallel tests
+  const available = await canUseRipgrep();
+  if (!available) {
+    throw new Error('Failed to download ripgrep binary');
+  }
+
   // Clean up old test runs, but keep the latest few for debugging
   try {
     const testRuns = await readdir(integrationTestsDir);
@@ -52,6 +59,8 @@ export async function setup() {
 
   process.env['INTEGRATION_TEST_FILE_DIR'] = runDir;
   process.env['GEMINI_CLI_INTEGRATION_TEST'] = 'true';
+  // Force file storage to avoid keychain prompts/hangs in CI, especially on macOS
+  process.env['GEMINI_FORCE_FILE_STORAGE'] = 'true';
   process.env['TELEMETRY_LOG_FILE'] = join(runDir, 'telemetry.log');
 
   if (process.env['KEEP_OUTPUT']) {
@@ -65,6 +74,10 @@ export async function setup() {
 export async function teardown() {
   // Cleanup the test run directory unless KEEP_OUTPUT is set
   if (process.env['KEEP_OUTPUT'] !== 'true' && runDir) {
-    await rm(runDir, { recursive: true, force: true });
+    try {
+      await rm(runDir, { recursive: true, force: true });
+    } catch (e) {
+      console.warn('Failed to clean up test run directory:', e);
+    }
   }
 }

integration-tests/hooks-system.after-model.responses

@@ -0,0 +1 @@
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"**Addressing the Inquiry**\n\nI've grasped the core of the user's question and identified that no tools are needed. My focus is now on crafting a straightforward, direct response that fully addresses their query without any unnecessary complexity. The goal is to provide a clear and concise answer.\n\n\n","thought":true}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12777,"totalTokenCount":12802,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12777}],"thoughtsTokenCount":25}},{"candidates":[{"content":{"parts":[{"text":"4","thoughtSignature":"CiQBcsjafBFqw6veocEvtOGGuQcsyHdcNrXDIn19n9ImwBBwcYQKdgFyyNp8g7o8Ji++OXoqml4gbLPIB2DQbXcaRQfRuYefF8RxMEpzJSITZBlT1VpJQoeYmQcb9c8dg/POmo5d3ZcuLbpVJpbjMIV1SoUI4KEn3zqz7a8BFuyq3zY4VEliRWMZO21JMd8qp59M9m64hX7W1YPyzu8KPwFyyNp8aNCD7P1NJDG3csQkiMW/0jWdPkh+7+XxT7i3ku/lYH4yTEShdicPcmnzoPGhEWTUDr/4Lx+A0DnVGQ=="}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":12777,"totalTokenCount":12802,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12777}],"thoughtsTokenCount":25}}]}

integration-tests/hooks-system.after-tool-context.responses

@@ -0,0 +1,2 @@
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"**Analyzing File Access**\n\nI've realized the `read_file` tool is perfect for accessing the contents of `test-file.txt`. My next step is to call this tool and set the `file_path` parameter to `test-file.txt`.\n\n\n","thought":true}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12785,"totalTokenCount":12841,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12785}],"thoughtsTokenCount":56}},{"candidates":[{"content":{"parts":[{"functionCall":{"name":"read_file","args":{"file_path":"test-file.txt"}},"thoughtSignature":"CiQBcsjafE9D7iAF+V3wpXP81/VmxiMeSFA6afML/lAB76U6QFQKXgFyyNp8i/vhxpkTQ5Cq81QTeEJDDMaYihzSTFMqO4Vj0+CLNtoy+SC/LmqA+WaXh4tm6UCNFTzB2fpVW13YOU1oVYhLpVpeck746YExu1MOSTAq7AC9Yz8ZoelXdecKdwFyyNp8q0PejiY9K1osdOJ02tOHAzAb8ZCSFHtHamEPxRB93krGMNvuIYC1jM1JnC/fzpH8gYV+0/xkoPJMHpF/aSzWq4kZ/j5cUhMYaqKJTulY8ZZGfawnXG7z0spmmr06gwfgILa+HK++xQhhTphMQCobX5hyCjUBcsjafHY6eJfVNitYmfruLV1mnoYnNViHuAOOOni9jIz4VMIjLbClKkb2rpVfHIjx+vZSHA=="}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":12785,"candidatesTokenCount":20,"totalTokenCount":12861,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12785}],"thoughtsTokenCount":56}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"This"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12889,"candidatesTokenCount":1,"totalTokenCount":12890,"cachedContentTokenCount":12206,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12889}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":12206}]}},{"candidates":[{"content":{"parts":[{"text":" is test content"}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":12889,"candidatesTokenCount":4,"totalTokenCount":12893,"cachedContentTokenCount":12206,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12889}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":12206}]}}]}

integration-tests/hooks-system.allow-tool.responses

@@ -0,0 +1,4 @@
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"**Formulating the Write Operation**\n\nOkay, I'm now clear on the user's intent: they want a file called `approved.txt`, containing the words \"Approved content.\"  I've decided to leverage the `write_file` tool.  The specific parameter assignments seem straightforward; `file_path` will be \"approved.txt\", and the file's `content` will precisely mirror the desired output string.\n\n\n","thought":true}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12778,"totalTokenCount":12838,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12778}],"thoughtsTokenCount":60}},{"candidates":[{"content":{"parts":[{"functionCall":{"name":"write_file","args":{"content":"Approved content","file_path":"approved.txt"}},"thoughtSignature":"CiQBcsjafF4NswdygCBTU7cA/yXVRcUI3XHwV+E8BDg/hRr1MaoKZQFyyNp8HRY1qEvivtg0LpYPo1022IfTY3QIeigqGvSoRVospxT5MBggc9nRbwH2vrdhZ772IdqOCrpjNHs3wc+h0AF4JzjlBet6+yC2m7TdenVOkzVAtqnNDMQAIS1gDZyKs8w/CngBcsjafOeuyDQtxuK7JCafKjtfvPvoKOkVxzDetQtHesBkPtv1Xng9dkP77jLH44hn9rrg7yA+za6vssiFZUjC/FU25pCWQgIhM+K7nt3wbAgoOZRqra2gRr3od2D3osV/UpYhy8MoloykqrWvHDOzT/0KScpHarwKXQFyyNp8qabyDYlfElywQBjqQT4f6My7+Ln9AbKZQz4NaEe90ESg4jr4jjANxyd/WKzRheaBq7BYxTHQSeShgQbVjk2D0tZO4hAN+CToMtQwJl95Ss4ZEov6gAwMNA=="}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":12778,"candidatesTokenCount":24,"totalTokenCount":12862,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12778}],"thoughtsTokenCount":60}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":12939,"totalTokenCount":12939,"cachedContentTokenCount":12203,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12939}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":12203}]}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":12939,"totalTokenCount":12939,"cachedContentTokenCount":12203,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12939}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":12203}]}}]}
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"**Confirming File Creation**\n\nI've successfully created the file `approved.txt`, and I've verified that it contains the intended content, \"Approved content\". Moving on.\n\n\n","thought":true}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12887,"totalTokenCount":12932,"cachedContentTokenCount":12198,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12887}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":12198}],"thoughtsTokenCount":45}},{"candidates":[{"content":{"parts":[{"text":"**Assessing File Contents**\n\nI'm now checking the content of `approved.txt`. I used `cat` to display its contents, and it confirms the initial content of \"Approved content\" is present. My next step will be based on this verification.\n\n\n","thought":true}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12887,"totalTokenCount":12946,"cachedContentTokenCount":12198,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12887}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":12198}],"thoughtsTokenCount":59}},{"candidates":[{"content":{"parts":[{"text":"I have created the file. What would you like me to do next?","thoughtSignature":"CiQBcsjafEAq9BWRwBqUousKwXME0A2Wh1tJI5cJC9ROpr9Cix8KagFyyNp81VagWC/YxtY8zCAiThU3BHMVh5wZIsGIWv1NNIXqACLQLoSeLhWEneb6CBkKdbKBugy6g9+jP5phYt+Vz5oYuO1Op2kM1qWjFmEQyr71TUISNtZ9zrOHNQKKW7K9ukUi0paw85YKoAEBcsjafF6QLINjBWwQPZh6EPVNGk4wojTKglNp7xy5vclYBbq58A6A8AtZUHKYA2cV32SLb2TGcPnkE4iKunvPf6sZy9Uc7gKA+x/OgSl7i5m0wSpMOh9fLpGt4CNtieigpxHkNAdxdZ5qzGvCkBFWYhaZAWGbj7+1YibIKJFNjX9yEz1T5dOQmVmceu80dFyz+fwl7RiOXSGR5xK4J7DeClYBcsjafPUccUubdSVLFmRohU4bBtQzLvXxw25mqm5TKANLKINQoloZ+xfXzfe8xw/WZL/mg30AqQErBXPNnLk5vIWLK7suuFAZ7oXdisTCj3MRa1HQmQ=="}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":12887,"candidatesTokenCount":13,"totalTokenCount":12959,"cachedContentTokenCount":12198,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12887}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":12198}],"thoughtsTokenCount":59}}]}

integration-tests/hooks-system.before-agent.responses

@@ -0,0 +1 @@
+{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"**Responding Truthfully**\n\nI've determined the user's question is straightforward and doesn't necessitate tools. My primary focus now is ensuring a truthful and direct response, without getting caught up in unnecessary complexity. The goal is clarity and accuracy in my reply.\n\n\n","thought":true}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12795,"totalTokenCount":12818,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12795}],"thoughtsTokenCount":23}},{"candidates":[{"content":{"parts":[{"text":"Hello! I'm doing well, thank you. I'm ready to help you with your software engineering tasks. All","thoughtSignature":"CiQBcsjafEYrS7SUZE2xuCgUZ7+hs+NrTRZFywSgq09wuKUzD5gKbQFyyNp8snmh8vfDLLCmnKl2shxGR5McWLmRDIQx+gvyW9ipB+5v5R3tvYgBY0yYGxuB8XPHJDP8unxCqg2koazS050HLU5NZaF74m9KDAWrnWPqQ2hDPc9suJRZpcTse5R+nepMu+oXWEsD03UKOwFyyNp82dmgHDF2DLELc6ly78JDLDmb4kM4qkXmuT8OP7Nu5z2o8kkHiKD4HTx0srjLi6u6dN4ufA0o"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12795,"candidatesTokenCount":24,"totalTokenCount":12842,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12795}],"thoughtsTokenCount":23}},{"candidates":[{"content":{"parts":[{"text":" our interactions are logged for security and compliance purposes. How can I assist you today?"}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":12795,"candidatesTokenCount":41,"totalTokenCount":12859,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12795}],"thoughtsTokenCount":23}}]}