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

Co-authored-by: Jack Wotherspoon <jackwoth@google.com>

.gemini/commands/fix-behavioral-eval.toml

@@ -25,7 +25,7 @@ You are an expert at fixing behavioral evaluations.
        the same scenario. We don't want to lose test fidelity by making the prompts too
        direct (i.e.: easy).
      - Your primary mechanism for improving the agent's behavior is to make changes to
-       tool instructions, prompt.ts, and/or modules that contribute to the prompt.
+       tool instructions, system prompt (snippets.ts), and/or modules that contribute to the prompt.
      - If prompt and description changes are unsuccessful, use logs and debugging to
        confirm that everything is working as expected.
     - If unable to fix the test, you can make recommendations for architecture changes

.gemini/commands/frontend.toml

@@ -14,41 +14,7 @@ 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 (`!`).
+!{cat .gemini/commands/strict-development-rules.md}
 
 {{args}}. 
  """

.gemini/commands/full-context.toml

@@ -17,41 +17,7 @@ prompts.
 
 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 (`!`).
+!{cat .gemini/commands/strict-development-rules.md}
 
 {{args}}. 
  """

.gemini/commands/promote-behavioral-eval.toml

@@ -0,0 +1,29 @@
+description = "Promote behavioral evals that have a 100% success rate over the last 7 nightly runs."
+prompt = """
+You are an expert at analyzing and promoting behavioral evaluations.
+
+1. **Investigate**:
+   - Use 'gh' cli to fetch the results from the most recent run from the main branch: https://github.com/google-gemini/gemini-cli/actions/workflows/evals-nightly.yml.
+   - DO NOT push any changes or start any runs. The rest of your evaluation will be local.
+   - Evals are in evals/ directory and are documented by evals/README.md.
+   - Identify tests that have passed 100% of the time for ALL enabled models across the past 7 runs in a row.
+   - NOTE: the results summary from the most recent run contains the last 7 runs test results. 100% means the test passed 3/3 times for that model and run.
+   - If a test meets this criteria, it is a candidate for promotion.
+
+2. **Promote**:
+   - For each candidate test, locate the test file in the evals/ directory.
+   - Promote the test according to the project's standard promotion process (e.g., moving it to a stable suite, updating its tags, or removing skip/flaky annotations). 
+   - Ensure you follow any guidelines in evals/README.md for stable tests.
+   - Your **final** change should be **minimal and targeted** to just promoting the test status.
+
+3. **Verify**:
+   - Run the promoted tests locally to validate that they still execute correctly. Be sure to run vitest in non-interactive mode.
+   - Check that the test is now part of the expected standard or stable test suites.
+
+4. **Report**:
+   - Provide a summary of the tests that were promoted.
+   - Include the success rate evidence (7/7 runs passed for all models) for each promoted test.
+   - If no tests met the criteria for promotion, clearly state that and summarize the closest candidates.
+
+{{args}}
+"""

.gemini/commands/review-and-fix.toml

@@ -22,132 +22,9 @@ Follow these steps to conduct a thorough review:
 4.  Search the codebase if required.
 5.  Write a concise review of the changes, keeping in mind to encourage strong code quality and best practices. Pay particular attention to the Gemini MD file in the repo.
 6.  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.
-7.  Evaluate all tests on the changes 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 changes, 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.
-     * When creating parameterized tests, give the parameters types to ensure
-       that the tests are type-safe.
-8. Evaluate all react logic carefully keeping in mind that the author of the
-    changes 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.
-9. Evaluate `packages/core` (Services, Tools, Utilities):
-    * Ensure services are implemented as classes with clear lifecycle management (e.g., `initialize()` methods).
-    * Verify that `debugLogger` from `packages/core/src/utils/debugLogger.ts` is used for internal logging instead of `console`.
-    * Ensure all shell operations use `spawnAsync` from `packages/core/src/utils/shell-utils.ts` for consistent error handling and promise management.
-    * Check that filesystem errors are handled gracefully using `isNodeError` from `packages/core/src/utils/errors.ts`.
-    * Verify that new tools are added to `packages/core/src/tools/` and registered in `packages/core/src/tools/tool-registry.ts`.
-    * Ensure all new public services, utilities, and types are exported from `packages/core/src/index.ts`.
-    * Check that services are stateless where possible, or use the centralized `Storage` service for persistence.
-    * **Cross-Service Communication**: Prefer using the `coreEvents` bus (from `packages/core/src/utils/events.ts`) for asynchronous communication between services or to notify the UI of state changes. Avoid tight coupling between services.
-10. Architectural Audit (Package Boundaries):
-    * **Logic Placement**: Non-UI logic (e.g., model orchestration, tool implementation, git/filesystem operations) MUST reside in `packages/core`. `packages/cli` should only contain UI/Ink components, command-line argument parsing, and user interaction logic.
-    * **Environment Isolation**: Core logic should not assume a TUI environment. Use the `ConfirmationBus` or `Output` abstractions for communicating with the user from Core.
-    * **Decoupling**: Actively look for opportunities to decouple services by using `coreEvents`. If a service is importing another service just to notify it of a change, it should probably be using an event instead.
-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.
-    * **STRICT TYPING**: Strictly forbid 'any' and 'unknown' in both CLI and Core
-      packages. 'unknown' is only allowed if it is immediately narrowed using
-      type guards or Zod validation. Reject any code that uses 'any' or
-      'unknown' without narrowing.
-13. **Ruthless Cleanup**:
-    * If you identify significant code duplication, technical debt, or "AI Slop" (boilerplate, redundant comments), explicitly suggest initiating a `ruthless-refactorer` loop to clean it up.
-14. Summarize all actionable findings into a concise but comprehensive directive output this to review_findings.md and advance to phase 2.
+7.  Follow these detailed review rules:
+!{cat .gemini/commands/strict-development-rules.md}
+8.  Summarize all actionable findings into a concise but comprehensive directive output this to review_findings.md and advance to phase 2.
 
 Remember to use the GitHub CLI (`gh`) for all GitHub-related tasks, and local `git` commands if the target is 'staged'.
 

.gemini/commands/review-frontend.toml

@@ -18,121 +18,12 @@ Follow these steps:
 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
+9. Follow these detailed review rules:
+!{cat .gemini/commands/strict-development-rules.md}
+10. 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
+11. 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

.gemini/commands/strict-development-rules.md

@@ -0,0 +1,142 @@
+# Gemini CLI Strict Development Rules
+
+These rules apply strictly to all code modifications and additions within the
+Gemini CLI project.
+
+## Testing Guidelines
+
+- **Async/Await**: Always use `waitFor` from
+  `packages/cli/src/test-utils/async.ts` instead of `vi.waitFor` for all
+  `waitFor` calls within `packages/cli`. NEVER use fixed waits (e.g.,
+  `await delay(100)`). Always use `waitFor` with a predicate to ensure tests are
+  stable and fast. Using the wrong `waitFor` can result in flaky tests and `act`
+  warnings.
+- **React Testing**: Use `act` to wrap all blocks in tests that change component
+  state. Use `render` or `renderWithProviders` from
+  `packages/cli/src/test-utils/render.tsx` instead of `render` from
+  `ink-testing-library` directly. This prevents spurious `act` warnings. If test
+  cases specify providers directly, consider whether the existing
+  `renderWithProviders` should be modified.
+- **Snapshots**: Use `toMatchSnapshot` to verify that rendering works as
+  expected rather than matching against the raw content of the output. When
+  modifying snapshots, verify the changes are intentional and do not hide
+  underlying bugs.
+- **Parameterized Tests**: Use parameterized tests where it reduces duplicated
+  lines. Give the parameters explicit types to ensure the tests are type-safe.
+- **Mocks Management**:
+  - Mock critical dependencies (`fs`, `os`, `child_process`) ONLY at the top of
+    the file. Ideally, avoid mocking these dependencies altogether.
+  - Reuse existing mocks and fakes rather than creating new ones.
+  - Avoid mocking the file system whenever possible. If using the real file
+    system is too difficult, consider writing an integration test instead.
+  - Always call `vi.restoreAllMocks()` in `afterEach` to prevent test pollution.
+  - Use `vi.useFakeTimers()` for tests involving time-based logic to avoid
+    flakiness.
+- **Typing in Tests**: Avoid using `any` in tests; prefer proper types or
+  `unknown` with narrowing.
+
+## React Guidelines (`packages/cli`)
+
+- **`setState` and Side Effects**: NEVER trigger side effects from within the
+  body of a `setState` callback. Use a reducer or `useRef` if necessary. These
+  cases have historically introduced multiple bugs; typically, they should be
+  resolved using a reducer.
+- **Rendering**: Do not introduce infinite rendering loops. Avoid synchronous
+  file I/O in React components as it will hang the UI. Do not implement new
+  logic for custom string measurement or string truncation. Use Ink layout
+  instead, leveraging `ResizeObserver` as needed.
+- **Keyboard Handling**: Keyboard handling MUST go through `useKeyPress.ts` from
+  the Gemini CLI package rather than the standard ink library. This library
+  supports reporting multiple keyboard events sequentially in the same React
+  frame (critical for slow terminals). Handling this correctly often requires
+  reducers to ensure multiple state updates are handled gracefully without
+  overriding values. Refer to `text-buffer.ts` for a canonical example.
+- **Logging**: Do not leave `console.log`, `console.warn`, or `console.error` in
+  the code.
+- **State & Effects**: Ensure state initialization is explicit (e.g., use
+  `undefined` rather than `true` as a default if the state is truly unknown).
+  Carefully manage `useEffect` dependencies. Prefer a reducer whenever
+  practical. NEVER disable `react-hooks/exhaustive-deps`; fix the code to
+  correctly declare dependencies instead.
+- **Context & Props**: Avoid excessive property drilling. Leverage existing
+  providers, extend them, or propose a new one if necessary. Only use providers
+  for properties that are consistent across the entire application.
+- **Code Structure**: Avoid complex `if` statements where `switch` statements
+  could be used. Keep `AppContainer` minimal; refactor complex logic into React
+  hooks. Evaluate whether business logic should be added to `hookSystem.ts` or
+  integrated into `packages/core` rather than `packages/cli`.
+
+## Core Guidelines (`packages/core`)
+
+- **Services**: Implement services as classes with clear lifecycle management
+  (e.g., `initialize()` methods). Services should be stateless where possible,
+  or use the centralized `Storage` service for persistence.
+- **Cross-Service Communication**: Prefer using the `coreEvents` bus (from
+  `packages/core/src/utils/events.ts`) for asynchronous communication between
+  services or to notify the UI of state changes. Avoid tight coupling between
+  services.
+- **Utilities**: Use `debugLogger` from `packages/core/src/utils/debugLogger.ts`
+  for internal logging instead of `console`. Ensure all shell operations use
+  `spawnAsync` from `packages/core/src/utils/shell-utils.ts` for consistent
+  error handling and promise management. Handle filesystem errors gracefully
+  using `isNodeError` from `packages/core/src/utils/errors.ts`.
+- **Exports & Tooling**: Add new tools to `packages/core/src/tools/` and
+  register them in `packages/core/src/tools/tool-registry.ts`. Export all new
+  public services, utilities, and types from `packages/core/src/index.ts`.
+
+## Architectural Audit (Package Boundaries)
+
+- **Logic Placement**: Non-UI logic (e.g., model orchestration, tool
+  implementation, git/filesystem operations) MUST reside in `packages/core`.
+  `packages/cli` should ONLY contain UI/Ink components, command-line argument
+  parsing, and user interaction logic.
+- **Environment Isolation**: Core logic must not assume a TUI environment. Use
+  the `ConfirmationBus` or `Output` abstractions for communicating with the user
+  from Core.
+- **Decoupling**: Actively look for opportunities to decouple services using
+  `coreEvents`. If a service imports another just to notify it of a change, use
+  an event instead.
+
+## General Gemini CLI Design Principles
+
+- **Settings**: Use settings for user-configurable options rather than adding
+  new command line arguments. Add new settings 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.
+- **Logging**: Use `debugLogger` for rethrown errors to avoid duplicate logging.
+- **Keyboard Shortcuts**: Define all new keyboard shortcuts in
+  `packages/cli/src/config/keyBindings.ts` and document them in
+  `docs/cli/keyboard-shortcuts.md`. Be careful of keybindings that require the
+  `Meta` key, as only certain meta key shortcuts are supported on Mac. Avoid
+  function keys and shortcuts commonly bound in VSCode.
+
+## 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.
+- **STRICT TYPING**: Strictly forbid `any` and `unknown` in both CLI and Core
+  packages. `unknown` is only allowed if it is immediately narrowed using type
+  guards or Zod validation.
+- NEVER disable `@typescript-eslint/no-floating-promises`.
+- Avoid making types nullable unless strictly necessary, as it hurts
+  readability.
+
+## TUI Best Practices
+
+- **Terminal Compatibility**: Consider how changes might behave differently
+  across terminals (e.g., VSCode terminal, SSH, Kitty, default Mac terminal,
+  iTerm2, Windows terminal). If modifying keyboard handling, integrate deeply
+  with existing files like `KeypressContext.tsx` and
+  `terminalCapabilityManager.ts`.
+- **iTerm**: Be aware that `ITERM_SESSION_ID` may be present when users run
+  VSCode from within iTerm, even if the terminal is not iTerm.
+
+## Code Cleanup
+
+- **Refactoring**: Actively clean up code duplication, technical debt, and
+  boilerplate ("AI Slop") when working in the codebase.
+- **Prompts**: Be aware that changes can impact the prompts sent to Gemini CLI
+  and affect overall quality.

.gemini/config.yaml

@@ -9,4 +9,5 @@ code_review:
     help: false
     summary: true
     code_review: true
+    include_drafts: false
 ignore_patterns: []

.gemini/settings.json

@@ -0,0 +1,10 @@
+{
+  "experimental": {
+    "plan": true,
+    "extensionReloading": true,
+    "modelSteering": true
+  },
+  "general": {
+    "devtools": true
+  }
+}

.gemini/skills/docs-changelog/SKILL.md

@@ -0,0 +1,166 @@
+---
+name: docs-changelog
+description: >-
+  Generates and formats changelog files for a new release based on provided
+  version and raw changelog data.
+---
+
+# Procedure: Updating Changelog for New Releases
+
+## Objective
+
+To standardize the process of updating changelog files (`latest.md`,
+`preview.md`, `index.md`) based on automated release information.
+
+## Inputs
+
+- **version**: The release version string (e.g., `v0.28.0`,
+  `v0.29.0-preview.2`).
+- **TIME**: The release timestamp (e.g., `2026-02-12T20:33:15Z`).
+- **BODY**: The raw markdown release notes, containing a "What's Changed"
+  section and a "Full Changelog" link.
+
+## Guidelines for `latest.md` and `preview.md` Highlights
+
+- Aim for **3-5 key highlight points**.
+- Each highlight point must start with a bold-typed title that summarizes the
+  change (e.g., `**New Feature:** A brief description...`).
+- **Prioritize** summarizing new features over other changes like bug fixes or
+  chores.
+- **Avoid** mentioning features that are "experimental" or "in preview" in
+  Stable Releases.
+- **DO NOT** include PR numbers, links, or author names in these highlights.
+- Refer to `.gemini/skills/docs-changelog/references/highlights_examples.md`
+  for the correct style and tone.
+
+## Initial Processing
+
+1.  **Analyze Version**: Determine the release path based on the `version`
+    string.
+    - If `version` contains "nightly", **STOP**. No changes are made.
+    - If `version` ends in `.0`, follow the **Path A: New Minor Version**
+      procedure.
+    - If `version` does not end in `.0`, follow the **Path B: Patch Version**
+      procedure.
+2.  **Process Time**: Convert the `TIME` input into two formats for later use:
+    `yyyy-mm-dd` and `Month dd, yyyy`.
+3.  **Process Body**:
+    - Save the incoming `BODY` content to a temporary file for processing.
+    - In the "What's Changed" section of the temporary file, reformat all pull
+      request URLs to be markdown links with the PR number as the text (e.g.,
+      `[#12345](URL)`).
+    - If a "New Contributors" section exists, delete it.
+    - Preserve the "**Full Changelog**" link. The processed content of this
+      temporary file will be used in subsequent steps.
+
+---
+
+## Path A: New Minor Version
+
+*Use this path if the version number ends in `.0`.*
+
+**Important:** Based on the version, you must choose to follow either section
+A.1 for stable releases or A.2 for preview releases. Do not follow the
+instructions for the other section.
+
+### A.1: Stable Release (e.g., `v0.28.0`)
+
+For a stable release, you will generate two distinct summaries from the
+changelog: a concise **announcement** for the main changelog page, and a more
+detailed **highlights** section for the release-specific page.
+
+1.  **Create the Announcement for `index.md`**:
+    -   Generate a concise announcement summarizing the most important changes.
+        Each announcement entry must start with a bold-typed title that
+        summarizes the change.
+    -   **Important**: The format for this announcement is unique. You **must**
+        use the existing announcements in `docs/changelogs/index.md` and the
+        example within
+        `.gemini/skills/docs-changelog/references/index_template.md` as your
+        guide. This format includes PR links and authors. Stick to 1 or 2 PR
+        links and authors.
+    -   Add this new announcement to the top of `docs/changelogs/index.md`.
+
+2.  **Create Highlights and Update `latest.md`**:
+    -   Generate a comprehensive "Highlights" section, following the guidelines
+        in the "Guidelines for `latest.md` and `preview.md` Highlights" section
+        above.
+    -   Take the content from
+        `.gemini/skills/docs-changelog/references/latest_template.md`.
+    -   Populate the template with the `version`, `release_date`, generated
+        `highlights`, and the processed content from the temporary file.
+    -   **Completely replace** the contents of `docs/changelogs/latest.md` with
+        the populated template.
+
+### A.2: Preview Release (e.g., `v0.29.0-preview.0`)
+
+1.  **Update `preview.md`**:
+    -   Generate a comprehensive "Highlights" section, following the highlight
+        guidelines.
+    -   Take the content from
+        `.gemini/skills/docs-changelog/references/preview_template.md`.
+    -   Populate the template with the `version`, `release_date`, generated
+        `highlights`, and the processed content from the temporary file.
+    -   **Completely replace** the contents of `docs/changelogs/preview.md`
+        with the populated template.
+
+---
+
+## Path B: Patch Version
+
+*Use this path if the version number does **not** end in `.0`.*
+
+**Important:** Based on the version, you must choose to follow either section
+B.1 for stable patches or B.2 for preview patches. Do not follow the
+instructions for the other section.
+
+### B.1: Stable Patch (e.g., `v0.28.1`)
+
+- **Target File**: `docs/changelogs/latest.md`
+- Perform the following edits on the target file:
+    1.  Update the version in the main header. The line should read,
+        `# Latest stable release: {{version}}`
+    2.  Update the rease date. The line should read,
+        `Released: {{release_date_month_dd_yyyy}}`
+    3.  Determine if a "What's Changed" section exists in the temporary file
+        If so, continue to step 4. Otherwise, skip to step 5.
+    4.  **Prepend** the processed "What's Changed" list from the temporary file
+        to the existing "What's Changed" list in `latest.md`. Do not change or
+        replace the existing list, **only add** to the beginning of it.
+    5.  In the "Full Changelog", edit **only** the end of the URL. Identify the
+        last part of the URL that looks like `...{previous_version}` and update
+        it to be `...{version}`.
+
+        Example: assume the patch version is `v0.29.1`. Change
+        `Full Changelog: https://github.com/google-gemini/gemini-cli/compare/v0.28.2…v0.29.0`
+        to
+        `Full Changelog: https://github.com/google-gemini/gemini-cli/compare/v0.28.2…v0.29.1`
+
+### B.2: Preview Patch (e.g., `v0.29.0-preview.3`)
+
+- **Target File**: `docs/changelogs/preview.md`
+- Perform the following edits on the target file:
+    1.  Update the version in the main header. The line should read,
+        `# Preview release: {{version}}`
+    2.  Update the rease date. The line should read,
+        `Released: {{release_date_month_dd_yyyy}}`
+    3.  Determine if a "What's Changed" section exists in the temporary file
+        If so, continue to step 4. Otherwise, skip to step 5.
+    4.  **Prepend** the processed "What's Changed" list from the temporary file
+        to the existing "What's Changed" list in `preview.md`. Do not change or
+        replace the existing list, **only add** to the beginning of it.
+    5.  In the "Full Changelog", edit **only** the end of the URL. Identify the
+        last part of the URL that looks like `...{previous_version}` and update
+        it to be `...{version}`.
+
+        Example: assume the patch version is `v0.29.0-preview.1`. Change
+        `Full Changelog: https://github.com/google-gemini/gemini-cli/compare/v0.28.2…v0.29.0-preview.0`
+        to
+        `Full Changelog: https://github.com/google-gemini/gemini-cli/compare/v0.28.2…v0.29.0-preview.1`
+
+---
+
+## Finalize
+
+- After making changes, run `npm run format` ONLY to ensure consistency.
+- Delete any temporary files created during the process.

.gemini/skills/docs-changelog/references/highlights_examples.md

@@ -0,0 +1,68 @@
+## Highlights example 1
+
+- **Plan Mode Enhancements**: Significant updates to Plan Mode, including new
+  commands, support for MCP servers, integration of planning artifacts, and
+  improved iteration guidance.
+- **Core Agent Improvements**: Enhancements to the core agent, including better
+  system prompt rigor, improved subagent definitions, and enhanced tool
+  execution limits.
+- **CLI UX/UI Updates**: Various UI and UX improvements, such as autocomplete in
+  the input prompt, updated approval mode labels, DevTools integration, and
+  improved header spacing.
+- **Tooling & Extension Updates**: Improvements to existing tools like
+  `ask_user` and `grep_search`, and new features for extension management.
+- **Bug Fixes**: Numerous bug fixes across the CLI and core, addressing issues
+  with interactive commands, memory leaks, permission checks, and more.
+- **Context and Tool Output Management**: Features for observation masking for
+  tool outputs, session-linked tool output storage, and persistence for masked
+  tool outputs.
+
+## Highlights example 2
+
+- **Commands & UX Enhancements:** Introduced `/prompt-suggest` command,
+  alongside updated undo/redo keybindings and automatic theme switching.
+- **Expanded IDE Support:** Now offering compatibility with Positron IDE,
+  expanding integration options for developers.
+- **Enhanced Security & Authentication:** Implemented interactive and
+  non-interactive OAuth consent, improving both security and diagnostic
+  capabilities for bug reports.
+- **Advanced Planning & Agent Tools:** Integrated a generic Checklist component
+  for structured task management and evolved subagent capabilities with dynamic
+  policy registration.
+- **Improved Core Stability & Reliability:** Resolved critical environment
+  loading, authentication, and session management issues, ensuring a more robust
+  experience.
+- **Background Shell Commands:** Enabled the execution of shell commands in the
+  background for increased workflow efficiency.
+
+## Highlights example 3
+
+- **Event-Driven Architecture:** The CLI now uses an event-driven scheduler for
+  tool execution, improving performance and responsiveness. This includes
+  migrating non-interactive flows and sub-agents to the new scheduler.
+- **Enhanced User Experience:** This release introduces several UI/UX
+  improvements, including queued tool confirmations and the ability to expand
+  and collapse large pasted text blocks. The `Settings` dialog has been improved
+  to reduce jitter and preserve focus.
+- **Agent and Skill Improvements:** Agent Skills have been promoted to a stable
+  feature. Sub-agents now use a JSON schema for input and are tracked by an
+  `AgentRegistry`.
+- **New `/rewind` Command:** A new `/rewind` command has been implemented to
+  allow users to go back in their session history.
+- **Improved Shell and File Handling:** The shell tool's output format has been
+  optimized, and the CLI now gracefully handles disk-full errors during chat
+  recording. A bug in detecting already added paths has been fixed.
+- **Linux Clipboard Support:** Image pasting capabilities for Wayland and X11 on
+  Linux have been added.
+
+## Highlights example 4
+
+- **Improved Hooks Management:** Hooks enable/disable functionality now aligns
+  with skills and offers improved completion.
+- **Custom Themes for Extensions:** Extensions can now support custom themes,
+  allowing for greater personalization.
+- **User Identity Display:** User identity information (auth, email, tier) is
+  now displayed on startup and in the `stats` command.
+- **Plan Mode Enhancements:** Plan mode has been improved with a generic
+  `Checklist` component and refactored `Todo`.
+- **Background Shell Commands:** Implementation of background shell commands.

.gemini/skills/docs-changelog/references/index_template.md

@@ -0,0 +1,10 @@
+## Announcements: {{version}} - {{release_date_yyyy_mm_dd}}
+
+{{announcement_content}}
+
+<!-- Example entry, multiple entries per highlights
+  - **Highlighted Feature:** We've added a new highlighted feature to help
+  you generate prompt suggestions
+  ([#nnnnn](https://github.com/google-gemini/gemini-cli/pull/nnnnn) by
+  @author).
+-->

.gemini/skills/docs-changelog/references/latest_template.md

@@ -0,0 +1,20 @@
+# Latest stable release: {{version}}
+
+Released: {{release_date_month_dd_yyyy}}
+
+For most users, our latest stable release is the recommended release. Install
+the latest stable version with:
+
+```
+npm install -g @google/gemini-cli
+```
+
+## Highlights
+
+{{highlights_content}}
+
+## What's Changed
+
+{{changelog_list}}
+
+**Full Changelog**: {{full_changelog_link}}

.gemini/skills/docs-changelog/references/preview_template.md

@@ -0,0 +1,22 @@
+# Preview release: {{version}}
+
+Released: {{release_date_month_dd_yyyy}}
+
+Our preview release includes the latest, new, and experimental features. This
+release may not be as stable as our [latest weekly release](latest.md).
+
+To install the preview release:
+
+```
+npm install -g @google/gemini-cli@preview
+```
+
+## Highlights
+
+{{highlights_content}}
+
+## What's Changed
+
+{{changelog_list}}
+
+**Full Changelog**: {{full_changelog_link}}

.gemini/skills/pr-address-comments/SKILL.md

@@ -0,0 +1,13 @@
+---
+name: pr-address-comments
+description: Use this skill if the user asks you to help them address GitHub PR comments for their current branch of the Gemini CLI. Requires `gh` CLI tool.
+---
+You are helping the user address comments on their Pull Request. These comments may have come from an automated review agent or a team member.
+
+OBJECTIVE: Help the user review and address comments on their PR.
+
+# Comment Review Procedure
+
+1. Run the `scripts/fetch-pr-info.js` script to get PR info and state. MAKE SURE you read the entire output of the command, even if it gets truncated.
+2. Summarize the review status by analyzing the diff, commit log, and comments to see which still need to be addressed. Pay attention to the current user's comments. For resolved threads, summarize as a single line with a ✅. For open threads, provide a reference number e.g. [1] and the comment content.
+3. Present your summary of the feedback and current state and allow the user to guide you as to what to fix/address/skip. DO NOT begin fixing issues automatically.

.gemini/skills/pr-address-comments/scripts/fetch-pr-info.js

@@ -0,0 +1,160 @@
+#!/usr/bin/env node
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* eslint-env node */
+/* global console, process */
+
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
+
+const execAsync = promisify(exec);
+
+async function run(cmd) {
+  try {
+    const { stdout } = await execAsync(cmd, {
+      encoding: 'utf8',
+      stdio: ['pipe', 'pipe', 'ignore'],
+    });
+    return stdout.trim();
+  } catch {
+    return null;
+  }
+}
+
+const IGNORE_MESSAGES = [
+  'thank you so much for your contribution to Gemini CLI!',
+  "I'm currently reviewing this pull request and will post my feedback shortly.",
+  'This pull request is being closed because it is not currently linked to an issue.',
+];
+
+const shouldIgnore = (body) => {
+  if (!body) return false;
+  return IGNORE_MESSAGES.some((msg) => body.includes(msg));
+};
+
+async function main() {
+  const branch = await run('git branch --show-current');
+  if (!branch) {
+    console.error('❌ Could not determine current git branch.');
+    process.exit(1);
+  }
+
+  const gqlQuery = `query($branch:String!){repository(name:"gemini-cli",owner:"google-gemini"){pullRequests(headRefName:$branch,first:100){nodes{id,number,state,comments(first:100){nodes{createdAt,isMinimized,minimizedReason,author{login},body,url,authorAssociation}},reviews(first:100){nodes{id,author{login},createdAt,isMinimized,minimizedReason,body,state,comments(first:30){nodes{id,replyTo{id},author{login},createdAt,body,isMinimized,minimizedReason,path,line,startLine,originalLine,originalStartLine}}}}}}}}`;
+
+  const [authInfo, diff, commits, rawJson] = await Promise.all([
+    run('gh auth status -a'),
+    run('gh pr diff'),
+    run(
+      'git fetch && git log origin/main..origin/$(git branch --show-current)',
+    ),
+    run(`gh api graphql -F branch="${branch}" -f query='${gqlQuery}'`),
+  ]);
+
+  if (!diff) {
+    console.error(`⚠️ No active PR found for branch: ${branch}`);
+    process.exit(1);
+  }
+
+  console.log(`\n# Current GitHub user info:\n\n${authInfo}\n`);
+  console.log(`\n# PR diff for current branch: ${branch}\n\n\`\`\``);
+  console.log(diff);
+  console.log('```');
+  console.log(
+    `\n# Commit history (origin/main..origin/${branch})\n\n${commits}`,
+  );
+
+  const data = JSON.parse(rawJson || '{}');
+  const prs = data?.data?.repository?.pullRequests?.nodes || [];
+
+  // Sort PRs by number descending so we check the newest one first
+  prs.sort((a, b) => b.number - a.number);
+
+  const pr = prs.find((p) => p.state === 'OPEN') || prs[0];
+
+  if (!pr) {
+    console.error('❌ No PR data found.');
+    process.exit(1);
+  }
+
+  console.log('\n# PR Feedback\n');
+
+  // 1. General PR Comments
+  const general = pr.comments.nodes.filter((c) => !shouldIgnore(c.body));
+  if (general.length > 0) {
+    console.log('\n💬 GENERAL COMMENTS:');
+    general.forEach((c) => {
+      const minimized = c.isMinimized
+        ? ` (Minimized: ${c.minimizedReason})`
+        : '';
+      console.log(
+        `[${c.createdAt}] [${c.author.login}]${minimized}: ${c.body}\n`,
+      );
+    });
+  }
+
+  // 2. Process ALL Review Comments into a single Thread Map
+  const allInlineComments = pr.reviews.nodes.flatMap((r) => r.comments.nodes);
+  const filteredInlines = allInlineComments.filter(
+    (c) => !shouldIgnore(c.body),
+  );
+
+  console.log('🔍 CODE REVIEWS & INLINE THREADS:');
+
+  // Print Review Summaries First
+  pr.reviews.nodes.forEach((review) => {
+    if (review.body && !shouldIgnore(review.body)) {
+      const icon = review.state === 'APPROVED' ? '✅' : '💬';
+      const minimized = review.isMinimized
+        ? ` (Minimized: ${review.minimizedReason})`
+        : '';
+      console.log(
+        `\n${icon} ${review.state} by ${review.author.login} at ${review.createdAt}${minimized}: "${review.body}"`,
+      );
+    }
+  });
+
+  // Build and Print Threads
+  const topLevelThreads = filteredInlines.filter((c) => !c.replyTo);
+
+  const printThread = (parentId, depth = 1) => {
+    const indent = '  '.repeat(depth);
+    filteredInlines
+      .filter((c) => c.replyTo?.id === parentId)
+      .forEach((reply) => {
+        const minimized = reply.isMinimized
+          ? ` (Minimized: ${reply.minimizedReason})`
+          : '';
+        console.log(
+          `${indent}↳ [${reply.createdAt}] ${reply.author.login}${minimized}: ${reply.body}`,
+        );
+        printThread(reply.id, depth + 1);
+      });
+  };
+
+  topLevelThreads.forEach((c) => {
+    const start = c.startLine || c.originalStartLine;
+    const end = c.line || c.originalLine;
+    const range = start && end && start !== end ? `${start}-${end}` : end || '';
+    const fileInfo = c.path
+      ? `(${c.path}${range ? `:${range}` : ''}) `
+      : range
+        ? `(Line ${range}) `
+        : '';
+    const minimized = c.isMinimized ? ` (Minimized: ${c.minimizedReason})` : '';
+    console.log(
+      `\n💬 ${minimized}${c.author.login} | ${c.createdAt} ${fileInfo}\n${c.body}`,
+    );
+    printThread(c.id);
+  });
+
+  console.log('\n');
+}
+
+main().catch((err) => {
+  console.error('❌ Unexpected error:', err);
+  process.exit(1);
+});

.gemini/skills/pr-creator/SKILL.md

@@ -14,25 +14,34 @@ repository's standards.
 
 Follow these steps to create a Pull Request:
 
-1.  **Branch Management**: Check the current branch to avoid working directly
-    on `main`.
+1.  **Branch Management**: **CRITICAL:** Ensure you are NOT working on the
+    `main` branch.
     - Run `git branch --show-current`.
-    - If the current branch is `main`, create and switch to a new descriptive
-      branch:
+    - If the current branch is `main`, you MUST create and switch to a new
+      descriptive branch:
       ```bash
       git checkout -b <new-branch-name>
       ```
 
-2.  **Locate Template**: Search for a pull request template in the repository.
+2.  **Commit Changes**: Verify that all intended changes are committed.
+    - Run `git status` to check for unstaged or uncommitted changes.
+    - If there are uncommitted changes, stage and commit them with a descriptive
+      message before proceeding. NEVER commit directly to `main`.
+      ```bash
+      git add .
+      git commit -m "type(scope): description"
+      ```
+
+3.  **Locate Template**: Search for a pull request template in the repository.
     - Check `.github/pull_request_template.md`
     - Check `.github/PULL_REQUEST_TEMPLATE.md`
     - If multiple templates exist (e.g., in `.github/PULL_REQUEST_TEMPLATE/`),
       ask the user which one to use or select the most appropriate one based on
       the context (e.g., `bug_fix.md` vs `feature.md`).
 
-3.  **Read Template**: Read the content of the identified template file.
+4.  **Read Template**: Read the content of the identified template file.
 
-4.  **Draft Description**: Create a PR description that strictly follows the
+5.  **Draft Description**: Create a PR description that strictly follows the
     template's structure.
     - **Headings**: Keep all headings from the template.
     - **Checklists**: Review each item. Mark with `[x]` if completed. If an item
@@ -44,14 +53,24 @@ Follow these steps to create a Pull Request:
     - **Related Issues**: Link any issues fixed or related to this PR (e.g.,
       "Fixes #123").
 
-5.  **Preflight Check**: Before creating the PR, run the workspace preflight
+6.  **Preflight Check**: Before creating the PR, run the workspace preflight
     script to ensure all build, lint, and test checks pass.
     ```bash
     npm run preflight
     ```
     If any checks fail, address the issues before proceeding to create the PR.
 
-6.  **Create PR**: Use the `gh` CLI to create the PR. To avoid shell escaping
+7.  **Push Branch**: Push the current branch to the remote repository.
+    **CRITICAL SAFETY RAIL:** Double-check your branch name before pushing.
+    NEVER push if the current branch is `main`.
+    ```bash
+    # Verify current branch is NOT main
+    git branch --show-current
+    # Push non-interactively
+    git push -u origin HEAD
+    ```
+
+8.  **Create PR**: Use the `gh` CLI to create the PR. To avoid shell escaping
     issues with multi-line Markdown, write the description to a temporary file
     first.
     ```bash
@@ -68,6 +87,7 @@ Follow these steps to create a Pull Request:
 
 ## Principles
 
+- **Safety First**: NEVER push to `main`. This is your highest priority.
 - **Compliance**: Never ignore the PR template. It exists for a reason.
 - **Completeness**: Fill out all relevant sections.
 - **Accuracy**: Don't check boxes for tasks you haven't done.

.github/actions/create-pull-request/action.yml

@@ -39,18 +39,22 @@ runs:
       if: "inputs.dry-run != 'true'"
       env:
         GH_TOKEN: '${{ inputs.github-token }}'
+        INPUTS_BRANCH_NAME: '${{ inputs.branch-name }}'
+        INPUTS_PR_TITLE: '${{ inputs.pr-title }}'
+        INPUTS_PR_BODY: '${{ inputs.pr-body }}'
+        INPUTS_BASE_BRANCH: '${{ inputs.base-branch }}'
       shell: 'bash'
       working-directory: '${{ inputs.working-directory }}'
       run: |
         set -e
-        if ! git ls-remote --exit-code --heads origin "${{ inputs.branch-name }}"; then
-          echo "::error::Branch '${{ inputs.branch-name }}' does not exist on the remote repository."
+        if ! git ls-remote --exit-code --heads origin "${INPUTS_BRANCH_NAME}"; then
+          echo "::error::Branch '${INPUTS_BRANCH_NAME}' does not exist on the remote repository."
           exit 1
         fi
         PR_URL=$(gh pr create \
-          --title "${{ inputs.pr-title }}" \
-          --body "${{ inputs.pr-body }}" \
-          --base "${{ inputs.base-branch }}" \
-          --head "${{ inputs.branch-name }}" \
+          --title "${INPUTS_PR_TITLE}" \
+          --body "${INPUTS_PR_BODY}" \
+          --base "${INPUTS_BASE_BRANCH}" \
+          --head "${INPUTS_BRANCH_NAME}" \
           --fill)
         gh pr merge "$PR_URL" --auto

.github/actions/npm-auth-token/action.yml

@@ -30,16 +30,22 @@ runs:
       id: 'npm_auth_token'
       shell: 'bash'
       run: |
-        AUTH_TOKEN="${{ inputs.github-token }}"
-        PACKAGE_NAME="${{ inputs.package-name }}"
+        AUTH_TOKEN="${INPUTS_GITHUB_TOKEN}"
+        PACKAGE_NAME="${INPUTS_PACKAGE_NAME}"
         PRIVATE_REPO="@google-gemini/"
         if [[ "$PACKAGE_NAME" == "$PRIVATE_REPO"* ]]; then
-          AUTH_TOKEN="${{ inputs.github-token }}"
+          AUTH_TOKEN="${INPUTS_GITHUB_TOKEN}"
         elif [[ "$PACKAGE_NAME" == "@google/gemini-cli" ]]; then
-          AUTH_TOKEN="${{ inputs.wombat-token-cli }}"
+          AUTH_TOKEN="${INPUTS_WOMBAT_TOKEN_CLI}"
         elif [[ "$PACKAGE_NAME" == "@google/gemini-cli-core" ]]; then
-          AUTH_TOKEN="${{ inputs.wombat-token-core }}"
+          AUTH_TOKEN="${INPUTS_WOMBAT_TOKEN_CORE}"
         elif [[ "$PACKAGE_NAME" == "@google/gemini-cli-a2a-server" ]]; then
-          AUTH_TOKEN="${{ inputs.wombat-token-a2a-server }}"
+          AUTH_TOKEN="${INPUTS_WOMBAT_TOKEN_A2A_SERVER}"
         fi
         echo "auth-token=$AUTH_TOKEN" >> $GITHUB_OUTPUT
+      env:
+        INPUTS_GITHUB_TOKEN: '${{ inputs.github-token }}'
+        INPUTS_PACKAGE_NAME: '${{ inputs.package-name }}'
+        INPUTS_WOMBAT_TOKEN_CLI: '${{ inputs.wombat-token-cli }}'
+        INPUTS_WOMBAT_TOKEN_CORE: '${{ inputs.wombat-token-core }}'
+        INPUTS_WOMBAT_TOKEN_A2A_SERVER: '${{ inputs.wombat-token-a2a-server }}'

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

@@ -20,6 +20,9 @@ inputs:
   github-token:
     description: 'The GitHub token for creating the release.'
     required: true
+  github-release-token:
+    description: 'The GitHub token used specifically for creating the GitHub release (to trigger other workflows).'
+    required: false
   dry-run:
     description: 'Whether to run in dry-run mode.'
     type: 'string'
@@ -90,15 +93,19 @@ runs:
       id: 'release_branch'
       shell: 'bash'
       run: |
-        BRANCH_NAME="release/${{ inputs.release-tag }}"
+        BRANCH_NAME="release/${INPUTS_RELEASE_TAG}"
         git switch -c "${BRANCH_NAME}"
         echo "BRANCH_NAME=${BRANCH_NAME}" >> "${GITHUB_OUTPUT}"
+      env:
+        INPUTS_RELEASE_TAG: '${{ inputs.release-tag }}'
 
     - name: '⬆️ Update package versions'
       working-directory: '${{ inputs.working-directory }}'
       shell: 'bash'
       run: |
-        npm run release:version "${{ inputs.release-version }}"
+        npm run release:version "${INPUTS_RELEASE_VERSION}"
+      env:
+        INPUTS_RELEASE_VERSION: '${{ inputs.release-version }}'
 
     - name: '💾 Commit and Conditionally Push package versions'
       working-directory: '${{ inputs.working-directory }}'
@@ -160,23 +167,30 @@ runs:
       working-directory: '${{ inputs.working-directory }}'
       env:
         NODE_AUTH_TOKEN: '${{ steps.core-token.outputs.auth-token }}'
+        INPUTS_DRY_RUN: '${{ inputs.dry-run }}'
+        INPUTS_CORE_PACKAGE_NAME: '${{ inputs.core-package-name }}'
       shell: 'bash'
       run: |
         npm publish \
-          --dry-run="${{ inputs.dry-run }}" \
-          --workspace="${{ inputs.core-package-name }}" \
+          --dry-run="${INPUTS_DRY_RUN}" \
+          --workspace="${INPUTS_CORE_PACKAGE_NAME}" \
           --no-tag
-        npm dist-tag rm ${{ inputs.core-package-name }} false --silent
+        npm dist-tag rm ${INPUTS_CORE_PACKAGE_NAME} false --silent
 
     - name: '🔗 Install latest core package'
       working-directory: '${{ inputs.working-directory }}'
       if: "${{ inputs.dry-run != 'true' }}"
       shell: 'bash'
       run: |
-        npm install "${{ inputs.core-package-name }}@${{ inputs.release-version }}" \
-        --workspace="${{ inputs.cli-package-name }}" \
-        --workspace="${{ inputs.a2a-package-name }}" \
+        npm install "${INPUTS_CORE_PACKAGE_NAME}@${INPUTS_RELEASE_VERSION}" \
+        --workspace="${INPUTS_CLI_PACKAGE_NAME}" \
+        --workspace="${INPUTS_A2A_PACKAGE_NAME}" \
         --save-exact
+      env:
+        INPUTS_CORE_PACKAGE_NAME: '${{ inputs.core-package-name }}'
+        INPUTS_RELEASE_VERSION: '${{ inputs.release-version }}'
+        INPUTS_CLI_PACKAGE_NAME: '${{ inputs.cli-package-name }}'
+        INPUTS_A2A_PACKAGE_NAME: '${{ inputs.a2a-package-name }}'
 
     - name: 'Get CLI Token'
       uses: './.github/actions/npm-auth-token'
@@ -192,13 +206,15 @@ runs:
       working-directory: '${{ inputs.working-directory }}'
       env:
         NODE_AUTH_TOKEN: '${{ steps.cli-token.outputs.auth-token }}'
+        INPUTS_DRY_RUN: '${{ inputs.dry-run }}'
+        INPUTS_CLI_PACKAGE_NAME: '${{ inputs.cli-package-name }}'
       shell: 'bash'
       run: |
         npm publish \
-          --dry-run="${{ inputs.dry-run }}" \
-          --workspace="${{ inputs.cli-package-name }}" \
+          --dry-run="${INPUTS_DRY_RUN}" \
+          --workspace="${INPUTS_CLI_PACKAGE_NAME}" \
           --no-tag
-        npm dist-tag rm ${{ inputs.cli-package-name }} false --silent
+        npm dist-tag rm ${INPUTS_CLI_PACKAGE_NAME} false --silent
 
     - name: 'Get a2a-server Token'
       uses: './.github/actions/npm-auth-token'
@@ -214,14 +230,16 @@ runs:
       working-directory: '${{ inputs.working-directory }}'
       env:
         NODE_AUTH_TOKEN: '${{ steps.a2a-token.outputs.auth-token }}'
+        INPUTS_DRY_RUN: '${{ inputs.dry-run }}'
+        INPUTS_A2A_PACKAGE_NAME: '${{ inputs.a2a-package-name }}'
       shell: 'bash'
       # Tag staging for initial release
       run: |
         npm publish \
-          --dry-run="${{ inputs.dry-run }}" \
-          --workspace="${{ inputs.a2a-package-name }}" \
+          --dry-run="${INPUTS_DRY_RUN}" \
+          --workspace="${INPUTS_A2A_PACKAGE_NAME}" \
           --no-tag
-        npm dist-tag rm ${{ inputs.a2a-package-name }} false --silent
+        npm dist-tag rm ${INPUTS_A2A_PACKAGE_NAME} false --silent
 
     - name: '🔬 Verify NPM release by version'
       uses: './.github/actions/verify-release'
@@ -254,14 +272,17 @@ runs:
       working-directory: '${{ inputs.working-directory }}'
       if: "${{ inputs.dry-run != 'true' && inputs.skip-github-release != 'true' && inputs.npm-tag != 'dev' && inputs.npm-registry-url != 'https://npm.pkg.github.com/' }}"
       env:
-        GITHUB_TOKEN: '${{ inputs.github-token }}'
+        GITHUB_TOKEN: '${{ inputs.github-release-token || inputs.github-token }}'
+        INPUTS_RELEASE_TAG: '${{ inputs.release-tag }}'
+        STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
+        INPUTS_PREVIOUS_TAG: '${{ inputs.previous-tag }}'
       shell: 'bash'
       run: |
-        gh release create "${{ inputs.release-tag }}" \
+        gh release create "${INPUTS_RELEASE_TAG}" \
           bundle/gemini.js \
-          --target "${{ steps.release_branch.outputs.BRANCH_NAME }}" \
-          --title "Release ${{ inputs.release-tag }}" \
-          --notes-start-tag "${{ inputs.previous-tag }}" \
+          --target "${STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME}" \
+          --title "Release ${INPUTS_RELEASE_TAG}" \
+          --notes-start-tag "${INPUTS_PREVIOUS_TAG}" \
           --generate-notes \
           ${{ inputs.npm-tag != 'latest' && '--prerelease' || '' }}
 
@@ -271,5 +292,8 @@ runs:
       continue-on-error: true
       shell: 'bash'
       run: |
-        echo "Cleaning up release branch ${{ steps.release_branch.outputs.BRANCH_NAME }}..."
-        git push origin --delete "${{ steps.release_branch.outputs.BRANCH_NAME }}"
+        echo "Cleaning up release branch ${STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME}..."
+        git push origin --delete "${STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME}"
+
+      env:
+        STEPS_RELEASE_BRANCH_OUTPUTS_BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}'

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

@@ -52,8 +52,10 @@ runs:
       id: 'branch_name'
       shell: 'bash'
       run: |
-        REF_NAME="${{ inputs.ref-name }}"
+        REF_NAME="${INPUTS_REF_NAME}"
         echo "name=${REF_NAME%/merge}" >> $GITHUB_OUTPUT
+      env:
+        INPUTS_REF_NAME: '${{ inputs.ref-name }}'
     - name: 'Build and Push the Docker Image'
       uses: 'docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83' # ratchet:docker/build-push-action@v6
       with:

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

@@ -56,8 +56,8 @@ runs:
       id: 'image_tag'
       shell: 'bash'
       run: |-
-        SHELL_TAG_NAME="${{ inputs.github-ref-name }}"
-        FINAL_TAG="${{ inputs.github-sha }}"
+        SHELL_TAG_NAME="${INPUTS_GITHUB_REF_NAME}"
+        FINAL_TAG="${INPUTS_GITHUB_SHA}"
         if [[ "$SHELL_TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.-]+)?$ ]]; then
           echo "Release detected."
           FINAL_TAG="${SHELL_TAG_NAME#v}"
@@ -66,22 +66,36 @@ runs:
         fi
         echo "Determined image tag: $FINAL_TAG"
         echo "FINAL_TAG=$FINAL_TAG" >> $GITHUB_OUTPUT
+      env:
+        INPUTS_GITHUB_REF_NAME: '${{ inputs.github-ref-name }}'
+        INPUTS_GITHUB_SHA: '${{ inputs.github-sha }}'
     - name: 'build'
       id: 'docker_build'
       shell: 'bash'
       env:
         GEMINI_SANDBOX_IMAGE_TAG: '${{ steps.image_tag.outputs.FINAL_TAG }}'
         GEMINI_SANDBOX: 'docker'
+        STEPS_IMAGE_TAG_OUTPUTS_FINAL_TAG: '${{ steps.image_tag.outputs.FINAL_TAG }}'
       run: |-
         npm run build:sandbox -- \
-          --image google/gemini-cli-sandbox:${{ steps.image_tag.outputs.FINAL_TAG }} \
+          --image google/gemini-cli-sandbox:${STEPS_IMAGE_TAG_OUTPUTS_FINAL_TAG} \
           --output-file final_image_uri.txt
         echo "uri=$(cat final_image_uri.txt)" >> $GITHUB_OUTPUT
+    - name: 'verify'
+      shell: 'bash'
+      run: |-
+        docker run --rm --entrypoint sh "${{ steps.docker_build.outputs.uri }}" -lc '
+          set -e
+          node -e "const fs=require(\"node:fs\"); JSON.parse(fs.readFileSync(\"/usr/local/share/npm-global/lib/node_modules/@google/gemini-cli/package.json\",\"utf8\")); JSON.parse(fs.readFileSync(\"/usr/local/share/npm-global/lib/node_modules/@google/gemini-cli-core/package.json\",\"utf8\"));"
+          /usr/local/share/npm-global/bin/gemini --version >/dev/null
+        '
     - name: 'publish'
       shell: 'bash'
       if: "${{ inputs.dry-run != 'true' }}"
       run: |-
-        docker push "${{ steps.docker_build.outputs.uri }}"
+        docker push "${STEPS_DOCKER_BUILD_OUTPUTS_URI}"
+      env:
+        STEPS_DOCKER_BUILD_OUTPUTS_URI: '${{ steps.docker_build.outputs.uri }}'
     - name: 'Create issue on failure'
       if: |-
         ${{ failure() }}

.github/actions/setup-npmrc/action.yml

@@ -18,5 +18,7 @@ runs:
       shell: 'bash'
       run: |-
         echo ""@google-gemini:registry=https://npm.pkg.github.com"" > ~/.npmrc
-        echo ""//npm.pkg.github.com/:_authToken=${{ inputs.github-token }}"" >> ~/.npmrc
+        echo ""//npm.pkg.github.com/:_authToken=${INPUTS_GITHUB_TOKEN}"" >> ~/.npmrc
         echo ""@google:registry=https://wombat-dressing-room.appspot.com"" >> ~/.npmrc
+      env:
+        INPUTS_GITHUB_TOKEN: '${{ inputs.github-token }}'

.github/actions/tag-npm-release/action.yml

@@ -71,10 +71,13 @@ runs:
         ${{ inputs.dry-run != 'true' }}
       env:
         NODE_AUTH_TOKEN: '${{ steps.core-token.outputs.auth-token }}'
+        INPUTS_CORE_PACKAGE_NAME: '${{ inputs.core-package-name }}'
+        INPUTS_VERSION: '${{ inputs.version }}'
+        INPUTS_CHANNEL: '${{ inputs.channel }}'
       shell: 'bash'
       working-directory: '${{ inputs.working-directory }}'
       run: |
-        npm dist-tag add ${{ inputs.core-package-name }}@${{ inputs.version }} ${{ inputs.channel }}
+        npm dist-tag add ${INPUTS_CORE_PACKAGE_NAME}@${INPUTS_VERSION} ${INPUTS_CHANNEL}
 
     - name: 'Get cli Token'
       uses: './.github/actions/npm-auth-token'
@@ -91,10 +94,13 @@ runs:
         ${{ inputs.dry-run != 'true' }}
       env:
         NODE_AUTH_TOKEN: '${{ steps.cli-token.outputs.auth-token }}'
+        INPUTS_CLI_PACKAGE_NAME: '${{ inputs.cli-package-name }}'
+        INPUTS_VERSION: '${{ inputs.version }}'
+        INPUTS_CHANNEL: '${{ inputs.channel }}'
       shell: 'bash'
       working-directory: '${{ inputs.working-directory }}'
       run: |
-        npm dist-tag add ${{ inputs.cli-package-name }}@${{ inputs.version }} ${{ inputs.channel }}
+        npm dist-tag add ${INPUTS_CLI_PACKAGE_NAME}@${INPUTS_VERSION} ${INPUTS_CHANNEL}
 
     - name: 'Get a2a Token'
       uses: './.github/actions/npm-auth-token'
@@ -111,10 +117,13 @@ runs:
         ${{ inputs.dry-run == 'false' }}
       env:
         NODE_AUTH_TOKEN: '${{ steps.a2a-token.outputs.auth-token }}'
+        INPUTS_A2A_PACKAGE_NAME: '${{ inputs.a2a-package-name }}'
+        INPUTS_VERSION: '${{ inputs.version }}'
+        INPUTS_CHANNEL: '${{ inputs.channel }}'
       shell: 'bash'
       working-directory: '${{ inputs.working-directory }}'
       run: |
-        npm dist-tag add ${{ inputs.a2a-package-name }}@${{ inputs.version }} ${{ inputs.channel }}
+        npm dist-tag add ${INPUTS_A2A_PACKAGE_NAME}@${INPUTS_VERSION} ${INPUTS_CHANNEL}
 
     - name: 'Log dry run'
       if: |-
@@ -122,4 +131,15 @@ runs:
       shell: 'bash'
       working-directory: '${{ inputs.working-directory }}'
       run: |
-        echo "Dry run: Would have added tag '${{ inputs.channel }}' to version '${{ inputs.version }}' for ${{ inputs.cli-package-name }}, ${{ inputs.core-package-name }}, and ${{ inputs.a2a-package-name }}."
+        echo "Dry run: Would have added tag '${INPUTS_CHANNEL}' to version '${INPUTS_VERSION}' for ${INPUTS_CLI_PACKAGE_NAME}, ${INPUTS_CORE_PACKAGE_NAME}, and ${INPUTS_A2A_PACKAGE_NAME}."
+
+      env:
+        INPUTS_CHANNEL: '${{ inputs.channel }}'
+
+        INPUTS_VERSION: '${{ inputs.version }}'
+
+        INPUTS_CLI_PACKAGE_NAME: '${{ inputs.cli-package-name }}'
+
+        INPUTS_CORE_PACKAGE_NAME: '${{ inputs.core-package-name }}'
+
+        INPUTS_A2A_PACKAGE_NAME: '${{ inputs.a2a-package-name }}'

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

@@ -64,10 +64,13 @@ runs:
       working-directory: '${{ inputs.working-directory }}'
       run: |-
         gemini_version=$(gemini --version)
-        if [ "$gemini_version" != "${{ inputs.expected-version }}" ]; then
-          echo "❌ NPM Version mismatch: Got $gemini_version from ${{ inputs.npm-package }}, expected ${{ inputs.expected-version }}"
+        if [ "$gemini_version" != "${INPUTS_EXPECTED_VERSION}" ]; then
+          echo "❌ NPM Version mismatch: Got $gemini_version from ${INPUTS_NPM_PACKAGE}, expected ${INPUTS_EXPECTED_VERSION}"
           exit 1
         fi
+      env:
+        INPUTS_EXPECTED_VERSION: '${{ inputs.expected-version }}'
+        INPUTS_NPM_PACKAGE: '${{ inputs.npm-package }}'
 
     - name: 'Clear npm cache'
       shell: 'bash'
@@ -77,11 +80,14 @@ runs:
       shell: 'bash'
       working-directory: '${{ inputs.working-directory }}'
       run: |-
-        gemini_version=$(npx --prefer-online "${{ inputs.npm-package}}" --version)
-        if [ "$gemini_version" != "${{ inputs.expected-version }}" ]; then
-          echo "❌ NPX Run Version mismatch: Got $gemini_version from ${{ inputs.npm-package }}, expected ${{ inputs.expected-version }}"
+        gemini_version=$(npx --prefer-online "${INPUTS_NPM_PACKAGE}" --version)
+        if [ "$gemini_version" != "${INPUTS_EXPECTED_VERSION}" ]; then
+          echo "❌ NPX Run Version mismatch: Got $gemini_version from ${INPUTS_NPM_PACKAGE}, expected ${INPUTS_EXPECTED_VERSION}"
           exit 1
         fi
+      env:
+        INPUTS_NPM_PACKAGE: '${{ inputs.npm-package }}'
+        INPUTS_EXPECTED_VERSION: '${{ inputs.expected-version }}'
 
     - name: 'Install dependencies for integration tests'
       shell: 'bash'

.github/scripts/pr-triage.sh

@@ -22,7 +22,7 @@ get_issue_labels() {
     # Check cache
     case "${ISSUE_LABELS_CACHE_FLAT}" in
         *"|${ISSUE_NUM}:"*) 
-            local suffix="${ISSUE_LABELS_CACHE_FLAT#*|${ISSUE_NUM}:}"
+            local suffix="${ISSUE_LABELS_CACHE_FLAT#*|"${ISSUE_NUM}":}"
             echo "${suffix%%|*}"
             return
             ;; 

.github/scripts/sync-maintainer-labels.cjs

@@ -1,5 +1,9 @@
-/* eslint-disable @typescript-eslint/no-require-imports */
-/* global process, console, require */
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 const { Octokit } = require('@octokit/rest');
 
 /**

.github/workflows/chained_e2e.yml

@@ -31,6 +31,7 @@ jobs:
     name: 'Merge Queue Skipper'
     permissions: 'read-all'
     runs-on: 'gemini-cli-ubuntu-16-core'
+    if: "github.repository == 'google-gemini/gemini-cli'"
     outputs:
       skip: '${{ steps.merge-queue-e2e-skipper.outputs.skip-check }}'
     steps:
@@ -42,7 +43,7 @@ jobs:
 
   download_repo_name:
     runs-on: 'gemini-cli-ubuntu-16-core'
-    if: "${{github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_run'}}"
+    if: "github.repository == 'google-gemini/gemini-cli' && (github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_run')"
     outputs:
       repo_name: '${{ steps.output-repo-name.outputs.repo_name }}'
       head_sha: '${{ steps.output-repo-name.outputs.head_sha }}'
@@ -53,7 +54,7 @@ jobs:
           REPO_NAME: '${{ github.event.inputs.repo_name }}'
         run: |
           mkdir -p ./pr
-          echo '${{ env.REPO_NAME }}' > ./pr/repo_name
+          echo "${REPO_NAME}" > ./pr/repo_name
       - uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4
         with:
           name: 'repo_name'
@@ -91,7 +92,7 @@ jobs:
     name: 'Parse run context'
     runs-on: 'gemini-cli-ubuntu-16-core'
     needs: 'download_repo_name'
-    if: 'always()'
+    if: "github.repository == 'google-gemini/gemini-cli' && always()"
     outputs:
       repository: '${{ steps.set_context.outputs.REPO }}'
       sha: '${{ steps.set_context.outputs.SHA }}'
@@ -111,11 +112,11 @@ jobs:
     permissions: 'write-all'
     needs:
       - 'parse_run_context'
-    if: 'always()'
+    if: "github.repository == 'google-gemini/gemini-cli' && always()"
     steps:
       - name: 'Set pending status'
         uses: 'myrotvorets/set-commit-status-action@16037e056d73b2d3c88e37e393ff369047f70886' # ratchet:myrotvorets/set-commit-status-action@master
-        if: 'always()'
+        if: "github.repository == 'google-gemini/gemini-cli' && always()"
         with:
           allowForks: 'true'
           repo: '${{ github.repository }}'
@@ -131,7 +132,7 @@ jobs:
       - 'parse_run_context'
     runs-on: 'gemini-cli-ubuntu-16-core'
     if: |
-      always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
+      github.repository == 'google-gemini/gemini-cli' && always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
     strategy:
       fail-fast: false
       matrix:
@@ -184,7 +185,7 @@ jobs:
       - 'parse_run_context'
     runs-on: 'macos-latest'
     if: |
-      always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
+      github.repository == 'google-gemini/gemini-cli' && always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
@@ -222,10 +223,8 @@ jobs:
       - 'merge_queue_skipper'
       - 'parse_run_context'
     if: |
-      always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
+      github.repository == 'google-gemini/gemini-cli' && always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
     runs-on: 'gemini-cli-windows-16-core'
-    continue-on-error: true
-
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
@@ -284,7 +283,7 @@ jobs:
       - 'parse_run_context'
     runs-on: 'gemini-cli-ubuntu-16-core'
     if: |
-      always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
+      github.repository == 'google-gemini/gemini-cli' && always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
@@ -311,35 +310,42 @@ jobs:
   e2e:
     name: 'E2E'
     if: |
-      always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
+      github.repository == 'google-gemini/gemini-cli' && always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
     needs:
       - 'e2e_linux'
       - 'e2e_mac'
+      - 'e2e_windows'
       - 'evals'
       - 'merge_queue_skipper'
     runs-on: 'gemini-cli-ubuntu-16-core'
     steps:
       - name: 'Check E2E test results'
         run: |
-          if [[ ${{ needs.e2e_linux.result }} != 'success' || \
-               ${{ needs.e2e_mac.result }} != 'success' || \
-               ${{ needs.evals.result }} != 'success' ]]; then
+          if [[ ${NEEDS_E2E_LINUX_RESULT} != 'success' || \
+               ${NEEDS_E2E_MAC_RESULT} != 'success' || \
+               ${NEEDS_E2E_WINDOWS_RESULT} != 'success' || \
+               ${NEEDS_EVALS_RESULT} != 'success' ]]; then
             echo "One or more E2E jobs failed."
             exit 1
           fi
           echo "All required E2E jobs passed!"
+        env:
+          NEEDS_E2E_LINUX_RESULT: '${{ needs.e2e_linux.result }}'
+          NEEDS_E2E_MAC_RESULT: '${{ needs.e2e_mac.result }}'
+          NEEDS_E2E_WINDOWS_RESULT: '${{ needs.e2e_windows.result }}'
+          NEEDS_EVALS_RESULT: '${{ needs.evals.result }}'
 
   set_workflow_status:
     runs-on: 'gemini-cli-ubuntu-16-core'
     permissions: 'write-all'
-    if: 'always()'
+    if: "github.repository == 'google-gemini/gemini-cli' && always()"
     needs:
       - 'parse_run_context'
       - 'e2e'
     steps:
       - name: 'Set workflow status'
         uses: 'myrotvorets/set-commit-status-action@16037e056d73b2d3c88e37e393ff369047f70886' # ratchet:myrotvorets/set-commit-status-action@master
-        if: 'always()'
+        if: "github.repository == 'google-gemini/gemini-cli' && always()"
         with:
           allowForks: 'true'
           repo: '${{ github.repository }}'

.github/workflows/ci.yml

@@ -37,6 +37,7 @@ jobs:
     permissions: 'read-all'
     name: 'Merge Queue Skipper'
     runs-on: 'gemini-cli-ubuntu-16-core'
+    if: "github.repository == 'google-gemini/gemini-cli'"
     outputs:
       skip: '${{ steps.merge-queue-ci-skipper.outputs.skip-check }}'
     steps:
@@ -49,7 +50,7 @@ jobs:
     name: 'Lint'
     runs-on: 'gemini-cli-ubuntu-16-core'
     needs: 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
+    if: "github.repository == 'google-gemini/gemini-cli' && needs.merge_queue_skipper.outputs.skip == 'false'"
     env:
       GEMINI_LINT_TEMP_DIR: '${{ github.workspace }}/.gemini-linters'
     steps:
@@ -116,6 +117,7 @@ jobs:
   link_checker:
     name: 'Link Checker'
     runs-on: 'ubuntu-latest'
+    if: "github.repository == 'google-gemini/gemini-cli'"
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
@@ -129,7 +131,7 @@ jobs:
     runs-on: 'gemini-cli-ubuntu-16-core'
     needs:
       - 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
+    if: "github.repository == 'google-gemini/gemini-cli' && needs.merge_queue_skipper.outputs.skip == 'false'"
     permissions:
       contents: 'read'
       checks: 'write'
@@ -216,7 +218,7 @@ jobs:
     runs-on: 'macos-latest'
     needs:
       - 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
+    if: "github.repository == 'google-gemini/gemini-cli' && needs.merge_queue_skipper.outputs.skip == 'false'"
     permissions:
       contents: 'read'
       checks: 'write'
@@ -311,7 +313,7 @@ jobs:
     name: 'CodeQL'
     runs-on: 'gemini-cli-ubuntu-16-core'
     needs: 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
+    if: "github.repository == 'google-gemini/gemini-cli' && needs.merge_queue_skipper.outputs.skip == 'false'"
     permissions:
       actions: 'read'
       contents: 'read'
@@ -334,7 +336,7 @@ jobs:
   bundle_size:
     name: 'Check Bundle Size'
     needs: 'merge_queue_skipper'
-    if: "${{github.event_name == 'pull_request' && needs.merge_queue_skipper.outputs.skip == 'false'}}"
+    if: "github.repository == 'google-gemini/gemini-cli' && github.event_name == 'pull_request' && needs.merge_queue_skipper.outputs.skip == 'false'"
     runs-on: 'gemini-cli-ubuntu-16-core'
     permissions:
       contents: 'read' # For checkout
@@ -356,11 +358,16 @@ jobs:
           clean-script: 'clean'
 
   test_windows:
-    name: 'Slow Test - Win'
+    name: 'Slow Test - Win - ${{ matrix.shard }}'
     runs-on: 'gemini-cli-windows-16-core'
     needs: 'merge_queue_skipper'
-    if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
-    continue-on-error: true
+    if: "github.repository == 'google-gemini/gemini-cli' && needs.merge_queue_skipper.outputs.skip == 'false'"
+    timeout-minutes: 60
+    strategy:
+      matrix:
+        shard:
+          - 'cli'
+          - 'others'
 
     steps:
       - name: 'Checkout'
@@ -411,7 +418,14 @@ jobs:
           NODE_OPTIONS: '--max-old-space-size=32768 --max-semi-space-size=256'
           UV_THREADPOOL_SIZE: '32'
           NODE_ENV: 'test'
-        run: 'npm run test:ci -- --coverage.enabled=false'
+        run: |
+          if ("${{ matrix.shard }}" -eq "cli") {
+            npm run test:ci --workspace @google/gemini-cli -- --coverage.enabled=false
+          } else {
+            # Explicitly list non-cli packages to ensure they are sharded correctly
+            npm run test:ci --workspace @google/gemini-cli-core --workspace @google/gemini-cli-a2a-server --workspace gemini-cli-vscode-ide-companion --workspace @google/gemini-cli-test-utils --if-present -- --coverage.enabled=false
+            npm run test:scripts
+          }
         shell: 'pwsh'
 
       - name: 'Bundle'
@@ -439,25 +453,35 @@ jobs:
 
   ci:
     name: 'CI'
-    if: 'always()'
+    if: "github.repository == 'google-gemini/gemini-cli' && always()"
     needs:
       - 'lint'
       - 'link_checker'
       - 'test_linux'
       - 'test_mac'
+      - 'test_windows'
       - 'codeql'
       - 'bundle_size'
     runs-on: 'gemini-cli-ubuntu-16-core'
     steps:
       - name: 'Check all job results'
         run: |
-          if [[ (${{ needs.lint.result }} != 'success' && ${{ needs.lint.result }} != 'skipped') || \
-               (${{ needs.link_checker.result }} != 'success' && ${{ needs.link_checker.result }} != 'skipped') || \
-               (${{ needs.test_linux.result }} != 'success' && ${{ needs.test_linux.result }} != 'skipped') || \
-               (${{ needs.test_mac.result }} != 'success' && ${{ needs.test_mac.result }} != 'skipped') || \
-               (${{ needs.codeql.result }} != 'success' && ${{ needs.codeql.result }} != 'skipped') || \
-               (${{ needs.bundle_size.result }} != 'success' && ${{ needs.bundle_size.result }} != 'skipped') ]]; then
+          if [[ (${NEEDS_LINT_RESULT} != 'success' && ${NEEDS_LINT_RESULT} != 'skipped') || \
+               (${NEEDS_LINK_CHECKER_RESULT} != 'success' && ${NEEDS_LINK_CHECKER_RESULT} != 'skipped') || \
+               (${NEEDS_TEST_LINUX_RESULT} != 'success' && ${NEEDS_TEST_LINUX_RESULT} != 'skipped') || \
+               (${NEEDS_TEST_MAC_RESULT} != 'success' && ${NEEDS_TEST_MAC_RESULT} != 'skipped') || \
+               (${NEEDS_TEST_WINDOWS_RESULT} != 'success' && ${NEEDS_TEST_WINDOWS_RESULT} != 'skipped') || \
+               (${NEEDS_CODEQL_RESULT} != 'success' && ${NEEDS_CODEQL_RESULT} != 'skipped') || \
+               (${NEEDS_BUNDLE_SIZE_RESULT} != 'success' && ${NEEDS_BUNDLE_SIZE_RESULT} != 'skipped') ]]; then
             echo "One or more CI jobs failed."
             exit 1
           fi
           echo "All CI jobs passed!"
+        env:
+          NEEDS_LINT_RESULT: '${{ needs.lint.result }}'
+          NEEDS_LINK_CHECKER_RESULT: '${{ needs.link_checker.result }}'
+          NEEDS_TEST_LINUX_RESULT: '${{ needs.test_linux.result }}'
+          NEEDS_TEST_MAC_RESULT: '${{ needs.test_mac.result }}'
+          NEEDS_TEST_WINDOWS_RESULT: '${{ needs.test_windows.result }}'
+          NEEDS_CODEQL_RESULT: '${{ needs.codeql.result }}'
+          NEEDS_BUNDLE_SIZE_RESULT: '${{ needs.bundle_size.result }}'

.github/workflows/deflake.yml

@@ -27,6 +27,7 @@ jobs:
   deflake_e2e_linux:
     name: 'E2E Test (Linux) - ${{ matrix.sandbox }}'
     runs-on: 'gemini-cli-ubuntu-16-core'
+    if: "github.repository == 'google-gemini/gemini-cli'"
     strategy:
       fail-fast: false
       matrix:
@@ -68,15 +69,16 @@ jobs:
           VERBOSE: 'true'
         shell: 'bash'
         run: |
-          if [[ "${{ env.IS_DOCKER }}" == "true" ]]; then
-            npm run deflake:test:integration:sandbox:docker -- --runs="${{ env.RUNS }}" -- --testNamePattern "'${{ env.TEST_NAME_PATTERN }}'"
+          if [[ "${IS_DOCKER}" == "true" ]]; then
+            npm run deflake:test:integration:sandbox:docker -- --runs="${RUNS}" -- --testNamePattern "'${TEST_NAME_PATTERN}'"
           else
-            npm run deflake:test:integration:sandbox:none -- --runs="${{ env.RUNS }}" -- --testNamePattern "'${{ env.TEST_NAME_PATTERN }}'"
+            npm run deflake:test:integration:sandbox:none -- --runs="${RUNS}" -- --testNamePattern "'${TEST_NAME_PATTERN}'"
           fi
 
   deflake_e2e_mac:
     name: 'E2E Test (macOS)'
     runs-on: 'macos-latest'
+    if: "github.repository == 'google-gemini/gemini-cli'"
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
@@ -109,11 +111,12 @@ jobs:
           TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}'
           VERBOSE: 'true'
         run: |
-          npm run deflake:test:integration:sandbox:none -- --runs="${{ env.RUNS }}" -- --testNamePattern "'${{ env.TEST_NAME_PATTERN }}'"
+          npm run deflake:test:integration:sandbox:none -- --runs="${RUNS}" -- --testNamePattern "'${TEST_NAME_PATTERN}'"
 
   deflake_e2e_windows:
     name: 'Slow E2E - Win'
     runs-on: 'gemini-cli-windows-16-core'
+    if: "github.repository == 'google-gemini/gemini-cli'"
 
     steps:
       - name: 'Checkout'
@@ -167,4 +170,4 @@ jobs:
           TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}'
         shell: 'pwsh'
         run: |
-          npm run deflake:test:integration:sandbox:none -- --runs="${{ env.RUNS }}" -- --testNamePattern "'${{ env.TEST_NAME_PATTERN }}'"
+          npm run deflake:test:integration:sandbox:none -- --runs="$env:RUNS" -- --testNamePattern "'$env:TEST_NAME_PATTERN'"

.github/workflows/docs-page-action.yml

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

.github/workflows/docs-rebuild.yml

@@ -7,6 +7,7 @@ on:
       - 'docs/**'
 jobs:
   trigger-rebuild:
+    if: "github.repository == 'google-gemini/gemini-cli'"
     runs-on: 'ubuntu-latest'
     steps:
       - name: 'Trigger rebuild'

.github/workflows/eval.yml

@@ -44,5 +44,5 @@ jobs:
       - name: 'Run evaluation'
         working-directory: '/app'
         run: |
-          poetry run exp_run --experiment-mode=on-demand --branch-or-commit=${{ github.ref_name }} --model-name=gemini-2.5-pro --dataset=swebench_verified --concurrency=15
+          poetry run exp_run --experiment-mode=on-demand --branch-or-commit="${GITHUB_REF_NAME}" --model-name=gemini-2.5-pro --dataset=swebench_verified --concurrency=15
           poetry run python agent_prototypes/scripts/parse_gcli_logs_experiment.py --experiment_dir=experiments/adhoc/gcli_temp_exp --gcs-bucket="${EVAL_GCS_BUCKET}" --gcs-path=gh_action_artifacts

.github/workflows/evals-nightly.yml

@@ -23,10 +23,12 @@ jobs:
   evals:
     name: 'Evals (USUALLY_PASSING) nightly run'
     runs-on: 'gemini-cli-ubuntu-16-core'
+    if: "github.repository == 'google-gemini/gemini-cli'"
     strategy:
       fail-fast: false
       matrix:
         model:
+          - 'gemini-3.1-pro-preview-customtools'
           - 'gemini-3-pro-preview'
           - 'gemini-3-flash-preview'
           - 'gemini-2.5-pro'
@@ -61,7 +63,7 @@ jobs:
           TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}'
         run: |
           CMD="npm run test:all_evals"
-          PATTERN="${{ env.TEST_NAME_PATTERN }}"
+          PATTERN="${TEST_NAME_PATTERN}"
 
           if [[ -n "$PATTERN" ]]; then
             if [[ "$PATTERN" == *.ts || "$PATTERN" == *.js || "$PATTERN" == */* ]]; then
@@ -84,7 +86,7 @@ jobs:
   aggregate-results:
     name: 'Aggregate Results'
     needs: ['evals']
-    if: 'always()'
+    if: "github.repository == 'google-gemini/gemini-cli' && always()"
     runs-on: 'gemini-cli-ubuntu-16-core'
     steps:
       - name: 'Checkout'

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

@@ -155,7 +155,10 @@ jobs:
               "telemetry": {
                 "enabled": true,
                 "target": "gcp"
-              }
+              },
+              "coreTools": [
+                "run_shell_command(echo)"
+              ]
             }
           prompt: |-
             ## Role
@@ -284,8 +287,21 @@ jobs:
                   return;
                 }
               } else {
-                core.setFailed(`Output is not valid JSON and does not contain a JSON markdown block.\nRaw output: ${rawOutput}`);
-                return;
+                // If no markdown block, try to find a raw JSON object in the output.
+                // The CLI may include debug/log lines (e.g. telemetry init, YOLO mode)
+                // before the actual JSON response.
+                const jsonObjectMatch = rawOutput.match(/(\{[\s\S]*"labels_to_set"[\s\S]*\})/);
+                if (jsonObjectMatch) {
+                  try {
+                    parsedLabels = JSON.parse(jsonObjectMatch[0]);
+                  } catch (extractError) {
+                    core.setFailed(`Found JSON-like content but failed to parse: ${extractError.message}\nRaw output: ${rawOutput}`);
+                    return;
+                  }
+                } else {
+                  core.setFailed(`Output is not valid JSON and does not contain extractable JSON.\nRaw output: ${rawOutput}`);
+                  return;
+                }
               }
             }
 

.github/workflows/gemini-scheduled-stale-issue-closer.yml

@@ -21,13 +21,14 @@ defaults:
 
 jobs:
   close-stale-issues:
+    if: "github.repository == 'google-gemini/gemini-cli'"
     runs-on: 'ubuntu-latest'
     permissions:
       issues: 'write'
     steps:
       - name: 'Generate GitHub App Token'
         id: 'generate_token'
-        uses: 'actions/create-github-app-token@v1'
+        uses: 'actions/create-github-app-token@v2'
         with:
           app-id: '${{ secrets.APP_ID }}'
           private-key: '${{ secrets.PRIVATE_KEY }}'

.github/workflows/gemini-scheduled-stale-pr-closer.yml

@@ -23,12 +23,10 @@ jobs:
     steps:
       - name: 'Generate GitHub App Token'
         id: 'generate_token'
-        uses: 'actions/create-github-app-token@v1'
+        uses: 'actions/create-github-app-token@v2'
         with:
           app-id: '${{ secrets.APP_ID }}'
           private-key: '${{ secrets.PRIVATE_KEY }}'
-          owner: '${{ github.repository_owner }}'
-          repositories: 'gemini-cli'
 
       - name: 'Process Stale PRs'
         uses: 'actions/github-script@v7'
@@ -43,23 +41,56 @@ jobs:
 
             // 1. Fetch maintainers for verification
             let maintainerLogins = new Set();
-            let teamFetchSucceeded = false;
-            try {
-              const members = await github.paginate(github.rest.teams.listMembersInOrg, {
-                org: context.repo.owner,
-                team_slug: 'gemini-cli-maintainers'
-              });
-              maintainerLogins = new Set(members.map(m => m.login.toLowerCase()));
-              teamFetchSucceeded = true;
-              core.info(`Successfully fetched ${maintainerLogins.size} team members from gemini-cli-maintainers`);
-            } catch (e) {
-              core.warning(`Failed to fetch team members from gemini-cli-maintainers: ${e.message}. Falling back to author_association only.`);
+            const teams = ['gemini-cli-maintainers', 'gemini-cli-askmode-approvers', 'gemini-cli-docs'];
+
+            for (const team_slug of teams) {
+              try {
+                const members = await github.paginate(github.rest.teams.listMembersInOrg, {
+                  org: context.repo.owner,
+                  team_slug: team_slug
+                });
+                for (const m of members) maintainerLogins.add(m.login.toLowerCase());
+                core.info(`Successfully fetched ${members.length} team members from ${team_slug}`);
+              } catch (e) {
+                core.warning(`Failed to fetch team members from ${team_slug}: ${e.message}`);
+              }
             }
 
-            const isMaintainer = (login, assoc) => {
+            const isGooglerCache = new Map();
+            const isGoogler = async (login) => {
+              if (isGooglerCache.has(login)) return isGooglerCache.get(login);
+
+              try {
+                // Check membership in 'googlers' or 'google' orgs
+                const orgs = ['googlers', 'google'];
+                for (const org of orgs) {
+                  try {
+                    await github.rest.orgs.checkMembershipForUser({
+                      org: org,
+                      username: login
+                    });
+                    core.info(`User ${login} is a member of ${org} organization.`);
+                    isGooglerCache.set(login, true);
+                    return true;
+                  } catch (e) {
+                    // 404 just means they aren't a member, which is fine
+                    if (e.status !== 404) throw e;
+                  }
+                }
+              } catch (e) {
+                core.warning(`Failed to check org membership for ${login}: ${e.message}`);
+              }
+
+              isGooglerCache.set(login, false);
+              return false;
+            };
+
+            const isMaintainer = async (login, assoc) => {
               const isTeamMember = maintainerLogins.has(login.toLowerCase());
               const isRepoMaintainer = ['OWNER', 'MEMBER', 'COLLABORATOR'].includes(assoc);
-              return isTeamMember || isRepoMaintainer;
+              if (isTeamMember || isRepoMaintainer) return true;
+
+              return await isGoogler(login);
             };
 
             // 2. Determine which PRs to check
@@ -81,7 +112,7 @@ jobs:
             }
 
             for (const pr of prs) {
-              const maintainerPr = isMaintainer(pr.user.login, pr.author_association);
+              const maintainerPr = await isMaintainer(pr.user.login, pr.author_association);
               const isBot = pr.user.type === 'Bot' || pr.user.login.endsWith('[bot]');
 
               // Detection Logic for Linked Issues
@@ -175,7 +206,7 @@ jobs:
                     pull_number: pr.number
                   });
                   for (const r of reviews) {
-                    if (isMaintainer(r.user.login, r.author_association)) {
+                    if (await isMaintainer(r.user.login, r.author_association)) {
                       const d = new Date(r.submitted_at || r.updated_at);
                       if (d > lastActivity) lastActivity = d;
                     }
@@ -186,7 +217,7 @@ jobs:
                     issue_number: pr.number
                   });
                   for (const c of comments) {
-                    if (isMaintainer(c.user.login, c.author_association)) {
+                    if (await isMaintainer(c.user.login, c.author_association)) {
                       const d = new Date(c.updated_at);
                       if (d > lastActivity) lastActivity = d;
                     }

.github/workflows/gemini-self-assign-issue.yml

@@ -48,6 +48,24 @@ jobs:
             const repo = context.repo.repo;
             const MAX_ISSUES_ASSIGNED = 3;
 
+            const issue = await github.rest.issues.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: issueNumber,
+            });
+
+            const hasHelpWantedLabel = issue.data.labels.some(label => label.name === 'help wanted');
+
+            if (!hasHelpWantedLabel) {
+              await github.rest.issues.createComment({
+                owner: owner,
+                repo: repo,
+                issue_number: issueNumber,
+                body: `👋 @${commenter}, thanks for your interest in this issue! We're reserving self-assignment for issues that have been marked with the \`help wanted\` label. Feel free to check out our list of [issues that need attention](https://github.com/google-gemini/gemini-cli/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22).`
+              });
+              return;
+            }
+
             // Search for open issues already assigned to the commenter in this repo
             const { data: assignedIssues } = await github.rest.search.issuesAndPullRequests({
               q: `is:issue repo:${owner}/${repo} assignee:${commenter} is:open`,
@@ -64,13 +82,6 @@ jobs:
               return; // exit
             }
 
-            // Check if the issue is already assigned
-            const issue = await github.rest.issues.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: issueNumber,
-            });
-
             if (issue.data.assignees.length > 0) {
               // Comment that it's already assigned
               await github.rest.issues.createComment({

.github/workflows/label-backlog-child-issues.yml

@@ -14,7 +14,7 @@ permissions:
 jobs:
   # Event-based: Quick reaction to new/edited issues in THIS repo
   labeler:
-    if: "github.event_name == 'issues'"
+    if: "github.repository == 'google-gemini/gemini-cli' && github.event_name == 'issues'"
     runs-on: 'ubuntu-latest'
     steps:
       - name: 'Checkout'
@@ -36,7 +36,7 @@ jobs:
 
   # Scheduled/Manual: Recursive sync across multiple repos
   sync-maintainer-labels:
-    if: "github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'"
+    if: "github.repository == 'google-gemini/gemini-cli' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')"
     runs-on: 'ubuntu-latest'
     steps:
       - name: 'Checkout'

.github/workflows/label-workstream-rollup.yml

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

.github/workflows/pr-contribution-guidelines-notifier.yml

@@ -19,7 +19,7 @@ jobs:
           APP_ID: '${{ secrets.APP_ID }}'
         if: |-
           ${{ env.APP_ID != '' }}
-        uses: 'actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b' # ratchet:actions/create-github-app-token@v2
+        uses: 'actions/create-github-app-token@v2'
         with:
           app-id: '${{ secrets.APP_ID }}'
           private-key: '${{ secrets.PRIVATE_KEY }}'
@@ -35,9 +35,59 @@ jobs:
             const pr_number = context.payload.pull_request.number;
 
             // 1. Check if the PR author is a maintainer
+            // Check team membership (most reliable for private org members)
+            let isTeamMember = false;
+            const teams = ['gemini-cli-maintainers', 'gemini-cli-askmode-approvers', 'gemini-cli-docs'];
+            for (const team_slug of teams) {
+              try {
+                const members = await github.paginate(github.rest.teams.listMembersInOrg, {
+                  org: org,
+                  team_slug: team_slug
+                });
+                if (members.some(m => m.login.toLowerCase() === username.toLowerCase())) {
+                  isTeamMember = true;
+                  core.info(`${username} is a member of ${team_slug}. No notification needed.`);
+                  break;
+                }
+              } catch (e) {
+                core.warning(`Failed to fetch team members from ${team_slug}: ${e.message}`);
+              }
+            }
+
+            if (isTeamMember) return;
+
+            // Check author_association from webhook payload
             const authorAssociation = context.payload.pull_request.author_association;
-            if (['OWNER', 'MEMBER', 'COLLABORATOR'].includes(authorAssociation)) {
-              core.info(`${username} is a maintainer (Association: ${authorAssociation}). No notification needed.`);
+            const isRepoMaintainer = ['OWNER', 'MEMBER', 'COLLABORATOR'].includes(authorAssociation);
+
+            if (isRepoMaintainer) {
+              core.info(`${username} is a maintainer (author_association: ${authorAssociation}). No notification needed.`);
+              return;
+            }
+
+            // Check if author is a Googler
+            const isGoogler = async (login) => {
+              try {
+                const orgs = ['googlers', 'google'];
+                for (const org of orgs) {
+                  try {
+                    await github.rest.orgs.checkMembershipForUser({
+                      org: org,
+                      username: login
+                    });
+                    return true;
+                  } catch (e) {
+                    if (e.status !== 404) throw e;
+                  }
+                }
+              } catch (e) {
+                core.warning(`Failed to check org membership for ${login}: ${e.message}`);
+              }
+              return false;
+            };
+
+            if (await isGoogler(username)) {
+              core.info(`${username} is a Googler. No notification needed.`);
               return;
             }
 

.github/workflows/pr-rate-limiter.yaml

@@ -0,0 +1,29 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+
+name: 'PR rate limiter'
+
+permissions: {}
+
+on:
+  pull_request_target:
+    types:
+      - 'opened'
+      - 'reopened'
+
+jobs:
+  limit:
+    runs-on: 'gemini-cli-ubuntu-16-core'
+    permissions:
+      contents: 'read'
+      pull-requests: 'write'
+    steps:
+      - name: 'Limit open pull requests per user'
+        uses: 'Homebrew/actions/limit-pull-requests@9ceb7934560eb61d131dde205a6c2d77b2e1529d' # master
+        with:
+          except-author-associations: 'MEMBER,OWNER,COLLABORATOR'
+          comment-limit: 8
+          comment: >
+            You already have 7 pull requests open. Please work on getting
+            existing PRs merged before opening more.
+          close-limit: 8
+          close: true

.github/workflows/release-change-tags.yml

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

.github/workflows/release-manual.yml

@@ -47,6 +47,7 @@ on:
 
 jobs:
   release:
+    if: "github.repository == 'google-gemini/gemini-cli'"
     runs-on: 'ubuntu-latest'
     environment: "${{ github.event.inputs.environment || 'prod' }}"
     permissions:
@@ -110,6 +111,7 @@ jobs:
           wombat-token-cli: '${{ secrets.WOMBAT_TOKEN_CLI }}'
           wombat-token-a2a-server: '${{ secrets.WOMBAT_TOKEN_A2A_SERVER }}'
           github-token: '${{ secrets.GITHUB_TOKEN }}'
+          github-release-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
           dry-run: '${{ github.event.inputs.dry_run }}'
           previous-tag: '${{ steps.release_info.outputs.PREVIOUS_TAG }}'
           skip-github-release: '${{ github.event.inputs.skip_github_release }}'

.github/workflows/release-nightly.yml

@@ -124,6 +124,7 @@ jobs:
           wombat-token-cli: '${{ secrets.WOMBAT_TOKEN_CLI }}'
           wombat-token-a2a-server: '${{ secrets.WOMBAT_TOKEN_A2A_SERVER }}'
           github-token: '${{ secrets.GITHUB_TOKEN }}'
+          github-release-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
           dry-run: '${{ steps.vars.outputs.is_dry_run }}'
           previous-tag: '${{ steps.nightly_version.outputs.PREVIOUS_TAG }}'
           working-directory: './release'
@@ -144,7 +145,7 @@ jobs:
           branch-name: 'release/${{ steps.nightly_version.outputs.RELEASE_TAG }}'
           pr-title: 'chore/release: bump version to ${{ steps.nightly_version.outputs.RELEASE_VERSION }}'
           pr-body: 'Automated version bump for nightly release.'
-          github-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
+          github-token: '${{ secrets.GITHUB_TOKEN }}'
           dry-run: '${{ steps.vars.outputs.is_dry_run }}'
           working-directory: './release'
 

.github/workflows/release-notes.yml

@@ -0,0 +1,101 @@
+# This workflow is triggered on every new release.
+# It uses Gemini to generate release notes and creates a PR with the changes.
+name: 'Generate Release Notes'
+
+on:
+  release:
+    types: ['published']
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'New version (e.g., v1.2.3)'
+        required: true
+        type: 'string'
+      body:
+        description: 'Release notes body'
+        required: true
+        type: 'string'
+      time:
+        description: 'Release time'
+        required: true
+        type: 'string'
+
+jobs:
+  generate-release-notes:
+    if: "github.repository == 'google-gemini/gemini-cli'"
+    runs-on: 'ubuntu-latest'
+    permissions:
+      contents: 'write'
+      pull-requests: 'write'
+    steps:
+      - name: 'Checkout repository'
+        uses: 'actions/checkout@v4'
+        with:
+          # The user-level skills need to be available to the workflow
+          fetch-depth: 0
+          ref: 'main'
+
+      - name: 'Set up Node.js'
+        uses: 'actions/setup-node@v4'
+        with:
+          node-version: '20'
+
+      - name: 'Get release information'
+        id: 'release_info'
+        run: |
+          VERSION="${{ github.event.inputs.version || github.event.release.tag_name }}"
+          TIME="${{ github.event.inputs.time || github.event.release.created_at }}"
+
+          echo "VERSION=${VERSION}" >> "$GITHUB_OUTPUT"
+          echo "TIME=${TIME}" >> "$GITHUB_OUTPUT"
+
+          # Use a heredoc to preserve multiline release body
+          echo 'RAW_CHANGELOG<<EOF' >> "$GITHUB_OUTPUT"
+          printf "%s\n" "$BODY" >> "$GITHUB_OUTPUT"
+          echo 'EOF' >> "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
+          BODY: '${{ github.event.inputs.body || github.event.release.body }}'
+
+      - name: 'Validate version'
+        id: 'validate_version'
+        run: |
+          if echo "${{ steps.release_info.outputs.VERSION }}" | grep -q "nightly"; then
+            echo "Nightly release detected. Stopping workflow."
+            echo "CONTINUE=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "CONTINUE=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: 'Generate Changelog with Gemini'
+        if: "steps.validate_version.outputs.CONTINUE == 'true'"
+        uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0
+        with:
+          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
+          prompt: |
+            Activate the 'docs-changelog' skill.
+
+            **Release Information:**
+            - New Version: ${{ steps.release_info.outputs.VERSION }}
+            - Release Date: ${{ steps.release_info.outputs.TIME }}
+            - Raw Changelog Data: ${{ steps.release_info.outputs.RAW_CHANGELOG }}
+
+            Execute the release notes generation process using the information provided.
+
+            When you are done, please output your thought process and the steps you took for future debugging purposes.
+
+      - name: 'Create Pull Request'
+        if: "steps.validate_version.outputs.CONTINUE == 'true'"
+        uses: 'peter-evans/create-pull-request@v6'
+        with:
+          token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
+          commit-message: 'docs(changelog): update for ${{ steps.release_info.outputs.VERSION }}'
+          title: 'Changelog for ${{ steps.release_info.outputs.VERSION }}'
+          body: |
+            This PR contains the auto-generated changelog for the ${{ steps.release_info.outputs.VERSION }} release.
+
+            Please review and merge.
+          branch: 'changelog-${{ steps.release_info.outputs.VERSION }}'
+          base: 'main'
+          team-reviewers: 'gemini-cli-docs, gemini-cli-maintainers'
+          delete-branch: true

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

@@ -118,6 +118,7 @@ jobs:
           ORIGINAL_RELEASE_VERSION: '${{ steps.patch_version.outputs.RELEASE_VERSION }}'
           ORIGINAL_RELEASE_TAG: '${{ steps.patch_version.outputs.RELEASE_TAG }}'
           ORIGINAL_PREVIOUS_TAG: '${{ steps.patch_version.outputs.PREVIOUS_TAG }}'
+          VARS_CLI_PACKAGE_NAME: '${{ vars.CLI_PACKAGE_NAME }}'
         run: |
           echo "🔍 Verifying no concurrent patch releases have occurred..."
 
@@ -129,7 +130,7 @@ jobs:
 
           # Re-run the same version calculation script
           echo "Re-calculating version to check for changes..."
-          CURRENT_PATCH_JSON=$(node scripts/get-release-version.js --cli-package-name="${{vars.CLI_PACKAGE_NAME}}" --type=patch --patch-from="${CHANNEL}")
+          CURRENT_PATCH_JSON=$(node scripts/get-release-version.js --cli-package-name="${VARS_CLI_PACKAGE_NAME}" --type=patch --patch-from="${CHANNEL}")
           CURRENT_RELEASE_VERSION=$(echo "${CURRENT_PATCH_JSON}" | jq -r .releaseVersion)
           CURRENT_RELEASE_TAG=$(echo "${CURRENT_PATCH_JSON}" | jq -r .releaseTag)
           CURRENT_PREVIOUS_TAG=$(echo "${CURRENT_PATCH_JSON}" | jq -r .previousReleaseTag)
@@ -162,10 +163,15 @@ jobs:
       - name: 'Print Calculated Version'
         run: |-
           echo "Patch Release Summary:"
-          echo "  Release Version: ${{ steps.patch_version.outputs.RELEASE_VERSION }}"
-          echo "  Release Tag: ${{ steps.patch_version.outputs.RELEASE_TAG }}"
-          echo "  NPM Tag: ${{ steps.patch_version.outputs.NPM_TAG }}"
-          echo "  Previous Tag: ${{ steps.patch_version.outputs.PREVIOUS_TAG }}"
+          echo "  Release Version: ${STEPS_PATCH_VERSION_OUTPUTS_RELEASE_VERSION}"
+          echo "  Release Tag: ${STEPS_PATCH_VERSION_OUTPUTS_RELEASE_TAG}"
+          echo "  NPM Tag: ${STEPS_PATCH_VERSION_OUTPUTS_NPM_TAG}"
+          echo "  Previous Tag: ${STEPS_PATCH_VERSION_OUTPUTS_PREVIOUS_TAG}"
+        env:
+          STEPS_PATCH_VERSION_OUTPUTS_RELEASE_VERSION: '${{ steps.patch_version.outputs.RELEASE_VERSION }}'
+          STEPS_PATCH_VERSION_OUTPUTS_RELEASE_TAG: '${{ steps.patch_version.outputs.RELEASE_TAG }}'
+          STEPS_PATCH_VERSION_OUTPUTS_NPM_TAG: '${{ steps.patch_version.outputs.NPM_TAG }}'
+          STEPS_PATCH_VERSION_OUTPUTS_PREVIOUS_TAG: '${{ steps.patch_version.outputs.PREVIOUS_TAG }}'
 
       - name: 'Run Tests'
         if: "${{github.event.inputs.force_skip_tests != 'true'}}"
@@ -184,6 +190,7 @@ jobs:
           wombat-token-cli: '${{ secrets.WOMBAT_TOKEN_CLI }}'
           wombat-token-a2a-server: '${{ secrets.WOMBAT_TOKEN_A2A_SERVER }}'
           github-token: '${{ secrets.GITHUB_TOKEN }}'
+          github-release-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
           dry-run: '${{ github.event.inputs.dry_run }}'
           previous-tag: '${{ steps.patch_version.outputs.PREVIOUS_TAG }}'
           gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'

.github/workflows/release-promote.yml

@@ -239,6 +239,7 @@ jobs:
           wombat-token-cli: '${{ secrets.WOMBAT_TOKEN_CLI }}'
           wombat-token-a2a-server: '${{ secrets.WOMBAT_TOKEN_A2A_SERVER }}'
           github-token: '${{ secrets.GITHUB_TOKEN }}'
+          github-release-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
           dry-run: '${{ github.event.inputs.dry_run }}'
           previous-tag: '${{ needs.calculate-versions.outputs.PREVIOUS_PREVIEW_TAG }}'
           working-directory: './release'
@@ -305,6 +306,7 @@ jobs:
           wombat-token-cli: '${{ secrets.WOMBAT_TOKEN_CLI }}'
           wombat-token-a2a-server: '${{ secrets.WOMBAT_TOKEN_A2A_SERVER }}'
           github-token: '${{ secrets.GITHUB_TOKEN }}'
+          github-release-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
           dry-run: '${{ github.event.inputs.dry_run }}'
           previous-tag: '${{ needs.calculate-versions.outputs.PREVIOUS_STABLE_TAG }}'
           working-directory: './release'
@@ -360,23 +362,28 @@ jobs:
       - name: 'Create and switch to a new branch'
         id: 'release_branch'
         run: |
-          BRANCH_NAME="chore/nightly-version-bump-${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}"
+          BRANCH_NAME="chore/nightly-version-bump-${NEEDS_CALCULATE_VERSIONS_OUTPUTS_NEXT_NIGHTLY_VERSION}"
           git switch -c "${BRANCH_NAME}"
           echo "BRANCH_NAME=${BRANCH_NAME}" >> "${GITHUB_OUTPUT}"
+        env:
+          NEEDS_CALCULATE_VERSIONS_OUTPUTS_NEXT_NIGHTLY_VERSION: '${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}'
 
       - name: 'Update package versions'
-        run: 'npm run release:version "${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}"'
+        run: 'npm run release:version "${NEEDS_CALCULATE_VERSIONS_OUTPUTS_NEXT_NIGHTLY_VERSION}"'
+        env:
+          NEEDS_CALCULATE_VERSIONS_OUTPUTS_NEXT_NIGHTLY_VERSION: '${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}'
 
       - name: 'Commit and Push package versions'
         env:
           BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
           DRY_RUN: '${{ github.event.inputs.dry_run }}'
+          NEEDS_CALCULATE_VERSIONS_OUTPUTS_NEXT_NIGHTLY_VERSION: '${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}'
         run: |-
           git add package.json packages/*/package.json
           if [ -f package-lock.json ]; then
             git add package-lock.json
           fi
-          git commit -m "chore(release): bump version to ${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}"
+          git commit -m "chore(release): bump version to ${NEEDS_CALCULATE_VERSIONS_OUTPUTS_NEXT_NIGHTLY_VERSION}"
           if [[ "${DRY_RUN}" == "false" ]]; then
             echo "Pushing release branch to remote..."
             git push --set-upstream origin "${BRANCH_NAME}"
@@ -390,7 +397,7 @@ jobs:
           branch-name: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
           pr-title: 'chore(release): bump version to ${{ needs.calculate-versions.outputs.NEXT_NIGHTLY_VERSION }}'
           pr-body: 'Automated version bump to prepare for the next nightly release.'
-          github-token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
+          github-token: '${{ secrets.GITHUB_TOKEN }}'
           dry-run: '${{ github.event.inputs.dry_run }}'
 
       - name: 'Create Issue on Failure'

.github/workflows/release-rollback.yml

@@ -42,6 +42,7 @@ on:
 
 jobs:
   change-tags:
+    if: "github.repository == 'google-gemini/gemini-cli'"
     environment: "${{ github.event.inputs.environment || 'prod' }}"
     runs-on: 'ubuntu-latest'
     permissions:
@@ -203,7 +204,7 @@ jobs:
         run: |
           ROLLBACK_COMMIT=$(git rev-parse -q --verify "$TARGET_TAG")
           if [ "$ROLLBACK_COMMIT" != "$TARGET_HASH" ]; then
-            echo '❌ Failed to add tag $TARGET_TAG to commit $TARGET_HASH'
+            echo "❌ Failed to add tag ${TARGET_TAG} to commit ${TARGET_HASH}"
             echo '❌ This means the tag was not added, and the workflow should fail.'
             exit 1
           fi

.github/workflows/release-sandbox.yml

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

.github/workflows/smoke-test.yml

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

.github/workflows/trigger_e2e.yml

@@ -15,6 +15,7 @@ on:
 
 jobs:
   save_repo_name:
+    if: "github.repository == 'google-gemini/gemini-cli'"
     runs-on: 'gemini-cli-ubuntu-16-core'
     steps:
       - name: 'Save Repo name'
@@ -23,14 +24,15 @@ jobs:
           HEAD_SHA: '${{ github.event.inputs.head_sha || github.event.pull_request.head.sha }}'
         run: |
           mkdir -p ./pr
-          echo '${{ env.REPO_NAME }}' > ./pr/repo_name
-          echo '${{ env.HEAD_SHA }}' > ./pr/head_sha
+          echo "${REPO_NAME}" > ./pr/repo_name
+          echo "${HEAD_SHA}" > ./pr/head_sha
       - uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4
         with:
           name: 'repo_name'
           path: 'pr/'
   trigger_e2e:
     name: 'Trigger e2e'
+    if: "github.repository == 'google-gemini/gemini-cli'"
     runs-on: 'gemini-cli-ubuntu-16-core'
     steps:
       - id: 'trigger-e2e'

.github/workflows/verify-release.yml

@@ -28,8 +28,13 @@ on:
 
 jobs:
   verify-release:
+    if: "github.repository == 'google-gemini/gemini-cli'"
     environment: "${{ github.event.inputs.environment || 'prod' }}"
-    runs-on: 'ubuntu-latest'
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
+    runs-on: '${{ matrix.os }}'
     permissions:
       contents: 'read'
       packages: 'write'

.gitignore

@@ -46,6 +46,7 @@ packages/*/coverage/
 # Generated files
 packages/cli/src/generated/
 packages/core/src/generated/
+packages/devtools/src/_client-assets.ts
 .integration-tests/
 packages/vscode-ide-companion/*.vsix
 packages/cli/download-ripgrep*/
@@ -60,4 +61,4 @@ gemini-debug.log
 .genkit
 .gemini-clipboard/
 .eslintcache
-evals/logs/
+evals/logs/

.prettierignore

@@ -21,3 +21,4 @@ junit.xml
 Thumbs.db
 .pytest_cache
 **/SKILL.md
+packages/sdk/test-data/*.json

CONTRIBUTING.md

@@ -372,8 +372,7 @@ specific debug settings.
 
 ### React DevTools
 
-To debug the CLI's React-based UI, you can use React DevTools. Ink, the library
-used for the CLI's interface, is compatible with React DevTools version 4.x.
+To debug the CLI's React-based UI, you can use React DevTools.
 
 1.  **Start the Gemini CLI in development mode:**
 
@@ -381,20 +380,20 @@ used for the CLI's interface, is compatible with React DevTools version 4.x.
     DEV=true npm start
     ```
 
-2.  **Install and run React DevTools version 4.28.5 (or the latest compatible
-    4.x version):**
+2.  **Install and run React DevTools version 6 (which matches the CLI's
+    `react-devtools-core`):**
 
     You can either install it globally:
 
     ```bash
-    npm install -g react-devtools@4.28.5
+    npm install -g react-devtools@6
     react-devtools
     ```
 
     Or run it directly using npx:
 
     ```bash
-    npx react-devtools@4.28.5
+    npx react-devtools@6
     ```
 
     Your running CLI application should then connect to React DevTools.
@@ -408,12 +407,13 @@ On macOS, `gemini` uses Seatbelt (`sandbox-exec`) under a `permissive-open`
 profile (see `packages/cli/src/utils/sandbox-macos-permissive-open.sb`) that
 restricts writes to the project folder but otherwise allows all other operations
 and outbound network traffic ("open") by default. You can switch to a
-`restrictive-closed` profile (see
-`packages/cli/src/utils/sandbox-macos-restrictive-closed.sb`) that declines all
-operations and outbound network traffic ("closed") by default by setting
-`SEATBELT_PROFILE=restrictive-closed` in your environment or `.env` file.
-Available built-in profiles are `{permissive,restrictive}-{open,closed,proxied}`
-(see below for proxied networking). You can also switch to a custom profile
+`strict-open` profile (see
+`packages/cli/src/utils/sandbox-macos-strict-open.sb`) that restricts both reads
+and writes to the working directory while allowing outbound network traffic by
+setting `SEATBELT_PROFILE=strict-open` in your environment or `.env` file.
+Available built-in profiles are `permissive-{open,proxied}`,
+`restrictive-{open,proxied}`, and `strict-{open,proxied}` (see below for proxied
+networking). You can also switch to a custom profile
 `SEATBELT_PROFILE=<profile>` if you also create a file
 `.gemini/sandbox-macos-<profile>.sb` under your project settings directory
 `.gemini`.
@@ -545,7 +545,7 @@ Before submitting your documentation pull request, please:
 
 If you have questions about contributing documentation:
 
-- Check our [FAQ](/docs/faq.md).
+- Check our [FAQ](/docs/resources/faq.md).
 - Review existing documentation for examples.
 - Open [an issue](https://github.com/google-gemini/gemini-cli/issues) to discuss
   your proposed changes.

Dockerfile

@@ -42,7 +42,10 @@ USER node
 # install gemini-cli and clean up
 COPY packages/cli/dist/google-gemini-cli-*.tgz /tmp/gemini-cli.tgz
 COPY packages/core/dist/google-gemini-cli-core-*.tgz /tmp/gemini-core.tgz
-RUN npm install -g /tmp/gemini-cli.tgz /tmp/gemini-core.tgz \
+RUN npm install -g /tmp/gemini-core.tgz \
+  && npm install -g /tmp/gemini-cli.tgz \
+  && node -e "const fs=require('node:fs'); JSON.parse(fs.readFileSync('/usr/local/share/npm-global/lib/node_modules/@google/gemini-cli/package.json','utf8')); JSON.parse(fs.readFileSync('/usr/local/share/npm-global/lib/node_modules/@google/gemini-cli-core/package.json','utf8'));" \
+  && gemini --version > /dev/null \
   && npm cache clean --force \
   && rm -f /tmp/gemini-{cli,core}.tgz
 

GEMINI.md

@@ -47,20 +47,35 @@ powerful tool for developers.
     be relative to the workspace root, e.g.,
     `-w @google/gemini-cli-core -- src/routing/modelRouterService.test.ts`)
 - **Full Validation:** `npm run preflight` (Heaviest check; runs clean, install,
-  build, lint, type check, and tests. Recommended before submitting PRs.)
+  build, lint, type check, and tests. Recommended before submitting PRs. Due to
+  its long runtime, only run this at the very end of a code implementation task.
+  If it fails, use faster, targeted commands (e.g., `npm run test`,
+  `npm run lint`, or workspace-specific tests) to iterate on fixes before
+  re-running `preflight`. For simple, non-code changes like documentation or
+  prompting updates, skip `preflight` at the end of the task and wait for PR
+  validation.)
 - **Individual Checks:** `npm run lint` / `npm run format` / `npm run typecheck`
 
 ## Development Conventions
 
+- **Legacy Snippets:** `packages/core/src/prompts/snippets.legacy.ts` is a
+  snapshot of an older system prompt. Avoid changing the prompting verbiage to
+  preserve its historical behavior; however, structural changes to ensure
+  compilation or simplify the code are permitted.
 - **Contributions:** Follow the process outlined in `CONTRIBUTING.md`. Requires
   signing the Google CLA.
 - **Pull Requests:** Keep PRs small, focused, and linked to an existing issue.
+  Always activate the `pr-creator` skill for PR generation, even when using the
+  `gh` CLI.
 - **Commit Messages:** Follow the
   [Conventional Commits](https://www.conventionalcommits.org/) standard.
 - **Coding Style:** Adhere to existing patterns in `packages/cli` (React/Ink)
   and `packages/core` (Backend logic).
 - **Imports:** Use specific imports and avoid restricted relative imports
   between packages (enforced by ESLint).
+- **License Headers:** For all new source code files (`.ts`, `.tsx`, `.js`),
+  include the Apache-2.0 license header with the current year. (e.g.,
+  `Copyright 2026 Google LLC`). This is enforced by ESLint.
 
 ## Testing Conventions
 

README.md

@@ -29,10 +29,9 @@ Learn all about Gemini CLI in our [documentation](https://geminicli.com/docs/).
 
 ## 📦 Installation
 
-### Pre-requisites before installation
-
-- Node.js version 20 or higher
-- macOS, Linux, or Windows
+See
+[Gemini CLI installation, execution, and releases](./docs/get-started/installation.md)
+for recommended system specifications and a detailed installation guide.
 
 ### Quick Install
 
@@ -383,7 +382,7 @@ See the [Uninstall Guide](docs/cli/uninstall.md) for removal instructions.
 ## 📄 Legal
 
 - **License**: [Apache License 2.0](LICENSE)
-- **Terms of Service**: [Terms & Privacy](./docs/tos-privacy.md)
+- **Terms of Service**: [Terms & Privacy](./docs/resources/tos-privacy.md)
 - **Security**: [Security Policy](SECURITY.md)
 
 ---

docs/admin/enterprise-controls.md

@@ -0,0 +1,115 @@
+# Enterprise Admin Controls
+
+Gemini CLI empowers enterprise administrators to manage and enforce security
+policies and configuration settings across their entire organization. Secure
+defaults are enabled automatically for all enterprise users, but can be
+customized via the [Management Console](https://goo.gle/manage-gemini-cli).
+
+**Enterprise Admin Controls are enforced globally and cannot be overridden by
+users locally**, ensuring a consistent security posture.
+
+## Admin Controls vs. System Settings
+
+While [System-wide settings](../cli/settings.md) act as convenient configuration
+overrides, they can still be modified by users with sufficient privileges. In
+contrast, admin controls are immutable at the local level, making them the
+preferred method for enforcing policy.
+
+## Available Controls
+
+### Strict Mode
+
+**Enabled/Disabled** | Default: enabled
+
+If enabled, users will not be able to enter yolo mode.
+
+### Extensions
+
+**Enabled/Disabled** | Default: disabled
+
+If disabled, users will not be able to use or install extensions. See
+[Extensions](../extensions/index.md) for more details.
+
+### MCP
+
+#### Enabled/Disabled
+
+**Enabled/Disabled** | Default: disabled
+
+If disabled, users will not be able to use MCP servers. See
+[MCP Server Integration](../tools/mcp-server.md) for more details.
+
+#### MCP Servers (preview)
+
+**Default**: empty
+
+Allows administrators to define an explicit allowlist of MCP servers. This
+guarantees that users can only connect to trusted MCP servers defined by the
+organization.
+
+**Allowlist Format:**
+
+```json
+{
+  "mcpServers": {
+    "external-provider": {
+      "url": "https://api.mcp-provider.com",
+      "type": "sse",
+      "trust": true,
+      "includeTools": ["toolA", "toolB"],
+      "excludeTools": []
+    },
+    "internal-corp-tool": {
+      "url": "https://mcp.internal-tool.corp",
+      "type": "http",
+      "includeTools": [],
+      "excludeTools": ["adminTool"]
+    }
+  }
+}
+```
+
+**Supported Fields:**
+
+- `url`: (Required) The full URL of the MCP server endpoint.
+- `type`: (Required) The connection type (e.g., `sse` or `http`).
+- `trust`: (Optional) If set to `true`, the server is trusted and tool execution
+  will not require user approval.
+- `includeTools`: (Optional) An explicit list of tool names to allow. If
+  specified, only these tools will be available.
+- `excludeTools`: (Optional) A list of tool names to hide. These tools will be
+  blocked.
+
+**Client Enforcement Logic:**
+
+- **Empty Allowlist**: If the admin allowlist is empty, the client uses the
+  user’s local configuration as is (unless the MCP toggle above is disabled).
+- **Active Allowlist**: If the allowlist contains one or more servers, **all
+  locally configured servers not present in the allowlist are ignored**.
+- **Configuration Merging**: For a server to be active, it must exist in
+  **both** the admin allowlist and the user’s local configuration (matched by
+  name). The client merges these definitions as follows:
+  - **Override Fields**: The `url`, `type`, & `trust` are always taken from the
+    admin allowlist, overriding any local values.
+  - **Tools Filtering**: If `includeTools` or `excludeTools` are defined in the
+    allowlist, the admin’s rules are used exclusively. If both are undefined in
+    the admin allowlist, the client falls back to the user’s local tool
+    settings.
+  - **Cleared Fields**: To ensure security and consistency, the client
+    automatically clears local execution fields (`command`, `args`, `env`,
+    `cwd`, `httpUrl`, `tcp`). This prevents users from overriding the connection
+    method.
+  - **Other Fields**: All other MCP fields are pulled from the user’s local
+    configuration.
+- **Missing Allowlisted Servers**: If a server appears in the admin allowlist
+  but is missing from the local configuration, it will not be initialized. This
+  ensures users maintain final control over which permitted servers are actually
+  active in their environment.
+
+### Unmanaged Capabilities
+
+**Enabled/Disabled** | Default: disabled
+
+If disabled, users will not be able to use certain features. Currently, this
+control disables Agent Skills. See [Agent Skills](../cli/skills.md) for more
+details.

docs/architecture.md

@@ -1,80 +0,0 @@
-# Gemini CLI Architecture Overview
-
-This document provides a high-level overview of the Gemini CLI's architecture.
-
-## Core components
-
-The Gemini CLI is primarily composed of two main packages, along with a suite of
-tools that can be used by the system in the course of handling command-line
-input:
-
-1.  **CLI package (`packages/cli`):**
-    - **Purpose:** This contains the user-facing portion of the Gemini CLI, such
-      as handling the initial user input, presenting the final output, and
-      managing the overall user experience.
-    - **Key functions contained in the package:**
-      - [Input processing](/docs/cli/commands)
-      - History management
-      - Display rendering
-      - [Theme and UI customization](/docs/cli/themes)
-      - [CLI configuration settings](/docs/get-started/configuration)
-
-2.  **Core package (`packages/core`):**
-    - **Purpose:** This acts as the backend for the Gemini CLI. It receives
-      requests sent from `packages/cli`, orchestrates interactions with the
-      Gemini API, and manages the execution of available tools.
-    - **Key functions contained in the package:**
-      - API client for communicating with the Google Gemini API
-      - Prompt construction and management
-      - Tool registration and execution logic
-      - State management for conversations or sessions
-      - Server-side configuration
-
-3.  **Tools (`packages/core/src/tools/`):**
-    - **Purpose:** These are individual modules that extend the capabilities of
-      the Gemini model, allowing it to interact with the local environment
-      (e.g., file system, shell commands, web fetching).
-    - **Interaction:** `packages/core` invokes these tools based on requests
-      from the Gemini model.
-
-## Interaction flow
-
-A typical interaction with the Gemini CLI follows this flow:
-
-1.  **User input:** The user types a prompt or command into the terminal, which
-    is managed by `packages/cli`.
-2.  **Request to core:** `packages/cli` sends the user's input to
-    `packages/core`.
-3.  **Request processed:** The core package:
-    - Constructs an appropriate prompt for the Gemini API, possibly including
-      conversation history and available tool definitions.
-    - Sends the prompt to the Gemini API.
-4.  **Gemini API response:** The Gemini API processes the prompt and returns a
-    response. This response might be a direct answer or a request to use one of
-    the available tools.
-5.  **Tool execution (if applicable):**
-    - When the Gemini API requests a tool, the core package prepares to execute
-      it.
-    - If the requested tool can modify the file system or execute shell
-      commands, the user is first given details of the tool and its arguments,
-      and the user must approve the execution.
-    - Read-only operations, such as reading files, might not require explicit
-      user confirmation to proceed.
-    - Once confirmed, or if confirmation is not required, the core package
-      executes the relevant action within the relevant tool, and the result is
-      sent back to the Gemini API by the core package.
-    - The Gemini API processes the tool result and generates a final response.
-6.  **Response to CLI:** The core package sends the final response back to the
-    CLI package.
-7.  **Display to user:** The CLI package formats and displays the response to
-    the user in the terminal.
-
-## Key design principles
-
-- **Modularity:** Separating the CLI (frontend) from the Core (backend) allows
-  for independent development and potential future extensions (e.g., different
-  frontends for the same backend).
-- **Extensibility:** The tool system is designed to be extensible, allowing new
-  capabilities to be added.
-- **User experience:** The CLI focuses on providing a rich and interactive
-  terminal experience.

docs/changelogs/index.md

@@ -18,6 +18,83 @@ on GitHub.
 | [Preview](preview.md) | Experimental features ready for early feedback. |
 | [Stable](latest.md)   | Stable, recommended for general use.            |
 
+## Announcements: v0.30.0 - 2026-02-25
+
+- **SDK & Custom Skills:** Introduced the initial SDK package, enabling dynamic
+  system instructions, `SessionContext` for SDK tool calls, and support for
+  custom skills
+  ([#18861](https://github.com/google-gemini/gemini-cli/pull/18861) by
+  @mbleigh).
+- **Policy Engine Enhancements:** Added a new `--policy` flag for user-defined
+  policies, introduced strict seatbelt profiles, and deprecated
+  `--allowed-tools` in favor of the policy engine
+  ([#18500](https://github.com/google-gemini/gemini-cli/pull/18500) by
+  @allenhutchison).
+- **UI & Themes:** Added a generic searchable list for settings and extensions,
+  new Solarized themes, text wrapping for markdown tables, and a clean UI toggle
+  prototype ([#19064](https://github.com/google-gemini/gemini-cli/pull/19064) by
+  @rmedranollamas).
+- **Vim & Terminal Interaction:** Improved Vim support to feel more complete and
+  added support for Ctrl-Z terminal suspension
+  ([#18755](https://github.com/google-gemini/gemini-cli/pull/18755) by
+  @ppgranger, [#18931](https://github.com/google-gemini/gemini-cli/pull/18931)
+  by @scidomino).
+
+## Announcements: v0.29.0 - 2026-02-17
+
+- **Plan Mode:** A new comprehensive planning capability with `/plan`,
+  `enter_plan_mode` tool, and dedicated documentation
+  ([#17698](https://github.com/google-gemini/gemini-cli/pull/17698) by @Adib234,
+  [#18324](https://github.com/google-gemini/gemini-cli/pull/18324) by @jerop).
+- **Gemini 3 Default:** We've removed the preview flag and enabled Gemini 3 by
+  default for all users
+  ([#18414](https://github.com/google-gemini/gemini-cli/pull/18414) by
+  @sehoon38).
+- **Extension Exploration:** New UI and settings to explore and manage
+  extensions more easily
+  ([#18686](https://github.com/google-gemini/gemini-cli/pull/18686) by
+  @sripasg).
+- **Admin Control:** Administrators can now allowlist specific MCP server
+  configurations
+  ([#18311](https://github.com/google-gemini/gemini-cli/pull/18311) by
+  @skeshive).
+
+## Announcements: v0.28.0 - 2026-02-10
+
+- **Slash Command:** We've added a new `/prompt-suggest` slash command to help
+  you generate prompt suggestions
+  ([#17264](https://github.com/google-gemini/gemini-cli/pull/17264) by
+  @NTaylorMullen).
+- **IDE Support:** Gemini CLI now supports the Positron IDE
+  ([#15047](https://github.com/google-gemini/gemini-cli/pull/15047) by
+  @kapsner).
+- **Customization:** You can now use custom themes in extensions, and we've
+  implemented automatic theme switching based on your terminal's background
+  ([#17327](https://github.com/google-gemini/gemini-cli/pull/17327) by
+  @spencer426, [#17976](https://github.com/google-gemini/gemini-cli/pull/17976)
+  by @Abhijit-2592).
+- **Authentication:** We've added interactive and non-interactive consent for
+  OAuth, and you can now include your auth method in bug reports
+  ([#17699](https://github.com/google-gemini/gemini-cli/pull/17699) by
+  @ehedlund, [#17569](https://github.com/google-gemini/gemini-cli/pull/17569) by
+  @erikus).
+
+## Announcements: v0.27.0 - 2026-02-03
+
+- **Event-Driven Architecture:** The CLI now uses a new event-driven scheduler
+  for tool execution, resulting in a more responsive and performant experience
+  ([#17078](https://github.com/google-gemini/gemini-cli/pull/17078) by
+  @abhipatel12).
+- **Enhanced User Experience:** This release includes queued tool confirmations,
+  and expandable large text pastes for a smoother workflow.
+- **New `/rewind` Command:** Easily navigate your session history with the new
+  `/rewind` command
+  ([#15720](https://github.com/google-gemini/gemini-cli/pull/15720) by
+  @Adib234).
+- **Linux Clipboard Support:** You can now paste images on Linux with Wayland
+  and X11 ([#17144](https://github.com/google-gemini/gemini-cli/pull/17144) by
+  @devr0306).
+
 ## Announcements: v0.26.0 - 2026-01-27
 
 - **Agents and Skills:** We've introduced a new `skill-creator` skill
@@ -240,7 +317,8 @@ on GitHub.
 - **Experimental permission improvements:** We are now experimenting with a new
   policy engine in Gemini CLI. This allows users and administrators to create
   fine-grained policy for tool calls. Currently behind a flag. See
-  [policy engine documentation](../core/policy-engine.md) for more information.
+  [policy engine documentation](../reference/policy-engine.md) for more
+  information.
   - Blog:
     [https://allen.hutchison.org/2025/11/26/the-guardrails-of-autonomy/](https://allen.hutchison.org/2025/11/26/the-guardrails-of-autonomy/)
 - **Gemini 3 support for paid:** Gemini 3 support has been rolled out to all API

docs/changelogs/latest.md

@@ -1,6 +1,6 @@
-# Latest stable release: v0.26.0
+# Latest stable release: v0.30.1
 
-Released: January 27, 2026
+Released: February 27, 2026
 
 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -11,328 +11,326 @@ npm install -g @google/gemini-cli
 
 ## Highlights
 
-- **Enhanced Agent and Skill Capabilities:** This release introduces the new
-  `skill-creator` built-in skill, enables Agent Skills by default, and adds a
-  generalist agent to improve task routing. Security for skill installation has
-  also been enhanced with new consent prompts.
-- **Improved UI and UX:** A new "Rewind" feature lets you walk back through
-  conversation history. We've also added an `/introspect` command for debugging
-  and unified various shell confirmation dialogs for a more consistent user
-  experience.
-- **Core Stability and Performance:** This release includes significant
-  performance improvements, including a fix for PDF token estimation,
-  optimizations for large inputs, and prevention of OOM crashes. Key memory
-  management components like `LRUCache` have also been updated.
-- **Scheduler and Policy Refactoring:** The core tool scheduler has been
-  decoupled into distinct orchestration, policy, and confirmation components,
-  and we've added an experimental event-driven scheduler to improve performance
-  and reliability.
+- **SDK & Custom Skills**: Introduced the initial SDK package, dynamic system
+  instructions, `SessionContext` for SDK tool calls, and support for custom
+  skills.
+- **Policy Engine Enhancements**: Added a `--policy` flag for user-defined
+  policies, strict seatbelt profiles, and transitioned away from
+  `--allowed-tools`.
+- **UI & Themes**: Introduced a generic searchable list for settings and
+  extensions, added Solarized Dark and Light themes, text wrapping capabilities
+  to markdown tables, and a clean UI toggle prototype.
+- **Vim Support & Ctrl-Z**: Improved Vim support to provide a more complete
+  experience and added support for Ctrl-Z suspension.
+- **Plan Mode & Tools**: Plan Mode now supports project exploration without
+  planning and skills can be enabled in plan mode. Tool output masking is
+  enabled by default, and core tool definitions have been centralized.
 
 ## What's Changed
 
-- fix: PDF token estimation (#16494) by @korade-krushna in
-  [#16527](https://github.com/google-gemini/gemini-cli/pull/16527)
-- chore(release): bump version to 0.26.0-nightly.20260114.bb6c57414 by
+- fix(patch): cherry-pick 58df1c6 to release/v0.30.0-pr-20374 [CONFLICTS] by
   @gemini-cli-robot in
-  [#16604](https://github.com/google-gemini/gemini-cli/pull/16604)
-- docs: clarify F12 to open debug console by @jackwotherspoon in
-  [#16570](https://github.com/google-gemini/gemini-cli/pull/16570)
-- docs: Remove .md extension from internal links in architecture.md by
-  @medic-code in
-  [#12899](https://github.com/google-gemini/gemini-cli/pull/12899)
-- Add an experimental setting for extension config by @chrstnb in
-  [#16506](https://github.com/google-gemini/gemini-cli/pull/16506)
-- feat: add Rewind Confirmation dialog and Rewind Viewer component by @Adib234
-  in [#15717](https://github.com/google-gemini/gemini-cli/pull/15717)
-- fix(a2a): Don't throw errors for GeminiEventType Retry and InvalidStream. by
-  @ehedlund in [#16541](https://github.com/google-gemini/gemini-cli/pull/16541)
-- prefactor: add rootCommands as array so it can be used for policy parsing by
-  @abhipatel12 in
-  [#16640](https://github.com/google-gemini/gemini-cli/pull/16640)
-- remove unnecessary \x7f key bindings by @scidomino in
-  [#16646](https://github.com/google-gemini/gemini-cli/pull/16646)
-- docs(skills): use body-file in pr-creator skill for better reliability by
-  @abhipatel12 in
-  [#16642](https://github.com/google-gemini/gemini-cli/pull/16642)
-- chore(automation): recursive labeling for workstream descendants by @bdmorgan
-  in [#16609](https://github.com/google-gemini/gemini-cli/pull/16609)
-- feat: introduce 'skill-creator' built-in skill and CJS management tools by
-  @NTaylorMullen in
-  [#16394](https://github.com/google-gemini/gemini-cli/pull/16394)
-- chore(automation): remove automated PR size and complexity labeler by
-  @bdmorgan in [#16648](https://github.com/google-gemini/gemini-cli/pull/16648)
-- refactor(skills): replace 'project' with 'workspace' scope by @NTaylorMullen
-  in [#16380](https://github.com/google-gemini/gemini-cli/pull/16380)
-- Docs: Update release notes for 1/13/2026 by @jkcinouye in
-  [#16583](https://github.com/google-gemini/gemini-cli/pull/16583)
-- Simplify paste handling by @scidomino in
-  [#16654](https://github.com/google-gemini/gemini-cli/pull/16654)
-- chore(automation): improve scheduled issue triage discovery and throughput by
-  @bdmorgan in [#16652](https://github.com/google-gemini/gemini-cli/pull/16652)
-- fix(acp): run exit cleanup when stdin closes by @codefromthecrypt in
-  [#14953](https://github.com/google-gemini/gemini-cli/pull/14953)
-- feat(scheduler): add types needed for event driven scheduler by @abhipatel12
-  in [#16641](https://github.com/google-gemini/gemini-cli/pull/16641)
-- Remove unused rewind key binding by @scidomino in
-  [#16659](https://github.com/google-gemini/gemini-cli/pull/16659)
-- Remove sequence binding by @scidomino in
-  [#16664](https://github.com/google-gemini/gemini-cli/pull/16664)
-- feat(cli): undeprecate the --prompt flag by @alexaustin007 in
-  [#13981](https://github.com/google-gemini/gemini-cli/pull/13981)
-- chore: update dependabot configuration by @cosmopax in
-  [#13507](https://github.com/google-gemini/gemini-cli/pull/13507)
-- feat(config): add 'auto' alias for default model selection by @sehoon38 in
-  [#16661](https://github.com/google-gemini/gemini-cli/pull/16661)
-- Enable & disable agents by @sehoon38 in
-  [#16225](https://github.com/google-gemini/gemini-cli/pull/16225)
-- cleanup: Improve keybindings by @scidomino in
-  [#16672](https://github.com/google-gemini/gemini-cli/pull/16672)
-- Add timeout for shell-utils to prevent hangs. by @jacob314 in
-  [#16667](https://github.com/google-gemini/gemini-cli/pull/16667)
-- feat(plan): add experimental plan flag by @jerop in
-  [#16650](https://github.com/google-gemini/gemini-cli/pull/16650)
-- feat(cli): add security consent prompts for skill installation by
-  @NTaylorMullen in
-  [#16549](https://github.com/google-gemini/gemini-cli/pull/16549)
-- fix: replace 3 consecutive periods with ellipsis character by @Vist233 in
-  [#16587](https://github.com/google-gemini/gemini-cli/pull/16587)
-- chore(automation): ensure status/need-triage is applied and never cleared
-  automatically by @bdmorgan in
-  [#16657](https://github.com/google-gemini/gemini-cli/pull/16657)
-- fix: Handle colons in skill description frontmatter by @maru0804 in
-  [#16345](https://github.com/google-gemini/gemini-cli/pull/16345)
-- refactor(core): harden skill frontmatter parsing by @NTaylorMullen in
-  [#16705](https://github.com/google-gemini/gemini-cli/pull/16705)
-- feat(skills): add conflict detection and warnings for skill overrides by
-  @NTaylorMullen in
-  [#16709](https://github.com/google-gemini/gemini-cli/pull/16709)
-- feat(scheduler): add SchedulerStateManager for reactive tool state by
-  @abhipatel12 in
-  [#16651](https://github.com/google-gemini/gemini-cli/pull/16651)
-- chore(automation): enforce 'help wanted' label permissions and update
-  guidelines by @bdmorgan in
-  [#16707](https://github.com/google-gemini/gemini-cli/pull/16707)
-- fix(core): resolve circular dependency via tsconfig paths by @sehoon38 in
-  [#16730](https://github.com/google-gemini/gemini-cli/pull/16730)
-- chore/release: bump version to 0.26.0-nightly.20260115.6cb3ae4e0 by
+  [#20567](https://github.com/google-gemini/gemini-cli/pull/20567)
+- feat(ux): added text wrapping capabilities to markdown tables by @devr0306 in
+  [#18240](https://github.com/google-gemini/gemini-cli/pull/18240)
+- Revert "fix(mcp): ensure MCP transport is closed to prevent memory leaks" by
+  @skeshive in [#18771](https://github.com/google-gemini/gemini-cli/pull/18771)
+- chore(release): bump version to 0.30.0-nightly.20260210.a2174751d by
   @gemini-cli-robot in
-  [#16738](https://github.com/google-gemini/gemini-cli/pull/16738)
-- fix(automation): correct status/need-issue label matching wildcard by
-  @bdmorgan in [#16727](https://github.com/google-gemini/gemini-cli/pull/16727)
-- fix(automation): prevent label-enforcer loop by ignoring all bots by @bdmorgan
-  in [#16746](https://github.com/google-gemini/gemini-cli/pull/16746)
-- Add links to supported locations and minor fixes by @g-samroberts in
-  [#16476](https://github.com/google-gemini/gemini-cli/pull/16476)
-- feat(policy): add source tracking to policy rules by @allenhutchison in
-  [#16670](https://github.com/google-gemini/gemini-cli/pull/16670)
-- feat(automation): enforce '🔒 maintainer only' and fix bot loop by @bdmorgan
-  in [#16751](https://github.com/google-gemini/gemini-cli/pull/16751)
-- Make merged settings non-nullable and fix all lints related to that. by
-  @jacob314 in [#16647](https://github.com/google-gemini/gemini-cli/pull/16647)
-- fix(core): prevent ModelInfo event emission on aborted signal by @sehoon38 in
-  [#16752](https://github.com/google-gemini/gemini-cli/pull/16752)
-- Replace relative paths to fix website build by @chrstnb in
-  [#16755](https://github.com/google-gemini/gemini-cli/pull/16755)
-- Restricting to localhost by @cocosheng-g in
-  [#16548](https://github.com/google-gemini/gemini-cli/pull/16548)
-- fix(cli): add explicit dependency on color-convert by @sehoon38 in
-  [#16757](https://github.com/google-gemini/gemini-cli/pull/16757)
-- fix(automation): robust label enforcement with permission checks by @bdmorgan
-  in [#16762](https://github.com/google-gemini/gemini-cli/pull/16762)
-- fix(cli): prevent OOM crash by limiting file search traversal and adding
-  timeout by @galz10 in
-  [#16696](https://github.com/google-gemini/gemini-cli/pull/16696)
-- fix(cli): safely handle /dev/tty access on macOS by @korade-krushna in
-  [#16531](https://github.com/google-gemini/gemini-cli/pull/16531)
-- docs: clarify workspace test execution in GEMINI.md by @mattKorwel in
-  [#16764](https://github.com/google-gemini/gemini-cli/pull/16764)
-- Add support for running available commands prior to MCP servers loading by
-  @Adib234 in [#15596](https://github.com/google-gemini/gemini-cli/pull/15596)
-- feat(plan): add experimental 'plan' approval mode by @jerop in
-  [#16753](https://github.com/google-gemini/gemini-cli/pull/16753)
-- feat(scheduler): add functional awaitConfirmation utility by @abhipatel12 in
-  [#16721](https://github.com/google-gemini/gemini-cli/pull/16721)
-- fix(infra): update maintainer rollup label to 'workstream-rollup' by @bdmorgan
-  in [#16809](https://github.com/google-gemini/gemini-cli/pull/16809)
-- fix(infra): use GraphQL to detect direct parents in rollup workflow by
-  @bdmorgan in [#16811](https://github.com/google-gemini/gemini-cli/pull/16811)
-- chore(workflows): rename label-workstream-rollup workflow by @bdmorgan in
-  [#16818](https://github.com/google-gemini/gemini-cli/pull/16818)
-- skip simple-mcp-server.test.ts by @scidomino in
-  [#16842](https://github.com/google-gemini/gemini-cli/pull/16842)
-- Steer outer agent to use expert subagents when present by @gundermanc in
-  [#16763](https://github.com/google-gemini/gemini-cli/pull/16763)
-- Fix race condition by awaiting scheduleToolCalls by @chrstnb in
-  [#16759](https://github.com/google-gemini/gemini-cli/pull/16759)
-- cleanup: Organize key bindings by @scidomino in
-  [#16798](https://github.com/google-gemini/gemini-cli/pull/16798)
-- feat(core): Add generalist agent. by @joshualitt in
-  [#16638](https://github.com/google-gemini/gemini-cli/pull/16638)
-- perf(ui): optimize text buffer and highlighting for large inputs by
+  [#18772](https://github.com/google-gemini/gemini-cli/pull/18772)
+- chore: cleanup unused and add unlisted dependencies in packages/core by
+  @adamfweidman in
+  [#18762](https://github.com/google-gemini/gemini-cli/pull/18762)
+- chore(core): update activate_skill prompt verbiage to be more direct by
   @NTaylorMullen in
-  [#16782](https://github.com/google-gemini/gemini-cli/pull/16782)
-- fix(core): fix PTY descriptor shell leak by @galz10 in
-  [#16773](https://github.com/google-gemini/gemini-cli/pull/16773)
-- feat(plan): enforce strict read-only policy and halt execution on violation by
-  @jerop in [#16849](https://github.com/google-gemini/gemini-cli/pull/16849)
-- remove need-triage label from bug_report template by @sehoon38 in
-  [#16864](https://github.com/google-gemini/gemini-cli/pull/16864)
-- fix(core): truncate large telemetry log entries by @sehoon38 in
-  [#16769](https://github.com/google-gemini/gemini-cli/pull/16769)
-- docs(extensions): add Agent Skills support and mark feature as experimental by
-  @NTaylorMullen in
-  [#16859](https://github.com/google-gemini/gemini-cli/pull/16859)
-- fix(core): surface warnings for invalid hook event names in configuration
-  (#16788) by @sehoon38 in
-  [#16873](https://github.com/google-gemini/gemini-cli/pull/16873)
-- feat(plan): remove read_many_files from approval mode policies by @jerop in
-  [#16876](https://github.com/google-gemini/gemini-cli/pull/16876)
-- feat(admin): implement admin controls polling and restart prompt by @skeshive
-  in [#16627](https://github.com/google-gemini/gemini-cli/pull/16627)
-- Remove LRUCache class migrating to mnemoist by @jacob314 in
-  [#16872](https://github.com/google-gemini/gemini-cli/pull/16872)
-- feat(settings): rename negative settings to positive naming (disable* ->
-  enable*) by @afarber in
-  [#14142](https://github.com/google-gemini/gemini-cli/pull/14142)
-- refactor(cli): unify shell confirmation dialogs by @NTaylorMullen in
-  [#16828](https://github.com/google-gemini/gemini-cli/pull/16828)
-- feat(agent): enable agent skills by default by @NTaylorMullen in
-  [#16736](https://github.com/google-gemini/gemini-cli/pull/16736)
-- refactor(core): foundational truncation refactoring and token estimation
-  optimization by @NTaylorMullen in
-  [#16824](https://github.com/google-gemini/gemini-cli/pull/16824)
-- fix(hooks): enable /hooks disable to reliably stop single hooks by
-  @abhipatel12 in
-  [#16804](https://github.com/google-gemini/gemini-cli/pull/16804)
-- Don't commit unless user asks us to. by @gundermanc in
-  [#16902](https://github.com/google-gemini/gemini-cli/pull/16902)
-- chore: remove a2a-adapter and bump @a2a-js/sdk to 0.3.8 by @adamfweidman in
-  [#16800](https://github.com/google-gemini/gemini-cli/pull/16800)
-- fix: Show experiment values in settings UI for compressionThreshold by
-  @ishaanxgupta in
-  [#16267](https://github.com/google-gemini/gemini-cli/pull/16267)
-- feat(cli): replace relative keyboard shortcuts link with web URL by
-  @imaliabbas in
-  [#16479](https://github.com/google-gemini/gemini-cli/pull/16479)
-- fix(core): resolve PKCE length issue and stabilize OAuth redirect port by
-  @sehoon38 in [#16815](https://github.com/google-gemini/gemini-cli/pull/16815)
-- Delete rewind documentation for now by @Adib234 in
-  [#16932](https://github.com/google-gemini/gemini-cli/pull/16932)
-- Stabilize skill-creator CI and package format by @NTaylorMullen in
-  [#17001](https://github.com/google-gemini/gemini-cli/pull/17001)
-- Stabilize the git evals by @gundermanc in
-  [#16989](https://github.com/google-gemini/gemini-cli/pull/16989)
-- fix(core): attempt compression before context overflow check by @NTaylorMullen
-  in [#16914](https://github.com/google-gemini/gemini-cli/pull/16914)
-- Fix inverted logic. by @gundermanc in
-  [#17007](https://github.com/google-gemini/gemini-cli/pull/17007)
-- chore(scripts): add duplicate issue closer script and fix lint errors by
-  @bdmorgan in [#16997](https://github.com/google-gemini/gemini-cli/pull/16997)
-- docs: update README and config guide to reference Gemini 3 by @JayadityaGit in
-  [#15806](https://github.com/google-gemini/gemini-cli/pull/15806)
-- fix(cli): correct Homebrew installation detection by @kij in
-  [#14727](https://github.com/google-gemini/gemini-cli/pull/14727)
-- Demote git evals to nightly run. by @gundermanc in
-  [#17030](https://github.com/google-gemini/gemini-cli/pull/17030)
-- fix(cli): use OSC-52 clipboard copy in Windows Terminal by @Thomas-Shephard in
-  [#16920](https://github.com/google-gemini/gemini-cli/pull/16920)
-- Fix: Process all parts in response chunks when thought is first by @pyrytakala
-  in [#13539](https://github.com/google-gemini/gemini-cli/pull/13539)
-- fix(automation): fix jq quoting error in pr-triage.sh by @Kimsoo0119 in
-  [#16958](https://github.com/google-gemini/gemini-cli/pull/16958)
-- refactor(core): decouple scheduler into orchestration, policy, and
-  confirmation by @abhipatel12 in
-  [#16895](https://github.com/google-gemini/gemini-cli/pull/16895)
-- feat: add /introspect slash command by @NTaylorMullen in
-  [#17048](https://github.com/google-gemini/gemini-cli/pull/17048)
-- refactor(cli): centralize tool mapping and decouple legacy scheduler by
-  @abhipatel12 in
-  [#17044](https://github.com/google-gemini/gemini-cli/pull/17044)
-- fix(ui): ensure rationale renders before tool calls by @NTaylorMullen in
-  [#17043](https://github.com/google-gemini/gemini-cli/pull/17043)
-- fix(workflows): use author_association for maintainer check by @bdmorgan in
-  [#17060](https://github.com/google-gemini/gemini-cli/pull/17060)
-- fix return type of fireSessionStartEvent to defaultHookOutput by @ved015 in
-  [#16833](https://github.com/google-gemini/gemini-cli/pull/16833)
-- feat(cli): add experiment gate for event-driven scheduler by @abhipatel12 in
-  [#17055](https://github.com/google-gemini/gemini-cli/pull/17055)
-- feat(core): improve shell redirection transparency and security by
-  @NTaylorMullen in
-  [#16486](https://github.com/google-gemini/gemini-cli/pull/16486)
-- fix(core): deduplicate ModelInfo emission in GeminiClient by @NTaylorMullen in
-  [#17075](https://github.com/google-gemini/gemini-cli/pull/17075)
-- docs(themes): remove unsupported DiffModified color key by @jw409 in
-  [#17073](https://github.com/google-gemini/gemini-cli/pull/17073)
-- fix: update currentSequenceModel when modelChanged by @adamfweidman in
-  [#17051](https://github.com/google-gemini/gemini-cli/pull/17051)
-- feat(core): enhanced anchored iterative context compression with
-  self-verification by @rmedranollamas in
-  [#15710](https://github.com/google-gemini/gemini-cli/pull/15710)
-- Fix mcp instructions by @chrstnb in
-  [#16439](https://github.com/google-gemini/gemini-cli/pull/16439)
-- [A2A] Disable checkpointing if git is not installed by @cocosheng-g in
-  [#16896](https://github.com/google-gemini/gemini-cli/pull/16896)
-- feat(admin): set admin.skills.enabled based on advancedFeaturesEnabled setting
-  by @skeshive in
-  [#17095](https://github.com/google-gemini/gemini-cli/pull/17095)
-- Test coverage for hook exit code cases by @gundermanc in
-  [#17041](https://github.com/google-gemini/gemini-cli/pull/17041)
-- Revert "Revert "Update extension examples"" by @chrstnb in
-  [#16445](https://github.com/google-gemini/gemini-cli/pull/16445)
-- fix(core): Provide compact, actionable errors for agent delegation failures by
+  [#18605](https://github.com/google-gemini/gemini-cli/pull/18605)
+- Add autoconfigure memory usage setting to the dialog by @jacob314 in
+  [#18510](https://github.com/google-gemini/gemini-cli/pull/18510)
+- fix(core): prevent race condition in policy persistence by @braddux in
+  [#18506](https://github.com/google-gemini/gemini-cli/pull/18506)
+- fix(evals): prevent false positive in hierarchical memory test by
+  @Abhijit-2592 in
+  [#18777](https://github.com/google-gemini/gemini-cli/pull/18777)
+- test(evals): mark all `save_memory` evals as `USUALLY_PASSES` due to
+  unreliability by @jerop in
+  [#18786](https://github.com/google-gemini/gemini-cli/pull/18786)
+- feat(cli): add setting to hide shortcuts hint UI by @LyalinDotCom in
+  [#18562](https://github.com/google-gemini/gemini-cli/pull/18562)
+- feat(core): formalize 5-phase sequential planning workflow by @jerop in
+  [#18759](https://github.com/google-gemini/gemini-cli/pull/18759)
+- Introduce limits for search results. by @gundermanc in
+  [#18767](https://github.com/google-gemini/gemini-cli/pull/18767)
+- fix(cli): allow closing debug console after auto-open via flicker by
   @SandyTao520 in
-  [#16493](https://github.com/google-gemini/gemini-cli/pull/16493)
-- fix: migrate BeforeModel and AfterModel hooks to HookSystem by @ved015 in
-  [#16599](https://github.com/google-gemini/gemini-cli/pull/16599)
-- feat(admin): apply admin settings to gemini skills/mcp/extensions commands by
-  @skeshive in [#17102](https://github.com/google-gemini/gemini-cli/pull/17102)
-- fix(core): update telemetry token count after session resume by @psinha40898
-  in [#15491](https://github.com/google-gemini/gemini-cli/pull/15491)
-- Demote the subagent test to nightly by @gundermanc in
-  [#17105](https://github.com/google-gemini/gemini-cli/pull/17105)
-- feat(plan): telemetry to track adoption and usage of plan mode by @Adib234 in
-  [#16863](https://github.com/google-gemini/gemini-cli/pull/16863)
-- feat: Add flash lite utility fallback chain by @adamfweidman in
-  [#17056](https://github.com/google-gemini/gemini-cli/pull/17056)
-- Fixes Windows crash: "Cannot resize a pty that has already exited" by @dzammit
-  in [#15757](https://github.com/google-gemini/gemini-cli/pull/15757)
-- feat(core): Add initial eval for generalist agent. by @joshualitt in
-  [#16856](https://github.com/google-gemini/gemini-cli/pull/16856)
-- feat(core): unify agent enabled and disabled flags by @SandyTao520 in
-  [#17127](https://github.com/google-gemini/gemini-cli/pull/17127)
-- fix(core): resolve auto model in default strategy by @sehoon38 in
-  [#17116](https://github.com/google-gemini/gemini-cli/pull/17116)
-- docs: update project context and pr-creator workflow by @NTaylorMullen in
-  [#17119](https://github.com/google-gemini/gemini-cli/pull/17119)
-- fix(cli): send gemini-cli version as mcp client version by @dsp in
-  [#13407](https://github.com/google-gemini/gemini-cli/pull/13407)
-- fix(cli): resolve Ctrl+Enter and Ctrl+J newline issues by @imadraude in
-  [#17021](https://github.com/google-gemini/gemini-cli/pull/17021)
-- Remove missing sidebar item by @chrstnb in
-  [#17145](https://github.com/google-gemini/gemini-cli/pull/17145)
-- feat(core): Ensure all properties in hooks object are event names. by
-  @joshualitt in
-  [#16870](https://github.com/google-gemini/gemini-cli/pull/16870)
-- fix(cli): fix newline support broken in previous PR by @scidomino in
-  [#17159](https://github.com/google-gemini/gemini-cli/pull/17159)
-- Add interactive ValidationDialog for handling 403 VALIDATION_REQUIRED errors.
-  by @gsquared94 in
-  [#16231](https://github.com/google-gemini/gemini-cli/pull/16231)
-- Add Esc-Esc to clear prompt when it's not empty by @Adib234 in
-  [#17131](https://github.com/google-gemini/gemini-cli/pull/17131)
-- Avoid spurious warnings about unexpected renders triggered by appEvents and
-  coreEvents. by @jacob314 in
-  [#17160](https://github.com/google-gemini/gemini-cli/pull/17160)
-- fix(cli): resolve home/end keybinding conflict by @scidomino in
-  [#17124](https://github.com/google-gemini/gemini-cli/pull/17124)
-- fix(cli): display 'http' type on mcp list by @pamanta in
-  [#16915](https://github.com/google-gemini/gemini-cli/pull/16915)
-- fix bad fallback logic external editor logic by @scidomino in
-  [#17166](https://github.com/google-gemini/gemini-cli/pull/17166)
-- Fix bug where System scopes weren't migrated. by @jacob314 in
-  [#17174](https://github.com/google-gemini/gemini-cli/pull/17174)
-- Fix mcp tool lookup in tool registry by @werdnum in
-  [#17054](https://github.com/google-gemini/gemini-cli/pull/17054)
+  [#18795](https://github.com/google-gemini/gemini-cli/pull/18795)
+- feat(masking): enable tool output masking by default by @abhipatel12 in
+  [#18564](https://github.com/google-gemini/gemini-cli/pull/18564)
+- perf(ui): optimize table rendering by memoizing styled characters by @devr0306
+  in [#18770](https://github.com/google-gemini/gemini-cli/pull/18770)
+- feat: multi-line text answers in ask-user tool by @jackwotherspoon in
+  [#18741](https://github.com/google-gemini/gemini-cli/pull/18741)
+- perf(cli): truncate large debug logs and limit message history by @mattKorwel
+  in [#18663](https://github.com/google-gemini/gemini-cli/pull/18663)
+- fix(core): complete MCP discovery when configured servers are skipped by
+  @LyalinDotCom in
+  [#18586](https://github.com/google-gemini/gemini-cli/pull/18586)
+- fix(core): cache CLI version to ensure consistency during sessions by
+  @sehoon38 in [#18793](https://github.com/google-gemini/gemini-cli/pull/18793)
+- fix(cli): resolve double rendering in shpool and address vscode lint warnings
+  by @braddux in
+  [#18704](https://github.com/google-gemini/gemini-cli/pull/18704)
+- feat(plan): document and validate Plan Mode policy overrides by @jerop in
+  [#18825](https://github.com/google-gemini/gemini-cli/pull/18825)
+- Fix pressing any key to exit select mode. by @jacob314 in
+  [#18421](https://github.com/google-gemini/gemini-cli/pull/18421)
+- fix(cli): update F12 behavior to only open drawer if browser fails by
+  @SandyTao520 in
+  [#18829](https://github.com/google-gemini/gemini-cli/pull/18829)
+- feat(plan): allow skills to be enabled in plan mode by @Adib234 in
+  [#18817](https://github.com/google-gemini/gemini-cli/pull/18817)
+- docs(plan): add documentation for plan mode tools by @jerop in
+  [#18827](https://github.com/google-gemini/gemini-cli/pull/18827)
+- Remove experimental note in extension settings docs by @chrstnb in
+  [#18822](https://github.com/google-gemini/gemini-cli/pull/18822)
+- Update prompt and grep tool definition to limit context size by @gundermanc in
+  [#18780](https://github.com/google-gemini/gemini-cli/pull/18780)
+- docs(plan): add `ask_user` tool documentation by @jerop in
+  [#18830](https://github.com/google-gemini/gemini-cli/pull/18830)
+- Revert unintended credentials exposure by @Adib234 in
+  [#18840](https://github.com/google-gemini/gemini-cli/pull/18840)
+- feat(core): update internal utility models to Gemini 3 by @SandyTao520 in
+  [#18773](https://github.com/google-gemini/gemini-cli/pull/18773)
+- feat(a2a): add value-resolver for auth credential resolution by @adamfweidman
+  in [#18653](https://github.com/google-gemini/gemini-cli/pull/18653)
+- Removed getPlainTextLength by @devr0306 in
+  [#18848](https://github.com/google-gemini/gemini-cli/pull/18848)
+- More grep prompt tweaks by @gundermanc in
+  [#18846](https://github.com/google-gemini/gemini-cli/pull/18846)
+- refactor(cli): Reactive useSettingsStore hook by @psinha40898 in
+  [#14915](https://github.com/google-gemini/gemini-cli/pull/14915)
+- fix(mcp): Ensure that stdio MCP server execution has the `GEMINI_CLI=1` env
+  variable populated. by @richieforeman in
+  [#18832](https://github.com/google-gemini/gemini-cli/pull/18832)
+- fix(core): improve headless mode detection for flags and query args by @galz10
+  in [#18855](https://github.com/google-gemini/gemini-cli/pull/18855)
+- refactor(cli): simplify UI and remove legacy inline tool confirmation logic by
+  @abhipatel12 in
+  [#18566](https://github.com/google-gemini/gemini-cli/pull/18566)
+- feat(cli): deprecate --allowed-tools and excludeTools in favor of policy
+  engine by @Abhijit-2592 in
+  [#18508](https://github.com/google-gemini/gemini-cli/pull/18508)
+- fix(workflows): improve maintainer detection for automated PR actions by
+  @bdmorgan in [#18869](https://github.com/google-gemini/gemini-cli/pull/18869)
+- refactor(cli): consolidate useToolScheduler and delete legacy implementation
+  by @abhipatel12 in
+  [#18567](https://github.com/google-gemini/gemini-cli/pull/18567)
+- Update changelog for v0.28.0 and v0.29.0-preview0 by @g-samroberts in
+  [#18819](https://github.com/google-gemini/gemini-cli/pull/18819)
+- fix(core): ensure sub-agents are registered regardless of tools.allowed by
+  @mattKorwel in
+  [#18870](https://github.com/google-gemini/gemini-cli/pull/18870)
+- Show notification when there's a conflict with an extensions command by
+  @chrstnb in [#17890](https://github.com/google-gemini/gemini-cli/pull/17890)
+- fix(cli): dismiss '?' shortcuts help on hotkeys and active states by
+  @LyalinDotCom in
+  [#18583](https://github.com/google-gemini/gemini-cli/pull/18583)
+- fix(core): prioritize conditional policy rules and harden Plan Mode by
+  @Abhijit-2592 in
+  [#18882](https://github.com/google-gemini/gemini-cli/pull/18882)
+- feat(core): refine Plan Mode system prompt for agentic execution by
+  @NTaylorMullen in
+  [#18799](https://github.com/google-gemini/gemini-cli/pull/18799)
+- feat(plan): create metrics for usage of `AskUser` tool by @Adib234 in
+  [#18820](https://github.com/google-gemini/gemini-cli/pull/18820)
+- feat(cli): support Ctrl-Z suspension by @scidomino in
+  [#18931](https://github.com/google-gemini/gemini-cli/pull/18931)
+- fix(github-actions): use robot PAT for release creation to trigger release
+  notes by @SandyTao520 in
+  [#18794](https://github.com/google-gemini/gemini-cli/pull/18794)
+- feat: add strict seatbelt profiles and remove unusable closed profiles by
+  @SandyTao520 in
+  [#18876](https://github.com/google-gemini/gemini-cli/pull/18876)
+- chore: cleanup unused and add unlisted dependencies in packages/a2a-server by
+  @adamfweidman in
+  [#18916](https://github.com/google-gemini/gemini-cli/pull/18916)
+- fix(plan): isolate plan files per session by @Adib234 in
+  [#18757](https://github.com/google-gemini/gemini-cli/pull/18757)
+- fix: character truncation in raw markdown mode by @jackwotherspoon in
+  [#18938](https://github.com/google-gemini/gemini-cli/pull/18938)
+- feat(cli): prototype clean UI toggle and minimal-mode bleed-through by
+  @LyalinDotCom in
+  [#18683](https://github.com/google-gemini/gemini-cli/pull/18683)
+- ui(polish) blend background color with theme by @jacob314 in
+  [#18802](https://github.com/google-gemini/gemini-cli/pull/18802)
+- Add generic searchable list to back settings and extensions by @chrstnb in
+  [#18838](https://github.com/google-gemini/gemini-cli/pull/18838)
+- feat(ui): align `AskUser` color scheme with UX spec by @jerop in
+  [#18943](https://github.com/google-gemini/gemini-cli/pull/18943)
+- Hide AskUser tool validation errors from UI (agent self-corrects) by @jerop in
+  [#18954](https://github.com/google-gemini/gemini-cli/pull/18954)
+- bug(cli) fix flicker due to AppContainer continuous initialization by
+  @jacob314 in [#18958](https://github.com/google-gemini/gemini-cli/pull/18958)
+- feat(admin): Add admin controls documentation by @skeshive in
+  [#18644](https://github.com/google-gemini/gemini-cli/pull/18644)
+- feat(cli): disable ctrl-s shortcut outside of alternate buffer mode by
+  @jacob314 in [#18887](https://github.com/google-gemini/gemini-cli/pull/18887)
+- fix(vim): vim support that feels (more) complete by @ppgranger in
+  [#18755](https://github.com/google-gemini/gemini-cli/pull/18755)
+- feat(policy): add --policy flag for user defined policies by @allenhutchison
+  in [#18500](https://github.com/google-gemini/gemini-cli/pull/18500)
+- Update installation guide by @g-samroberts in
+  [#18823](https://github.com/google-gemini/gemini-cli/pull/18823)
+- refactor(core): centralize tool definitions (Group 1: replace, search, grep)
+  by @aishaneeshah in
+  [#18944](https://github.com/google-gemini/gemini-cli/pull/18944)
+- refactor(cli): finalize event-driven transition and remove interaction bridge
+  by @abhipatel12 in
+  [#18569](https://github.com/google-gemini/gemini-cli/pull/18569)
+- Fix drag and drop escaping by @scidomino in
+  [#18965](https://github.com/google-gemini/gemini-cli/pull/18965)
+- feat(sdk): initial package bootstrap for SDK by @mbleigh in
+  [#18861](https://github.com/google-gemini/gemini-cli/pull/18861)
+- feat(sdk): implements SessionContext for SDK tool calls by @mbleigh in
+  [#18862](https://github.com/google-gemini/gemini-cli/pull/18862)
+- fix(plan): make question type required in AskUser tool by @Adib234 in
+  [#18959](https://github.com/google-gemini/gemini-cli/pull/18959)
+- fix(core): ensure --yolo does not force headless mode by @NTaylorMullen in
+  [#18976](https://github.com/google-gemini/gemini-cli/pull/18976)
+- refactor(core): adopt `CoreToolCallStatus` enum for type safety by @jerop in
+  [#18998](https://github.com/google-gemini/gemini-cli/pull/18998)
+- Enable in-CLI extension management commands for team by @chrstnb in
+  [#18957](https://github.com/google-gemini/gemini-cli/pull/18957)
+- Adjust lint rules to avoid unnecessary warning. by @scidomino in
+  [#18970](https://github.com/google-gemini/gemini-cli/pull/18970)
+- fix(vscode): resolve unsafe type assertion lint errors by @ehedlund in
+  [#19006](https://github.com/google-gemini/gemini-cli/pull/19006)
+- Remove unnecessary eslint config file by @scidomino in
+  [#19015](https://github.com/google-gemini/gemini-cli/pull/19015)
+- fix(core): Prevent loop detection false positives on lists with long shared
+  prefixes by @SandyTao520 in
+  [#18975](https://github.com/google-gemini/gemini-cli/pull/18975)
+- feat(core): fallback to chat-base when using unrecognized models for chat by
+  @SandyTao520 in
+  [#19016](https://github.com/google-gemini/gemini-cli/pull/19016)
+- docs: fix inconsistent commandRegex example in policy engine by @NTaylorMullen
+  in [#19027](https://github.com/google-gemini/gemini-cli/pull/19027)
+- fix(plan): persist the approval mode in UI even when agent is thinking by
+  @Adib234 in [#18955](https://github.com/google-gemini/gemini-cli/pull/18955)
+- feat(sdk): Implement dynamic system instructions by @mbleigh in
+  [#18863](https://github.com/google-gemini/gemini-cli/pull/18863)
+- Docs: Refresh docs to organize and standardize reference materials. by
+  @jkcinouye in [#18403](https://github.com/google-gemini/gemini-cli/pull/18403)
+- fix windows escaping (and broken tests) by @scidomino in
+  [#19011](https://github.com/google-gemini/gemini-cli/pull/19011)
+- refactor: use `CoreToolCallStatus` in the the history data model by @jerop in
+  [#19033](https://github.com/google-gemini/gemini-cli/pull/19033)
+- feat(cleanup): enable 30-day session retention by default by @skeshive in
+  [#18854](https://github.com/google-gemini/gemini-cli/pull/18854)
+- feat(plan): hide plan write and edit operations on plans in Plan Mode by
+  @jerop in [#19012](https://github.com/google-gemini/gemini-cli/pull/19012)
+- bug(ui) fix flicker refreshing background color by @jacob314 in
+  [#19041](https://github.com/google-gemini/gemini-cli/pull/19041)
+- chore: fix dep vulnerabilities by @scidomino in
+  [#19036](https://github.com/google-gemini/gemini-cli/pull/19036)
+- Revamp automated changelog skill by @g-samroberts in
+  [#18974](https://github.com/google-gemini/gemini-cli/pull/18974)
+- feat(sdk): implement support for custom skills by @mbleigh in
+  [#19031](https://github.com/google-gemini/gemini-cli/pull/19031)
+- refactor(core): complete centralization of core tool definitions by
+  @aishaneeshah in
+  [#18991](https://github.com/google-gemini/gemini-cli/pull/18991)
+- feat: add /commands reload to refresh custom TOML commands by @korade-krushna
+  in [#19078](https://github.com/google-gemini/gemini-cli/pull/19078)
+- fix(cli): wrap terminal capability queries in hidden sequence by @srithreepo
+  in [#19080](https://github.com/google-gemini/gemini-cli/pull/19080)
+- fix(workflows): fix GitHub App token permissions for maintainer detection by
+  @bdmorgan in [#19139](https://github.com/google-gemini/gemini-cli/pull/19139)
+- test: fix hook integration test flakiness on Windows CI by @NTaylorMullen in
+  [#18665](https://github.com/google-gemini/gemini-cli/pull/18665)
+- fix(core): Encourage non-interactive flags for scaffolding commands by
+  @NTaylorMullen in
+  [#18804](https://github.com/google-gemini/gemini-cli/pull/18804)
+- fix(core): propagate User-Agent header to setup-phase CodeAssist API calls by
+  @gsquared94 in
+  [#19182](https://github.com/google-gemini/gemini-cli/pull/19182)
+- docs: document .agents/skills alias and discovery precedence by @kevmoo in
+  [#19166](https://github.com/google-gemini/gemini-cli/pull/19166)
+- feat(cli): add loading state to new agents notification by @sehoon38 in
+  [#19190](https://github.com/google-gemini/gemini-cli/pull/19190)
+- Add base branch to workflow. by @g-samroberts in
+  [#19189](https://github.com/google-gemini/gemini-cli/pull/19189)
+- feat(cli): handle invalid model names in useQuotaAndFallback by @sehoon38 in
+  [#19222](https://github.com/google-gemini/gemini-cli/pull/19222)
+- docs: custom themes in extensions by @jackwotherspoon in
+  [#19219](https://github.com/google-gemini/gemini-cli/pull/19219)
+- Disable workspace settings when starting GCLI in the home directory. by
+  @kevinjwang1 in
+  [#19034](https://github.com/google-gemini/gemini-cli/pull/19034)
+- feat(cli): refactor model command to support set and manage subcommands by
+  @sehoon38 in [#19221](https://github.com/google-gemini/gemini-cli/pull/19221)
+- Add refresh/reload aliases to slash command subcommands by @korade-krushna in
+  [#19218](https://github.com/google-gemini/gemini-cli/pull/19218)
+- refactor: consolidate development rules and add cli guidelines by @jacob314 in
+  [#19214](https://github.com/google-gemini/gemini-cli/pull/19214)
+- chore(ui): remove outdated tip about model routing by @sehoon38 in
+  [#19226](https://github.com/google-gemini/gemini-cli/pull/19226)
+- feat(core): support custom reasoning models by default by @NTaylorMullen in
+  [#19227](https://github.com/google-gemini/gemini-cli/pull/19227)
+- Add Solarized Dark and Solarized Light themes by @rmedranollamas in
+  [#19064](https://github.com/google-gemini/gemini-cli/pull/19064)
+- fix(telemetry): replace JSON.stringify with safeJsonStringify in file
+  exporters by @gsquared94 in
+  [#19244](https://github.com/google-gemini/gemini-cli/pull/19244)
+- feat(telemetry): add keychain availability and token storage metrics by
+  @abhipatel12 in
+  [#18971](https://github.com/google-gemini/gemini-cli/pull/18971)
+- feat(cli): update approval mode cycle order by @jerop in
+  [#19254](https://github.com/google-gemini/gemini-cli/pull/19254)
+- refactor(cli): code review cleanup fix for tab+tab by @jacob314 in
+  [#18967](https://github.com/google-gemini/gemini-cli/pull/18967)
+- feat(plan): support project exploration without planning when in plan mode by
+  @Adib234 in [#18992](https://github.com/google-gemini/gemini-cli/pull/18992)
+- feat: add role-specific statistics to telemetry and UI (cont. #15234) by
+  @yunaseoul in [#18824](https://github.com/google-gemini/gemini-cli/pull/18824)
+- feat(cli): remove Plan Mode from rotation when actively working by @jerop in
+  [#19262](https://github.com/google-gemini/gemini-cli/pull/19262)
+- Fix side breakage where anchors don't work in slugs. by @g-samroberts in
+  [#19261](https://github.com/google-gemini/gemini-cli/pull/19261)
+- feat(config): add setting to make directory tree context configurable by
+  @kevin-ramdass in
+  [#19053](https://github.com/google-gemini/gemini-cli/pull/19053)
+- fix(acp): Wait for mcp initialization in acp (#18893) by @Mervap in
+  [#18894](https://github.com/google-gemini/gemini-cli/pull/18894)
+- docs: format UTC times in releases doc by @pavan-sh in
+  [#18169](https://github.com/google-gemini/gemini-cli/pull/18169)
+- Docs: Clarify extensions documentation. by @jkcinouye in
+  [#19277](https://github.com/google-gemini/gemini-cli/pull/19277)
+- refactor(core): modularize tool definitions by model family by @aishaneeshah
+  in [#19269](https://github.com/google-gemini/gemini-cli/pull/19269)
+- fix(paths): Add cross-platform path normalization by @spencer426 in
+  [#18939](https://github.com/google-gemini/gemini-cli/pull/18939)
+- feat(core): experimental in-progress steering hints (1 of 3) by @joshualitt in
+  [#19008](https://github.com/google-gemini/gemini-cli/pull/19008)
+- fix(patch): cherry-pick 261788c to release/v0.30.0-preview.0-pr-19453 to patch
+  version v0.30.0-preview.0 and create version 0.30.0-preview.1 by
+  @gemini-cli-robot in
+  [#19490](https://github.com/google-gemini/gemini-cli/pull/19490)
+- fix(patch): cherry-pick c43500c to release/v0.30.0-preview.1-pr-19502 to patch
+  version v0.30.0-preview.1 and create version 0.30.0-preview.2 by
+  @gemini-cli-robot in
+  [#19521](https://github.com/google-gemini/gemini-cli/pull/19521)
+- fix(patch): cherry-pick aa9163d to release/v0.30.0-preview.3-pr-19991 to patch
+  version v0.30.0-preview.3 and create version 0.30.0-preview.4 by
+  @gemini-cli-robot in
+  [#20040](https://github.com/google-gemini/gemini-cli/pull/20040)
+- fix(patch): cherry-pick 2c1d6f8 to release/v0.30.0-preview.4-pr-19369 to patch
+  version v0.30.0-preview.4 and create version 0.30.0-preview.5 by
+  @gemini-cli-robot in
+  [#20086](https://github.com/google-gemini/gemini-cli/pull/20086)
+- fix(patch): cherry-pick d96bd05 to release/v0.30.0-preview.5-pr-19867 to patch
+  version v0.30.0-preview.5 and create version 0.30.0-preview.6 by
+  @gemini-cli-robot in
+  [#20112](https://github.com/google-gemini/gemini-cli/pull/20112)
 
-**Full changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.25.2...v0.26.0
+**Full Changelog**:
+https://github.com/google-gemini/gemini-cli/compare/v0.29.7...v0.30.1

docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: Release v0.27.0-preview.0
+# Preview release: v0.31.0-preview.1
 
-Released: January 27, 2026
+Released: February 27, 2026
 
 Our preview release includes the latest, new, and experimental features. This
 release may not be as stable as our [latest weekly release](latest.md).
@@ -13,425 +13,404 @@ npm install -g @google/gemini-cli@preview
 
 ## Highlights
 
-- **Event-Driven Architecture:** The tool execution scheduler is now
-  event-driven, improving performance and reliability.
-- **System Prompt Override:** Now supports dynamic variable substitution.
-- **Rewind Command:** The `/rewind` command has been implemented.
-- **Linux Clipboard:** Image pasting capabilities for Wayland and X11 on Linux.
+- **Plan Mode Enhancements**: Numerous additions including automatic model
+  switching, custom storage directory configuration, message injection upon
+  manual exit, enforcement of read-only constraints, and centralized tool
+  visibility in the policy engine.
+- **Policy Engine Updates**: Project-level policy support added, alongside MCP
+  server wildcard support, tool annotation propagation and matching, and
+  workspace-level "Always Allow" persistence.
+- **MCP Integration Improvements**: Better integration through support for MCP
+  progress updates with input validation and throttling, environment variable
+  expansion for servers, and full details expansion on tool approval.
+- **CLI & Core UX Enhancements**: Several UI and quality-of-life updates such as
+  Alt+D for forward word deletion, macOS run-event notifications, enhanced
+  folder trust configurations with security warnings, improved startup warnings,
+  and a new experimental browser agent.
+- **Security & Stability**: Introduced the Conseca framework, deceptive URL and
+  Unicode character detection, stricter access checks, rate limits on web fetch,
+  and resolved multiple dependency vulnerabilities.
 
 ## What's Changed
 
-- remove fireAgent and beforeAgent hook by @ishaanxgupta in
-  [#16919](https://github.com/google-gemini/gemini-cli/pull/16919)
-- Remove unused modelHooks and toolHooks by @ved015 in
-  [#17115](https://github.com/google-gemini/gemini-cli/pull/17115)
-- feat(cli): sanitize ANSI escape sequences in non-interactive output by
-  @sehoon38 in [#17172](https://github.com/google-gemini/gemini-cli/pull/17172)
-- Update Attempt text to Retry when showing the retry happening to the … by
-  @sehoon38 in [#17178](https://github.com/google-gemini/gemini-cli/pull/17178)
-- chore(skills): update pr-creator skill workflow by @sehoon38 in
-  [#17180](https://github.com/google-gemini/gemini-cli/pull/17180)
-- feat(cli): implement event-driven tool execution scheduler by @abhipatel12 in
-  [#17078](https://github.com/google-gemini/gemini-cli/pull/17078)
-- chore(release): bump version to 0.27.0-nightly.20260121.97aac696f by
+- fix(patch): cherry-pick 58df1c6 to release/v0.31.0-preview.0-pr-20374 to patch
+  version v0.31.0-preview.0 and create version 0.31.0-preview.1 by
   @gemini-cli-robot in
-  [#17181](https://github.com/google-gemini/gemini-cli/pull/17181)
-- Remove other rewind reference in docs by @chrstnb in
-  [#17149](https://github.com/google-gemini/gemini-cli/pull/17149)
-- feat(skills): add code-reviewer skill by @sehoon38 in
-  [#17187](httpshttps://github.com/google-gemini/gemini-cli/pull/17187)
-- feat(plan): Extend Shift+Tab Mode Cycling to include Plan Mode by @Adib234 in
-  [#17177](https://github.com/google-gemini/gemini-cli/pull/17177)
-- feat(plan): refactor TestRig and eval helper to support configurable approval
-  modes by @jerop in
-  [#17171](https://github.com/google-gemini/gemini-cli/pull/17171)
-- feat(workflows): support recursive workstream labeling and new IDs by
-  @bdmorgan in [#17207](https://github.com/google-gemini/gemini-cli/pull/17207)
-- Run evals for all models. by @gundermanc in
-  [#17123](https://github.com/google-gemini/gemini-cli/pull/17123)
-- fix(github): improve label-workstream-rollup efficiency with GraphQL by
-  @bdmorgan in [#17217](https://github.com/google-gemini/gemini-cli/pull/17217)
-- Docs: Update changelogs for v.0.25.0 and v0.26.0-preview.0 releases. by
-  @g-samroberts in
-  [#17215](https://github.com/google-gemini/gemini-cli/pull/17215)
-- Migrate beforeTool and afterTool hooks to hookSystem by @ved015 in
-  [#17204](https://github.com/google-gemini/gemini-cli/pull/17204)
-- fix(github): improve label-workstream-rollup efficiency and fix bugs by
-  @bdmorgan in [#17219](https://github.com/google-gemini/gemini-cli/pull/17219)
-- feat(cli): improve skill enablement/disablement verbiage by @NTaylorMullen in
-  [#17192](https://github.com/google-gemini/gemini-cli/pull/17192)
-- fix(admin): Ensure CLI commands run in non-interactive mode by @skeshive in
-  [#17218](https://github.com/google-gemini/gemini-cli/pull/17218)
-- feat(core): support dynamic variable substitution in system prompt override by
-  @NTaylorMullen in
-  [#17042](https://github.com/google-gemini/gemini-cli/pull/17042)
-- fix(core,cli): enable recursive directory access for by @galz10 in
-  [#17094](https://github.com/google-gemini/gemini-cli/pull/17094)
-- Docs: Marking for experimental features by @jkcinouye in
-  [#16760](https://github.com/google-gemini/gemini-cli/pull/16760)
-- Support command/ctrl/alt backspace correctly by @scidomino in
-  [#17175](https://github.com/google-gemini/gemini-cli/pull/17175)
-- feat(plan): add approval mode instructions to system prompt by @jerop in
-  [#17151](https://github.com/google-gemini/gemini-cli/pull/17151)
-- feat(core): enable disableLLMCorrection by default by @SandyTao520 in
-  [#17223](https://github.com/google-gemini/gemini-cli/pull/17223)
-- Remove unused slug from sidebar by @chrstnb in
-  [#17229](https://github.com/google-gemini/gemini-cli/pull/17229)
-- drain stdin on exit by @scidomino in
-  [#17241](https://github.com/google-gemini/gemini-cli/pull/17241)
-- refactor(cli): decouple UI from live tool execution via ToolActionsContext by
-  @abhipatel12 in
-  [#17183](https://github.com/google-gemini/gemini-cli/pull/17183)
-- fix(core): update token count and telemetry on /chat resume history load by
-  @psinha40898 in
-  [#16279](https://github.com/google-gemini/gemini-cli/pull/16279)
-- fix: /policy to display policies according to mode by @ishaanxgupta in
-  [#16772](https://github.com/google-gemini/gemini-cli/pull/16772)
-- fix(core): simplify replace tool error message by @SandyTao520 in
-  [#17246](https://github.com/google-gemini/gemini-cli/pull/17246)
-- feat(cli): consolidate shell inactivity and redirection monitoring by
-  @NTaylorMullen in
-  [#17086](https://github.com/google-gemini/gemini-cli/pull/17086)
-- fix(scheduler): prevent stale tool re-publication and fix stuck UI state by
-  @abhipatel12 in
-  [#17227](https://github.com/google-gemini/gemini-cli/pull/17227)
-- feat(config): default enableEventDrivenScheduler to true by @abhipatel12 in
-  [#17211](https://github.com/google-gemini/gemini-cli/pull/17211)
-- feat(hooks): enable hooks system by default by @abhipatel12 in
-  [#17247](https://github.com/google-gemini/gemini-cli/pull/17247)
-- feat(core): Enable AgentRegistry to track all discovered subagents by
+  [#20568](https://github.com/google-gemini/gemini-cli/pull/20568)
+- Use ranged reads and limited searches and fuzzy editing improvements by
+  @gundermanc in
+  [#19240](https://github.com/google-gemini/gemini-cli/pull/19240)
+- Fix bottom border color by @jacob314 in
+  [#19266](https://github.com/google-gemini/gemini-cli/pull/19266)
+- Release note generator fix by @g-samroberts in
+  [#19363](https://github.com/google-gemini/gemini-cli/pull/19363)
+- test(evals): add behavioral tests for tool output masking by @NTaylorMullen in
+  [#19172](https://github.com/google-gemini/gemini-cli/pull/19172)
+- docs: clarify preflight instructions in GEMINI.md by @NTaylorMullen in
+  [#19377](https://github.com/google-gemini/gemini-cli/pull/19377)
+- feat(cli): add gemini --resume hint on exit by @Mag1ck in
+  [#16285](https://github.com/google-gemini/gemini-cli/pull/16285)
+- fix: optimize height calculations for ask_user dialog by @jackwotherspoon in
+  [#19017](https://github.com/google-gemini/gemini-cli/pull/19017)
+- feat(cli): add Alt+D for forward word deletion by @scidomino in
+  [#19300](https://github.com/google-gemini/gemini-cli/pull/19300)
+- Disable failing eval test by @chrstnb in
+  [#19455](https://github.com/google-gemini/gemini-cli/pull/19455)
+- fix(cli): support legacy onConfirm callback in ToolActionsContext by
   @SandyTao520 in
-  [#17253](https://github.com/google-gemini/gemini-cli/pull/17253)
-- feat(core): Have subagents use a JSON schema type for input. by @joshualitt in
-  [#17152](https://github.com/google-gemini/gemini-cli/pull/17152)
-- feat: replace large text pastes with [Pasted Text: X lines] placeholder by
-  @jackwotherspoon in
-  [#16422](https://github.com/google-gemini/gemini-cli/pull/16422)
-- security(hooks): Wrap hook-injected context in distinct XML tags by @yunaseoul
-  in [#17237](https://github.com/google-gemini/gemini-cli/pull/17237)
-- Enable the ability to queue specific nightly eval tests by @gundermanc in
-  [#17262](https://github.com/google-gemini/gemini-cli/pull/17262)
-- docs(hooks): comprehensive update of hook documentation and specs by
-  @abhipatel12 in
-  [#16816](https://github.com/google-gemini/gemini-cli/pull/16816)
-- refactor: improve large text paste placeholder by @jacob314 in
-  [#17269](https://github.com/google-gemini/gemini-cli/pull/17269)
-- feat: implement /rewind command by @Adib234 in
-  [#15720](https://github.com/google-gemini/gemini-cli/pull/15720)
-- Feature/jetbrains ide detection by @SoLoHiC in
-  [#16243](https://github.com/google-gemini/gemini-cli/pull/16243)
-- docs: update typo in mcp-server.md file by @schifferl in
-  [#17099](https://github.com/google-gemini/gemini-cli/pull/17099)
-- Sanitize command names and descriptions by @ehedlund in
-  [#17228](https://github.com/google-gemini/gemini-cli/pull/17228)
-- fix(auth): don't crash when initial auth fails by @skeshive in
-  [#17308](https://github.com/google-gemini/gemini-cli/pull/17308)
-- Added image pasting capabilities for Wayland and X11 on Linux by @devr0306 in
-  [#17144](https://github.com/google-gemini/gemini-cli/pull/17144)
-- feat: add AskUser tool schema by @jackwotherspoon in
-  [#16988](https://github.com/google-gemini/gemini-cli/pull/16988)
-- fix cli settings: resolve layout jitter in settings bar by @Mag1ck in
-  [#16256](https://github.com/google-gemini/gemini-cli/pull/16256)
-- fix: show whitespace changes in edit tool diffs by @Ujjiyara in
-  [#17213](https://github.com/google-gemini/gemini-cli/pull/17213)
-- Remove redundant calls setting linuxClipboardTool. getUserLinuxClipboardTool()
-  now handles the caching internally by @jacob314 in
-  [#17320](https://github.com/google-gemini/gemini-cli/pull/17320)
-- ci: allow failure in evals-nightly run step by @gundermanc in
-  [#17319](https://github.com/google-gemini/gemini-cli/pull/17319)
-- feat(cli): Add state management and plumbing for agent configuration dialog by
-  @SandyTao520 in
-  [#17259](https://github.com/google-gemini/gemini-cli/pull/17259)
-- bug: fix ide-client connection to ide-companion when inside docker via
-  ssh/devcontainer by @kapsner in
-  [#15049](https://github.com/google-gemini/gemini-cli/pull/15049)
-- Emit correct newline type return by @scidomino in
-  [#17331](https://github.com/google-gemini/gemini-cli/pull/17331)
-- New skill: docs-writer by @g-samroberts in
-  [#17268](https://github.com/google-gemini/gemini-cli/pull/17268)
-- fix(core): Resolve AbortSignal MaxListenersExceededWarning (#5950) by
-  @spencer426 in
-  [#16735](https://github.com/google-gemini/gemini-cli/pull/16735)
-- Disable tips after 10 runs by @Adib234 in
-  [#17101](https://github.com/google-gemini/gemini-cli/pull/17101)
-- Fix so rewind starts at the bottom and loadHistory refreshes static content.
-  by @jacob314 in
-  [#17335](https://github.com/google-gemini/gemini-cli/pull/17335)
-- feat(core): Remove legacy settings. by @joshualitt in
-  [#17244](https://github.com/google-gemini/gemini-cli/pull/17244)
-- feat(plan): add 'communicate' tool kind by @jerop in
-  [#17341](https://github.com/google-gemini/gemini-cli/pull/17341)
-- feat(routing): A/B Test Numerical Complexity Scoring for Gemini 3 by
-  @mattKorwel in
-  [#16041](https://github.com/google-gemini/gemini-cli/pull/16041)
-- feat(plan): update UI Theme for Plan Mode by @Adib234 in
-  [#17243](https://github.com/google-gemini/gemini-cli/pull/17243)
-- fix(ui): stabilize rendering during terminal resize in alternate buffer by
-  @lkk214 in [#15783](https://github.com/google-gemini/gemini-cli/pull/15783)
-- feat(cli): add /agents config command and improve agent discovery by
-  @SandyTao520 in
-  [#17342](https://github.com/google-gemini/gemini-cli/pull/17342)
-- feat(mcp): add enable/disable commands for MCP servers (#11057) by @jasmeetsb
-  in [#16299](https://github.com/google-gemini/gemini-cli/pull/16299)
-- fix(cli)!: Default to interactive mode for positional arguments by
-  @ishaanxgupta in
-  [#16329](https://github.com/google-gemini/gemini-cli/pull/16329)
-- Fix issue #17080 by @jacob314 in
-  [#17100](https://github.com/google-gemini/gemini-cli/pull/17100)
-- feat(core): Refresh agents after loading an extension. by @joshualitt in
-  [#17355](https://github.com/google-gemini/gemini-cli/pull/17355)
-- fix(cli): include source in policy rule display by @allenhutchison in
-  [#17358](https://github.com/google-gemini/gemini-cli/pull/17358)
-- fix: remove obsolete CloudCode PerDay quota and 120s terminal threshold by
-  @gsquared94 in
-  [#17236](https://github.com/google-gemini/gemini-cli/pull/17236)
-- Refactor subagent delegation to be one tool per agent by @gundermanc in
-  [#17346](https://github.com/google-gemini/gemini-cli/pull/17346)
-- fix(core): Include MCP server name in OAuth message by @jerop in
-  [#17351](https://github.com/google-gemini/gemini-cli/pull/17351)
-- Fix pr-triage.sh script to update pull requests with tags "help wanted" and
-  "maintainer only" by @jacob314 in
-  [#17324](https://github.com/google-gemini/gemini-cli/pull/17324)
-- feat(plan): implement simple workflow for planning in main agent by @jerop in
-  [#17326](https://github.com/google-gemini/gemini-cli/pull/17326)
-- fix: exit with non-zero code when esbuild is missing by @yuvrajangadsingh in
-  [#16967](https://github.com/google-gemini/gemini-cli/pull/16967)
-- fix: ensure @docs/cli/custom-commands.md UI message ordering and test by
-  @medic-code in
-  [#12038](https://github.com/google-gemini/gemini-cli/pull/12038)
-- fix(core): add alternative command names for Antigravity editor detec… by
-  @BaeSeokJae in
-  [#16829](https://github.com/google-gemini/gemini-cli/pull/16829)
-- Refactor: Migrate CLI appEvents to Core coreEvents by @Adib234 in
-  [#15737](https://github.com/google-gemini/gemini-cli/pull/15737)
-- fix(core): await MCP initialization in non-interactive mode by @Ratish1 in
-  [#17390](https://github.com/google-gemini/gemini-cli/pull/17390)
-- Fix modifyOtherKeys enablement on unsupported terminals by @seekskyworld in
-  [#16714](https://github.com/google-gemini/gemini-cli/pull/16714)
-- fix(core): gracefully handle disk full errors in chat recording by
+  [#19369](https://github.com/google-gemini/gemini-cli/pull/19369)
+- chore(deps): bump tar from 7.5.7 to 7.5.8 by dependabot[bot] in
+  [#19367](https://github.com/google-gemini/gemini-cli/pull/19367)
+- fix(plan): allow safe fallback when experiment setting for plan is not enabled
+  but approval mode at startup is plan by @Adib234 in
+  [#19439](https://github.com/google-gemini/gemini-cli/pull/19439)
+- Add explicit color-convert dependency by @chrstnb in
+  [#19460](https://github.com/google-gemini/gemini-cli/pull/19460)
+- feat(devtools): migrate devtools package into monorepo by @SandyTao520 in
+  [#18936](https://github.com/google-gemini/gemini-cli/pull/18936)
+- fix(core): clarify plan mode constraints and exit mechanism by @jerop in
+  [#19438](https://github.com/google-gemini/gemini-cli/pull/19438)
+- feat(cli): add macOS run-event notifications (interactive only) by
+  @LyalinDotCom in
+  [#19056](https://github.com/google-gemini/gemini-cli/pull/19056)
+- Changelog for v0.29.0 by @gemini-cli-robot in
+  [#19361](https://github.com/google-gemini/gemini-cli/pull/19361)
+- fix(ui): preventing empty history items from being added by @devr0306 in
+  [#19014](https://github.com/google-gemini/gemini-cli/pull/19014)
+- Changelog for v0.30.0-preview.0 by @gemini-cli-robot in
+  [#19364](https://github.com/google-gemini/gemini-cli/pull/19364)
+- feat(core): add support for MCP progress updates by @NTaylorMullen in
+  [#19046](https://github.com/google-gemini/gemini-cli/pull/19046)
+- fix(core): ensure directory exists before writing conversation file by
   @godwiniheuwa in
-  [#17305](https://github.com/google-gemini/gemini-cli/pull/17305)
-- fix(oauth): update oauth to use 127.0.0.1 instead of localhost by @skeshive in
-  [#17388](https://github.com/google-gemini/gemini-cli/pull/17388)
-- fix(core): use RFC 9728 compliant path-based OAuth protected resource
-  discovery by @vrv in
-  [#15756](https://github.com/google-gemini/gemini-cli/pull/15756)
-- Update Code Wiki README badge by @PatoBeltran in
-  [#15229](https://github.com/google-gemini/gemini-cli/pull/15229)
-- Add conda installation instructions for Gemini CLI by @ishaanxgupta in
-  [#16921](https://github.com/google-gemini/gemini-cli/pull/16921)
-- chore(refactor): extract BaseSettingsDialog component by @SandyTao520 in
-  [#17369](https://github.com/google-gemini/gemini-cli/pull/17369)
-- fix(cli): preserve input text when declining tool approval (#15624) by
-  @ManojINaik in
-  [#15659](https://github.com/google-gemini/gemini-cli/pull/15659)
-- chore: upgrade dep: diff 7.0.0-> 8.0.3 by @scidomino in
-  [#17403](https://github.com/google-gemini/gemini-cli/pull/17403)
-- feat: add AskUserDialog for UI component of AskUser tool by @jackwotherspoon
-  in [#17344](https://github.com/google-gemini/gemini-cli/pull/17344)
-- feat(ui): display user tier in about command by @sehoon38 in
-  [#17400](https://github.com/google-gemini/gemini-cli/pull/17400)
-- feat: add clearContext to AfterAgent hooks by @jackwotherspoon in
-  [#16574](https://github.com/google-gemini/gemini-cli/pull/16574)
-- fix(cli): change image paste location to global temp directory (#17396) by
-  @devr0306 in [#17396](https://github.com/google-gemini/gemini-cli/pull/17396)
-- Fix line endings issue with Notice file by @scidomino in
-  [#17417](https://github.com/google-gemini/gemini-cli/pull/17417)
-- feat(plan): implement persistent approvalMode setting by @Adib234 in
-  [#17350](https://github.com/google-gemini/gemini-cli/pull/17350)
-- feat(ui): Move keyboard handling into BaseSettingsDialog by @SandyTao520 in
-  [#17404](https://github.com/google-gemini/gemini-cli/pull/17404)
-- Allow prompt queueing during MCP initialization by @Adib234 in
-  [#17395](https://github.com/google-gemini/gemini-cli/pull/17395)
-- feat: implement AgentConfigDialog for /agents config command by @SandyTao520
-  in [#17370](https://github.com/google-gemini/gemini-cli/pull/17370)
-- fix(agents): default to all tools when tool list is omitted in subagents by
+  [#18429](https://github.com/google-gemini/gemini-cli/pull/18429)
+- fix(ui): move margin from top to bottom in ToolGroupMessage by @imadraude in
+  [#17198](https://github.com/google-gemini/gemini-cli/pull/17198)
+- fix(cli): treat unknown slash commands as regular input instead of showing
+  error by @skyvanguard in
+  [#17393](https://github.com/google-gemini/gemini-cli/pull/17393)
+- feat(core): experimental in-progress steering hints (2 of 2) by @joshualitt in
+  [#19307](https://github.com/google-gemini/gemini-cli/pull/19307)
+- docs(plan): add documentation for plan mode command by @Adib234 in
+  [#19467](https://github.com/google-gemini/gemini-cli/pull/19467)
+- fix(core): ripgrep fails when pattern looks like ripgrep flag by @syvb in
+  [#18858](https://github.com/google-gemini/gemini-cli/pull/18858)
+- fix(cli): disable auto-completion on Shift+Tab to preserve mode cycling by
+  @NTaylorMullen in
+  [#19451](https://github.com/google-gemini/gemini-cli/pull/19451)
+- use issuer instead of authorization_endpoint for oauth discovery by
+  @garrettsparks in
+  [#17332](https://github.com/google-gemini/gemini-cli/pull/17332)
+- feat(cli): include `/dir add` directories in @ autocomplete suggestions by
+  @jasmeetsb in [#19246](https://github.com/google-gemini/gemini-cli/pull/19246)
+- feat(admin): Admin settings should only apply if adminControlsApplicable =
+  true and fetch errors should be fatal by @skeshive in
+  [#19453](https://github.com/google-gemini/gemini-cli/pull/19453)
+- Format strict-development-rules command by @g-samroberts in
+  [#19484](https://github.com/google-gemini/gemini-cli/pull/19484)
+- feat(core): centralize compatibility checks and add TrueColor detection by
+  @spencer426 in
+  [#19478](https://github.com/google-gemini/gemini-cli/pull/19478)
+- Remove unused files and update index and sidebar. by @g-samroberts in
+  [#19479](https://github.com/google-gemini/gemini-cli/pull/19479)
+- Migrate core render util to use xterm.js as part of the rendering loop. by
+  @jacob314 in [#19044](https://github.com/google-gemini/gemini-cli/pull/19044)
+- Changelog for v0.30.0-preview.1 by @gemini-cli-robot in
+  [#19496](https://github.com/google-gemini/gemini-cli/pull/19496)
+- build: replace deprecated built-in punycode with userland package by @jacob314
+  in [#19502](https://github.com/google-gemini/gemini-cli/pull/19502)
+- Speculative fixes to try to fix react error. by @jacob314 in
+  [#19508](https://github.com/google-gemini/gemini-cli/pull/19508)
+- fix spacing by @jacob314 in
+  [#19494](https://github.com/google-gemini/gemini-cli/pull/19494)
+- fix(core): ensure user rejections update tool outcome for telemetry by
+  @abhiasap in [#18982](https://github.com/google-gemini/gemini-cli/pull/18982)
+- fix(acp): Initialize config (#18897) by @Mervap in
+  [#18898](https://github.com/google-gemini/gemini-cli/pull/18898)
+- fix(core): add error logging for IDE fetch failures by @yuvrajangadsingh in
+  [#17981](https://github.com/google-gemini/gemini-cli/pull/17981)
+- feat(acp): support set_mode interface (#18890) by @Mervap in
+  [#18891](https://github.com/google-gemini/gemini-cli/pull/18891)
+- fix(core): robust workspace-based IDE connection discovery by @ehedlund in
+  [#18443](https://github.com/google-gemini/gemini-cli/pull/18443)
+- Deflake windows tests. by @jacob314 in
+  [#19511](https://github.com/google-gemini/gemini-cli/pull/19511)
+- Fix: Avoid tool confirmation timeout when no UI listeners are present by
+  @pdHaku0 in [#17955](https://github.com/google-gemini/gemini-cli/pull/17955)
+- format md file by @scidomino in
+  [#19474](https://github.com/google-gemini/gemini-cli/pull/19474)
+- feat(cli): add experimental.useOSC52Copy setting by @scidomino in
+  [#19488](https://github.com/google-gemini/gemini-cli/pull/19488)
+- feat(cli): replace loading phrases boolean with enum setting by @LyalinDotCom
+  in [#19347](https://github.com/google-gemini/gemini-cli/pull/19347)
+- Update skill to adjust for generated results. by @g-samroberts in
+  [#19500](https://github.com/google-gemini/gemini-cli/pull/19500)
+- Fix message too large issue. by @gundermanc in
+  [#19499](https://github.com/google-gemini/gemini-cli/pull/19499)
+- fix(core): prevent duplicate tool approval entries in auto-saved.toml by
+  @Abhijit-2592 in
+  [#19487](https://github.com/google-gemini/gemini-cli/pull/19487)
+- fix(core): resolve crash in ClearcutLogger when os.cpus() is empty by @Adib234
+  in [#19555](https://github.com/google-gemini/gemini-cli/pull/19555)
+- chore(core): improve encapsulation and remove unused exports by @adamfweidman
+  in [#19556](https://github.com/google-gemini/gemini-cli/pull/19556)
+- Revert "Add generic searchable list to back settings and extensions (… by
+  @chrstnb in [#19434](https://github.com/google-gemini/gemini-cli/pull/19434)
+- fix(core): improve error type extraction for telemetry by @yunaseoul in
+  [#19565](https://github.com/google-gemini/gemini-cli/pull/19565)
+- fix: remove extra padding in Composer by @jackwotherspoon in
+  [#19529](https://github.com/google-gemini/gemini-cli/pull/19529)
+- feat(plan): support configuring custom plans storage directory by @jerop in
+  [#19577](https://github.com/google-gemini/gemini-cli/pull/19577)
+- Migrate files to resource or references folder. by @g-samroberts in
+  [#19503](https://github.com/google-gemini/gemini-cli/pull/19503)
+- feat(policy): implement project-level policy support by @Abhijit-2592 in
+  [#18682](https://github.com/google-gemini/gemini-cli/pull/18682)
+- feat(core): Implement parallel FC for read only tools. by @joshualitt in
+  [#18791](https://github.com/google-gemini/gemini-cli/pull/18791)
+- chore(skills): adds pr-address-comments skill to work on PR feedback by
+  @mbleigh in [#19576](https://github.com/google-gemini/gemini-cli/pull/19576)
+- refactor(sdk): introduce session-based architecture by @mbleigh in
+  [#19180](https://github.com/google-gemini/gemini-cli/pull/19180)
+- fix(ci): add fallback JSON extraction to issue triage workflow by @bdmorgan in
+  [#19593](https://github.com/google-gemini/gemini-cli/pull/19593)
+- feat(core): refine Edit and WriteFile tool schemas for Gemini 3 by
+  @SandyTao520 in
+  [#19476](https://github.com/google-gemini/gemini-cli/pull/19476)
+- Changelog for v0.30.0-preview.3 by @gemini-cli-robot in
+  [#19585](https://github.com/google-gemini/gemini-cli/pull/19585)
+- fix(plan): exclude EnterPlanMode tool from YOLO mode by @Adib234 in
+  [#19570](https://github.com/google-gemini/gemini-cli/pull/19570)
+- chore: resolve build warnings and update dependencies by @mattKorwel in
+  [#18880](https://github.com/google-gemini/gemini-cli/pull/18880)
+- feat(ui): add source indicators to slash commands by @ehedlund in
+  [#18839](https://github.com/google-gemini/gemini-cli/pull/18839)
+- docs: refine Plan Mode documentation structure and workflow by @jerop in
+  [#19644](https://github.com/google-gemini/gemini-cli/pull/19644)
+- Docs: Update release information regarding Gemini 3.1 by @jkcinouye in
+  [#19568](https://github.com/google-gemini/gemini-cli/pull/19568)
+- fix(security): rate limit web_fetch tool to mitigate DDoS via prompt injection
+  by @mattKorwel in
+  [#19567](https://github.com/google-gemini/gemini-cli/pull/19567)
+- Add initial implementation of /extensions explore command by @chrstnb in
+  [#19029](https://github.com/google-gemini/gemini-cli/pull/19029)
+- fix: use discoverOAuthFromWWWAuthenticate for reactive OAuth flow (#18760) by
+  @maximus12793 in
+  [#19038](https://github.com/google-gemini/gemini-cli/pull/19038)
+- Search updates by @alisa-alisa in
+  [#19482](https://github.com/google-gemini/gemini-cli/pull/19482)
+- feat(cli): add support for numpad SS3 sequences by @scidomino in
+  [#19659](https://github.com/google-gemini/gemini-cli/pull/19659)
+- feat(cli): enhance folder trust with configuration discovery and security
+  warnings by @galz10 in
+  [#19492](https://github.com/google-gemini/gemini-cli/pull/19492)
+- feat(ui): improve startup warnings UX with dismissal and show-count limits by
+  @spencer426 in
+  [#19584](https://github.com/google-gemini/gemini-cli/pull/19584)
+- feat(a2a): Add API key authentication provider by @adamfweidman in
+  [#19548](https://github.com/google-gemini/gemini-cli/pull/19548)
+- Send accepted/removed lines with ACCEPT_FILE telemetry. by @gundermanc in
+  [#19670](https://github.com/google-gemini/gemini-cli/pull/19670)
+- feat(models): support Gemini 3.1 Pro Preview and fixes by @sehoon38 in
+  [#19676](https://github.com/google-gemini/gemini-cli/pull/19676)
+- feat(plan): enforce read-only constraints in Plan Mode by @mattKorwel in
+  [#19433](https://github.com/google-gemini/gemini-cli/pull/19433)
+- fix(cli): allow perfect match @scripts/test-windows-paths.js completions to
+  submit on Enter by @spencer426 in
+  [#19562](https://github.com/google-gemini/gemini-cli/pull/19562)
+- fix(core): treat 503 Service Unavailable as retryable quota error by @sehoon38
+  in [#19642](https://github.com/google-gemini/gemini-cli/pull/19642)
+- Update sidebar.json for to allow top nav tabs. by @g-samroberts in
+  [#19595](https://github.com/google-gemini/gemini-cli/pull/19595)
+- security: strip deceptive Unicode characters from terminal output by @ehedlund
+  in [#19026](https://github.com/google-gemini/gemini-cli/pull/19026)
+- Fixes 'input.on' is not a function error in Gemini CLI by @gundermanc in
+  [#19691](https://github.com/google-gemini/gemini-cli/pull/19691)
+- Revert "feat(ui): add source indicators to slash commands" by @ehedlund in
+  [#19695](https://github.com/google-gemini/gemini-cli/pull/19695)
+- security: implement deceptive URL detection and disclosure in tool
+  confirmations by @ehedlund in
+  [#19288](https://github.com/google-gemini/gemini-cli/pull/19288)
+- fix(core): restore auth consent in headless mode and add unit tests by
+  @ehedlund in [#19689](https://github.com/google-gemini/gemini-cli/pull/19689)
+- Fix unsafe assertions in code_assist folder. by @gundermanc in
+  [#19706](https://github.com/google-gemini/gemini-cli/pull/19706)
+- feat(cli): make JetBrains warning more specific by @jacob314 in
+  [#19687](https://github.com/google-gemini/gemini-cli/pull/19687)
+- fix(cli): extensions dialog UX polish by @jacob314 in
+  [#19685](https://github.com/google-gemini/gemini-cli/pull/19685)
+- fix(cli): use getDisplayString for manual model selection in dialog by
+  @sehoon38 in [#19726](https://github.com/google-gemini/gemini-cli/pull/19726)
+- feat(policy): repurpose "Always Allow" persistence to workspace level by
+  @Abhijit-2592 in
+  [#19707](https://github.com/google-gemini/gemini-cli/pull/19707)
+- fix(cli): re-enable CLI banner by @sehoon38 in
+  [#19741](https://github.com/google-gemini/gemini-cli/pull/19741)
+- Disallow and suppress unsafe assignment by @gundermanc in
+  [#19736](https://github.com/google-gemini/gemini-cli/pull/19736)
+- feat(core): migrate read_file to 1-based start_line/end_line parameters by
+  @adamfweidman in
+  [#19526](https://github.com/google-gemini/gemini-cli/pull/19526)
+- feat(cli): improve CTRL+O experience for both standard and alternate screen
+  buffer (ASB) modes by @jwhelangoog in
+  [#19010](https://github.com/google-gemini/gemini-cli/pull/19010)
+- Utilize pipelining of grep_search -> read_file to eliminate turns by
   @gundermanc in
-  [#17422](https://github.com/google-gemini/gemini-cli/pull/17422)
-- feat(cli): Moves tool confirmations to a queue UX by @abhipatel12 in
-  [#17276](https://github.com/google-gemini/gemini-cli/pull/17276)
-- fix(core): hide user tier name by @sehoon38 in
-  [#17418](https://github.com/google-gemini/gemini-cli/pull/17418)
-- feat: Enforce unified folder trust for /directory add by @galz10 in
-  [#17359](https://github.com/google-gemini/gemini-cli/pull/17359)
-- migrate fireToolNotificationHook to hookSystem by @ved015 in
-  [#17398](https://github.com/google-gemini/gemini-cli/pull/17398)
-- Clean up dead code by @scidomino in
-  [#17443](https://github.com/google-gemini/gemini-cli/pull/17443)
-- feat(workflow): add stale pull request closer with linked-issue enforcement by
-  @bdmorgan in [#17449](https://github.com/google-gemini/gemini-cli/pull/17449)
-- feat(workflow): expand stale-exempt labels to include help wanted and Public
-  Roadmap by @bdmorgan in
-  [#17459](https://github.com/google-gemini/gemini-cli/pull/17459)
-- chore(workflow): remove redundant label-enforcer workflow by @bdmorgan in
-  [#17460](https://github.com/google-gemini/gemini-cli/pull/17460)
-- Resolves the confusing error message `ripgrep exited with code null that
-  occurs when a search operation is cancelled or aborted by @maximmasiutin in
-  [#14267](https://github.com/google-gemini/gemini-cli/pull/14267)
-- fix: detect pnpm/pnpx in ~/.local by @rwakulszowa in
-  [#15254](https://github.com/google-gemini/gemini-cli/pull/15254)
-- docs: Add instructions for MacPorts and uninstall instructions for Homebrew by
-  @breun in [#17412](https://github.com/google-gemini/gemini-cli/pull/17412)
-- docs(hooks): clarify mandatory 'type' field and update hook schema
-  documentation by @abhipatel12 in
-  [#17499](https://github.com/google-gemini/gemini-cli/pull/17499)
-- Improve error messages on failed onboarding by @gsquared94 in
-  [#17357](https://github.com/google-gemini/gemini-cli/pull/17357)
-- Follow up to "enableInteractiveShell for external tooling relying on a2a
-  server" by @DavidAPierce in
-  [#17130](https://github.com/google-gemini/gemini-cli/pull/17130)
-- Fix/issue 17070 by @alih552 in
-  [#17242](https://github.com/google-gemini/gemini-cli/pull/17242)
-- fix(core): handle URI-encoded workspace paths in IdeClient by @dong-jun-shin
-  in [#17476](https://github.com/google-gemini/gemini-cli/pull/17476)
-- feat(cli): add quick clear input shortcuts in vim mode by @harshanadim in
-  [#17470](https://github.com/google-gemini/gemini-cli/pull/17470)
-- feat(core): optimize shell tool llmContent output format by @SandyTao520 in
-  [#17538](https://github.com/google-gemini/gemini-cli/pull/17538)
-- Fix bug in detecting already added paths. by @jacob314 in
-  [#17430](https://github.com/google-gemini/gemini-cli/pull/17430)
-- feat(scheduler): support multi-scheduler tool aggregation and nested call IDs
-  by @abhipatel12 in
-  [#17429](https://github.com/google-gemini/gemini-cli/pull/17429)
-- feat(agents): implement first-run experience for project-level sub-agents by
-  @gundermanc in
-  [#17266](https://github.com/google-gemini/gemini-cli/pull/17266)
-- Update extensions docs by @chrstnb in
-  [#16093](https://github.com/google-gemini/gemini-cli/pull/16093)
-- Docs: Refactor left nav on the website by @jkcinouye in
-  [#17558](https://github.com/google-gemini/gemini-cli/pull/17558)
-- fix(core): stream grep/ripgrep output to prevent OOM by @adamfweidman in
-  [#17146](https://github.com/google-gemini/gemini-cli/pull/17146)
-- feat(plan): add persistent plan file storage by @jerop in
-  [#17563](https://github.com/google-gemini/gemini-cli/pull/17563)
-- feat(agents): migrate subagents to event-driven scheduler by @abhipatel12 in
-  [#17567](https://github.com/google-gemini/gemini-cli/pull/17567)
-- Fix extensions config error by @chrstnb in
-  [#17580](https://github.com/google-gemini/gemini-cli/pull/17580)
-- fix(plan): remove subagent invocation from plan mode by @jerop in
-  [#17593](https://github.com/google-gemini/gemini-cli/pull/17593)
-- feat(ui): add solid background color option for input prompt by @jacob314 in
-  [#16563](https://github.com/google-gemini/gemini-cli/pull/16563)
-- feat(plan): refresh system prompt when approval mode changes (Shift+Tab) by
-  @jerop in [#17585](https://github.com/google-gemini/gemini-cli/pull/17585)
-- feat(cli): add global setting to disable UI spinners by @galz10 in
-  [#17234](https://github.com/google-gemini/gemini-cli/pull/17234)
-- fix(security): enforce strict policy directory permissions by @yunaseoul in
-  [#17353](https://github.com/google-gemini/gemini-cli/pull/17353)
-- test(core): fix tests in windows by @scidomino in
-  [#17592](https://github.com/google-gemini/gemini-cli/pull/17592)
-- feat(mcp/extensions): Allow users to selectively enable/disable MCP servers
-  included in an extension( Issue #11057 & #17402) by @jasmeetsb in
-  [#17434](https://github.com/google-gemini/gemini-cli/pull/17434)
-- Always map mac keys, even on other platforms by @scidomino in
-  [#17618](https://github.com/google-gemini/gemini-cli/pull/17618)
-- Ctrl-O by @jacob314 in
-  [#17617](https://github.com/google-gemini/gemini-cli/pull/17617)
-- feat(plan): update cycling order of approval modes by @Adib234 in
-  [#17622](https://github.com/google-gemini/gemini-cli/pull/17622)
-- fix(cli): restore 'Modify with editor' option in external terminals by
-  @abhipatel12 in
-  [#17621](https://github.com/google-gemini/gemini-cli/pull/17621)
-- Slash command for helping in debugging by @gundermanc in
-  [#17609](https://github.com/google-gemini/gemini-cli/pull/17609)
-- feat: add double-click to expand/collapse large paste placeholders by
-  @jackwotherspoon in
-  [#17471](https://github.com/google-gemini/gemini-cli/pull/17471)
-- refactor(cli): migrate non-interactive flow to event-driven scheduler by
-  @abhipatel12 in
-  [#17572](https://github.com/google-gemini/gemini-cli/pull/17572)
-- fix: loadcodeassist eligible tiers getting ignored for unlicensed users
-  (regression) by @gsquared94 in
-  [#17581](https://github.com/google-gemini/gemini-cli/pull/17581)
-- chore(core): delete legacy nonInteractiveToolExecutor by @abhipatel12 in
-  [#17573](https://github.com/google-gemini/gemini-cli/pull/17573)
-- feat(core): enforce server prefixes for MCP tools in agent definitions by
-  @abhipatel12 in
-  [#17574](https://github.com/google-gemini/gemini-cli/pull/17574)
-- feat (mcp): Refresh MCP prompts on list changed notification by @MrLesk in
-  [#14863](https://github.com/google-gemini/gemini-cli/pull/14863)
-- feat(ui): pretty JSON rendering tool outputs by @medic-code in
-  [#9767](https://github.com/google-gemini/gemini-cli/pull/9767)
-- Fix iterm alternate buffer mode issue rendering backgrounds by @jacob314 in
-  [#17634](https://github.com/google-gemini/gemini-cli/pull/17634)
-- feat(cli): add gemini extensions list --output-format=json by @AkihiroSuda in
-  [#14479](https://github.com/google-gemini/gemini-cli/pull/14479)
-- fix(extensions): add .gitignore to extension templates by @godwiniheuwa in
-  [#17293](https://github.com/google-gemini/gemini-cli/pull/17293)
-- paste transform followup by @jacob314 in
-  [#17624](https://github.com/google-gemini/gemini-cli/pull/17624)
-- refactor: rename formatMemoryUsage to formatBytes by @Nubebuster in
-  [#14997](https://github.com/google-gemini/gemini-cli/pull/14997)
-- chore: remove extra top margin from /hooks and /extensions by @jackwotherspoon
-  in [#17663](https://github.com/google-gemini/gemini-cli/pull/17663)
-- feat(cli): add oncall command for issue triage by @sehoon38 in
-  [#17661](https://github.com/google-gemini/gemini-cli/pull/17661)
-- Fix sidebar issue for extensions link by @chrstnb in
-  [#17668](https://github.com/google-gemini/gemini-cli/pull/17668)
-- Change formatting to prevent UI redressing attacks by @scidomino in
-  [#17611](https://github.com/google-gemini/gemini-cli/pull/17611)
-- Fix cluster of bugs in the settings dialog. by @jacob314 in
-  [#17628](https://github.com/google-gemini/gemini-cli/pull/17628)
-- Update sidebar to resolve site build issues by @chrstnb in
-  [#17674](https://github.com/google-gemini/gemini-cli/pull/17674)
-- fix(admin): fix a few bugs related to admin controls by @skeshive in
-  [#17590](https://github.com/google-gemini/gemini-cli/pull/17590)
-- revert bad changes to tests by @scidomino in
-  [#17673](https://github.com/google-gemini/gemini-cli/pull/17673)
-- feat(cli): show candidate issue state reason and duplicate status in triage by
-  @sehoon38 in [#17676](https://github.com/google-gemini/gemini-cli/pull/17676)
-- Fix missing slash commands when Gemini CLI is in a project with a package.json
-  that doesn't follow semantic versioning by @Adib234 in
-  [#17561](https://github.com/google-gemini/gemini-cli/pull/17561)
-- feat(core): Model family-specific system prompts by @joshualitt in
-  [#17614](https://github.com/google-gemini/gemini-cli/pull/17614)
-- Sub-agents documentation. by @gundermanc in
-  [#16639](https://github.com/google-gemini/gemini-cli/pull/16639)
-- feat: wire up AskUserTool with dialog by @jackwotherspoon in
-  [#17411](https://github.com/google-gemini/gemini-cli/pull/17411)
-- Load extension settings for hooks, agents, skills by @chrstnb in
-  [#17245](https://github.com/google-gemini/gemini-cli/pull/17245)
-- Fix issue where Gemini CLI can make changes when simply asked a question by
-  @gundermanc in
-  [#17608](https://github.com/google-gemini/gemini-cli/pull/17608)
-- Update docs-writer skill for editing and add style guide for reference. by
-  @g-samroberts in
-  [#17669](https://github.com/google-gemini/gemini-cli/pull/17669)
-- fix(ux): have user message display a short path for pasted images by @devr0306
-  in [#17613](https://github.com/google-gemini/gemini-cli/pull/17613)
-- feat(plan): enable AskUser tool in Plan mode for clarifying questions by
-  @jerop in [#17694](https://github.com/google-gemini/gemini-cli/pull/17694)
-- GEMINI.md polish by @jacob314 in
-  [#17680](https://github.com/google-gemini/gemini-cli/pull/17680)
-- refactor(core): centralize path validation and allow temp dir access for tools
-  by @NTaylorMullen in
-  [#17185](https://github.com/google-gemini/gemini-cli/pull/17185)
-- feat(skills): promote Agent Skills to stable by @abhipatel12 in
-  [#17693](https://github.com/google-gemini/gemini-cli/pull/17693)
-- refactor(cli): keyboard handling and AskUserDialog by @jacob314 in
-  [#17414](https://github.com/google-gemini/gemini-cli/pull/17414)
-- docs: Add Experimental Remote Agent Docs by @adamfweidman in
-  [#17697](https://github.com/google-gemini/gemini-cli/pull/17697)
-- revert: promote Agent Skills to stable (#17693) by @abhipatel12 in
-  [#17712](https://github.com/google-gemini/gemini-cli/pull/17712)
-- feat(ux) Expandable (ctrl-O) and scrollable approvals in alternate buffer
-  mode. by @jacob314 in
-  [#17640](https://github.com/google-gemini/gemini-cli/pull/17640)
-- feat(skills): promote skills settings to stable by @abhipatel12 in
-  [#17713](https://github.com/google-gemini/gemini-cli/pull/17713)
-- fix(cli): Preserve settings dialog focus when searching by @SandyTao520 in
-  [#17701](https://github.com/google-gemini/gemini-cli/pull/17701)
-- feat(ui): add terminal cursor support by @jacob314 in
-  [#17711](https://github.com/google-gemini/gemini-cli/pull/17711)
-- docs(skills): remove experimental labels and update tutorials by @abhipatel12
-  in [#17714](https://github.com/google-gemini/gemini-cli/pull/17714)
-- docs: remove 'experimental' syntax for hooks in docs by @abhipatel12 in
-  [#17660](https://github.com/google-gemini/gemini-cli/pull/17660)
-- Add support for an additional exclusion file besides .gitignore and
-  .geminiignore by @alisa-alisa in
-  [#16487](https://github.com/google-gemini/gemini-cli/pull/16487)
-- feat: add review-frontend-and-fix command by @galz10 in
-  [#17707](https://github.com/google-gemini/gemini-cli/pull/17707)
+  [#19574](https://github.com/google-gemini/gemini-cli/pull/19574)
+- refactor(core): remove unsafe type assertions in error utils (Phase 1.1) by
+  @mattKorwel in
+  [#19750](https://github.com/google-gemini/gemini-cli/pull/19750)
+- Disallow unsafe returns. by @gundermanc in
+  [#19767](https://github.com/google-gemini/gemini-cli/pull/19767)
+- fix(cli): filter subagent sessions from resume history by @abhipatel12 in
+  [#19698](https://github.com/google-gemini/gemini-cli/pull/19698)
+- chore(lint): fix lint errors seen when running npm run lint by @abhipatel12 in
+  [#19844](https://github.com/google-gemini/gemini-cli/pull/19844)
+- feat(core): remove unnecessary login verbiage from Code Assist auth by
+  @NTaylorMullen in
+  [#19861](https://github.com/google-gemini/gemini-cli/pull/19861)
+- fix(plan): time share by approval mode dashboard reporting negative time
+  shares by @Adib234 in
+  [#19847](https://github.com/google-gemini/gemini-cli/pull/19847)
+- fix(core): allow any preview model in quota access check by @bdmorgan in
+  [#19867](https://github.com/google-gemini/gemini-cli/pull/19867)
+- fix(core): prevent omission placeholder deletions in replace/write_file by
+  @nsalerni in [#19870](https://github.com/google-gemini/gemini-cli/pull/19870)
+- fix(core): add uniqueness guard to edit tool by @Shivangisharma4 in
+  [#19890](https://github.com/google-gemini/gemini-cli/pull/19890)
+- refactor(config): remove enablePromptCompletion from settings by @sehoon38 in
+  [#19974](https://github.com/google-gemini/gemini-cli/pull/19974)
+- refactor(core): move session conversion logic to core by @abhipatel12 in
+  [#19972](https://github.com/google-gemini/gemini-cli/pull/19972)
+- Fix: Persist manual model selection on restart #19864 by @Nixxx19 in
+  [#19891](https://github.com/google-gemini/gemini-cli/pull/19891)
+- fix(core): increase default retry attempts and add quota error backoff by
+  @sehoon38 in [#19949](https://github.com/google-gemini/gemini-cli/pull/19949)
+- feat(core): add policy chain support for Gemini 3.1 by @sehoon38 in
+  [#19991](https://github.com/google-gemini/gemini-cli/pull/19991)
+- Updates command reference and /stats command. by @g-samroberts in
+  [#19794](https://github.com/google-gemini/gemini-cli/pull/19794)
+- Fix for silent failures in non-interactive mode by @owenofbrien in
+  [#19905](https://github.com/google-gemini/gemini-cli/pull/19905)
+- fix(plan): allow plan mode writes on Windows and fix prompt paths by @Adib234
+  in [#19658](https://github.com/google-gemini/gemini-cli/pull/19658)
+- fix(core): prevent OAuth server crash on unexpected requests by @reyyanxahmed
+  in [#19668](https://github.com/google-gemini/gemini-cli/pull/19668)
+- feat: Map tool kinds to explicit ACP.ToolKind values and update test … by
+  @sripasg in [#19547](https://github.com/google-gemini/gemini-cli/pull/19547)
+- chore: restrict gemini-automted-issue-triage to only allow echo by @galz10 in
+  [#20047](https://github.com/google-gemini/gemini-cli/pull/20047)
+- Allow ask headers longer than 16 chars by @scidomino in
+  [#20041](https://github.com/google-gemini/gemini-cli/pull/20041)
+- fix(core): prevent state corruption in McpClientManager during collis by @h30s
+  in [#19782](https://github.com/google-gemini/gemini-cli/pull/19782)
+- fix(bundling): copy devtools package to bundle for runtime resolution by
+  @SandyTao520 in
+  [#19766](https://github.com/google-gemini/gemini-cli/pull/19766)
+- feat(policy): Support MCP Server Wildcards in Policy Engine by @jerop in
+  [#20024](https://github.com/google-gemini/gemini-cli/pull/20024)
+- docs(CONTRIBUTING): update React DevTools version to 6 by @mmgok in
+  [#20014](https://github.com/google-gemini/gemini-cli/pull/20014)
+- feat(core): optimize tool descriptions and schemas for Gemini 3 by
+  @aishaneeshah in
+  [#19643](https://github.com/google-gemini/gemini-cli/pull/19643)
+- feat(core): implement experimental direct web fetch by @mbleigh in
+  [#19557](https://github.com/google-gemini/gemini-cli/pull/19557)
+- feat(core): replace expected_replacements with allow_multiple in replace tool
+  by @SandyTao520 in
+  [#20033](https://github.com/google-gemini/gemini-cli/pull/20033)
+- fix(sandbox): harden image packaging integrity checks by @aviralgarg05 in
+  [#19552](https://github.com/google-gemini/gemini-cli/pull/19552)
+- fix(core): allow environment variable expansion and explicit overrides for MCP
+  servers by @galz10 in
+  [#18837](https://github.com/google-gemini/gemini-cli/pull/18837)
+- feat(policy): Implement Tool Annotation Matching in Policy Engine by @jerop in
+  [#20029](https://github.com/google-gemini/gemini-cli/pull/20029)
+- fix(core): prevent utility calls from changing session active model by
+  @adamfweidman in
+  [#20035](https://github.com/google-gemini/gemini-cli/pull/20035)
+- fix(cli): skip workspace policy loading when in home directory by
+  @Abhijit-2592 in
+  [#20054](https://github.com/google-gemini/gemini-cli/pull/20054)
+- fix(scripts): Add Windows (win32/x64) support to lint.js by @ZafeerMahmood in
+  [#16193](https://github.com/google-gemini/gemini-cli/pull/16193)
+- fix(a2a-server): Remove unsafe type assertions in agent by @Nixxx19 in
+  [#19723](https://github.com/google-gemini/gemini-cli/pull/19723)
+- Fix: Handle corrupted token file gracefully when switching auth types (#19845)
+  by @Nixxx19 in
+  [#19850](https://github.com/google-gemini/gemini-cli/pull/19850)
+- fix critical dep vulnerability by @scidomino in
+  [#20087](https://github.com/google-gemini/gemini-cli/pull/20087)
+- Add new setting to configure maxRetries by @kevinjwang1 in
+  [#20064](https://github.com/google-gemini/gemini-cli/pull/20064)
+- Stabilize tests. by @gundermanc in
+  [#20095](https://github.com/google-gemini/gemini-cli/pull/20095)
+- make windows tests mandatory by @scidomino in
+  [#20096](https://github.com/google-gemini/gemini-cli/pull/20096)
+- Add 3.1 pro preview to behavioral evals. by @gundermanc in
+  [#20088](https://github.com/google-gemini/gemini-cli/pull/20088)
+- feat:PR-rate-limit by @JagjeevanAK in
+  [#19804](https://github.com/google-gemini/gemini-cli/pull/19804)
+- feat(cli): allow expanding full details of MCP tool on approval by @y-okt in
+  [#19916](https://github.com/google-gemini/gemini-cli/pull/19916)
+- feat(security): Introduce Conseca framework by @shrishabh in
+  [#13193](https://github.com/google-gemini/gemini-cli/pull/13193)
+- fix(cli): Remove unsafe type assertions in activityLogger #19713 by @Nixxx19
+  in [#19745](https://github.com/google-gemini/gemini-cli/pull/19745)
+- feat: implement AfterTool tail tool calls by @googlestrobe in
+  [#18486](https://github.com/google-gemini/gemini-cli/pull/18486)
+- ci(actions): fix PR rate limiter excluding maintainers by @scidomino in
+  [#20117](https://github.com/google-gemini/gemini-cli/pull/20117)
+- Shortcuts: Move SectionHeader title below top line and refine styling by
+  @keithguerin in
+  [#18721](https://github.com/google-gemini/gemini-cli/pull/18721)
+- refactor(ui): Update and simplify use of gray colors in themes by @keithguerin
+  in [#20141](https://github.com/google-gemini/gemini-cli/pull/20141)
+- fix punycode2 by @jacob314 in
+  [#20154](https://github.com/google-gemini/gemini-cli/pull/20154)
+- feat(ide): add GEMINI_CLI_IDE_PID env var to override IDE process detection by
+  @kiryltech in [#15842](https://github.com/google-gemini/gemini-cli/pull/15842)
+- feat(policy): Propagate Tool Annotations for MCP Servers by @jerop in
+  [#20083](https://github.com/google-gemini/gemini-cli/pull/20083)
+- fix(a2a-server): pass allowedTools settings to core Config by @reyyanxahmed in
+  [#19680](https://github.com/google-gemini/gemini-cli/pull/19680)
+- feat(mcp): add progress bar, throttling, and input validation for MCP tool
+  progress by @jasmeetsb in
+  [#19772](https://github.com/google-gemini/gemini-cli/pull/19772)
+- feat(policy): centralize plan mode tool visibility in policy engine by @jerop
+  in [#20178](https://github.com/google-gemini/gemini-cli/pull/20178)
+- feat(browser): implement experimental browser agent by @gsquared94 in
+  [#19284](https://github.com/google-gemini/gemini-cli/pull/19284)
+- feat(plan): summarize work after executing a plan by @jerop in
+  [#19432](https://github.com/google-gemini/gemini-cli/pull/19432)
+- fix(core): create new McpClient on restart to apply updated config by @h30s in
+  [#20126](https://github.com/google-gemini/gemini-cli/pull/20126)
+- Changelog for v0.30.0-preview.5 by @gemini-cli-robot in
+  [#20107](https://github.com/google-gemini/gemini-cli/pull/20107)
+- Update packages. by @jacob314 in
+  [#20152](https://github.com/google-gemini/gemini-cli/pull/20152)
+- Fix extension env dir loading issue by @chrstnb in
+  [#20198](https://github.com/google-gemini/gemini-cli/pull/20198)
+- restrict /assign to help-wanted issues by @scidomino in
+  [#20207](https://github.com/google-gemini/gemini-cli/pull/20207)
+- feat(plan): inject message when user manually exits Plan mode by @jerop in
+  [#20203](https://github.com/google-gemini/gemini-cli/pull/20203)
+- feat(extensions): enforce folder trust for local extension install by @galz10
+  in [#19703](https://github.com/google-gemini/gemini-cli/pull/19703)
+- feat(hooks): adds support for RuntimeHook functions. by @mbleigh in
+  [#19598](https://github.com/google-gemini/gemini-cli/pull/19598)
+- Docs: Update UI links. by @jkcinouye in
+  [#20224](https://github.com/google-gemini/gemini-cli/pull/20224)
+- feat: prompt users to run /terminal-setup with yes/no by @ishaanxgupta in
+  [#16235](https://github.com/google-gemini/gemini-cli/pull/16235)
+- fix: additional high vulnerabilities (minimatch, cross-spawn) by @adamfweidman
+  in [#20221](https://github.com/google-gemini/gemini-cli/pull/20221)
+- feat(telemetry): Add context breakdown to API response event by @SandyTao520
+  in [#19699](https://github.com/google-gemini/gemini-cli/pull/19699)
+- Docs: Add nested sub-folders for related topics by @g-samroberts in
+  [#20235](https://github.com/google-gemini/gemini-cli/pull/20235)
+- feat(plan): support automatic model switching for Plan Mode by @jerop in
+  [#20240](https://github.com/google-gemini/gemini-cli/pull/20240)
 
-**Full changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.26.0-preview.5...v0.27.0-preview.0
+**Full Changelog**:
+https://github.com/google-gemini/gemini-cli/compare/v0.30.0-preview.6...v0.31.0-preview.1

docs/cli/authentication.md

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

docs/cli/checkpointing.md

@@ -2,9 +2,8 @@
 
 The Gemini CLI includes a Checkpointing feature that automatically saves a
 snapshot of your project's state before any file modifications are made by
-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.
+AI-powered tools. This lets you safely experiment with and apply code changes,
+knowing you can instantly revert back to the state before the tool was run.
 
 ## How it works
 

docs/cli/cli-reference.md

@@ -1,4 +1,4 @@
-# CLI cheatsheet
+# Gemini CLI cheatsheet
 
 This page provides a reference for commonly used Gemini CLI commands, options,
 and parameters.
@@ -9,8 +9,7 @@ and parameters.
 | ---------------------------------- | ---------------------------------- | --------------------------------------------------- |
 | `gemini`                           | Start interactive REPL             | `gemini`                                            |
 | `gemini "query"`                   | Query non-interactively, then exit | `gemini "explain this project"`                     |
-| `gemini -p "query"`                | Query via SDK, then exit           | `gemini -p "explain this function"`                 |
-| `cat file \| gemini -p "query"`    | Process piped content              | `cat logs.txt \| gemini -p "explain"`               |
+| `cat file \| gemini`               | Process piped content              | `cat logs.txt \| gemini`                            |
 | `gemini -i "query"`                | Execute and continue interactively | `gemini -i "What is the purpose of this project?"`  |
 | `gemini -r "latest"`               | Continue most recent session       | `gemini -r "latest"`                                |
 | `gemini -r "latest" "query"`       | Continue session with a new prompt | `gemini -r "latest" "Check for type errors"`        |
@@ -27,34 +26,34 @@ and parameters.
 
 ## CLI Options
 
-| Option                           | Alias | Type    | Default   | Description                                                                                                |
-| -------------------------------- | ----- | ------- | --------- | ---------------------------------------------------------------------------------------------------------- |
-| `--debug`                        | `-d`  | boolean | `false`   | Run in debug mode with verbose logging                                                                     |
-| `--version`                      | `-v`  | -       | -         | Show CLI version number and exit                                                                           |
-| `--help`                         | `-h`  | -       | -         | Show help information                                                                                      |
-| `--model`                        | `-m`  | string  | `auto`    | Model to use. See [Model Selection](#model-selection) for available values.                                |
-| `--prompt`                       | `-p`  | string  | -         | Prompt text. Appended to stdin input if provided. **Deprecated:** Use positional arguments instead.        |
-| `--prompt-interactive`           | `-i`  | string  | -         | Execute prompt and continue in interactive mode                                                            |
-| `--sandbox`                      | `-s`  | boolean | `false`   | Run in a sandboxed environment for safer execution                                                         |
-| `--approval-mode`                | -     | string  | `default` | Approval mode for tool execution. Choices: `default`, `auto_edit`, `yolo`                                  |
-| `--yolo`                         | `-y`  | boolean | `false`   | **Deprecated.** Auto-approve all actions. Use `--approval-mode=yolo` instead.                              |
-| `--experimental-acp`             | -     | boolean | -         | Start in ACP (Agent Code Pilot) mode. **Experimental feature.**                                            |
-| `--experimental-zed-integration` | -     | boolean | -         | Run in Zed editor integration mode. **Experimental feature.**                                              |
-| `--allowed-mcp-server-names`     | -     | array   | -         | Allowed MCP server names (comma-separated or multiple flags)                                               |
-| `--allowed-tools`                | -     | array   | -         | Tools that are allowed to run without confirmation (comma-separated or multiple flags)                     |
-| `--extensions`                   | `-e`  | array   | -         | List of extensions to use. If not provided, all extensions are enabled (comma-separated or multiple flags) |
-| `--list-extensions`              | `-l`  | boolean | -         | List all available extensions and exit                                                                     |
-| `--resume`                       | `-r`  | string  | -         | Resume a previous session. Use `"latest"` for most recent or index number (e.g. `--resume 5`)              |
-| `--list-sessions`                | -     | boolean | -         | List available sessions for the current project and exit                                                   |
-| `--delete-session`               | -     | string  | -         | Delete a session by index number (use `--list-sessions` to see available sessions)                         |
-| `--include-directories`          | -     | array   | -         | Additional directories to include in the workspace (comma-separated or multiple flags)                     |
-| `--screen-reader`                | -     | boolean | -         | Enable screen reader mode for accessibility                                                                |
-| `--output-format`                | `-o`  | string  | `text`    | The format of the CLI output. Choices: `text`, `json`, `stream-json`                                       |
+| Option                           | Alias | Type    | Default   | Description                                                                                                                                                            |
+| -------------------------------- | ----- | ------- | --------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `--debug`                        | `-d`  | boolean | `false`   | Run in debug mode with verbose logging                                                                                                                                 |
+| `--version`                      | `-v`  | -       | -         | Show CLI version number and exit                                                                                                                                       |
+| `--help`                         | `-h`  | -       | -         | Show help information                                                                                                                                                  |
+| `--model`                        | `-m`  | string  | `auto`    | Model to use. See [Model Selection](#model-selection) for available values.                                                                                            |
+| `--prompt`                       | `-p`  | string  | -         | Prompt text. Appended to stdin input if provided. **Deprecated:** Use positional arguments instead.                                                                    |
+| `--prompt-interactive`           | `-i`  | string  | -         | Execute prompt and continue in interactive mode                                                                                                                        |
+| `--sandbox`                      | `-s`  | boolean | `false`   | Run in a sandboxed environment for safer execution                                                                                                                     |
+| `--approval-mode`                | -     | string  | `default` | Approval mode for tool execution. Choices: `default`, `auto_edit`, `yolo`                                                                                              |
+| `--yolo`                         | `-y`  | boolean | `false`   | **Deprecated.** Auto-approve all actions. Use `--approval-mode=yolo` instead.                                                                                          |
+| `--experimental-acp`             | -     | boolean | -         | Start in ACP (Agent Code Pilot) mode. **Experimental feature.**                                                                                                        |
+| `--experimental-zed-integration` | -     | boolean | -         | Run in Zed editor integration mode. **Experimental feature.**                                                                                                          |
+| `--allowed-mcp-server-names`     | -     | array   | -         | Allowed MCP server names (comma-separated or multiple flags)                                                                                                           |
+| `--allowed-tools`                | -     | array   | -         | **Deprecated.** Use the [Policy Engine](../reference/policy-engine.md) instead. Tools that are allowed to run without confirmation (comma-separated or multiple flags) |
+| `--extensions`                   | `-e`  | array   | -         | List of extensions to use. If not provided, all extensions are enabled (comma-separated or multiple flags)                                                             |
+| `--list-extensions`              | `-l`  | boolean | -         | List all available extensions and exit                                                                                                                                 |
+| `--resume`                       | `-r`  | string  | -         | Resume a previous session. Use `"latest"` for most recent or index number (e.g. `--resume 5`)                                                                          |
+| `--list-sessions`                | -     | boolean | -         | List available sessions for the current project and exit                                                                                                               |
+| `--delete-session`               | -     | string  | -         | Delete a session by index number (use `--list-sessions` to see available sessions)                                                                                     |
+| `--include-directories`          | -     | array   | -         | Additional directories to include in the workspace (comma-separated or multiple flags)                                                                                 |
+| `--screen-reader`                | -     | boolean | -         | Enable screen reader mode for accessibility                                                                                                                            |
+| `--output-format`                | `-o`  | string  | `text`    | The format of the CLI output. Choices: `text`, `json`, `stream-json`                                                                                                   |
 
 ## Model selection
 
-The `--model` (or `-m`) flag allows you to specify which Gemini model to use.
-You can use either model aliases (user-friendly names) or concrete model names.
+The `--model` (or `-m`) flag lets you specify which Gemini model to use. You can
+use either model aliases (user-friendly names) or concrete model names.
 
 ### Model aliases
 

docs/cli/commands.md

@@ -1,430 +0,0 @@
-# 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
-with a forward slash (`/`), an at symbol (`@`), or an exclamation mark (`!`).
-
-## Slash commands (`/`)
-
-Slash commands provide meta-level control over the CLI itself.
-
-### Built-in Commands
-
-- **`/about`**
-  - **Description:** Show version info. Please share this information when
-    filing issues.
-
-- **`/auth`**
-  - **Description:** Open a dialog that lets you change the authentication
-    method.
-
-- **`/bug`**
-  - **Description:** File an issue about Gemini CLI. By default, the issue is
-    filed within the GitHub repository for Gemini CLI. The string you enter
-    after `/bug` will become the headline for the bug being filed. The default
-    `/bug` behavior can be modified using the `advanced.bugCommand` setting in
-    your `.gemini/settings.json` files.
-
-- **`/chat`**
-  - **Description:** Save and resume conversation history for branching
-    conversation state interactively, or resuming a previous state from a later
-    session.
-  - **Sub-commands:**
-    - **`delete <tag>`**
-      - **Description:** Deletes a saved conversation checkpoint.
-    - **`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.
-    - **`resume <tag>`**
-      - **Description:** Resumes a conversation from a previous save.
-      - **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.
-    - **`save <tag>`**
-      - **Description:** Saves the current conversation history. You must add a
-        `<tag>` for identifying the conversation state.
-      - **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>\`
-        - **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
-          [Checkpointing documentation](../cli/checkpointing.md).
-    - **`share [filename]`**
-      - **Description** Writes the current conversation to a provided Markdown
-        or JSON file. If no filename is provided, then the CLI will generate
-        one.
-      - **Usage** `/chat share file.md` or `/chat share file.json`.
-
-- **`/clear`**
-  - **Description:** Clear the terminal screen, including the visible session
-    history and scrollback within the CLI. The underlying session data (for
-    history recall) might be preserved depending on the exact implementation,
-    but the visual display is cleared.
-  - **Keyboard shortcut:** Press **Ctrl+L** at any time to perform a clear
-    action.
-
-- **`/compress`**
-  - **Description:** Replace the entire chat context with a summary. This saves
-    on tokens used for future tasks while retaining a high level summary of what
-    has happened.
-
-- **`/copy`**
-  - **Description:** Copies the last output produced by Gemini CLI to your
-    clipboard, for easy sharing or reuse.
-  - **Behavior:**
-    - Local sessions use system clipboard tools (pbcopy/xclip/clip).
-    - Remote sessions (SSH/WSL) use OSC 52 and require terminal support.
-  - **Note:** This command requires platform-specific clipboard tools to be
-    installed.
-    - On Linux, it requires `xclip` or `xsel`. You can typically install them
-      using your system's package manager.
-    - On macOS, it requires `pbcopy`, and on Windows, it requires `clip`. These
-      tools are typically pre-installed on their respective systems.
-
-- **`/directory`** (or **`/dir`**)
-  - **Description:** Manage workspace directories for multi-directory support.
-  - **Sub-commands:**
-    - **`add`**:
-      - **Description:** Add a directory to the workspace. The path can be
-        absolute or relative to the current working directory. Moreover, the
-        reference from home directory is supported as well.
-      - **Usage:** `/directory add <path1>,<path2>`
-      - **Note:** Disabled in restrictive sandbox profiles. If you're using
-        that, use `--include-directories` when starting the session instead.
-    - **`show`**:
-      - **Description:** Display all directories added by `/directory add` and
-        `--include-directories`.
-      - **Usage:** `/directory show`
-
-- **`/docs`**
-  - **Description:** Open the Gemini CLI documentation in your browser.
-
-- **`/editor`**
-  - **Description:** Open a dialog for selecting supported editors.
-
-- **`/extensions`**
-  - **Description:** Lists all active extensions in the current Gemini CLI
-    session. See [Gemini CLI Extensions](../extensions/index.md).
-
-- **`/help`** (or **`/?`**)
-  - **Description:** Display help information about Gemini CLI, including
-    available commands and their usage.
-
-- **`/hooks`**
-  - **Description:** Manage hooks, which allow you to intercept and customize
-    Gemini CLI behavior at specific lifecycle events.
-  - **Sub-commands:**
-    - **`disable-all`**:
-      - **Description:** Disable all enabled hooks.
-    - **`disable <hook-name>`**:
-      - **Description:** Disable a hook by name.
-    - **`enable-all`**:
-      - **Description:** Enable all disabled hooks.
-    - **`enable <hook-name>`**:
-      - **Description:** Enable a hook by name.
-    - **`list`** (or `show`, `panel`):
-      - **Description:** Display all registered hooks with their status.
-
-- **`/ide`**
-  - **Description:** Manage IDE integration.
-  - **Sub-commands:**
-    - **`disable`**:
-      - **Description:** Disable IDE integration.
-    - **`enable`**:
-      - **Description:** Enable IDE integration.
-    - **`install`**:
-      - **Description:** Install required IDE companion.
-    - **`status`**:
-      - **Description:** Check status of IDE integration.
-
-- **`/init`**
-  - **Description:** To help users easily create a `GEMINI.md` file, this
-    command analyzes the current directory and generates a tailored context
-    file, making it simpler for them to provide project-specific instructions to
-    the Gemini agent.
-
-- **`/introspect`**
-  - **Description:** Provide debugging information about the current Gemini CLI
-    session, including the state of loaded sub-agents and active hooks. This
-    command is primarily for advanced users and developers.
-
-- **`/mcp`**
-  - **Description:** Manage configured Model Context Protocol (MCP) servers.
-  - **Sub-commands:**
-    - **`auth`**:
-      - **Description:** Authenticate with an OAuth-enabled MCP server.
-      - **Usage:** `/mcp auth <server-name>`
-      - **Details:** If `<server-name>` is provided, it initiates the OAuth flow
-        for that server. If no server name is provided, it lists all configured
-        servers that support OAuth authentication.
-    - **`desc`**
-      - **Description:** List configured MCP servers and tools with
-        descriptions.
-    - **`list`** or **`ls`**:
-      - **Description:** List configured MCP servers and tools. This is the
-        default action if no subcommand is specified.
-    - **`refresh`**:
-      - **Description:** Restarts all MCP servers and re-discovers their
-        available tools.
-    - **`schema`**:
-      - **Description:** List configured MCP servers and tools with descriptions
-        and schemas.
-
-- **`/memory`**
-  - **Description:** Manage the AI's instructional context (hierarchical memory
-    loaded from `GEMINI.md` files).
-  - **Sub-commands:**
-    - **`add`**:
-      - **Description:** Adds the following text to the AI's memory. Usage:
-        `/memory add <text to remember>`
-    - **`list`**:
-      - **Description:** Lists the paths of the GEMINI.md files in use for
-        hierarchical memory.
-    - **`refresh`**:
-      - **Description:** Reload the hierarchical instructional memory from all
-        `GEMINI.md` files found in the configured locations (global,
-        project/ancestors, and sub-directories). This command updates the model
-        with the latest `GEMINI.md` content.
-    - **`show`**:
-      - **Description:** Display the full, concatenated content of the current
-        hierarchical memory that has been loaded from all `GEMINI.md` files.
-        This lets you inspect the instructional context being provided to the
-        Gemini model.
-    - **Note:** For more details on how `GEMINI.md` files contribute to
-      hierarchical memory, see the
-      [CLI Configuration documentation](../get-started/configuration.md).
-
-- [**`/model`**](./model.md)
-  - **Description:** Opens a dialog to choose your Gemini model.
-
-- **`/policies`**
-  - **Description:** Manage policies.
-  - **Sub-commands:**
-    - **`list`**:
-      - **Description:** List all active policies grouped by mode.
-
-- **`/privacy`**
-  - **Description:** Display the Privacy Notice and allow users to select
-    whether they consent to the collection of their data for service improvement
-    purposes.
-
-- **`/quit`** (or **`/exit`**)
-  - **Description:** Exit Gemini CLI.
-
-- **`/restore`**
-  - **Description:** Restores the project files to the state they were in just
-    before a tool was executed. This is particularly useful for undoing file
-    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 checkpointing is configured via
-    [settings](../get-started/configuration.md). See
-    [Checkpointing documentation](../cli/checkpointing.md) for more details.
-
-- [**`/rewind`**](./rewind.md)
-  - **Description:** Navigates backward through the conversation history,
-    allowing you to review past interactions and potentially revert to a
-    previous state. This feature helps in managing complex or branched
-    conversations.
-
-- **`/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:**
-    - **Management:** Delete unwanted sessions directly from the browser
-    - **Resume:** Select any session to resume and continue the conversation
-    - **Search:** Use `/` to search through conversation content across all
-      sessions
-    - **Session Browser:** Interactive interface showing all saved sessions with
-      timestamps, message counts, and first user message for context
-    - **Sorting:** Sort sessions by date or message count
-  - **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.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. 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,
-    while others require a restart.
-
-- **`/shells`** (or **`/bashes`**)
-  - **Description:** Toggle the background shells view. This allows you to view
-    and manage long-running processes that you've sent to the background.
-- **`/setup-github`**
-  - **Description:** Set up GitHub Actions to triage issues and review PRs with
-    Gemini.
-
-- [**`/skills`**](./skills.md)
-  - **Description:** Manage Agent Skills, which provide on-demand expertise and
-    specialized workflows.
-  - **Sub-commands:**
-    - **`disable <name>`**:
-      - **Description:** Disable a specific skill by name.
-      - **Usage:** `/skills disable <name>`
-    - **`enable <name>`**:
-      - **Description:** Enable a specific skill by name.
-      - **Usage:** `/skills enable <name>`
-    - **`list`**:
-      - **Description:** List all discovered skills and their current status
-        (enabled/disabled).
-    - **`reload`**:
-      - **Description:** Refresh the list of discovered skills from all tiers
-        (workspace, user, and extensions).
-
-- **`/stats`**
-  - **Description:** Display detailed statistics for the current Gemini CLI
-    session, including token usage, cached token savings (when available), and
-    session duration. Note: Cached token information is only displayed when
-    cached tokens are being used, which occurs with API key authentication but
-    not with OAuth authentication at this time.
-
-- **`/terminal-setup`**
-  - **Description:** Configure terminal keybindings for multiline input (VS
-    Code, Cursor, Windsurf).
-
-- [**`/theme`**](./themes.md)
-  - **Description:** Open a dialog that lets you change the visual theme of
-    Gemini CLI.
-
-- [**`/tools`**](../tools/index.md)
-  - **Description:** Display a list of tools that are currently available within
-    Gemini CLI.
-  - **Usage:** `/tools [desc]`
-  - **Sub-commands:**
-    - **`desc`** or **`descriptions`**:
-      - **Description:** Show detailed descriptions of each tool, including each
-        tool's name with its full description as provided to the model.
-    - **`nodesc`** or **`nodescriptions`**:
-      - **Description:** Hide tool descriptions, showing only the tool names.
-
-- **`/vim`**
-  - **Description:** Toggle vim mode on or off. When vim mode is enabled, the
-    input area supports vim-style navigation and editing commands in both NORMAL
-    and INSERT modes.
-  - **Features:**
-    - **Count support:** Prefix commands with numbers (e.g., `3h`, `5w`, `10G`)
-    - **Editing commands:** Delete with `x`, change with `c`, insert with `i`,
-      `a`, `o`, `O`; complex operations like `dd`, `cc`, `dw`, `cw`
-    - **INSERT mode:** Standard text input with escape to return to NORMAL mode
-    - **NORMAL mode:** Navigate with `h`, `j`, `k`, `l`; jump by words with `w`,
-      `b`, `e`; go to line start/end with `0`, `$`, `^`; go to specific lines
-      with `G` (or `gg` for first line)
-    - **Persistent setting:** Vim mode preference is saved to
-      `~/.gemini/settings.json` and restored between sessions
-    - **Repeat last command:** Use `.` to repeat the last editing operation
-    - **Status indicator:** When enabled, shows `[NORMAL]` or `[INSERT]` in the
-      footer
-
-### 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
-
-These shortcuts apply directly to the input prompt for text manipulation.
-
-- **Undo:**
-  - **Keyboard shortcut:** Press **Cmd+z** or **Alt+z** to undo the last action
-    in the input prompt.
-
-- **Redo:**
-  - **Keyboard shortcut:** Press **Shift+Cmd+Z** or **Shift+Alt+Z** to redo the
-    last undone action in the input prompt.
-
-## At commands (`@`)
-
-At commands are used to include the content of files or directories as part of
-your prompt to Gemini. These commands include git-aware filtering.
-
-- **`@<path_to_file_or_directory>`**
-  - **Description:** Inject the content of the specified file or files into your
-    current prompt. This is useful for asking questions about specific code,
-    text, or collections of files.
-  - **Examples:**
-    - `@path/to/your/file.txt Explain this text.`
-    - `@src/my_project/ Summarize the code in this directory.`
-    - `What is this file about? @README.md`
-  - **Details:**
-    - If a path to a single file is provided, the content of that file is read.
-    - If a path to a directory is provided, the command attempts to read the
-      content of files within that directory and any subdirectories.
-    - Spaces in paths should be escaped with a backslash (e.g.,
-      `@My\ Documents/file.txt`).
-    - The command uses the `read_many_files` tool internally. The content is
-      fetched and then inserted into your query before being sent to the Gemini
-      model.
-    - **Git-aware filtering:** By default, git-ignored files (like
-      `node_modules/`, `dist/`, `.env`, `.git/`) are excluded. This behavior can
-      be changed via the `context.fileFiltering` settings.
-    - **File types:** The command is intended for text-based files. While it
-      might attempt to read any file, binary files or very large files might be
-      skipped or truncated by the underlying `read_many_files` tool to ensure
-      performance and relevance. The tool indicates if files were skipped.
-  - **Output:** The CLI will show a tool call message indicating that
-    `read_many_files` was used, along with a message detailing the status and
-    the path(s) that were processed.
-
-- **`@` (Lone at symbol)**
-  - **Description:** If you type a lone `@` symbol without a path, the query is
-    passed as-is to the Gemini model. This might be useful if you are
-    specifically talking _about_ the `@` symbol in your prompt.
-
-### Error handling for `@` commands
-
-- If the path specified after `@` is not found or is invalid, an error message
-  will be displayed, and the query might not be sent to the Gemini model, or it
-  will be sent without the file content.
-- If the `read_many_files` tool encounters an error (e.g., permission issues),
-  this will also be reported.
-
-## Shell mode and passthrough commands (`!`)
-
-The `!` prefix lets you interact with your system's shell directly from within
-Gemini CLI.
-
-- **`!<shell_command>`**
-  - **Description:** Execute the given `<shell_command>` using `bash` on
-    Linux/macOS or `powershell.exe -NoProfile -Command` on Windows (unless you
-    override `ComSpec`). Any output or errors from the command are displayed in
-    the terminal.
-  - **Examples:**
-    - `!ls -la` (executes `ls -la` and returns to Gemini CLI)
-    - `!git status` (executes `git status` and returns to Gemini CLI)
-
-- **`!` (Toggle shell mode)**
-  - **Description:** Typing `!` on its own toggles shell mode.
-    - **Entering shell mode:**
-      - When active, shell mode uses a different coloring and a "Shell Mode
-        Indicator".
-      - While in shell mode, text you type is interpreted directly as a shell
-        command.
-    - **Exiting shell mode:**
-      - When exited, the UI reverts to its standard appearance and normal Gemini
-        CLI behavior resumes.
-
-- **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,
-  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/custom-commands.md

@@ -30,6 +30,9 @@ separator (`/` or `\`) being converted to a colon (`:`).
 - A file at `<project>/.gemini/commands/git/commit.toml` becomes the namespaced
   command `/git:commit`.
 
+> [!TIP] After creating or modifying `.toml` command files, run
+> `/commands reload` to pick up your changes without restarting the CLI.
+
 ## TOML file format (v1)
 
 Your command definition files must be written in the TOML format and use the

docs/cli/enterprise.md

@@ -20,7 +20,7 @@ The most powerful tools for enterprise administration are the system-wide
 settings files. These files allow you to define a baseline configuration
 (`system-defaults.json`) and a set of overrides (`settings.json`) that apply to
 all users on a machine. For a complete overview of configuration options, see
-the [Configuration documentation](../get-started/configuration.md).
+the [Configuration documentation](../reference/configuration.md).
 
 Settings are merged from four files. The precedence order for single-value
 settings (like `theme`) is:
@@ -223,9 +223,9 @@ gemini
 ## 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`
-settings. For a list of available tools, see the
-[Tools documentation](../tools/index.md).
+model can use. This is achieved through the `tools.core` setting and the
+[Policy Engine](../reference/policy-engine.md). For a list of available tools,
+see the [Tools documentation](../tools/index.md).
 
 ### Allowlisting with `coreTools`
 
@@ -243,7 +243,10 @@ on the approved list.
 }
 ```
 
-### Blocklisting with `excludeTools`
+### Blocklisting with `excludeTools` (Deprecated)
+
+> **Deprecated:** Use the [Policy Engine](../reference/policy-engine.md) for
+> more robust control.
 
 Alternatively, you can add specific tools that are considered dangerous in your
 environment to a blocklist.
@@ -286,8 +289,8 @@ unintended tool execution.
 ## 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
+[Model-Context Protocol (MCP) servers](../reference/tools-api.md), it is crucial
+to understand how server configurations are managed to apply security policies
 effectively.
 
 ### How MCP server configurations are merged
@@ -480,7 +483,7 @@ avoid collecting potentially sensitive information from user prompts.
 You can enforce a specific authentication method for all users by setting the
 `enforcedAuthType` in the system-level `settings.json` file. This prevents users
 from choosing a different authentication method. See the
-[Authentication docs](./authentication.md) for more details.
+[Authentication docs](../get-started/authentication.md) for more details.
 
 **Example:** Enforce the use of Google login for all users.
 

docs/cli/gemini-md.md

@@ -19,18 +19,18 @@ order:
     - **Location:** `~/.gemini/GEMINI.md` (in your user home directory).
     - **Scope:** Provides default instructions for all your projects.
 
-2.  **Project root and ancestor context files:**
-    - **Location:** The CLI searches for a `GEMINI.md` file in your current
-      working directory and then in each parent directory up to the project root
-      (identified by a `.git` folder).
-    - **Scope:** Provides context relevant to the entire project.
+2.  **Environment and workspace context files:**
+    - **Location:** The CLI searches for `GEMINI.md` files in your configured
+      workspace directories and their parent directories.
+    - **Scope:** Provides context relevant to the projects you are currently
+      working on.
 
-3.  **Sub-directory context files:**
-    - **Location:** The CLI also scans for `GEMINI.md` files in subdirectories
-      below your current working directory. It respects rules in `.gitignore`
-      and `.geminiignore`.
-    - **Scope:** Lets you write highly specific instructions for a particular
-      component or module.
+3.  **Just-in-time (JIT) context files:**
+    - **Location:** When a tool accesses a file or directory, the CLI
+      automatically scans for `GEMINI.md` files in that directory and its
+      ancestors up to a trusted root.
+    - **Scope:** Lets the model discover highly specific instructions for
+      particular components only when they are needed.
 
 The CLI footer displays the number of loaded context files, which gives you a
 quick visual cue of the active instructional context.
@@ -88,7 +88,7 @@ More content here.
 @../shared/style-guide.md
 ```
 
-For more details, see the [Memory Import Processor](../core/memport.md)
+For more details, see the [Memory Import Processor](../reference/memport.md)
 documentation.
 
 ## Customize the context file name
@@ -106,3 +106,11 @@ While `GEMINI.md` is the default filename, you can configure this in your
   }
 }
 ```
+
+## Next steps
+
+- Learn about [Ignoring files](./gemini-ignore.md) to exclude content from the
+  context system.
+- Explore the [Memory tool](../tools/memory.md) to save persistent memories.
+- See how to use [Custom commands](./custom-commands.md) to automate common
+  prompts.

docs/cli/headless.md

@@ -1,388 +1,50 @@
-# Headless mode
+# Headless mode reference
 
-Headless mode allows you to run Gemini CLI programmatically from command line
-scripts and automation tools without any interactive UI. This is ideal for
-scripting, automation, CI/CD pipelines, and building AI-powered tools.
+Headless mode provides a programmatic interface to Gemini CLI, returning
+structured text or JSON output without an interactive terminal UI.
 
-- [Headless Mode](#headless-mode)
-  - [Overview](#overview)
-  - [Basic Usage](#basic-usage)
-    - [Direct Prompts](#direct-prompts)
-    - [Stdin Input](#stdin-input)
-    - [Combining with File Input](#combining-with-file-input)
-  - [Output Formats](#output-formats)
-    - [Text Output (Default)](#text-output-default)
-    - [JSON Output](#json-output)
-      - [Response Schema](#response-schema)
-      - [Example Usage](#example-usage)
-    - [Streaming JSON Output](#streaming-json-output)
-      - [When to Use Streaming JSON](#when-to-use-streaming-json)
-      - [Event Types](#event-types)
-      - [Basic Usage](#basic-usage)
-      - [Example Output](#example-output)
-      - [Processing Stream Events](#processing-stream-events)
-      - [Real-World Examples](#real-world-examples)
-    - [File Redirection](#file-redirection)
-  - [Configuration Options](#configuration-options)
-  - [Examples](#examples)
-    - [Code review](#code-review)
-    - [Generate commit messages](#generate-commit-messages)
-    - [API documentation](#api-documentation)
-    - [Batch code analysis](#batch-code-analysis)
-    - [Code review](#code-review-1)
-    - [Log analysis](#log-analysis)
-    - [Release notes generation](#release-notes-generation)
-    - [Model and tool usage tracking](#model-and-tool-usage-tracking)
-  - [Resources](#resources)
+## Technical reference
 
-## Overview
+Headless mode is triggered when the CLI is run in a non-TTY environment or when
+providing a query as a positional argument without the interactive flag.
 
-The headless mode provides a headless interface to Gemini CLI that:
+### Output formats
 
-- Accepts prompts via command line arguments or stdin
-- Returns structured output (text or JSON)
-- Supports file redirection and piping
-- Enables automation and scripting workflows
-- Provides consistent exit codes for error handling
+You can specify the output format using the `--output-format` flag.
 
-## Basic usage
+#### JSON output
 
-### Direct prompts
+Returns a single JSON object containing the response and usage statistics.
 
-Use the `--prompt` (or `-p`) flag to run in headless mode:
+- **Schema:**
+  - `response`: (string) The model's final answer.
+  - `stats`: (object) Token usage and API latency metrics.
+  - `error`: (object, optional) Error details if the request failed.
 
-```bash
-gemini --prompt "What is machine learning?"
-```
+#### Streaming JSON output
 
-### Stdin input
+Returns a stream of newline-delimited JSON (JSONL) events.
 
-Pipe input to Gemini CLI from your terminal:
+- **Event types:**
+  - `init`: Session metadata (session ID, model).
+  - `message`: User and assistant message chunks.
+  - `tool_use`: Tool call requests with arguments.
+  - `tool_result`: Output from executed tools.
+  - `error`: Non-fatal warnings and system errors.
+  - `result`: Final outcome with aggregated statistics.
 
-```bash
-echo "Explain this code" | gemini
-```
+## Exit codes
 
-### Combining with file input
+The CLI returns standard exit codes to indicate the result of the headless
+execution:
 
-Read from files and process with Gemini:
+- `0`: Success.
+- `1`: General error or API failure.
+- `42`: Input error (invalid prompt or arguments).
+- `53`: Turn limit exceeded.
 
-```bash
-cat README.md | gemini --prompt "Summarize this documentation"
-```
+## Next steps
 
-## Output formats
-
-### Text output (default)
-
-Standard human-readable output:
-
-```bash
-gemini -p "What is the capital of France?"
-```
-
-Response format:
-
-```
-The capital of France is Paris.
-```
-
-### JSON output
-
-Returns structured data including response, statistics, and metadata. This
-format is ideal for programmatic processing and automation scripts.
-
-#### Response schema
-
-The JSON output follows this high-level structure:
-
-```json
-{
-  "response": "string", // The main AI-generated content answering your prompt
-  "stats": {
-    // Usage metrics and performance data
-    "models": {
-      // Per-model API and token usage statistics
-      "[model-name]": {
-        "api": {
-          /* request counts, errors, latency */
-        },
-        "tokens": {
-          /* prompt, response, cached, total counts */
-        }
-      }
-    },
-    "tools": {
-      // Tool execution statistics
-      "totalCalls": "number",
-      "totalSuccess": "number",
-      "totalFail": "number",
-      "totalDurationMs": "number",
-      "totalDecisions": {
-        /* accept, reject, modify, auto_accept counts */
-      },
-      "byName": {
-        /* per-tool detailed stats */
-      }
-    },
-    "files": {
-      // File modification statistics
-      "totalLinesAdded": "number",
-      "totalLinesRemoved": "number"
-    }
-  },
-  "error": {
-    // Present only when an error occurred
-    "type": "string", // Error type (e.g., "ApiError", "AuthError")
-    "message": "string", // Human-readable error description
-    "code": "number" // Optional error code
-  }
-}
-```
-
-#### Example usage
-
-```bash
-gemini -p "What is the capital of France?" --output-format json
-```
-
-Response:
-
-```json
-{
-  "response": "The capital of France is Paris.",
-  "stats": {
-    "models": {
-      "gemini-2.5-pro": {
-        "api": {
-          "totalRequests": 2,
-          "totalErrors": 0,
-          "totalLatencyMs": 5053
-        },
-        "tokens": {
-          "prompt": 24939,
-          "candidates": 20,
-          "total": 25113,
-          "cached": 21263,
-          "thoughts": 154,
-          "tool": 0
-        }
-      },
-      "gemini-2.5-flash": {
-        "api": {
-          "totalRequests": 1,
-          "totalErrors": 0,
-          "totalLatencyMs": 1879
-        },
-        "tokens": {
-          "prompt": 8965,
-          "candidates": 10,
-          "total": 9033,
-          "cached": 0,
-          "thoughts": 30,
-          "tool": 28
-        }
-      }
-    },
-    "tools": {
-      "totalCalls": 1,
-      "totalSuccess": 1,
-      "totalFail": 0,
-      "totalDurationMs": 1881,
-      "totalDecisions": {
-        "accept": 0,
-        "reject": 0,
-        "modify": 0,
-        "auto_accept": 1
-      },
-      "byName": {
-        "google_web_search": {
-          "count": 1,
-          "success": 1,
-          "fail": 0,
-          "durationMs": 1881,
-          "decisions": {
-            "accept": 0,
-            "reject": 0,
-            "modify": 0,
-            "auto_accept": 1
-          }
-        }
-      }
-    },
-    "files": {
-      "totalLinesAdded": 0,
-      "totalLinesRemoved": 0
-    }
-  }
-}
-```
-
-### 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
-
-Use `--output-format stream-json` when you need:
-
-- **Real-time progress monitoring** - See tool calls and responses as they
-  happen
-- **Event-driven automation** - React to specific events (e.g., tool failures)
-- **Live UI updates** - Build interfaces showing AI agent activity in real-time
-- **Detailed execution logs** - Capture complete interaction history with
-  timestamps
-- **Pipeline integration** - Stream events to logging/monitoring systems
-
-#### Event types
-
-The streaming format emits 6 event types:
-
-1. **`init`** - Session starts (includes session_id, model)
-2. **`message`** - User prompts and assistant responses
-3. **`tool_use`** - Tool call requests with parameters
-4. **`tool_result`** - Tool execution results (success/error)
-5. **`error`** - Non-fatal errors and warnings
-6. **`result`** - Final session outcome with aggregated stats
-
-#### Basic usage
-
-```bash
-# Stream events to console
-gemini --output-format stream-json --prompt "What is 2+2?"
-
-# Save event stream to file
-gemini --output-format stream-json --prompt "Analyze this code" > events.jsonl
-
-# Parse with jq
-gemini --output-format stream-json --prompt "List files" | jq -r '.type'
-```
-
-#### Example output
-
-Each line is a complete JSON event:
-
-```jsonl
-{"type":"init","timestamp":"2025-10-10T12:00:00.000Z","session_id":"abc123","model":"gemini-2.0-flash-exp"}
-{"type":"message","role":"user","content":"List files in current directory","timestamp":"2025-10-10T12:00:01.000Z"}
-{"type":"tool_use","tool_name":"Bash","tool_id":"bash-123","parameters":{"command":"ls -la"},"timestamp":"2025-10-10T12:00:02.000Z"}
-{"type":"tool_result","tool_id":"bash-123","status":"success","output":"file1.txt\nfile2.txt","timestamp":"2025-10-10T12:00:03.000Z"}
-{"type":"message","role":"assistant","content":"Here are the files...","delta":true,"timestamp":"2025-10-10T12:00:04.000Z"}
-{"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
-
-Save output to files or pipe to other commands:
-
-```bash
-# Save to file
-gemini -p "Explain Docker" > docker-explanation.txt
-gemini -p "Explain Docker" --output-format json > docker-explanation.json
-
-# Append to file
-gemini -p "Add more details" >> docker-explanation.txt
-
-# Pipe to other tools
-gemini -p "What is Kubernetes?" --output-format json | jq '.response'
-gemini -p "Explain microservices" | wc -w
-gemini -p "List programming languages" | grep -i "python"
-```
-
-## Configuration options
-
-Key command-line options for headless usage:
-
-| Option                  | Description                        | Example                                            |
-| ----------------------- | ---------------------------------- | -------------------------------------------------- |
-| `--prompt`, `-p`        | Run in headless mode               | `gemini -p "query"`                                |
-| `--output-format`       | Specify output format (text, json) | `gemini -p "query" --output-format json`           |
-| `--model`, `-m`         | Specify the Gemini model           | `gemini -p "query" -m gemini-2.5-flash`            |
-| `--debug`, `-d`         | Enable debug mode                  | `gemini -p "query" --debug`                        |
-| `--include-directories` | Include additional directories     | `gemini -p "query" --include-directories src,docs` |
-| `--yolo`, `-y`          | Auto-approve all actions           | `gemini -p "query" --yolo`                         |
-| `--approval-mode`       | Set approval mode                  | `gemini -p "query" --approval-mode auto_edit`      |
-
-For complete details on all available configuration options, settings files, and
-environment variables, see the
-[Configuration Guide](../get-started/configuration.md).
-
-## Examples
-
-#### Code review
-
-```bash
-cat src/auth.py | gemini -p "Review this authentication code for security issues" > security-review.txt
-```
-
-#### Generate commit messages
-
-```bash
-result=$(git diff --cached | gemini -p "Write a concise commit message for these changes" --output-format json)
-echo "$result" | jq -r '.response'
-```
-
-#### API documentation
-
-```bash
-result=$(cat api/routes.js | gemini -p "Generate OpenAPI spec for these routes" --output-format json)
-echo "$result" | jq -r '.response' > openapi.json
-```
-
-#### Batch code analysis
-
-```bash
-for file in src/*.py; do
-    echo "Analyzing $file..."
-    result=$(cat "$file" | gemini -p "Find potential bugs and suggest improvements" --output-format json)
-    echo "$result" | jq -r '.response' > "reports/$(basename "$file").analysis"
-    echo "Completed analysis for $(basename "$file")" >> reports/progress.log
-done
-```
-
-#### Code review
-
-```bash
-result=$(git diff origin/main...HEAD | gemini -p "Review these changes for bugs, security issues, and code quality" --output-format json)
-echo "$result" | jq -r '.response' > pr-review.json
-```
-
-#### Log analysis
-
-```bash
-grep "ERROR" /var/log/app.log | tail -20 | gemini -p "Analyze these errors and suggest root cause and fixes" > error-analysis.txt
-```
-
-#### Release notes generation
-
-```bash
-result=$(git log --oneline v1.0.0..HEAD | gemini -p "Generate release notes from these commits" --output-format json)
-response=$(echo "$result" | jq -r '.response')
-echo "$response"
-echo "$response" >> CHANGELOG.md
-```
-
-#### Model and tool usage tracking
-
-```bash
-result=$(gemini -p "Explain this database schema" --include-directories db --output-format json)
-total_tokens=$(echo "$result" | jq -r '.stats.models // {} | to_entries | map(.value.tokens.total) | add // 0')
-models_used=$(echo "$result" | jq -r '.stats.models // {} | keys | join(", ") | if . == "" then "none" else . end')
-tool_calls=$(echo "$result" | jq -r '.stats.tools.totalCalls // 0')
-tools_used=$(echo "$result" | jq -r '.stats.tools.byName // {} | keys | join(", ") | if . == "" then "none" else . end')
-echo "$(date): $total_tokens tokens, $tool_calls tool calls ($tools_used) used with models: $models_used" >> usage.log
-echo "$result" | jq -r '.response' > schema-docs.md
-echo "Recent usage trends:"
-tail -5 usage.log
-```
-
-## Resources
-
-- [CLI Configuration](../get-started/configuration.md) - Complete configuration
-  guide
-- [Authentication](../get-started/authentication.md) - Setup authentication
-- [Commands](./commands.md) - Interactive commands reference
-- [Tutorials](./tutorials.md) - Step-by-step automation guides
+- Follow the [Automation tutorial](./tutorials/automation.md) for practical
+  scripting examples.
+- See the [CLI reference](./cli-reference.md) for all available flags.

docs/cli/index.md

@@ -1,65 +0,0 @@
-# Gemini CLI
-
-Within Gemini CLI, `packages/cli` is the frontend for users to send and receive
-prompts with the Gemini AI model and its associated tools. For a general
-overview of Gemini CLI, see the [main documentation page](../index.md).
-
-## Basic features
-
-- **[Commands](./commands.md):** A reference for all built-in slash commands
-- **[Custom commands](./custom-commands.md):** Create your own commands and
-  shortcuts for frequently used prompts.
-- **[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 to improve your workflow.
-- **[Tutorials](./tutorials.md):** Step-by-step guides for common tasks.
-
-## Advanced features
-
-- **[Checkpointing](./checkpointing.md):** Automatically save and restore
-  snapshots of your session and files.
-- **[Enterprise configuration](./enterprise.md):** Deploy and manage Gemini CLI
-  in an enterprise environment.
-- **[Sandboxing](./sandbox.md):** Isolate tool execution in a secure,
-  containerized environment.
-- **[Agent Skills](./skills.md):** Extend the CLI with specialized expertise and
-  procedural workflows.
-- **[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
-  which projects can use the full capabilities of the CLI.
-- **[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,
-  hierarchical context to the model.
-- **[System prompt override](./system-prompt.md):** Replace the built‑in system
-  instructions using `GEMINI_SYSTEM_MD`.
-
-## Non-interactive mode
-
-Gemini CLI can be run in a non-interactive mode, which is useful for scripting
-and automation. In this mode, you pipe input to the CLI, it executes the
-command, and then it exits.
-
-The following example pipes a command to Gemini CLI from your terminal:
-
-```bash
-echo "What is fine tuning?" | gemini
-```
-
-You can also use the `--prompt` or `-p` flag:
-
-```bash
-gemini -p "What is fine tuning?"
-```
-
-For comprehensive documentation on headless usage, scripting, automation, and
-advanced examples, see the **[Headless mode](./headless.md)** guide.

docs/cli/model.md

@@ -19,27 +19,18 @@ Use the following command in Gemini CLI:
 
 Running this command will open a dialog with your options:
 
-| Option            | Description                                                    | Models                                                                 |
-| ----------------- | -------------------------------------------------------------- | ---------------------------------------------------------------------- |
-| Auto (Gemini 3)   | Let the system choose the best Gemini 3 model for your task.   | gemini-3-pro-preview (if enabled), gemini-3-flash-preview (if enabled) |
-| Auto (Gemini 2.5) | Let the system choose the best Gemini 2.5 model for your task. | gemini-2.5-pro, gemini-2.5-flash                                       |
-| Manual            | Select a specific model.                                       | Any available model.                                                   |
+| Option            | Description                                                    | Models                                       |
+| ----------------- | -------------------------------------------------------------- | -------------------------------------------- |
+| Auto (Gemini 3)   | Let the system choose the best Gemini 3 model for your task.   | gemini-3-pro-preview, gemini-3-flash-preview |
+| Auto (Gemini 2.5) | Let the system choose the best Gemini 2.5 model for your task. | gemini-2.5-pro, gemini-2.5-flash             |
+| Manual            | Select a specific model.                                       | Any available model.                         |
 
 We recommend selecting one of the above **Auto** options. However, you can
 select **Manual** to select a specific model from those available.
 
-### Gemini 3 and preview features
-
-> **Note:** Gemini 3 is not currently available on all account types. To learn
-> more about Gemini 3 access, refer to
-> [Gemini 3 on Gemini CLI](../get-started/gemini-3.md).
-
-To enable Gemini 3 Pro and Gemini 3 Flash (if available), enable
-[**Preview Features** by using the `settings` command](../cli/settings.md).
-
 You can also use the `--model` flag to specify a particular Gemini model on
 startup. For more details, refer to the
-[configuration documentation](../get-started/configuration.md).
+[configuration documentation](../reference/configuration.md).
 
 Changes to these settings will be applied to all subsequent interactions with
 Gemini CLI.

docs/cli/plan-mode.md

@@ -0,0 +1,312 @@
+# Plan Mode (experimental)
+
+Plan Mode is a read-only environment for architecting robust solutions before
+implementation. It allows you to:
+
+- **Research:** Explore the project in a read-only state to prevent accidental
+  changes.
+- **Design:** Understand problems, evaluate trade-offs, and choose a solution.
+- **Plan:** Align on an execution strategy before any code is modified.
+
+> **Note:** This is a preview feature currently under active development. Your
+> feedback is invaluable as we refine this feature. If you have ideas,
+> suggestions, or encounter issues:
+>
+> - [Open an issue](https://github.com/google-gemini/gemini-cli/issues) on
+>   GitHub.
+> - Use the **/bug** command within Gemini CLI to file an issue.
+
+- [Enabling Plan Mode](#enabling-plan-mode)
+- [How to use Plan Mode](#how-to-use-plan-mode)
+  - [Entering Plan Mode](#entering-plan-mode)
+  - [Planning Workflow](#planning-workflow)
+  - [Exiting Plan Mode](#exiting-plan-mode)
+- [Tool Restrictions](#tool-restrictions)
+  - [Customizing Planning with Skills](#customizing-planning-with-skills)
+  - [Customizing Policies](#customizing-policies)
+    - [Example: Allow git commands in Plan Mode](#example-allow-git-commands-in-plan-mode)
+    - [Example: Enable research subagents in Plan Mode](#example-enable-research-subagents-in-plan-mode)
+  - [Custom Plan Directory and Policies](#custom-plan-directory-and-policies)
+- [Automatic Model Routing](#automatic-model-routing)
+
+## Enabling Plan Mode
+
+To use Plan Mode, enable it via **/settings** (search for **Plan**) or add the
+following to your `settings.json`:
+
+```json
+{
+  "experimental": {
+    "plan": true
+  }
+}
+```
+
+## How to use Plan Mode
+
+### Entering Plan Mode
+
+You can configure Gemini CLI to start in Plan Mode by default or enter it
+manually during a session.
+
+- **Configuration:** Configure Gemini CLI to start directly in Plan Mode by
+  default:
+  1.  Type `/settings` in the CLI.
+  2.  Search for **Default Approval Mode**.
+  3.  Set the value to **Plan**.
+
+  Alternatively, use the `gemini --approval-mode=plan` CLI flag or manually
+  update:
+
+  ```json
+  {
+    "general": {
+      "defaultApprovalMode": "plan"
+    }
+  }
+  ```
+
+- **Keyboard Shortcut:** Press `Shift+Tab` to cycle through approval modes
+  (`Default` -> `Auto-Edit` -> `Plan`).
+
+  > **Note:** Plan Mode is automatically removed from the rotation when Gemini
+  > CLI is actively processing or showing confirmation dialogs.
+
+- **Command:** Type `/plan` in the input box.
+
+- **Natural Language:** Ask Gemini CLI to "start a plan for...". Gemini CLI then
+  calls the [`enter_plan_mode`] tool to switch modes.
+  > **Note:** This tool is not available when Gemini CLI is in [YOLO mode].
+
+### Planning Workflow
+
+Plan Mode uses an adaptive planning workflow where the research depth, plan
+structure, and consultation level are proportional to the task's complexity:
+
+1.  **Explore & Analyze:** Analyze requirements and use read-only tools to map
+    affected modules and identify dependencies.
+2.  **Consult:** The depth of consultation is proportional to the task's
+    complexity:
+    - **Simple Tasks:** Proceed directly to drafting.
+    - **Standard Tasks:** Present a summary of viable approaches via
+      [`ask_user`] for selection.
+    - **Complex Tasks:** Present detailed trade-offs for at least two viable
+      approaches via [`ask_user`] and obtain approval before drafting.
+3.  **Draft:** Write a detailed implementation plan to the
+    [plans directory](#custom-plan-directory-and-policies). The plan's structure
+    adapts to the task:
+    - **Simple Tasks:** Focused on specific **Changes** and **Verification**
+      steps.
+    - **Standard Tasks:** Includes an **Objective**, **Key Files & Context**,
+      **Implementation Steps**, and **Verification & Testing**.
+    - **Complex Tasks:** Comprehensive plans including **Background &
+      Motivation**, **Scope & Impact**, **Proposed Solution**, **Alternatives
+      Considered**, a phased **Implementation Plan**, **Verification**, and
+      **Migration & Rollback** strategies.
+4.  **Review & Approval:** Use the [`exit_plan_mode`] tool to present the plan
+    and formally request approval.
+    - **Approve:** Exit Plan Mode and start implementation.
+    - **Iterate:** Provide feedback to refine the plan.
+    - **Refine manually:** Press **Ctrl + X** to open the plan file in your
+      [preferred external editor]. This allows you to manually refine the plan
+      steps before approval. The CLI will automatically refresh and show the
+      updated plan after you save and close the editor.
+
+For more complex or specialized planning tasks, you can
+[customize the planning workflow with skills](#customizing-planning-with-skills).
+
+### Exiting Plan Mode
+
+To exit Plan Mode, you can:
+
+- **Keyboard Shortcut:** Press `Shift+Tab` to cycle to the desired mode.
+
+- **Tool:** Gemini CLI calls the [`exit_plan_mode`] tool to present the
+  finalized plan for your approval.
+
+## Tool Restrictions
+
+Plan Mode enforces strict safety policies to prevent accidental changes.
+
+These are the only allowed tools:
+
+- **FileSystem (Read):** [`read_file`], [`list_directory`], [`glob`]
+- **Search:** [`grep_search`], [`google_web_search`]
+- **Interaction:** [`ask_user`]
+- **MCP Tools (Read):** Read-only [MCP tools] (e.g., `github_read_issue`,
+  `postgres_read_schema`) are allowed.
+- **Planning (Write):** [`write_file`] and [`replace`] only allowed for `.md`
+  files in the `~/.gemini/tmp/<project>/<session-id>/plans/` directory or your
+  [custom plans directory](#custom-plan-directory-and-policies).
+- **Memory:** [`save_memory`]
+- **Skills:** [`activate_skill`] (allows loading specialized instructions and
+  resources in a read-only manner)
+
+### Customizing Planning with Skills
+
+You can use [Agent Skills](./skills.md) to customize how Gemini CLI approaches
+planning for specific types of tasks. When a skill is activated during Plan
+Mode, its specialized instructions and procedural workflows will guide the
+research, design and planning phases.
+
+For example:
+
+- A **"Database Migration"** skill could ensure the plan includes data safety
+  checks and rollback strategies.
+- A **"Security Audit"** skill could prompt Gemini CLI to look for specific
+  vulnerabilities during codebase exploration.
+- A **"Frontend Design"** skill could guide Gemini CLI to use specific UI
+  components and accessibility standards in its proposal.
+
+To use a skill in Plan Mode, you can explicitly ask Gemini CLI to "use the
+`<skill-name>` skill to plan..." or Gemini CLI may autonomously activate it
+based on the task description.
+
+### Customizing Policies
+
+Plan Mode's default tool restrictions are managed by the [policy engine] and
+defined in the built-in [`plan.toml`] file. The built-in policy (Tier 1)
+enforces the read-only state, but you can customize these rules by creating your
+own policies in your `~/.gemini/policies/` directory (Tier 2).
+
+#### Example: Automatically approve read-only MCP tools
+
+By default, read-only MCP tools require user confirmation in Plan Mode. You can
+use `toolAnnotations` and the `mcpName` wildcard to customize this behavior for
+your specific environment.
+
+`~/.gemini/policies/mcp-read-only.toml`
+
+```toml
+[[rule]]
+mcpName = "*"
+toolAnnotations = { readOnlyHint = true }
+decision = "allow"
+priority = 100
+modes = ["plan"]
+```
+
+#### Example: Allow git commands in Plan Mode
+
+This rule allows you to check the repository status and see changes while in
+Plan Mode.
+
+`~/.gemini/policies/git-research.toml`
+
+```toml
+[[rule]]
+toolName = "run_shell_command"
+commandPrefix = ["git status", "git diff"]
+decision = "allow"
+priority = 100
+modes = ["plan"]
+```
+
+#### Example: Enable research subagents in Plan Mode
+
+You can enable experimental research [subagents] like `codebase_investigator` to
+help gather architecture details during the planning phase.
+
+`~/.gemini/policies/research-subagents.toml`
+
+```toml
+[[rule]]
+toolName = "codebase_investigator"
+decision = "allow"
+priority = 100
+modes = ["plan"]
+```
+
+Tell Gemini CLI it can use these tools in your prompt, for example: _"You can
+check ongoing changes in git."_
+
+For more information on how the policy engine works, see the [policy engine]
+docs.
+
+### Custom Plan Directory and Policies
+
+By default, planning artifacts are stored in a managed temporary directory
+outside your project: `~/.gemini/tmp/<project>/<session-id>/plans/`.
+
+You can configure a custom directory for plans in your `settings.json`. For
+example, to store plans in a `.gemini/plans` directory within your project:
+
+```json
+{
+  "general": {
+    "plan": {
+      "directory": ".gemini/plans"
+    }
+  }
+}
+```
+
+To maintain the safety of Plan Mode, user-configured paths for the plans
+directory are restricted to the project root. This ensures that custom planning
+locations defined within a project's workspace cannot be used to escape and
+overwrite sensitive files elsewhere. Any user-configured directory must reside
+within the project boundary.
+
+Using a custom directory requires updating your [policy engine] configurations
+to allow `write_file` and `replace` in that specific location. For example, to
+allow writing to the `.gemini/plans` directory within your project, create a
+policy file at `~/.gemini/policies/plan-custom-directory.toml`:
+
+```toml
+[[rule]]
+toolName = ["write_file", "replace"]
+decision = "allow"
+priority = 100
+modes = ["plan"]
+# Adjust the pattern to match your custom directory.
+# This example matches any .md file in a .gemini/plans directory within the project.
+argsPattern = "\"file_path\":\"[^\"]+[\\\\/]+\\.gemini[\\\\/]+plans[\\\\/]+[\\w-]+\\.md\""
+```
+
+## Automatic Model Routing
+
+When using an [**auto model**], Gemini CLI automatically optimizes [**model
+routing**] based on the current phase of your task:
+
+1.  **Planning Phase:** While in Plan Mode, the CLI routes requests to a
+    high-reasoning **Pro** model to ensure robust architectural decisions and
+    high-quality plans.
+2.  **Implementation Phase:** Once a plan is approved and you exit Plan Mode,
+    the CLI detects the existence of the approved plan and automatically
+    switches to a high-speed **Flash** model. This provides a faster, more
+    responsive experience during the implementation of the plan.
+
+This behavior is enabled by default to provide the best balance of quality and
+performance. You can disable this automatic switching in your settings:
+
+```json
+{
+  "general": {
+    "plan": {
+      "modelRouting": false
+    }
+  }
+}
+```
+
+[`list_directory`]: /docs/tools/file-system.md#1-list_directory-readfolder
+[`read_file`]: /docs/tools/file-system.md#2-read_file-readfile
+[`grep_search`]: /docs/tools/file-system.md#5-grep_search-searchtext
+[`write_file`]: /docs/tools/file-system.md#3-write_file-writefile
+[`glob`]: /docs/tools/file-system.md#4-glob-findfiles
+[`google_web_search`]: /docs/tools/web-search.md
+[`replace`]: /docs/tools/file-system.md#6-replace-edit
+[MCP tools]: /docs/tools/mcp-server.md
+[`save_memory`]: /docs/tools/memory.md
+[`activate_skill`]: /docs/cli/skills.md
+[subagents]: /docs/core/subagents.md
+[policy engine]: /docs/reference/policy-engine.md
+[`enter_plan_mode`]: /docs/tools/planning.md#1-enter_plan_mode-enterplanmode
+[`exit_plan_mode`]: /docs/tools/planning.md#2-exit_plan_mode-exitplanmode
+[`ask_user`]: /docs/tools/ask-user.md
+[YOLO mode]: /docs/reference/configuration.md#command-line-arguments
+[`plan.toml`]:
+  https://github.com/google-gemini/gemini-cli/blob/main/packages/core/src/policy/policies/plan.toml
+[auto model]: /docs/reference/configuration.md#model-settings
+[model routing]: /docs/cli/telemetry.md#model-routing
+[preferred external editor]: /docs/reference/configuration.md#general

docs/cli/rewind.md

@@ -1,9 +1,9 @@
 # Rewind
 
-The `/rewind` command allows you to go back to a previous state in your
-conversation and, optionally, revert any file changes made by the AI during
-those interactions. This is a powerful tool for undoing mistakes, exploring
-different approaches, or simply cleaning up your session history.
+The `/rewind` command lets you go back to a previous state in your conversation
+and, optionally, revert any file changes made by the AI during those
+interactions. This is a powerful tool for undoing mistakes, exploring different
+approaches, or simply cleaning up your session history.
 
 ## Usage
 
@@ -17,13 +17,13 @@ Alternatively, you can use the keyboard shortcut: **Press `Esc` twice**.
 When you trigger a rewind, an interactive list of your previous interactions
 appears.
 
-1.  **Select Interaction:** Use the **Up/Down arrow keys** to navigate through
+1.  **Select interaction:** Use the **Up/Down arrow keys** to navigate through
     the list. The most recent interactions are at the bottom.
 2.  **Preview:** As you select an interaction, you'll see a preview of the user
     prompt and, if applicable, the number of files changed during that step.
-3.  **Confirm Selection:** Press **Enter** on the interaction you want to rewind
+3.  **Confirm selection:** Press **Enter** on the interaction you want to rewind
     back to.
-4.  **Action Selection:** After selecting an interaction, you'll be presented
+4.  **Action selection:** After selecting an interaction, you'll be presented
     with a confirmation dialog with up to three options:
     - **Rewind conversation and revert code changes:** Reverts both the chat
       history and the file modifications to the state before the selected
@@ -37,14 +37,14 @@ appears.
 If no code changes were made since the selected point, the options related to
 reverting code changes will be hidden.
 
-## Key Considerations
+## Key considerations
 
-- **Destructive Action:** Rewinding is a destructive action for your current
+- **Destructive action:** Rewinding is a destructive action for your current
   session history and potentially your files. Use it with care.
-- **Agent Awareness:** When you rewind the conversation, the AI model loses all
+- **Agent awareness:** When you rewind the conversation, the AI model loses all
   memory of the interactions that were removed. If you only revert code changes,
   you may need to inform the model that the files have changed.
-- **Manual Edits:** Rewinding only affects file changes made by the AI's edit
+- **Manual edits:** Rewinding only affects file changes made by the AI's edit
   tools. It does **not** undo manual edits you've made or changes triggered by
   the shell tool (`!`).
 - **Compression:** Rewind works across chat compression points by reconstructing

docs/cli/sandbox.md

@@ -82,10 +82,11 @@ gemini -p "run the test suite"
 Built-in profiles (set via `SEATBELT_PROFILE` env var):
 
 - `permissive-open` (default): Write restrictions, network allowed
-- `permissive-closed`: Write restrictions, no network
 - `permissive-proxied`: Write restrictions, network via proxy
 - `restrictive-open`: Strict restrictions, network allowed
-- `restrictive-closed`: Maximum restrictions
+- `restrictive-proxied`: Strict restrictions, network via proxy
+- `strict-open`: Read and write restrictions, network allowed
+- `strict-proxied`: Read and write restrictions, network via proxy
 
 ### Custom sandbox flags
 
@@ -166,6 +167,6 @@ gemini -s -p "run shell command: mount | grep workspace"
 
 ## Related documentation
 
-- [Configuration](../get-started/configuration.md): Full configuration options.
-- [Commands](./commands.md): Available commands.
-- [Troubleshooting](../troubleshooting.md): General troubleshooting.
+- [Configuration](../reference/configuration.md): Full configuration options.
+- [Commands](../reference/commands.md): Available commands.
+- [Troubleshooting](../resources/troubleshooting.md): General troubleshooting.

docs/cli/session-management.md

@@ -1,32 +1,36 @@
-# Session Management
+# 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.
+Session management saves your conversation history so you can resume your work
+where you left off. Use these features to review past interactions, manage
+history across different projects, and configure how long data is retained.
 
-## Automatic Saving
+## Automatic saving
 
-Every time you interact with Gemini CLI, your session is automatically saved.
-This happens in the background without any manual intervention.
+Your session history is recorded automatically as you interact with the model.
+This background process ensures your work is preserved even if you interrupt a
+session.
 
 - **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/`.
+  - Token usage statistics (input, output, cached, etc.).
+  - Assistant thoughts and reasoning summaries (when available).
+- **Location:** Sessions are stored in `~/.gemini/tmp/<project_hash>/chats/`,
+  where `<project_hash>` is a unique identifier based on your project's root
+  directory.
 - **Scope:** Sessions are project-specific. Switching directories to a different
-  project will switch to that project's session history.
+  project switches to that project's session history.
 
-## Resuming Sessions
+## Resuming sessions
 
 You can resume a previous session to continue the conversation with all prior
-context restored.
+context restored. Resuming is supported both through command-line flags and an
+interactive browser.
 
-### From the Command Line
+### From the command line
 
-When starting the CLI, you can use the `--resume` (or `-r`) flag:
+When starting Gemini CLI, use the `--resume` (or `-r`) flag to load existing
+sessions.
 
 - **Resume latest:**
 
@@ -36,8 +40,8 @@ When starting the CLI, you can use the `--resume` (or `-r`) flag:
 
   This immediately loads the most recent session.
 
-- **Resume by index:** First, list available sessions (see
-  [Listing Sessions](#listing-sessions)), then use the index number:
+- **Resume by index:** List available sessions first (see
+  [Listing sessions](#listing-sessions)), then use the index number:
 
   ```bash
   gemini --resume 1
@@ -48,30 +52,35 @@ When starting the CLI, you can use the `--resume` (or `-r`) flag:
   gemini --resume a1b2c3d4-e5f6-7890-abcd-ef1234567890
   ```
 
-### From the Interactive Interface
+### From the interactive interface
 
-While the CLI is running, you can use the `/resume` slash command to open the
-**Session Browser**:
+While the CLI is running, use the `/resume` slash command to open the **Session
+Browser**:
 
 ```text
 /resume
 ```
 
-This opens an interactive interface where you can:
+The Session Browser provides an interactive interface where you can perform the
+following actions:
 
 - **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.
+- **Select:** Press **Enter** to resume the selected session.
+- **Esc:** Press **Esc** to exit the Session Browser.
 
-## Managing Sessions
+## Managing sessions
 
-### Listing Sessions
+You can list and delete sessions to keep your history organized and manage disk
+space.
+
+### Listing sessions
 
 To see a list of all available sessions for the current project from the command
-line:
+line, use the `--list-sessions` flag:
 
 ```bash
 gemini --list-sessions
@@ -87,12 +96,12 @@ Available sessions for this project (3):
   3. Update documentation (Just now) [abcd1234]
 ```
 
-### Deleting Sessions
+### 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:
+**From the command line:** Use the `--delete-session` flag with an index or ID:
 
 ```bash
 gemini --delete-session 2
@@ -102,17 +111,18 @@ gemini --delete-session 2
 
 1.  Open the browser with `/resume`.
 2.  Navigate to the session you want to remove.
-3.  Press `x`.
+3.  Press **x**.
 
 ## Configuration
 
 You can configure how Gemini CLI manages your session history in your
-`settings.json` file.
+`settings.json` file. These settings let you control retention policies and
+session lengths.
 
-### Session Retention
+### Session retention
 
-To prevent your history from growing indefinitely, you can enable automatic
-cleanup policies.
+To prevent your history from growing indefinitely, enable automatic cleanup
+policies in your settings.
 
 ```json
 {
@@ -126,20 +136,20 @@ cleanup policies.
 }
 ```
 
-- **`enabled`**: (boolean) Master switch for session cleanup. Default is
+- **`enabled`**: (boolean) Master switch for session cleanup. Defaults to
   `false`.
-- **`maxAge`**: (string) Duration to keep sessions (e.g., "24h", "7d", "4w").
-  Sessions older than this will be deleted.
+- **`maxAge`**: (string) Duration to keep sessions (for example, "24h", "7d",
+  "4w"). Sessions older than this are deleted.
 - **`maxCount`**: (number) Maximum number of sessions to retain. The oldest
-  sessions exceeding this count will be deleted.
+  sessions exceeding this count are deleted.
 - **`minRetention`**: (string) Minimum retention period (safety limit). Defaults
-  to `"1d"`; sessions newer than this period are never deleted by automatic
+  to `"1d"`. Sessions newer than this period are never deleted by automatic
   cleanup.
 
-### Session Limits
+### Session limits
 
-You can also limit the length of individual sessions to prevent context windows
-from becoming too large and expensive.
+You can limit the length of individual sessions to prevent context windows from
+becoming too large and expensive.
 
 ```json
 {
@@ -149,10 +159,17 @@ from becoming too large and expensive.
 }
 ```
 
-- **`maxSessionTurns`**: (number) The maximum number of turns (user + model
+- **`maxSessionTurns`**: (number) The maximum number of turns (user and 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
+  - **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.
+  - **Non-interactive mode:** The CLI exits with an error.
+
+## Next steps
+
+- Explore the [Memory tool](../tools/memory.md) to save persistent information
+  across sessions.
+- Learn how to [Checkpoint](./checkpointing.md) your session state.
+- Check out the [CLI reference](./cli-reference.md) for all command-line flags.

docs/cli/settings.md

@@ -22,14 +22,18 @@ 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` |
-| Enable Auto Update              | `general.enableAutoUpdate`         | Enable automatic updates.                                     | `true`  |
-| 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` |
-| Enable Session Cleanup          | `general.sessionRetention.enabled` | Enable automatic session cleanup                              | `false` |
+| UI Label                | Setting                            | Description                                                                                                                                                                    | Default     |
+| ----------------------- | ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------- |
+| Vim Mode                | `general.vimMode`                  | Enable Vim keybindings                                                                                                                                                         | `false`     |
+| Default Approval Mode   | `general.defaultApprovalMode`      | The default approval mode for tool execution. 'default' prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is read-only mode. 'yolo' is not supported yet. | `"default"` |
+| Enable Auto Update      | `general.enableAutoUpdate`         | Enable automatic updates.                                                                                                                                                      | `true`      |
+| Enable Notifications    | `general.enableNotifications`      | Enable run-event notifications for action-required prompts and session completion. Currently macOS only.                                                                       | `false`     |
+| Plan Directory          | `general.plan.directory`           | The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory.                                                               | `undefined` |
+| Plan Model Routing      | `general.plan.modelRouting`        | Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro for the planning phase and Flash for the implementation phase.                           | `true`      |
+| Max Chat Model Attempts | `general.maxAttempts`              | Maximum number of attempts for requests to the main chat model. Cannot exceed 10.                                                                                              | `10`        |
+| Debug Keystroke Logging | `general.debugKeystrokeLogging`    | Enable debug logging of keystrokes to the console.                                                                                                                             | `false`     |
+| Enable Session Cleanup  | `general.sessionRetention.enabled` | Enable automatic session cleanup                                                                                                                                               | `false`     |
+| Keep chat history       | `general.sessionRetention.maxAge`  | Automatically delete chats older than this time period (e.g., "30d", "7d", "24h", "1w")                                                                                        | `undefined` |
 
 ### Output
 
@@ -39,33 +43,37 @@ they appear in the UI.
 
 ### UI
 
-| UI Label                             | Setting                                 | Description                                                                                                                                                       | Default |
-| ------------------------------------ | --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Auto Theme Switching                 | `ui.autoThemeSwitching`                 | Automatically switch between default light and dark themes based on terminal background color.                                                                    | `true`  |
-| Terminal Background Polling Interval | `ui.terminalBackgroundPollingInterval`  | Interval in seconds to poll the terminal background color.                                                                                                        | `60`    |
-| Hide Window Title                    | `ui.hideWindowTitle`                    | Hide the window title bar                                                                                                                                         | `false` |
-| Show Thoughts in Title               | `ui.showStatusInTitle`                  | Show Gemini CLI model thoughts in the terminal window title during the working phase                                                                              | `false` |
-| Dynamic Window Title                 | `ui.dynamicWindowTitle`                 | Update the terminal window title with current status icons (Ready: ◇, Action Required: ✋, Working: ✦)                                                            | `true`  |
-| Show Home Directory Warning          | `ui.showHomeDirectoryWarning`           | Show a warning when running Gemini CLI in the home directory.                                                                                                     | `true`  |
-| 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.                                                                                                                                    | `true`  |
-| Show Citations                       | `ui.showCitations`                      | Show citations for generated text in the chat.                                                                                                                    | `false` |
-| Show Model Info In Chat              | `ui.showModelInfoInChat`                | Show the model name in the chat for each model turn.                                                                                                              | `false` |
-| Show User Identity                   | `ui.showUserIdentity`                   | Show the logged-in user's identity (e.g. email) in the UI.                                                                                                        | `true`  |
-| Use Alternate Screen Buffer          | `ui.useAlternateBuffer`                 | Use an alternate screen buffer for the UI, preserving shell history.                                                                                              | `false` |
-| Use Background Color                 | `ui.useBackgroundColor`                 | Whether to use background colors in the UI.                                                                                                                       | `true`  |
-| Incremental Rendering                | `ui.incrementalRendering`               | Enable incremental rendering for the UI. This option will reduce flickering but may cause rendering artifacts. Only supported when useAlternateBuffer is enabled. | `true`  |
-| Show Spinner                         | `ui.showSpinner`                        | Show the spinner during operations.                                                                                                                               | `true`  |
-| Enable Loading Phrases               | `ui.accessibility.enableLoadingPhrases` | Enable loading phrases during operations.                                                                                                                         | `true`  |
-| Screen Reader Mode                   | `ui.accessibility.screenReader`         | Render output in plain-text to be more screen reader accessible                                                                                                   | `false` |
+| UI Label                             | Setting                                | Description                                                                                                                                                       | Default  |
+| ------------------------------------ | -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- |
+| Auto Theme Switching                 | `ui.autoThemeSwitching`                | Automatically switch between default light and dark themes based on terminal background color.                                                                    | `true`   |
+| Terminal Background Polling Interval | `ui.terminalBackgroundPollingInterval` | Interval in seconds to poll the terminal background color.                                                                                                        | `60`     |
+| Hide Window Title                    | `ui.hideWindowTitle`                   | Hide the window title bar                                                                                                                                         | `false`  |
+| Inline Thinking                      | `ui.inlineThinkingMode`                | Display model thinking inline: off or full.                                                                                                                       | `"off"`  |
+| Show Thoughts in Title               | `ui.showStatusInTitle`                 | Show Gemini CLI model thoughts in the terminal window title during the working phase                                                                              | `false`  |
+| Dynamic Window Title                 | `ui.dynamicWindowTitle`                | Update the terminal window title with current status icons (Ready: ◇, Action Required: ✋, Working: ✦)                                                            | `true`   |
+| Show Home Directory Warning          | `ui.showHomeDirectoryWarning`          | Show a warning when running Gemini CLI in the home directory.                                                                                                     | `true`   |
+| Show Compatibility Warnings          | `ui.showCompatibilityWarnings`         | Show warnings about terminal or OS compatibility issues.                                                                                                          | `true`   |
+| Hide Tips                            | `ui.hideTips`                          | Hide helpful tips in the UI                                                                                                                                       | `false`  |
+| Show Shortcuts Hint                  | `ui.showShortcutsHint`                 | Show the "? for shortcuts" hint above the input.                                                                                                                  | `true`   |
+| 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.                                                                                                                                    | `true`   |
+| Show Citations                       | `ui.showCitations`                     | Show citations for generated text in the chat.                                                                                                                    | `false`  |
+| Show Model Info In Chat              | `ui.showModelInfoInChat`               | Show the model name in the chat for each model turn.                                                                                                              | `false`  |
+| Show User Identity                   | `ui.showUserIdentity`                  | Show the logged-in user's identity (e.g. email) in the UI.                                                                                                        | `true`   |
+| Use Alternate Screen Buffer          | `ui.useAlternateBuffer`                | Use an alternate screen buffer for the UI, preserving shell history.                                                                                              | `false`  |
+| Use Background Color                 | `ui.useBackgroundColor`                | Whether to use background colors in the UI.                                                                                                                       | `true`   |
+| Incremental Rendering                | `ui.incrementalRendering`              | Enable incremental rendering for the UI. This option will reduce flickering but may cause rendering artifacts. Only supported when useAlternateBuffer is enabled. | `true`   |
+| Show Spinner                         | `ui.showSpinner`                       | Show the spinner during operations.                                                                                                                               | `true`   |
+| Loading Phrases                      | `ui.loadingPhrases`                    | What to show while the model is working: tips, witty comments, both, or nothing.                                                                                  | `"tips"` |
+| Error Verbosity                      | `ui.errorVerbosity`                    | Controls whether recoverable errors are hidden (low) or fully shown (full).                                                                                       | `"low"`  |
+| Screen Reader Mode                   | `ui.accessibility.screenReader`        | Render output in plain-text to be more screen reader accessible                                                                                                   | `false`  |
 
 ### IDE
 
@@ -73,14 +81,21 @@ they appear in the UI.
 | -------- | ------------- | ---------------------------- | ------- |
 | IDE Mode | `ide.enabled` | Enable IDE integration mode. | `false` |
 
+### Billing
+
+| UI Label         | Setting                   | Description                                                                                                                                                | Default |
+| ---------------- | ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| Overage Strategy | `billing.overageStrategy` | How to handle quota exhaustion when AI credits are available. 'ask' prompts each time, 'always' automatically uses credits, 'never' disables credit usage. | `"ask"` |
+
 ### Model
 
-| UI Label                | Setting                      | Description                                                                            | Default |
-| ----------------------- | ---------------------------- | -------------------------------------------------------------------------------------- | ------- |
-| 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.5`   |
-| Disable Loop Detection  | `model.disableLoopDetection` | Disable automatic detection and prevention of infinite loops.                          | `false` |
-| Skip Next Speaker Check | `model.skipNextSpeakerCheck` | Skip the next speaker check.                                                           | `true`  |
+| UI Label                | Setting                      | Description                                                                            | Default     |
+| ----------------------- | ---------------------------- | -------------------------------------------------------------------------------------- | ----------- |
+| Model                   | `model.name`                 | The Gemini model to use for conversations.                                             | `undefined` |
+| 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.5`       |
+| Disable Loop Detection  | `model.disableLoopDetection` | Disable automatic detection and prevention of infinite loops.                          | `false`     |
+| Skip Next Speaker Check | `model.skipNextSpeakerCheck` | Skip the next speaker check.                                                           | `true`      |
 
 ### Context
 
@@ -96,34 +111,43 @@ they appear in the UI.
 
 ### 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`     |
-| Approval Mode                    | `tools.approvalMode`                 | The default approval mode for tool execution. 'default' prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is read-only mode. 'yolo' is not supported yet. | `"default"` |
-| 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.                                                                                          | `4000000`   |
-| Tool Output Truncation Lines     | `tools.truncateToolOutputLines`      | The number of lines to keep when truncating tool output.                                                                                                                       | `1000`      |
-| Disable LLM Correction           | `tools.disableLLMCorrection`         | Disable LLM-based error correction for edit tools. When enabled, tools will fail immediately if exact string matches are not found, instead of attempting to self-correct.     | `true`      |
+| 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` |
+| Use Ripgrep                      | `tools.useRipgrep`                   | Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance.                                                            | `true`  |
+| Tool Output Truncation Threshold | `tools.truncateToolOutputThreshold`  | Maximum characters to show when truncating large tool outputs. Set to 0 or negative to disable truncation.                                                                 | `40000` |
+| Disable LLM Correction           | `tools.disableLLMCorrection`         | Disable LLM-based error correction for edit tools. When enabled, tools will fail immediately if exact string matches are not found, instead of attempting to self-correct. | `true`  |
 
 ### Security
 
-| UI Label                              | Setting                                         | Description                                                                                                                                                             | Default |
-| ------------------------------------- | ----------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Disable YOLO Mode                     | `security.disableYoloMode`                      | Disable YOLO mode, even if enabled by a flag.                                                                                                                           | `false` |
-| Allow Permanent Tool Approval         | `security.enablePermanentToolApproval`          | Enable the "Allow for all future sessions" option in tool confirmation dialogs.                                                                                         | `false` |
-| Blocks extensions from Git            | `security.blockGitExtensions`                   | Blocks installing and loading extensions from Git.                                                                                                                      | `false` |
-| Extension Source Regex Allowlist      | `security.allowedExtensions`                    | List of Regex patterns for allowed extensions. If nonempty, only extensions that match the patterns in this list are allowed. Overrides the blockGitExtensions setting. | `[]`    |
-| Folder Trust                          | `security.folderTrust.enabled`                  | Setting to track whether Folder trust is enabled.                                                                                                                       | `true`  |
-| Enable Environment Variable Redaction | `security.environmentVariableRedaction.enabled` | Enable redaction of environment variables that may contain secrets.                                                                                                     | `false` |
+| UI Label                              | Setting                                         | Description                                                                                                                                                                                                                          | Default |
+| ------------------------------------- | ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------- |
+| Disable YOLO Mode                     | `security.disableYoloMode`                      | Disable YOLO mode, even if enabled by a flag.                                                                                                                                                                                        | `false` |
+| Allow Permanent Tool Approval         | `security.enablePermanentToolApproval`          | Enable the "Allow for all future sessions" option in tool confirmation dialogs.                                                                                                                                                      | `false` |
+| Blocks extensions from Git            | `security.blockGitExtensions`                   | Blocks installing and loading extensions from Git.                                                                                                                                                                                   | `false` |
+| Extension Source Regex Allowlist      | `security.allowedExtensions`                    | List of Regex patterns for allowed extensions. If nonempty, only extensions that match the patterns in this list are allowed. Overrides the blockGitExtensions setting.                                                              | `[]`    |
+| Folder Trust                          | `security.folderTrust.enabled`                  | Setting to track whether Folder trust is enabled.                                                                                                                                                                                    | `true`  |
+| Enable Environment Variable Redaction | `security.environmentVariableRedaction.enabled` | Enable redaction of environment variables that may contain secrets.                                                                                                                                                                  | `false` |
+| Enable Context-Aware Security         | `security.enableConseca`                        | Enable the context-aware security checker. This feature uses an LLM to dynamically generate and enforce security policies for tool use based on your prompt, providing an additional layer of protection against unintended actions. | `false` |
+
+### Advanced
+
+| UI Label                          | Setting                        | Description                                   | Default |
+| --------------------------------- | ------------------------------ | --------------------------------------------- | ------- |
+| Auto Configure Max Old Space Size | `advanced.autoConfigureMemory` | Automatically configure Node.js memory limits | `false` |
 
 ### Experimental
 
-| UI Label         | Setting                      | Description                                                                         | Default |
-| ---------------- | ---------------------------- | ----------------------------------------------------------------------------------- | ------- |
-| Use OSC 52 Paste | `experimental.useOSC52Paste` | Use OSC 52 sequence for pasting instead of clipboardy (useful for remote sessions). | `false` |
-| Plan             | `experimental.plan`          | Enable planning features (Plan Mode and tools).                                     | `false` |
+| UI Label                   | Setting                                  | Description                                                                                                                                               | Default |
+| -------------------------- | ---------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| Enable Tool Output Masking | `experimental.toolOutputMasking.enabled` | Enables tool output masking to save tokens.                                                                                                               | `true`  |
+| Use OSC 52 Paste           | `experimental.useOSC52Paste`             | Use OSC 52 for pasting. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
+| Use OSC 52 Copy            | `experimental.useOSC52Copy`              | Use OSC 52 for copying. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
+| Plan                       | `experimental.plan`                      | Enable planning features (Plan Mode and tools).                                                                                                           | `false` |
+| Model Steering             | `experimental.modelSteering`             | Enable model steering (user hints) to guide the model during tool execution.                                                                              | `false` |
+| Direct Web Fetch           | `experimental.directWebFetch`            | Enable web fetch behavior that bypasses LLM summarization.                                                                                                | `false` |
+| Enable Gemma Model Router  | `experimental.gemmaModelRouter.enabled`  | Enable the Gemma Model Router. Requires a local endpoint serving Gemma via the Gemini API using LiteRT-LM shim.                                           | `false` |
 
 ### Skills
 

docs/cli/skills.md

@@ -35,16 +35,22 @@ the full instructions and resources required to complete the task using the
 
 Gemini CLI discovers skills from three primary locations:
 
-1.  **Workspace Skills** (`.gemini/skills/`): Workspace-specific skills that are
-    typically committed to version control and shared with the team.
-2.  **User Skills** (`~/.gemini/skills/`): Personal skills available across all
-    your workspaces.
+1.  **Workspace Skills**: Located in `.gemini/skills/` or the `.agents/skills/`
+    alias. Workspace skills are typically committed to version control and
+    shared with the team.
+2.  **User Skills**: Located in `~/.gemini/skills/` or the `~/.agents/skills/`
+    alias. These are personal skills available across all your workspaces.
 3.  **Extension Skills**: Skills bundled within installed
     [extensions](../extensions/index.md).
 
 **Precedence:** If multiple skills share the same name, higher-precedence
 locations override lower ones: **Workspace > User > Extension**.
 
+Within the same tier (user or workspace), the `.agents/skills/` alias takes
+precedence over the `.gemini/skills/` directory. This generic alias provides an
+intuitive path for managing agent-specific expertise that remains compatible
+across different AI agent tools.
+
 ## Managing Skills
 
 ### In an Interactive Session
@@ -69,14 +75,15 @@ The `gemini skills` command provides management utilities:
 gemini skills list
 
 # Link agent skills from a local directory via symlink
-# Discovers skills (SKILL.md or */SKILL.md) and creates symlinks in ~/.gemini/skills (user)
+# Discovers skills (SKILL.md or */SKILL.md) and creates symlinks in ~/.gemini/skills
+# (or ~/.agents/skills)
 gemini skills link /path/to/my-skills-repo
 
-# Link to the workspace scope (.gemini/skills)
+# Link to the workspace scope (.gemini/skills or .agents/skills)
 gemini skills link /path/to/my-skills-repo --scope workspace
 
 # Install a skill from a Git repository, local directory, or zipped skill file (.skill)
-# Uses the user scope by default (~/.gemini/skills)
+# Uses the user scope by default (~/.gemini/skills or ~/.agents/skills)
 gemini skills install https://github.com/user/repo.git
 gemini skills install /path/to/local/skill
 gemini skills install /path/to/local/my-expertise.skill
@@ -84,7 +91,7 @@ gemini skills install /path/to/local/my-expertise.skill
 # Install a specific skill from a monorepo or subdirectory using --path
 gemini skills install https://github.com/my-org/my-skills.git --path skills/frontend-design
 
-# Install to the workspace scope (.gemini/skills)
+# Install to the workspace scope (.gemini/skills or .agents/skills)
 gemini skills install /path/to/skill --scope workspace
 
 # Uninstall a skill by name

docs/cli/telemetry.md

@@ -93,7 +93,7 @@ Environment variables can be used to override the settings in the file.
 `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](../reference/configuration.md).
 
 ## Google Cloud telemetry
 
@@ -176,11 +176,12 @@ Sends telemetry directly to Google Cloud services. No collector needed.
    }
    ```
 2. Run Gemini CLI and send prompts.
-3. View logs and metrics:
+3. View logs, metrics, and traces:
    - Open the Google Cloud Console in your browser after sending prompts:
-     - Logs: https://console.cloud.google.com/logs/
-     - Metrics: https://console.cloud.google.com/monitoring/metrics-explorer
-     - Traces: https://console.cloud.google.com/traces/list
+     - Logs (Logs Explorer): https://console.cloud.google.com/logs/
+     - Metrics (Metrics Explorer):
+       https://console.cloud.google.com/monitoring/metrics-explorer
+     - Traces (Trace Explorer): https://console.cloud.google.com/traces/list
 
 ### Collector-based export (advanced)
 
@@ -208,11 +209,12 @@ forward data to Google Cloud.
    - Save collector logs to `~/.gemini/tmp/<projectHash>/otel/collector-gcp.log`
    - Stop collector on exit (e.g. `Ctrl+C`)
 3. Run Gemini CLI and send prompts.
-4. View logs and metrics:
+4. View logs, metrics, and traces:
    - Open the Google Cloud Console in your browser after sending prompts:
-     - Logs: https://console.cloud.google.com/logs/
-     - Metrics: https://console.cloud.google.com/monitoring/metrics-explorer
-     - Traces: https://console.cloud.google.com/traces/list
+     - Logs (Logs Explorer): https://console.cloud.google.com/logs/
+     - Metrics (Metrics Explorer):
+       https://console.cloud.google.com/monitoring/metrics-explorer
+     - Traces (Trace Explorer): https://console.cloud.google.com/traces/list
    - Open `~/.gemini/tmp/<projectHash>/otel/collector-gcp.log` to view local
      collector logs.
 
@@ -270,14 +272,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, metrics, and traces
 
-The following section describes the structure of logs and metrics generated for
-Gemini CLI.
+The following section describes the structure of logs, metrics, and traces
+generated for Gemini CLI.
 
-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.
+The `session.id`, `installation.id`, `active_approval_mode`, and `user.email`
+(available only when authenticated with a Google account) are included as common
+attributes on all logs and metrics.
 
 ### Logs
 
@@ -320,6 +322,8 @@ Captures startup configuration and user prompt submissions.
 
 Tracks changes and duration of approval modes.
 
+##### Lifecycle
+
 - `approval_mode_switch`: Approval mode was changed.
   - **Attributes**:
     - `from_mode` (string)
@@ -330,6 +334,15 @@ Tracks changes and duration of approval modes.
     - `mode` (string)
     - `duration_ms` (int)
 
+##### Execution
+
+These events track the execution of an approval mode, such as Plan Mode.
+
+- `plan_execution`: A plan was executed and the session switched from plan mode
+  to active execution.
+  - **Attributes**:
+    - `approval_mode` (string)
+
 #### Tools
 
 Captures tool executions, output truncation, and Edit behavior.
@@ -349,7 +362,21 @@ Captures tool executions, output truncation, and Edit behavior.
     - `extension_name` (string, if applicable)
     - `extension_id` (string, if applicable)
     - `content_length` (int, if applicable)
-    - `metadata` (if applicable)
+    - `metadata` (if applicable), which includes for the `AskUser` tool:
+      - `ask_user` (object):
+        - `question_types` (array of strings)
+        - `ask_user_dismissed` (boolean)
+        - `ask_user_empty_submission` (boolean)
+        - `ask_user_answer_count` (number)
+      - `diffStat` (if applicable), which includes:
+        - `model_added_lines` (number)
+        - `model_removed_lines` (number)
+        - `model_added_chars` (number)
+        - `model_removed_chars` (number)
+        - `user_added_lines` (number)
+        - `user_removed_lines` (number)
+        - `user_added_chars` (number)
+        - `user_removed_chars` (number)
 
 - `gemini_cli.tool_output_truncated`: Output of a tool call was truncated.
   - **Attributes**:
@@ -462,6 +489,7 @@ Captures Gemini API requests, responses, and errors.
     - `reasoning` (string, optional)
     - `failed` (boolean)
     - `error_message` (string, optional)
+    - `approval_mode` (string)
 
 #### Chat and streaming
 
@@ -686,12 +714,14 @@ Routing latency/failures and slash-command selections.
   - **Attributes**:
     - `routing.decision_model` (string)
     - `routing.decision_source` (string)
+    - `routing.approval_mode` (string)
 
 - `gemini_cli.model_routing.failure.count` (Counter, Int): Counts model routing
   failures.
   - **Attributes**:
     - `routing.decision_source` (string)
     - `routing.error_message` (string)
+    - `routing.approval_mode` (string)
 
 ##### Agent runs
 
@@ -710,6 +740,17 @@ Agent lifecycle metrics: runs, durations, and turns.
   - **Attributes**:
     - `agent_name` (string)
 
+##### Approval Mode
+
+###### Execution
+
+These metrics track the adoption and usage of specific approval workflows, such
+as Plan Mode.
+
+- `gemini_cli.plan.execution.count` (Counter, Int): Counts plan executions.
+  - **Attributes**:
+    - `approval_mode` (string)
+
 ##### UI
 
 UI stability signals such as flicker count.
@@ -785,6 +826,32 @@ Optional performance monitoring for startup, CPU/memory, and phase timing.
     - `current_value` (number)
     - `baseline_value` (number)
 
+### Traces
+
+Traces offer a granular, "under-the-hood" view of every agent and backend
+operation. By providing a high-fidelity execution map, they enable precise
+debugging of complex tool interactions and deep performance optimization. Each
+trace captures rich, consistent metadata via custom span attributes:
+
+- `gen_ai.operation.name` (string): The high-level operation kind (e.g.
+  "tool_call", "llm_call").
+- `gen_ai.agent.name` (string): The service agent identifier ("gemini-cli").
+- `gen_ai.agent.description` (string): The service agent description.
+- `gen_ai.input.messages` (string): Input messages or metadata specific to the
+  operation.
+- `gen_ai.output.messages` (string): Output messages or metadata generated from
+  the operation.
+- `gen_ai.request.model` (string): The request model name.
+- `gen_ai.response.model` (string): The response model name.
+- `gen_ai.system_instructions` (json string): The system instructions.
+- `gen_ai.prompt.name` (string): The prompt name.
+- `gen_ai.tool.name` (string): The executed tool's name.
+- `gen_ai.tool.call_id` (string): The generated specific ID of the tool call.
+- `gen_ai.tool.description` (string): The executed tool's description.
+- `gen_ai.tool.definitions` (json string): The executed tool's description.
+- `gen_ai.conversation.id` (string): The current CLI session ID.
+- Additional user-defined Custom Attributes passed via the span's configuration.
+
 #### GenAI semantic convention
 
 The following metrics comply with [OpenTelemetry GenAI semantic conventions] for

docs/cli/themes.md

@@ -16,12 +16,14 @@ using the `/theme` command within Gemini CLI:
   - `Default`
   - `Dracula`
   - `GitHub`
+  - `Solarized Dark`
 - **Light themes:**
   - `ANSI Light`
   - `Ayu Light`
   - `Default Light`
   - `GitHub Light`
   - `Google Code`
+  - `Solarized Light`
   - `Xcode`
 
 ### Changing themes
@@ -39,22 +41,22 @@ can change the theme using the `/theme` command.
 ### Theme persistence
 
 Selected themes are saved in Gemini CLI's
-[configuration](../get-started/configuration.md) so your preference is
-remembered across sessions.
+[configuration](../reference/configuration.md) so your preference is remembered
+across sessions.
 
 ---
 
 ## 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
+Gemini CLI lets you 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
 
 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
-color keys. For example:
+nested configuration objects. For example:
 
 ```json
 {
@@ -63,50 +65,52 @@ color keys. For example:
       "MyCustomTheme": {
         "name": "MyCustomTheme",
         "type": "custom",
-        "Background": "#181818",
-        ...
+        "background": {
+          "primary": "#181818"
+        },
+        "text": {
+          "primary": "#f0f0f0",
+          "secondary": "#a0a0a0"
+        }
       }
     }
   }
 }
 ```
 
-**Color keys:**
+**Configuration objects:**
 
-- `Background`
-- `Foreground`
-- `LightBlue`
-- `AccentBlue`
-- `AccentPurple`
-- `AccentCyan`
-- `AccentGreen`
-- `AccentYellow`
-- `AccentRed`
-- `Comment`
-- `Gray`
-- `DiffAdded` (optional, for added lines in diffs)
-- `DiffRemoved` (optional, for removed lines in diffs)
-
-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.
+- **`text`**: Defines text colors.
+  - `primary`: The default text color.
+  - `secondary`: Used for less prominent text.
+  - `link`: Color for URLs and links.
+  - `accent`: Used for highlights and emphasis.
+  - `response`: Precedence over `primary` for rendering model responses.
+- **`background`**: Defines background colors.
+  - `primary`: The main background color of the UI.
+  - `diff.added`: Background for added lines in diffs.
+  - `diff.removed`: Background for removed lines in diffs.
+- **`border`**: Defines border colors.
+  - `default`: The standard border color.
+  - `focused`: Border color when an element is focused.
+- **`status`**: Colors for status indicators.
+  - `success`: Used for successful operations.
+  - `warning`: Used for warnings.
+  - `error`: Used for errors.
+- **`ui`**: Other UI elements.
+  - `comment`: Color for code comments.
+  - `symbol`: Color for code symbols and operators.
+  - `gradient`: An array of colors used for gradient effects.
 
 **Required properties:**
 
 - `name` (must match the key in the `customThemes` object and be a string)
 - `type` (must be the string `"custom"`)
-- `Background`
-- `Foreground`
-- `LightBlue`
-- `AccentBlue`
-- `AccentPurple`
-- `AccentCyan`
-- `AccentGreen`
-- `AccentYellow`
-- `AccentRed`
-- `Comment`
-- `Gray`
+
+While all sub-properties are technically optional, we recommend providing at
+least `background.primary`, `text.primary`, `text.secondary`, and the various
+accent colors via `text.link`, `text.accent`, and `status` to ensure a cohesive
+UI.
 
 You can use either hex codes (e.g., `#FF0000`) **or** standard CSS color names
 (e.g., `coral`, `teal`, `blue`) for any color value. See
@@ -141,22 +145,35 @@ custom theme defined in `settings.json`.
 
 ```json
 {
-  "name": "My File Theme",
+  "name": "Gruvbox Dark",
   "type": "custom",
-  "Background": "#282A36",
-  "Foreground": "#F8F8F2",
-  "LightBlue": "#82AAFF",
-  "AccentBlue": "#61AFEF",
-  "AccentPurple": "#BD93F9",
-  "AccentCyan": "#8BE9FD",
-  "AccentGreen": "#50FA7B",
-  "AccentYellow": "#F1FA8C",
-  "AccentRed": "#FF5555",
-  "Comment": "#6272A4",
-  "Gray": "#ABB2BF",
-  "DiffAdded": "#A6E3A1",
-  "DiffRemoved": "#F38BA8",
-  "GradientColors": ["#4796E4", "#847ACE", "#C3677F"]
+  "background": {
+    "primary": "#282828",
+    "diff": {
+      "added": "#2b3312",
+      "removed": "#341212"
+    }
+  },
+  "text": {
+    "primary": "#ebdbb2",
+    "secondary": "#a89984",
+    "link": "#83a598",
+    "accent": "#d3869b"
+  },
+  "border": {
+    "default": "#3c3836",
+    "focused": "#458588"
+  },
+  "status": {
+    "success": "#b8bb26",
+    "warning": "#fabd2f",
+    "error": "#fb4934"
+  },
+  "ui": {
+    "comment": "#928374",
+    "symbol": "#8ec07c",
+    "gradient": ["#cc241d", "#d65d0e", "#d79921"]
+  }
 }
 ```
 
@@ -177,9 +194,18 @@ untrusted sources.
 - Or, set it as the default by adding `"theme": "MyCustomTheme"` to the `ui`
   object in your `settings.json`.
 - Custom themes can be set at the user, project, or system level, and follow the
-  same [configuration precedence](../get-started/configuration.md) as other
+  same [configuration precedence](../reference/configuration.md) as other
   settings.
 
+### Themes from extensions
+
+[Extensions](../extensions/reference.md#themes) can also provide custom themes.
+Once an extension is installed and enabled, its themes are automatically added
+to the selection list in the `/theme` command.
+
+Themes from extensions appear with the extension name in parentheses to help you
+identify their source, for example: `shades-of-green (green-extension)`.
+
 ---
 
 ## Dark themes
@@ -208,6 +234,10 @@ untrusted sources.
 
 <img src="/assets/theme-github.png" alt="GitHub theme" width="600">
 
+### Solarized Dark
+
+<img src="/assets/theme-solarized-dark.png" alt="Solarized Dark theme" width="600">
+
 ## Light themes
 
 ### ANSI Light
@@ -230,6 +260,10 @@ untrusted sources.
 
 <img src="/assets/theme-google-light.png" alt="Google Code theme" width="600">
 
+### Solarized Light
+
+<img src="/assets/theme-solarized-light.png" alt="Solarized Light theme" width="600">
+
 ### Xcode
 
 <img src="/assets/theme-xcode-light.png" alt="Xcode Light theme" width="600">

docs/cli/trusted-folders.md

@@ -38,6 +38,37 @@ 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.
 
+## Understanding folder contents: The discovery phase
+
+Before you make a choice, the Gemini CLI performs a **discovery phase** to scan
+the folder for potential configurations. This information is displayed in the
+trust dialog to help you make an informed decision.
+
+The discovery UI lists the following categories of items found in the project:
+
+- **Commands**: Custom `.toml` command definitions that add new functionality.
+- **MCP Servers**: Configured Model Context Protocol servers that the CLI will
+  attempt to connect to.
+- **Hooks**: System or custom hooks that can intercept and modify CLI behavior.
+- **Skills**: Local agent skills that provide specialized capabilities.
+- **Setting overrides**: Any project-specific configurations that override your
+  global user settings.
+
+### Security warnings and errors
+
+The trust dialog also highlights critical information that requires your
+attention:
+
+- **Security Warnings**: The CLI will explicitly flag potentially dangerous
+  settings, such as auto-approving certain tools or disabling the security
+  sandbox.
+- **Discovery Errors**: If the CLI encounters issues while scanning the folder
+  (e.g., a malformed `settings.json` file), these errors will be displayed
+  prominently.
+
+By reviewing these details, you can ensure that you only grant trust to projects
+that you know are safe.
+
 ## Why trust matters: The impact of an untrusted workspace
 
 When a folder is **untrusted**, the Gemini CLI runs in a restricted "safe mode"

docs/cli/tutorials.md

@@ -1,87 +0,0 @@
-# Tutorials
-
-This page contains tutorials for interacting with Gemini CLI.
-
-## Agent Skills
-
-- [Getting Started with Agent Skills](./tutorials/skills-getting-started.md)
-
-## Setting up a Model Context Protocol (MCP) server
-
-> [!CAUTION] Before using a third-party MCP server, ensure you trust its source
-> and understand the tools it provides. Your use of third-party servers is at
-> your own risk.
-
-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.
-
-### Prerequisites
-
-Before you begin, ensure you have the following installed and configured:
-
-- **Docker:** Install and run [Docker].
-- **GitHub Personal Access Token (PAT):** Create a new [classic] or
-  [fine-grained] PAT with the necessary scopes.
-
-[Docker]: https://www.docker.com/
-[classic]: https://github.com/settings/tokens/new
-[fine-grained]: https://github.com/settings/personal-access-tokens/new
-
-### Guide
-
-#### Configure the MCP server in `settings.json`
-
-In your project's root directory, create or open the
-[`.gemini/settings.json` file](../get-started/configuration.md). Within the
-file, add the `mcpServers` configuration block, which provides instructions for
-how to launch the GitHub MCP server.
-
-```json
-{
-  "mcpServers": {
-    "github": {
-      "command": "docker",
-      "args": [
-        "run",
-        "-i",
-        "--rm",
-        "-e",
-        "GITHUB_PERSONAL_ACCESS_TOKEN",
-        "ghcr.io/github/github-mcp-server"
-      ],
-      "env": {
-        "GITHUB_PERSONAL_ACCESS_TOKEN": "${GITHUB_PERSONAL_ACCESS_TOKEN}"
-      }
-    }
-  }
-}
-```
-
-#### Set your GitHub token
-
-> [!CAUTION] Using a broadly scoped personal access token that has access to
-> personal and private repositories can lead to information from the private
-> repository being leaked into the public repository. We recommend using a
-> fine-grained access token that doesn't share access to both public and private
-> repositories.
-
-Use an environment variable to store your GitHub PAT:
-
-```bash
-GITHUB_PERSONAL_ACCESS_TOKEN="pat_YourActualGitHubTokenHere"
-```
-
-Gemini CLI uses this value in the `mcpServers` configuration that you defined in
-the `settings.json` file.
-
-#### Launch Gemini CLI and verify the connection
-
-When you launch Gemini CLI, it automatically reads your configuration and
-launches the GitHub MCP server in the background. You can then use natural
-language prompts to ask Gemini CLI to perform GitHub actions. For example:
-
-```bash
-"get all open issues assigned to me in the 'foo/bar' repo and prioritize them"
-```

docs/cli/tutorials/automation.md

@@ -0,0 +1,187 @@
+# Automate tasks with headless mode
+
+Automate tasks with Gemini CLI. Learn how to use headless mode, pipe data into
+Gemini CLI, automate workflows with shell scripts, and generate structured JSON
+output for other applications.
+
+## Prerequisites
+
+- Gemini CLI installed and authenticated.
+- Familiarity with shell scripting (Bash/Zsh).
+
+## Why headless mode?
+
+Headless mode runs Gemini CLI once and exits. It's perfect for:
+
+- **CI/CD:** Analyzing pull requests automatically.
+- **Batch processing:** Summarizing a large number of log files.
+- **Tool building:** Creating your own "AI wrapper" scripts.
+
+## How to use headless mode
+
+Run Gemini CLI in headless mode by providing a prompt as a positional argument.
+This bypasses the interactive chat interface and prints the response to standard
+output (stdout).
+
+Run a single command:
+
+```bash
+gemini "Write a poem about TypeScript"
+```
+
+## How to pipe input to Gemini CLI
+
+Feed data into Gemini using the standard Unix pipe `|`. Gemini reads the
+standard input (stdin) as context and answers your question using standard
+output.
+
+Pipe a file:
+
+```bash
+cat error.log | gemini "Explain why this failed"
+```
+
+Pipe a command:
+
+```bash
+git diff | gemini "Write a commit message for these changes"
+```
+
+## Use Gemini CLI output in scripts
+
+Because Gemini prints to stdout, you can chain it with other tools or save the
+results to a file.
+
+### Scenario: Bulk documentation generator
+
+You have a folder of Python scripts and want to generate a `README.md` for each
+one.
+
+1.  Save the following code as `generate_docs.sh`:
+
+    ```bash
+    #!/bin/bash
+
+    # Loop through all Python files
+    for file in *.py; do
+      echo "Generating docs for $file..."
+
+      # Ask Gemini CLI to generate the documentation and print it to stdout
+      gemini "Generate a Markdown documentation summary for @$file. Print the
+      result to standard output." > "${file%.py}.md"
+    done
+    ```
+
+2.  Make the script executable and run it in your directory:
+
+    ```bash
+    chmod +x generate_docs.sh
+    ./generate_docs.sh
+    ```
+
+    This creates a corresponding Markdown file for every Python file in the
+    folder.
+
+## Extract structured JSON data
+
+When writing a script, you often need structured data (JSON) to pass to tools
+like `jq`. To get pure JSON data from the model, combine the
+`--output-format json` flag with `jq` to parse the response field.
+
+### Scenario: Extract and return structured data
+
+1.  Save the following script as `generate_json.sh`:
+
+    ```bash
+    #!/bin/bash
+
+    # Ensure we are in a project root
+    if [ ! -f "package.json" ]; then
+      echo "Error: package.json not found."
+      exit 1
+    fi
+
+    # Extract data
+    gemini --output-format json "Return a raw JSON object with keys 'version' and 'deps' from @package.json" | jq -r '.response' > data.json
+    ```
+
+2.  Run `generate_json.sh`:
+
+    ```bash
+    chmod +x generate_json.sh
+    ./generate_json.sh
+    ```
+
+3.  Check `data.json`. The file should look like this:
+
+    ```json
+    {
+      "version": "1.0.0",
+      "deps": {
+        "react": "^18.2.0"
+      }
+    }
+    ```
+
+## Build your own custom AI tools
+
+Use headless mode to perform custom, automated AI tasks.
+
+### Scenario: Create a "Smart Commit" alias
+
+You can add a function to your shell configuration (like `.zshrc` or `.bashrc`)
+to create a `git commit` wrapper that writes the message for you.
+
+1.  Open your `.zshrc` file (or `.bashrc` if you use Bash) in your preferred
+    text editor.
+
+    ```bash
+    nano ~/.zshrc
+    ```
+
+    **Note**: If you use VS Code, you can run `code ~/.zshrc`.
+
+2.  Scroll to the very bottom of the file and paste this code:
+
+    ```bash
+    function gcommit() {
+      # Get the diff of staged changes
+      diff=$(git diff --staged)
+
+      if [ -z "$diff" ]; then
+        echo "No staged changes to commit."
+        return 1
+      fi
+
+      # Ask Gemini to write the message
+      echo "Generating commit message..."
+      msg=$(echo "$diff" | gemini "Write a concise Conventional Commit message for this diff. Output ONLY the message.")
+
+      # Commit with the generated message
+      git commit -m "$msg"
+    }
+    ```
+
+    Save your file and exit.
+
+3.  Run this command to make the function available immediately:
+
+    ```bash
+    source ~/.zshrc
+    ```
+
+4.  Use your new command:
+
+    ```bash
+    gcommit
+    ```
+
+    Gemini CLI will analyze your staged changes and commit them with a generated
+    message.
+
+## Next steps
+
+- Explore the [Headless mode reference](../../cli/headless.md) for full JSON
+  schema details.
+- Learn about [Shell commands](shell-commands.md) to let the agent run scripts
+  instead of just writing them.

docs/cli/tutorials/file-management.md

@@ -0,0 +1,142 @@
+# File management with Gemini CLI
+
+Explore, analyze, and modify your codebase using Gemini CLI. In this guide,
+you'll learn how to provide Gemini CLI with files and directories, modify and
+create files, and control what Gemini CLI can see.
+
+## Prerequisites
+
+- Gemini CLI installed and authenticated.
+- A project directory to work with (e.g., a git repository).
+
+## How to give the agent context (Reading files)
+
+Gemini CLI will generally try to read relevant files, sometimes prompting you
+for access (depending on your settings). To ensure that Gemini CLI uses a file,
+you can also include it directly.
+
+### Direct file inclusion (`@`)
+
+If you know the path to the file you want to work on, use the `@` symbol. This
+forces the CLI to read the file immediately and inject its content into your
+prompt.
+
+```bash
+`@src/components/UserProfile.tsx Explain how this component handles user data.`
+```
+
+### Working with multiple files
+
+Complex features often span multiple files. You can chain `@` references to give
+the agent a complete picture of the dependencies.
+
+```bash
+`@src/components/UserProfile.tsx @src/types/User.ts Refactor the component to use the updated User interface.`
+```
+
+### Including entire directories
+
+For broad questions or refactoring, you can include an entire directory. Be
+careful with large folders, as this consumes more tokens.
+
+```bash
+`@src/utils/ Check these utility functions for any deprecated API usage.`
+```
+
+## How to find files (Exploration)
+
+If you _don't_ know the exact file path, you can ask Gemini CLI to find it for
+you. This is useful when navigating a new codebase or looking for specific
+logic.
+
+### Scenario: Find a component definition
+
+You know there's a `UserProfile` component, but you don't know where it lives.
+
+```none
+`Find the file that defines the UserProfile component.`
+```
+
+Gemini uses the `glob` or `list_directory` tools to search your project
+structure. It will return the specific path (e.g.,
+`src/components/UserProfile.tsx`), which you can then use with `@` in your next
+turn.
+
+> **Tip:** You can also ask for lists of files, like "Show me all the TypeScript
+> configuration files in the root directory."
+
+## How to modify code
+
+Once Gemini CLI has context, you can direct it to make specific edits. The agent
+is capable of complex refactoring, not just simple text replacement.
+
+```none
+`Update @src/components/UserProfile.tsx to show a loading spinner if the user data is null.`
+```
+
+Gemini CLI uses the `replace` tool to propose a targeted code change.
+
+### Creating new files
+
+You can also ask the agent to create entirely new files or folder structures.
+
+```none
+`Create a new file @src/components/LoadingSpinner.tsx with a simple Tailwind CSS spinner.`
+```
+
+Gemini CLI uses the `write_file` tool to generate the new file from scratch.
+
+## Review and confirm changes
+
+Gemini CLI prioritizes safety. Before any file is modified, it presents a
+unified diff of the proposed changes.
+
+```diff
+- if (!user) return null;
++ if (!user) return <LoadingSpinner />;
+```
+
+- **Red lines (-):** Code that will be removed.
+- **Green lines (+):** Code that will be added.
+
+Press **y** to confirm and apply the change to your local file system. If the
+diff doesn't look right, press **n** to cancel and refine your prompt.
+
+## Verify the result
+
+After the edit is complete, verify the fix. You can simply read the file again
+or, better yet, run your project's tests.
+
+```none
+`Run the tests for the UserProfile component.`
+```
+
+Gemini CLI uses the `run_shell_command` tool to execute your test runner (e.g.,
+`npm test` or `jest`). This ensures the changes didn't break existing
+functionality.
+
+## Advanced: Controlling what Gemini sees
+
+By default, Gemini CLI respects your `.gitignore` file. It won't read or search
+through `node_modules`, build artifacts, or other ignored paths.
+
+If you have sensitive files (like `.env`) or large assets that you want to keep
+hidden from the AI _without_ ignoring them in Git, you can create a
+`.geminiignore` file in your project root.
+
+**Example `.geminiignore`:**
+
+```text
+.env
+local-db-dump.sql
+private-notes.md
+```
+
+## Next steps
+
+- Learn how to [Manage context and memory](memory-management.md) to keep your
+  agent smarter over long sessions.
+- See [Execute shell commands](shell-commands.md) for more on running tests and
+  builds.
+- Explore the technical [File system reference](../../tools/file-system.md) for
+  advanced tool parameters.

docs/cli/tutorials/mcp-setup.md

@@ -0,0 +1,105 @@
+# Set up an MCP server
+
+Connect Gemini CLI to your external databases and services. In this guide,
+you'll learn how to extend Gemini CLI's capabilities by installing the GitHub
+MCP server and using it to manage your repositories.
+
+## Prerequisites
+
+- Gemini CLI installed.
+- **Docker:** Required for this specific example (many MCP servers run as Docker
+  containers).
+- **GitHub token:** A Personal Access Token (PAT) with repo permissions.
+
+## How to prepare your credentials
+
+Most MCP servers require authentication. For GitHub, you need a PAT.
+
+1.  Create a [fine-grained PAT](https://github.com/settings/tokens?type=beta).
+2.  Grant it **Read** access to **Metadata** and **Contents**, and
+    **Read/Write** access to **Issues** and **Pull Requests**.
+3.  Store it in your environment:
+
+```bash
+export GITHUB_PERSONAL_ACCESS_TOKEN="github_pat_..."
+```
+
+## How to configure Gemini CLI
+
+You tell Gemini about new servers by editing your `settings.json`.
+
+1.  Open `~/.gemini/settings.json` (or the project-specific
+    `.gemini/settings.json`).
+2.  Add the `mcpServers` block. This tells Gemini: "Run this docker container
+    and talk to it."
+
+```json
+{
+  "mcpServers": {
+    "github": {
+      "command": "docker",
+      "args": [
+        "run",
+        "-i",
+        "--rm",
+        "-e",
+        "GITHUB_PERSONAL_ACCESS_TOKEN",
+        "ghcr.io/modelcontextprotocol/servers/github:latest"
+      ],
+      "env": {
+        "GITHUB_PERSONAL_ACCESS_TOKEN": "${GITHUB_PERSONAL_ACCESS_TOKEN}"
+      }
+    }
+  }
+}
+```
+
+> **Note:** The `command` is `docker`, and the rest are arguments passed to it.
+> We map the local environment variable into the container so your secret isn't
+> hardcoded in the config file.
+
+## How to verify the connection
+
+Restart Gemini CLI. It will automatically try to start the defined servers.
+
+**Command:** `/mcp list`
+
+You should see: `✓ github: docker ... - Connected`
+
+If you see `Disconnected` or an error, check that Docker is running and your API
+token is valid.
+
+## How to use the new tools
+
+Now that the server is running, the agent has new capabilities ("tools"). You
+don't need to learn special commands; just ask in natural language.
+
+### Scenario: Listing pull requests
+
+**Prompt:** `List the open PRs in the google/gemini-cli repository.`
+
+The agent will:
+
+1.  Recognize the request matches a GitHub tool.
+2.  Call `github_list_pull_requests`.
+3.  Present the data to you.
+
+### Scenario: Creating an issue
+
+**Prompt:**
+`Create an issue in my repo titled "Bug: Login fails" with the description "See logs".`
+
+## Troubleshooting
+
+- **Server won't start?** Try running the docker command manually in your
+  terminal to see if it prints an error (e.g., "image not found").
+- **Tools not found?** Run `/mcp refresh` to force the CLI to re-query the
+  server for its capabilities.
+
+## Next steps
+
+- Explore the [MCP servers reference](../../tools/mcp-server.md) to learn about
+  SSE and HTTP transports for remote servers.
+- Browse the
+  [official MCP server list](https://github.com/modelcontextprotocol/servers) to
+  find connectors for Slack, Postgres, Google Drive, and more.

docs/cli/tutorials/memory-management.md

@@ -0,0 +1,126 @@
+# Manage context and memory
+
+Control what Gemini CLI knows about you and your projects. In this guide, you'll
+learn how to define project-wide rules with `GEMINI.md`, teach the agent
+persistent facts, and inspect the active context.
+
+## Prerequisites
+
+- Gemini CLI installed and authenticated.
+- A project directory where you want to enforce specific rules.
+
+## Why manage context?
+
+Out of the box, Gemini CLI is smart but generic. It doesn't know your preferred
+testing framework, your indentation style, or that you hate using `any` in
+TypeScript. Context management solves this by giving the agent persistent
+memory.
+
+You'll use these features when you want to:
+
+- **Enforce standards:** Ensure every generated file matches your team's style
+  guide.
+- **Set a persona:** Tell the agent to act as a "Senior Rust Engineer" or "QA
+  Specialist."
+- **Remember facts:** Save details like "My database port is 5432" so you don't
+  have to repeat them.
+
+## How to define project-wide rules (GEMINI.md)
+
+The most powerful way to control the agent's behavior is through `GEMINI.md`
+files. These are Markdown files containing instructions that are automatically
+loaded into every conversation.
+
+### Scenario: Create a project context file
+
+1.  In the root of your project, create a file named `GEMINI.md`.
+
+2.  Add your instructions:
+
+    ```markdown
+    # Project Instructions
+
+    - **Framework:** We use React with Vite.
+    - **Styling:** Use Tailwind CSS for all styling. Do not write custom CSS.
+    - **Testing:** All new components must include a Vitest unit test.
+    - **Tone:** Be concise. Don't explain basic React concepts.
+    ```
+
+3.  Start a new session. Gemini CLI will now know these rules automatically.
+
+### Scenario: Using the hierarchy
+
+Context is loaded hierarchically. This allows you to have general rules for
+everything and specific rules for sub-projects.
+
+1.  **Global:** `~/.gemini/GEMINI.md` (Rules for _every_ project you work on).
+2.  **Project Root:** `./GEMINI.md` (Rules for the current repository).
+3.  **Subdirectory:** `./src/GEMINI.md` (Rules specific to the `src` folder).
+
+**Example:** You might set "Always use strict typing" in your global config, but
+"Use Python 3.11" only in your backend repository.
+
+## How to teach the agent facts (Memory)
+
+Sometimes you don't want to write a config file. You just want to tell the agent
+something once and have it remember forever. You can do this naturally in chat.
+
+### Scenario: Saving a memory
+
+Just tell the agent to remember something.
+
+**Prompt:** `Remember that I prefer using 'const' over 'let' wherever possible.`
+
+The agent will use the `save_memory` tool to store this fact in your global
+memory file.
+
+**Prompt:** `Save the fact that the staging server IP is 10.0.0.5.`
+
+### Scenario: Using memory in conversation
+
+Once a fact is saved, you don't need to invoke it explicitly. The agent "knows"
+it.
+
+**Next Prompt:** `Write a script to deploy to staging.`
+
+**Agent Response:** "I'll write a script to deploy to **10.0.0.5**..."
+
+## How to manage and inspect context
+
+As your project grows, you might want to see exactly what instructions the agent
+is following.
+
+### Scenario: View active context
+
+To see the full, concatenated set of instructions currently loaded (from all
+`GEMINI.md` files and saved memories), use the `/memory show` command.
+
+**Command:** `/memory show`
+
+This prints the raw text the model receives at the start of the session. It's
+excellent for debugging why the agent might be ignoring a rule.
+
+### Scenario: Refresh context
+
+If you edit a `GEMINI.md` file while a session is running, the agent won't know
+immediately. Force a reload with:
+
+**Command:** `/memory refresh`
+
+## Best practices
+
+- **Keep it focused:** Don't dump your entire internal wiki into `GEMINI.md`.
+  Keep instructions actionable and relevant to code generation.
+- **Use negative constraints:** Explicitly telling the agent what _not_ to do
+  (e.g., "Do not use class components") is often more effective than vague
+  positive instructions.
+- **Review often:** Periodically check your `GEMINI.md` files to remove outdated
+  rules.
+
+## Next steps
+
+- Learn about [Session management](session-management.md) to see how short-term
+  history works.
+- Explore the [Command reference](../../reference/commands.md) for more
+  `/memory` options.
+- Read the technical spec for [Project context](../../cli/gemini-md.md).

docs/cli/tutorials/session-management.md

@@ -0,0 +1,105 @@
+# Manage sessions and history
+
+Resume, browse, and rewind your conversations with Gemini CLI. In this guide,
+you'll learn how to switch between tasks, manage your session history, and undo
+mistakes using the rewind feature.
+
+## Prerequisites
+
+- Gemini CLI installed and authenticated.
+- At least one active or past session.
+
+## How to resume where you left off
+
+It's common to switch context—maybe you're waiting for a build and want to work
+on a different feature. Gemini makes it easy to jump back in.
+
+### Scenario: Resume the last session
+
+The fastest way to pick up your most recent work is with the `--resume` flag (or
+`-r`).
+
+```bash
+gemini -r
+```
+
+This restores your chat history and memory, so you can say "Continue with the
+next step" immediately.
+
+### Scenario: Browse past sessions
+
+If you want to find a specific conversation from yesterday, use the interactive
+browser.
+
+**Command:** `/resume`
+
+This opens a searchable list of all your past sessions. You'll see:
+
+- A timestamp (e.g., "2 hours ago").
+- The first user message (helping you identify the topic).
+- The number of turns in the conversation.
+
+Select a session and press **Enter** to load it.
+
+## How to manage your workspace
+
+Over time, you'll accumulate a lot of history. Keeping your session list clean
+helps you find what you need.
+
+### Scenario: Deleting sessions
+
+In the `/resume` browser, navigate to a session you no longer need and press
+**x**. This permanently deletes the history for that specific conversation.
+
+You can also manage sessions from the command line:
+
+```bash
+# List all sessions with their IDs
+gemini --list-sessions
+
+# Delete a specific session by ID or index
+gemini --delete-session 1
+```
+
+## How to rewind time (Undo mistakes)
+
+Gemini CLI's **Rewind** feature is like `Ctrl+Z` for your workflow.
+
+### Scenario: Triggering rewind
+
+At any point in a chat, type `/rewind` or press **Esc** twice.
+
+### Scenario: Choosing a restore point
+
+You'll see a list of your recent interactions. Select the point _before_ the
+undesired changes occurred.
+
+### Scenario: Choosing what to revert
+
+Gemini gives you granular control over the undo process. You can choose to:
+
+1.  **Rewind conversation:** Only remove the chat history. The files stay
+    changed. (Useful if the code is good but the chat got off track).
+2.  **Revert code changes:** Keep the chat history but undo the file edits.
+    (Useful if you want to keep the context but retry the implementation).
+3.  **Rewind both:** Restore everything to exactly how it was.
+
+## How to fork conversations
+
+Sometimes you want to try two different approaches to the same problem.
+
+1.  Start a session and get to a decision point.
+2.  Save the current state with `/chat save decision-point`.
+3.  Try your first approach.
+4.  Later, use `/chat resume decision-point` to fork the conversation back to
+    that moment and try a different approach.
+
+This creates a new branch of history without losing your original work.
+
+## Next steps
+
+- Learn about [Checkpointing](../../cli/checkpointing.md) to understand the
+  underlying safety mechanism.
+- Explore [Task planning](task-planning.md) to keep complex sessions organized.
+- See the [Command reference](../../reference/commands.md) for all `/chat` and
+  `/resume` options.

docs/cli/tutorials/shell-commands.md

@@ -0,0 +1,107 @@
+# Execute shell commands
+
+Use the CLI to run builds, manage git, and automate system tasks without leaving
+the conversation. In this guide, you'll learn how to run commands directly,
+automate complex workflows, and manage background processes safely.
+
+## Prerequisites
+
+- Gemini CLI installed and authenticated.
+- Basic familiarity with your system's shell (Bash, Zsh, PowerShell, etc.).
+
+## How to run commands directly (`!`)
+
+Sometimes you just need to check a file size or git status without asking the AI
+to do it for you. You can pass commands directly to your shell using the `!`
+prefix.
+
+**Example:** `!ls -la`
+
+This executes `ls -la` immediately and prints the output to your terminal. The
+AI doesn't "see" this output unless you paste it back into the chat or use it in
+a prompt.
+
+### Scenario: Entering Shell mode
+
+If you're doing a lot of manual work, toggle "Shell Mode" by typing `!` and
+pressing **Enter**. Now, everything you type is sent to the shell until you exit
+(usually by pressing **Esc** or typing `exit`).
+
+## How to automate complex tasks
+
+You can automate tasks using a combination of Gemini CLI and shell commands.
+
+### Scenario: Run tests and fix failures
+
+You want to run tests and fix any failures.
+
+**Prompt:**
+`Run the unit tests. If any fail, analyze the error and try to fix the code.`
+
+**Workflow:**
+
+1.  Gemini calls `run_shell_command('npm test')`.
+2.  You see a confirmation prompt: `Allow command 'npm test'? [y/N]`.
+3.  You press `y`.
+4.  The tests run. If they fail, Gemini reads the error output.
+5.  Gemini uses `read_file` to inspect the failing test.
+6.  Gemini uses `replace` to fix the bug.
+7.  Gemini runs `npm test` again to verify the fix.
+
+This loop turns Gemini into an autonomous engineer.
+
+## How to manage background processes
+
+You can ask Gemini to start long-running tasks, like development servers or file
+watchers.
+
+**Prompt:** `Start the React dev server in the background.`
+
+Gemini will run the command (e.g., `npm run dev`) and detach it.
+
+### Scenario: Viewing active shells
+
+To see what's running in the background, use the `/shells` command.
+
+**Command:** `/shells`
+
+This opens a dashboard where you can view logs or kill runaway processes.
+
+## How to handle interactive commands
+
+Gemini CLI attempts to handle interactive commands (like `git add -p` or
+confirmation prompts) by streaming the output to you. However, for highly
+interactive tools (like `vim` or `top`), it's often better to run them yourself
+in a separate terminal window or use the `!` prefix.
+
+## Safety first
+
+Giving an AI access to your shell is powerful but risky. Gemini CLI includes
+several safety layers.
+
+### Confirmation prompts
+
+By default, **every** shell command requested by the agent requires your
+explicit approval.
+
+- **Allow once:** Runs the command one time.
+- **Allow always:** Trusts this specific command for the rest of the session.
+- **Deny:** Stops the agent.
+
+### Sandboxing
+
+For maximum security, especially when running untrusted code or exploring new
+projects, we strongly recommend enabling Sandboxing. This runs all shell
+commands inside a secure Docker container.
+
+**Enable sandboxing:** Use the `--sandbox` flag when starting the CLI:
+`gemini --sandbox`.
+
+## Next steps
+
+- Learn about [Sandboxing](../../cli/sandbox.md) to safely run destructive
+  commands.
+- See the [Shell tool reference](../../tools/shell.md) for configuration options
+  like timeouts and working directories.
+- Explore [Task planning](task-planning.md) to see how shell commands fit into
+  larger workflows.

docs/cli/tutorials/skills-getting-started.md

@@ -1,23 +1,27 @@
-# Getting Started with Agent Skills
+# Get started with Agent Skills
 
-Agent Skills allow you to extend Gemini CLI with specialized expertise. This
-tutorial will guide you through creating your first skill and using it in a
-session.
+Agent Skills extend Gemini CLI with specialized expertise. In this guide, you'll
+learn how to create your first skill, bundle custom scripts, and activate them
+during a session.
 
-## 1. Create your first skill
+## How to create a skill
 
-A skill is a directory containing a `SKILL.md` file. Let's create an **API
-Auditor** skill that helps you verify if local or remote endpoints are
+A skill is defined by a directory containing a `SKILL.md` file. Let's create an
+**API Auditor** skill that helps you verify if local or remote endpoints are
 responding correctly.
 
-1.  **Create the skill directory structure:**
+### Create the directory structure
+
+1.  Run the following command to create the folders:
 
     ```bash
     mkdir -p .gemini/skills/api-auditor/scripts
     ```
 
-2.  **Create the `SKILL.md` file:** Create a file at
-    `.gemini/skills/api-auditor/SKILL.md` with the following content:
+### Create the definition
+
+1.  Create a file at `.gemini/skills/api-auditor/SKILL.md`. This tells the agent
+    _when_ to use the skill and _how_ to behave.
 
     ```markdown
     ---
@@ -40,9 +44,12 @@ responding correctly.
         without an `https://` protocol.
     ```
 
-3.  **Create the bundled Node.js script:** Create a file at
-    `.gemini/skills/api-auditor/scripts/audit.js`. This script will be used by
-    the agent to perform the actual check:
+### Add the tool logic
+
+Skills can bundle resources like scripts.
+
+1.  Create a file at `.gemini/skills/api-auditor/scripts/audit.js`. This is the
+    code the agent will run.
 
     ```javascript
     // .gemini/skills/api-auditor/scripts/audit.js
@@ -59,39 +66,37 @@ responding correctly.
       .catch((e) => console.error(`Result: Failed (${e.message})`));
     ```
 
-## 2. Verify the skill is discovered
+## How to verify discovery
 
-Use the `/skills` slash command (or `gemini skills list` from your terminal) to
-see if Gemini CLI has found your new skill.
+Gemini CLI automatically discovers skills in the `.gemini/skills` directory. You
+can also use `.agents/skills` as a more generic alternative. Check that it found
+your new skill.
 
-In a Gemini CLI session:
-
-```
-/skills list
-```
+**Command:** `/skills list`
 
 You should see `api-auditor` in the list of available skills.
 
-## 3. Use the skill in a chat
+## How to use the skill
 
-Now, let's see the skill in action. Start a new session and ask a question about
-an endpoint.
+Now, try it out. Start a new session and ask a question that triggers the
+skill's description.
 
-**User:** "Can you audit http://geminili.com"
+**User:** "Can you audit http://geminicli.com"
 
-Gemini will recognize the request matches the `api-auditor` description and will
-ask for your permission to activate it.
+Gemini recognizes the request matches the `api-auditor` description and asks for
+permission to activate it.
 
 **Model:** (After calling `activate_skill`) "I've activated the **api-auditor**
 skill. I'll run the audit script now..."
 
-Gemini will then use the `run_shell_command` tool to execute your bundled Node
+Gemini then uses the `run_shell_command` tool to execute your bundled Node
 script:
 
 `node .gemini/skills/api-auditor/scripts/audit.js http://geminili.com`
 
-## Next Steps
+## Next steps
 
-- Explore [Agent Skills Authoring Guide](../skills.md#creating-a-skill) to learn
-  about more advanced skill features.
+- Explore the
+  [Agent Skills Authoring Guide](../../cli/skills.md#creating-a-skill) to learn
+  about more advanced features.
 - Learn how to share skills via [Extensions](../../extensions/index.md).

docs/cli/tutorials/task-planning.md

@@ -0,0 +1,93 @@
+# Plan tasks with todos
+
+Keep complex jobs on the rails with Gemini CLI's built-in task planning. In this
+guide, you'll learn how to ask for a plan, execute it step-by-step, and monitor
+progress with the todo list.
+
+## Prerequisites
+
+- Gemini CLI installed and authenticated.
+- A complex task in mind (e.g., a multi-file refactor or new feature).
+
+## Why use task planning?
+
+Standard LLMs have a limited context window and can "forget" the original goal
+after 10 turns of code generation. Task planning provides:
+
+1.  **Visibility:** You see exactly what the agent plans to do _before_ it
+    starts.
+2.  **Focus:** The agent knows exactly which step it's working on right now.
+3.  **Resilience:** If the agent gets stuck, the plan helps it get back on
+    track.
+
+## How to ask for a plan
+
+The best way to trigger task planning is to explicitly ask for it.
+
+**Prompt:**
+`I want to migrate this project from JavaScript to TypeScript. Please make a plan first.`
+
+Gemini will analyze your codebase and use the `write_todos` tool to generate a
+structured list.
+
+**Example Plan:**
+
+1.  [ ] Create `tsconfig.json`.
+2.  [ ] Rename `.js` files to `.ts`.
+3.  [ ] Fix type errors in `utils.js`.
+4.  [ ] Fix type errors in `server.js`.
+5.  [ ] Verify build passes.
+
+## How to review and iterate
+
+Once the plan is generated, it appears in your CLI. Review it.
+
+- **Missing steps?** Tell the agent: "You forgot to add a step for installing
+  `@types/node`."
+- **Wrong order?** Tell the agent: "Let's verify the build _after_ each file,
+  not just at the end."
+
+The agent will update the todo list dynamically.
+
+## How to execute the plan
+
+Tell the agent to proceed.
+
+**Prompt:** `Looks good. Start with the first step.`
+
+As the agent works, you'll see the todo list update in real-time above the input
+box.
+
+- **Current focus:** The active task is highlighted (e.g.,
+  `[IN_PROGRESS] Create tsconfig.json`).
+- **Progress:** Completed tasks are marked as done.
+
+## How to monitor progress (`Ctrl+T`)
+
+For a long-running task, the full todo list might be hidden to save space. You
+can toggle the full view at any time.
+
+**Action:** Press **Ctrl+T**.
+
+This shows the complete list, including pending, in-progress, and completed
+items. It's a great way to check "how much is left?" without scrolling back up.
+
+## How to handle unexpected changes
+
+Plans change. Maybe you discover a library is incompatible halfway through.
+
+**Prompt:**
+`Actually, let's skip the 'server.js' refactor for now. It's too risky.`
+
+The agent will mark that task as `cancelled` or remove it, and move to the next
+item. This dynamic adjustment is what makes the todo system powerful—it's a
+living document, not a static text block.
+
+## Next steps
+
+- Explore [Session management](session-management.md) to save your plan and
+  finish it tomorrow.
+- See the [Todo tool reference](../../tools/todos.md) for technical schema
+  details.
+- Learn about [Memory management](memory-management.md) to persist planning
+  preferences (e.g., "Always create a test plan first").

docs/cli/tutorials/web-tools.md

@@ -0,0 +1,78 @@
+# Web search and fetch
+
+Access the live internet directly from your prompt. In this guide, you'll learn
+how to search for up-to-date documentation, fetch deep context from specific
+URLs, and apply that knowledge to your code.
+
+## Prerequisites
+
+- Gemini CLI installed and authenticated.
+- An internet connection.
+
+## How to research new technologies
+
+Imagine you want to use a library released yesterday. The model doesn't know
+about it yet. You need to teach it.
+
+### Scenario: Find documentation
+
+**Prompt:**
+`Search for the 'Bun 1.0' release notes and summarize the key changes.`
+
+Gemini uses the `google_web_search` tool to find relevant pages and synthesizes
+an answer. This "grounding" process ensures the agent isn't hallucinating
+features that don't exist.
+
+**Prompt:** `Find the documentation for the 'React Router v7' loader API.`
+
+## How to fetch deep context
+
+Search gives you a summary, but sometimes you need the raw details. The
+`web_fetch` tool lets you feed a specific URL directly into the agent's context.
+
+### Scenario: Reading a blog post
+
+You found a blog post with the exact solution to your bug.
+
+**Prompt:**
+`Read https://example.com/fixing-memory-leaks and explain how to apply it to my code.`
+
+Gemini will retrieve the page content (stripping away ads and navigation) and
+use it to answer your question.
+
+### Scenario: Comparing sources
+
+You can even fetch multiple pages to compare approaches.
+
+**Prompt:**
+`Compare the pagination patterns in https://api.example.com/v1/docs and https://api.example.com/v2/docs.`
+
+## How to apply knowledge to code
+
+The real power comes when you combine web tools with file editing.
+
+**Workflow:**
+
+1.  **Search:** "How do I implement auth with Supabase?"
+2.  **Fetch:** "Read this guide: https://supabase.com/docs/guides/auth."
+3.  **Implement:** "Great. Now use that pattern to create an `auth.ts` file in
+    my project."
+
+## How to troubleshoot errors
+
+When you hit an obscure error message, paste it into the chat.
+
+**Prompt:**
+`I'm getting 'Error: hydration mismatch' in Next.js. Search for recent solutions.`
+
+The agent will search sources such as GitHub issues, StackOverflow, and forums
+to find relevant fixes that might be too new to be in its base training set.
+
+## Next steps
+
+- Explore [File management](file-management.md) to see how to apply the code you
+  generate.
+- See the [Web search tool reference](../../tools/web-search.md) for citation
+  details.
+- See the [Web fetch tool reference](../../tools/web-fetch.md) for technical
+  limitations.

docs/core/index.md

@@ -9,11 +9,11 @@ requests sent from `packages/cli`. For a general overview of Gemini CLI, see the
 
 - **[Sub-agents (experimental)](./subagents.md):** Learn how to create and use
   specialized sub-agents for complex tasks.
-- **[Core tools API](./tools-api.md):** Information on how tools are defined,
-  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
+- **[Core tools API](../reference/tools-api.md):** Information on how tools are
+  defined, registered, and used by the core.
+- **[Memory Import Processor](../reference/memport.md):** Documentation for the
+  modular GEMINI.md import feature using @file.md syntax.
+- **[Policy Engine](../reference/policy-engine.md):** Use the Policy Engine for
   fine-grained control over tool execution.
 
 ## Role of the core
@@ -92,8 +92,8 @@ This allows you to have global, project-level, and component-level context
 files, which are all combined to provide the model with the most relevant
 information.
 
-You can use the [`/memory` command](../cli/commands.md) to `show`, `add`, and
-`refresh` the content of loaded `GEMINI.md` files.
+You can use the [`/memory` command](../reference/commands.md) to `show`, `add`,
+and `refresh` the content of loaded `GEMINI.md` files.
 
 ## Citations
 

docs/core/subagents.md

@@ -1,13 +1,13 @@
-# Sub-agents (experimental)
+# Subagents (experimental)
 
-Sub-agents are specialized agents that operate within your main Gemini CLI
+Subagents are specialized agents that operate within your main Gemini CLI
 session. They are designed to handle specific, complex tasks—like deep codebase
 analysis, documentation lookup, or domain-specific reasoning—without cluttering
 the main agent's context or toolset.
 
-> **Note: Sub-agents are currently an experimental feature.**
+> **Note: Subagents are currently an experimental feature.**
 >
-> To use custom sub-agents, you must explicitly enable them in your
+> To use custom subagents, you must explicitly enable them in your
 > `settings.json`:
 >
 > ```json
@@ -16,31 +16,31 @@ the main agent's context or toolset.
 > }
 > ```
 >
-> **Warning:** Sub-agents currently operate in
-> ["YOLO mode"](../get-started/configuration.md#command-line-arguments), meaning
+> **Warning:** Subagents currently operate in
+> ["YOLO mode"](../reference/configuration.md#command-line-arguments), meaning
 > they may execute tools without individual user confirmation for each step.
 > Proceed with caution when defining agents with powerful tools like
 > `run_shell_command` or `write_file`.
 
-## What are sub-agents?
+## What are subagents?
 
-Sub-agents are "specialists" that the main Gemini agent can hire for a specific
+Subagents are "specialists" that the main Gemini agent can hire for a specific
 job.
 
-- **Focused context:** Each sub-agent has its own system prompt and persona.
-- **Specialized tools:** Sub-agents can have a restricted or specialized set of
+- **Focused context:** Each subagent has its own system prompt and persona.
+- **Specialized tools:** Subagents can have a restricted or specialized set of
   tools.
-- **Independent context window:** Interactions with a sub-agent happen in a
+- **Independent context window:** Interactions with a subagent happen in a
   separate context loop, which saves tokens in your main conversation history.
 
-Sub-agents are exposed to the main agent as a tool of the same name. When the
-main agent calls the tool, it delegates the task to the sub-agent. Once the
-sub-agent completes its task, it reports back to the main agent with its
+Subagents are exposed to the main agent as a tool of the same name. When the
+main agent calls the tool, it delegates the task to the subagent. Once the
+subagent completes its task, it reports back to the main agent with its
 findings.
 
-## Built-in sub-agents
+## Built-in subagents
 
-Gemini CLI comes with the following built-in sub-agents:
+Gemini CLI comes with the following built-in subagents:
 
 ### Codebase Investigator
 
@@ -75,15 +75,131 @@ Gemini CLI comes with the following built-in sub-agents:
 ### Generalist Agent
 
 - **Name:** `generalist_agent`
-- **Purpose:** Route tasks to the appropriate specialized sub-agent.
+- **Purpose:** Route tasks to the appropriate specialized subagent.
 - **When to use:** Implicitly used by the main agent for routing. Not directly
   invoked by the user.
 - **Configuration:** Enabled by default. No specific configuration options.
 
-## Creating custom sub-agents
+### Browser Agent (experimental)
 
-You can create your own sub-agents to automate specific workflows or enforce
-specific personas. To use custom sub-agents, you must enable them in your
+- **Name:** `browser_agent`
+- **Purpose:** Automate web browser tasks — navigating websites, filling forms,
+  clicking buttons, and extracting information from web pages — using the
+  accessibility tree.
+- **When to use:** "Go to example.com and fill out the contact form," "Extract
+  the pricing table from this page," "Click the login button and enter my
+  credentials."
+
+> **Note:** This is a preview feature currently under active development.
+
+#### Prerequisites
+
+The browser agent requires:
+
+- **Chrome** version 144 or later (any recent stable release will work).
+- **Node.js** with `npx` available (used to launch the
+  [`chrome-devtools-mcp`](https://www.npmjs.com/package/chrome-devtools-mcp)
+  server).
+
+#### Enabling the browser agent
+
+The browser agent is disabled by default. Enable it in your `settings.json`:
+
+```json
+{
+  "agents": {
+    "overrides": {
+      "browser_agent": {
+        "enabled": true
+      }
+    }
+  }
+}
+```
+
+#### Session modes
+
+The `sessionMode` setting controls how Chrome is launched and managed. Set it
+under `agents.browser`:
+
+```json
+{
+  "agents": {
+    "overrides": {
+      "browser_agent": {
+        "enabled": true
+      }
+    },
+    "browser": {
+      "sessionMode": "persistent"
+    }
+  }
+}
+```
+
+The available modes are:
+
+| Mode         | Description                                                                                                                                                                                 |
+| :----------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `persistent` | **(Default)** Launches Chrome with a persistent profile stored at `~/.gemini/cli-browser-profile/`. Cookies, history, and settings are preserved between sessions.                          |
+| `isolated`   | Launches Chrome with a temporary profile that is deleted after each session. Use this for clean-state automation.                                                                           |
+| `existing`   | Attaches to an already-running Chrome instance. You must enable remote debugging first by navigating to `chrome://inspect/#remote-debugging` in Chrome. No new browser process is launched. |
+
+#### Configuration reference
+
+All browser-specific settings go under `agents.browser` in your `settings.json`.
+
+| Setting       | Type      | Default        | Description                                                                                     |
+| :------------ | :-------- | :------------- | :---------------------------------------------------------------------------------------------- |
+| `sessionMode` | `string`  | `"persistent"` | How Chrome is managed: `"persistent"`, `"isolated"`, or `"existing"`.                           |
+| `headless`    | `boolean` | `false`        | Run Chrome in headless mode (no visible window).                                                |
+| `profilePath` | `string`  | —              | Custom path to a browser profile directory.                                                     |
+| `visualModel` | `string`  | —              | Model override for the visual agent (for example, `"gemini-2.5-computer-use-preview-10-2025"`). |
+
+#### Security
+
+The browser agent enforces the following security restrictions:
+
+- **Blocked URL patterns:** `file://`, `javascript:`, `data:text/html`,
+  `chrome://extensions`, and `chrome://settings/passwords` are always blocked.
+- **Sensitive action confirmation:** Actions like form filling, file uploads,
+  and form submissions require user confirmation through the standard policy
+  engine.
+
+#### Visual agent
+
+By default, the browser agent interacts with pages through the accessibility
+tree using element `uid` values. For tasks that require visual identification
+(for example, "click the yellow button" or "find the red error message"), you
+can enable the visual agent by setting a `visualModel`:
+
+```json
+{
+  "agents": {
+    "overrides": {
+      "browser_agent": {
+        "enabled": true
+      }
+    },
+    "browser": {
+      "visualModel": "gemini-2.5-computer-use-preview-10-2025"
+    }
+  }
+}
+```
+
+When enabled, the agent gains access to the `analyze_screenshot` tool, which
+captures a screenshot and sends it to the vision model for analysis. The model
+returns coordinates and element descriptions that the browser agent uses with
+the `click_at` tool for precise, coordinate-based interactions.
+
+> **Note:** The visual agent requires API key or Vertex AI authentication. It is
+> not available when using Google Login.
+
+## Creating custom subagents
+
+You can create your own subagents to automate specific workflows or enforce
+specific personas. To use custom subagents, you must enable them in your
 `settings.json`:
 
 ```json
@@ -138,20 +254,20 @@ it yourself; just report it.
 
 ### Configuration schema
 
-| Field          | Type   | Required | Description                                                                                                                |
-| :------------- | :----- | :------- | :------------------------------------------------------------------------------------------------------------------------- |
-| `name`         | string | Yes      | Unique identifier (slug) used as the tool name for the agent. Only lowercase letters, numbers, hyphens, and underscores.   |
-| `description`  | string | Yes      | Short description of what the agent does. This is visible to the main agent to help it decide when to call this sub-agent. |
-| `kind`         | string | No       | `local` (default) or `remote`.                                                                                             |
-| `tools`        | array  | No       | List of tool names this agent can use. If omitted, it may have access to a default set.                                    |
-| `model`        | string | No       | Specific model to use (e.g., `gemini-2.5-pro`). Defaults to `inherit` (uses the main session model).                       |
-| `temperature`  | number | No       | Model temperature (0.0 - 2.0).                                                                                             |
-| `max_turns`    | number | No       | Maximum number of conversation turns allowed for this agent before it must return. Defaults to `15`.                       |
-| `timeout_mins` | number | No       | Maximum execution time in minutes. Defaults to `5`.                                                                        |
+| Field          | Type   | Required | Description                                                                                                               |
+| :------------- | :----- | :------- | :------------------------------------------------------------------------------------------------------------------------ |
+| `name`         | string | Yes      | Unique identifier (slug) used as the tool name for the agent. Only lowercase letters, numbers, hyphens, and underscores.  |
+| `description`  | string | Yes      | Short description of what the agent does. This is visible to the main agent to help it decide when to call this subagent. |
+| `kind`         | string | No       | `local` (default) or `remote`.                                                                                            |
+| `tools`        | array  | No       | List of tool names this agent can use. If omitted, it may have access to a default set.                                   |
+| `model`        | string | No       | Specific model to use (e.g., `gemini-2.5-pro`). Defaults to `inherit` (uses the main session model).                      |
+| `temperature`  | number | No       | Model temperature (0.0 - 2.0).                                                                                            |
+| `max_turns`    | number | No       | Maximum number of conversation turns allowed for this agent before it must return. Defaults to `15`.                      |
+| `timeout_mins` | number | No       | Maximum execution time in minutes. Defaults to `5`.                                                                       |
 
-### Optimizing your sub-agent
+### Optimizing your subagent
 
-The main agent's system prompt encourages it to use an expert sub-agent when one
+The main agent's system prompt encourages it to use an expert subagent when one
 is available. It decides whether an agent is a relevant expert based on the
 agent's description. You can improve the reliability with which an agent is used
 by updating the description to more clearly indicate:
@@ -160,7 +276,7 @@ by updating the description to more clearly indicate:
 - When it should be used.
 - Some example scenarios.
 
-For example, the following sub-agent description should be called fairly
+For example, the following subagent description should be called fairly
 consistently for Git operations.
 
 > Git expert agent which should be used for all local and remote git operations.
@@ -170,13 +286,13 @@ consistently for Git operations.
 > - Searching for regressions with bisect
 > - Interacting with source control and issues providers such as GitHub.
 
-If you need to further tune your sub-agent, you can do so by selecting the model
+If you need to further tune your subagent, you can do so by selecting the model
 to optimize for with `/model` and then asking the model why it does not think
-that your sub-agent was called with a specific prompt and the given description.
+that your subagent was called with a specific prompt and the given description.
 
 ## Remote subagents (Agent2Agent) (experimental)
 
-Gemini CLI can also delegate tasks to remote sub-agents using the Agent-to-Agent
+Gemini CLI can also delegate tasks to remote subagents using the Agent-to-Agent
 (A2A) protocol.
 
 > **Note: Remote subagents are currently an experimental feature.**
@@ -184,8 +300,8 @@ Gemini CLI can also delegate tasks to remote sub-agents using the Agent-to-Agent
 See the [Remote Subagents documentation](/docs/core/remote-agents) for detailed
 configuration and usage instructions.
 
-## Extension sub-agents
+## Extension subagents
 
-Extensions can bundle and distribute sub-agents. See the
-[Extensions documentation](../extensions/index.md#sub-agents) for details on how
+Extensions can bundle and distribute subagents. See the
+[Extensions documentation](../extensions/index.md#subagents) for details on how
 to package agents within an extension.

docs/extensions/best-practices.md

@@ -1,19 +1,19 @@
-# Extensions on Gemini CLI: Best practices
+# Gemini CLI extension best practices
 
 This guide covers best practices for developing, securing, and maintaining
 Gemini CLI extensions.
 
 ## Development
 
-Developing extensions for Gemini CLI is intended to be a lightweight, iterative
-process.
+Developing extensions for Gemini CLI is a lightweight, iterative process. Use
+these strategies to build robust and efficient extensions.
 
 ### Structure your extension
 
-While simple extensions can just be a few files, we recommend a robust structure
-for complex extensions:
+While simple extensions may contain only a few files, we recommend a organized
+structure for complex projects.
 
-```
+```text
 my-extension/
 ├── package.json
 ├── tsconfig.json
@@ -24,47 +24,50 @@ my-extension/
 └── dist/
 ```
 
-- **Use TypeScript**: We strongly recommend using TypeScript for type safety and
-  better tooling.
-- **Separate source and build**: Keep your source code in `src` and build to
-  `dist`.
-- **Bundle dependencies**: If your extension has many dependencies, consider
-  bundling them (e.g., with `esbuild` or `webpack`) to reduce install time and
-  potential conflicts.
+- **Use TypeScript:** We strongly recommend using TypeScript for type safety and
+  improved developer experience.
+- **Separate source and build:** Keep your source code in `src/` and output
+  build artifacts to `dist/`.
+- **Bundle dependencies:** If your extension has many dependencies, bundle them
+  using a tool like `esbuild` to reduce installation time and avoid conflicts.
 
 ### Iterate with `link`
 
-Use `gemini extensions link` to develop locally without constantly reinstalling:
+Use the `gemini extensions link` command to develop locally without reinstalling
+your extension after every change.
 
 ```bash
 cd my-extension
 gemini extensions link .
 ```
 
-Changes to your code (after rebuilding) will be immediately available in the CLI
-on restart.
+Changes to your code are immediately available in the CLI after you rebuild the
+project and restart the session.
 
 ### Use `GEMINI.md` effectively
 
-Your `GEMINI.md` file provides context to the model. Keep it focused:
+Your `GEMINI.md` file provides essential context to the model.
 
-- **Do:** Explain high-level goals and how to use the provided tools.
-- **Don't:** Dump your entire documentation.
-- **Do:** Use clear, concise language.
+- **Focus on goals:** Explain the high-level purpose of the extension and how to
+  interact with its tools.
+- **Be concise:** Avoid dumping exhaustive documentation into the file. Use
+  clear, direct language.
+- **Provide examples:** Include brief examples of how the model should use
+  specific tools or commands.
 
 ## Security
 
-When building a Gemini CLI extension, follow general security best practices
-(such as least privilege and input validation) to reduce risk.
+Follow the principle of least privilege and rigorous input validation when
+building extensions.
 
 ### Minimal permissions
 
-When defining tools in your MCP server, only request the permissions necessary.
-Avoid giving the model broad access (like full shell access) if a more
-restricted set of tools will suffice.
+Only request the permissions your MCP server needs to function. Avoid giving the
+model broad access (such as full shell access) if restricted tools are
+sufficient.
 
-If you must use powerful tools like `run_shell_command`, consider restricting
-them to specific commands in your `gemini-extension.json`:
+If your extension uses powerful tools like `run_shell_command`, restrict them in
+your `gemini-extension.json` file:
 
 ```json
 {
@@ -73,27 +76,26 @@ them to specific commands in your `gemini-extension.json`:
 }
 ```
 
-This ensures that even if the model tries to execute a dangerous command, it
-will be blocked at the CLI level.
+This ensures the CLI blocks dangerous commands even if the model attempts to
+execute them.
 
 ### Validate inputs
 
-Your MCP server is running on the user's machine. Always validate inputs to your
-tools to prevent arbitrary code execution or filesystem access outside the
-intended scope.
+Your MCP server runs on the user's machine. Always validate tool inputs to
+prevent arbitrary code execution or unauthorized filesystem access.
 
 ```typescript
-// Good: Validating paths
+// Example: Validating paths
 if (!path.resolve(inputPath).startsWith(path.resolve(allowedDir) + path.sep)) {
   throw new Error('Access denied');
 }
 ```
 
-### Sensitive settings
+### Secure sensitive settings
 
-If your extension requires API keys, use the `sensitive: true` option in
-`gemini-extension.json`. This ensures keys are stored securely in the system
-keychain and obfuscated in the UI.
+If your extension requires API keys or other secrets, use the `sensitive: true`
+option in your manifest. This ensures keys are stored in the system keychain and
+obfuscated in the CLI output.
 
 ```json
 "settings": [
@@ -105,35 +107,82 @@ keychain and obfuscated in the UI.
 ]
 ```
 
-## Releasing
+## Release
 
-You can upload your extension directly to GitHub to list it in the gallery.
-Gemini CLI extensions also offers support for more complicated
-[releases](releasing.md).
+Follow standard versioning and release practices to ensure a smooth experience
+for your users.
 
 ### Semantic versioning
 
-Follow [Semantic Versioning](https://semver.org/).
+Follow [Semantic Versioning (SemVer)](https://semver.org/) to communicate
+changes clearly.
 
-- **Major**: Breaking changes (renaming tools, changing arguments).
-- **Minor**: New features (new tools, commands).
-- **Patch**: Bug fixes.
+- **Major:** Breaking changes (e.g., renaming tools or changing arguments).
+- **Minor:** New features (e.g., adding new tools or commands).
+- **Patch:** Bug fixes and performance improvements.
 
-### Release Channels
+### Release channels
 
-Use git branches to manage release channels (e.g., `main` for stable, `dev` for
-bleeding edge). This allows users to choose their stability level:
+Use Git branches to manage release channels. This lets users choose between
+stability and the latest features.
 
 ```bash
-# Stable
+# Install the stable version (default branch)
 gemini extensions install github.com/user/repo
 
-# Dev
+# Install the development version
 gemini extensions install github.com/user/repo --ref dev
 ```
 
 ### Clean artifacts
 
-If you are using GitHub Releases, ensure your release artifacts only contain the
-necessary files (`dist/`, `gemini-extension.json`, `package.json`). Exclude
-`node_modules` (users will install them) and `src/` to keep downloads small.
+When using GitHub Releases, ensure your archives only contain necessary files
+(such as `dist/`, `gemini-extension.json`, and `package.json`). Exclude
+`node_modules/` and `src/` to minimize download size.
+
+## Test and verify
+
+Test your extension thoroughly before releasing it to users.
+
+- **Manual verification:** Use `gemini extensions link` to test your extension
+  in a live CLI session. Verify that tools appear in the debug console (F12) and
+  that custom commands resolve correctly.
+- **Automated testing:** If your extension includes an MCP server, write unit
+  tests for your tool logic using a framework like Vitest or Jest. You can test
+  MCP tools in isolation by mocking the transport layer.
+
+## Troubleshooting
+
+Use these tips to diagnose and fix common extension issues.
+
+### Extension not loading
+
+If your extension doesn't appear in `/extensions list`:
+
+- **Check the manifest:** Ensure `gemini-extension.json` is in the root
+  directory and contains valid JSON.
+- **Verify the name:** The `name` field in the manifest must match the extension
+  directory name exactly.
+- **Restart the CLI:** Extensions are loaded at the start of a session. Restart
+  Gemini CLI after making changes to the manifest or linking a new extension.
+
+### MCP server failures
+
+If your tools aren't working as expected:
+
+- **Check the logs:** View the CLI logs to see if the MCP server failed to
+  start.
+- **Test the command:** Run the server's `command` and `args` directly in your
+  terminal to ensure it starts correctly outside of Gemini CLI.
+- **Debug console:** In interactive mode, press **F12** to open the debug
+  console and inspect tool calls and responses.
+
+### Command conflicts
+
+If a custom command isn't responding:
+
+- **Check precedence:** Remember that user and project commands take precedence
+  over extension commands. Use the prefixed name (e.g., `/extension.command`) to
+  verify the extension's version.
+- **Help command:** Run `/help` to see a list of all available commands and
+  their sources.

docs/extensions/index.md

@@ -1,24 +1,49 @@
 # Gemini CLI extensions
 
-Gemini CLI extensions package prompts, MCP servers, custom commands, hooks,
-sub-agents, and agent skills into a familiar and user-friendly format. With
-extensions, you can expand the capabilities of Gemini CLI and share those
+Gemini CLI extensions package prompts, MCP servers, custom commands, themes,
+hooks, sub-agents, and agent skills into a familiar and user-friendly format.
+With extensions, you can expand the capabilities of Gemini CLI and share those
 capabilities with others. They are designed to be easily installable and
 shareable.
 
-To see examples of extensions, you can browse a gallery of
-[Gemini CLI extensions](https://geminicli.com/extensions/browse/).
+To see what's possible, browse the
+[Gemini CLI extension gallery](https://geminicli.com/extensions/browse/).
 
-## Managing extensions
+## Choose your path
 
-You can verify your installed extensions and their status using the interactive
-command:
+Choose the guide that best fits your needs.
+
+### I want to use extensions
+
+Learn how to discover, install, and manage extensions to enhance your Gemini CLI
+experience.
+
+- **[Manage extensions](#manage-extensions):** List and verify your installed
+  extensions.
+- **[Install extensions](#installation):** Add new capabilities from GitHub or
+  local paths.
+
+### I want to build extensions
+
+Learn how to create, test, and share your own extensions with the community.
+
+- **[Build extensions](writing-extensions.md):** Create your first extension
+  from a template.
+- **[Best practices](best-practices.md):** Learn how to build secure and
+  reliable extensions.
+- **[Publish to the gallery](releasing.md):** Share your work with the world.
+
+## Manage extensions
+
+Use the interactive `/extensions` command to verify your installed extensions
+and their status:
 
 ```bash
 /extensions list
 ```
 
-or in noninteractive mode:
+You can also manage extensions from your terminal using the `gemini extensions`
+command group:
 
 ```bash
 gemini extensions list
@@ -26,20 +51,11 @@ gemini extensions list
 
 ## Installation
 
-To install a real extension, you can use the `extensions install` command with a
-GitHub repository URL in noninteractive mode. For example:
+Install an extension by providing its GitHub repository URL. For example:
 
 ```bash
 gemini extensions install https://github.com/gemini-cli-extensions/workspace
 ```
 
-## Next steps
-
-- [Writing extensions](writing-extensions.md): Learn how to create your first
-  extension.
-- [Extensions reference](reference.md): Deeply understand the extension format,
-  commands, and configuration.
-- [Best practices](best-practices.md): Learn strategies for building great
-  extensions.
-- [Extensions releasing](releasing.md): Learn how to share your extensions with
-  the world.
+For more advanced installation options, see the
+[Extension reference](reference.md#install-an-extension).

docs/extensions/reference.md

@@ -1,134 +1,113 @@
-# Extensions reference
+# Extension reference
 
 This guide covers the `gemini extensions` commands and the structure of the
 `gemini-extension.json` configuration file.
 
-## Extension management
+## Manage extensions
 
-We offer a suite of extension management tools using `gemini extensions`
-commands.
+Use the `gemini extensions` command group to manage your extensions from the
+terminal.
 
-Note that these commands (e.g. `gemini extensions install`) are not supported
-from within the CLI's **interactive mode**, although you can list installed
-extensions using the `/extensions list` slash command.
+Note that commands like `gemini extensions install` are not supported within the
+CLI's interactive mode. However, you can use the `/extensions list` command to
+view installed extensions. All management operations, including updates to slash
+commands, take effect only after you restart the CLI session.
 
-Note that all of these management operations (including updates to slash
-commands) will only be reflected in active CLI sessions on **restart**.
+### Install an extension
 
-### Installing an extension
+Install an extension by providing its GitHub repository URL or a local file
+path.
 
-You can install an extension using `gemini extensions install` with either a
-GitHub URL or a local path.
+Gemini CLI creates a copy of the extension during installation. You must run
+`gemini extensions update` to pull changes from the source. To install from
+GitHub, you must have `git` installed on your machine.
 
-Note that we create a copy of the installed extension, so you will need to run
-`gemini extensions update` to pull in changes from both locally-defined
-extensions and those on GitHub.
-
-NOTE: If you are installing an extension from GitHub, you'll need to have `git`
-installed on your machine. See
-[git installation instructions](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
-for help.
-
-```
+```bash
 gemini extensions install <source> [--ref <ref>] [--auto-update] [--pre-release] [--consent]
 ```
 
-- `<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.
+- `<source>`: The GitHub URL or local path of the extension.
+- `--ref`: The git ref (branch, tag, or commit) to install.
+- `--auto-update`: Enable automatic updates for this extension.
+- `--pre-release`: Enable installation of pre-release versions.
+- `--consent`: Acknowledge security risks and skip the confirmation prompt.
 
-### Uninstalling an extension
+### Uninstall an extension
 
-To uninstall one or more extensions, run
-`gemini extensions uninstall <name...>`:
+To uninstall one or more extensions, use the `uninstall` command:
 
-```
-gemini extensions uninstall gemini-cli-security gemini-cli-another-extension
+```bash
+gemini extensions uninstall <name...>
 ```
 
-### Disabling an extension
+### Disable an extension
 
-Extensions are, by default, enabled across all workspaces. You can disable an
-extension entirely or for specific workspace.
+Extensions are enabled globally by default. You can disable an extension
+entirely or for a specific workspace.
 
-```
+```bash
 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
+### Enable an extension
 
-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.
+Re-enable a disabled extension using the `enable` command:
 
-```
+```bash
 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
+### Update 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 <name>`.
-
-You can update all extensions with:
+Update an extension to the version specified in its `gemini-extension.json`
+file.
 
+```bash
+gemini extensions update <name>
 ```
+
+To update all installed extensions at once:
+
+```bash
 gemini extensions update --all
 ```
 
-### Create a boilerplate extension
+### Create an extension from a template
 
-We offer several example extensions `context`, `custom-commands`,
-`exclude-tools` and `mcp-server`. You can view these examples
-[here](https://github.com/google-gemini/gemini-cli/tree/main/packages/cli/src/commands/extensions/examples).
+Create a new extension directory using a built-in template.
 
-To copy one of these examples into a development directory using the type of
-your choosing, run:
-
-```
+```bash
 gemini extensions new <path> [template]
 ```
 
-- `<path>`: The path to create the extension in.
-- `[template]`: The boilerplate template to use.
+- `<path>`: The directory to create.
+- `[template]`: The template to use (e.g., `mcp-server`, `context`,
+  `custom-commands`).
 
 ### Link a local extension
 
-The `gemini extensions link` command will create a symbolic link from the
-extension installation directory to the development path.
+Create a symbolic link between your development directory and the Gemini CLI
+extensions directory. This lets you test changes immediately without
+reinstalling.
 
-This is useful so you don't have to run `gemini extensions update` every time
-you make changes you'd like to test.
-
-```
+```bash
 gemini extensions link <path>
 ```
 
-- `<path>`: The path of the extension to link.
-
 ## Extension format
 
-On startup, Gemini CLI looks for extensions in `<home>/.gemini/extensions`
-
-Extensions exist as a directory that contains a `gemini-extension.json` file.
-For example:
-
-`<home>/.gemini/extensions/my-extension/gemini-extension.json`
+Gemini CLI loads extensions from `<home>/.gemini/extensions`. Each extension
+must have a `gemini-extension.json` file in its root directory.
 
 ### `gemini-extension.json`
 
-The `gemini-extension.json` file contains the configuration for the extension.
-The file has the following structure:
+The manifest file defines the extension's behavior and configuration.
 
 ```json
 {
@@ -137,7 +116,9 @@ The file has the following structure:
   "description": "My awesome extension",
   "mcpServers": {
     "my-server": {
-      "command": "node my-server.js"
+      "command": "node",
+      "args": ["${extensionPath}/my-server.js"],
+      "cwd": "${extensionPath}"
     }
   },
   "contextFileName": "GEMINI.md",
@@ -156,12 +137,16 @@ The file has the following structure:
   [geminicli.com/extensions](https://geminicli.com/extensions).
 - `mcpServers`: A map of MCP servers to settings. The key is the name of the
   server, and the value is the server configuration. These servers will be
-  loaded on startup just like MCP servers settingsd in a
-  [`settings.json` file](../get-started/configuration.md). If both an extension
-  and a `settings.json` file settings an MCP server with the same name, the
-  server defined in the `settings.json` file takes precedence.
+  loaded on startup just like MCP servers defined in a
+  [`settings.json` file](../reference/configuration.md). If both an extension
+  and a `settings.json` file define an MCP server with the same name, the server
+  defined in the `settings.json` file takes precedence.
   - Note that all MCP server configuration options are supported except for
     `trust`.
+  - For portability, you should use `${extensionPath}` to refer to files within
+    your extension directory.
+  - Separate your executable and its arguments using `command` and `args`
+    instead of putting them both in `command`.
 - `contextFileName`: The name of the file that contains the context for the
   extension. This will be used to load the context from the extension directory.
   If this property is not used but a `GEMINI.md` file is present in your
@@ -177,24 +162,13 @@ When Gemini CLI starts, it loads all the extensions and merges their
 configurations. If there are any conflicts, the workspace configuration takes
 precedence.
 
-### Settings
+### Extension 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 users provide during installation, such as
+API keys or URLs. These values are stored in a `.env` file within the extension
+directory.
 
-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.
-
-To define settings, add a `settings` array to your `gemini-extension.json` file.
-Each object in the array should have the following properties:
-
-- `name`: A user-friendly name for the setting.
-- `description`: A description of the setting and what it's used for.
-- `envVar`: The name of the environment variable that the setting will be stored
-  as.
-- `sensitive`: Optional boolean. If true, obfuscates the input the user provides
-  and stores the secret in keychain storage. **Example**
+To define settings, add a `settings` array to your manifest:
 
 ```json
 {
@@ -204,133 +178,148 @@ Each object in the array should have the following properties:
     {
       "name": "API Key",
       "description": "Your API key for the service.",
-      "envVar": "MY_API_KEY"
+      "envVar": "MY_API_KEY",
+      "sensitive": true
     }
   ]
 }
 ```
 
-When a user installs this extension, they will be prompted to enter their API
-key. The value will be saved to a `.env` file in the extension's directory
-(e.g., `<home>/.gemini/extensions/my-api-extension/.env`).
+- `name`: The setting's display name.
+- `description`: A clear explanation of the setting.
+- `envVar`: The environment variable name where the value is stored.
+- `sensitive`: If `true`, the value is stored in the system keychain and
+  obfuscated in the UI.
 
-You can view a list of an extension's settings by running:
+To update an extension's settings:
 
+```bash
+gemini extensions config <name> [setting] [--scope <scope>]
 ```
-gemini extensions list
-```
-
-and you can update a given setting using:
-
-```
-gemini extensions config <extension name> [setting name] [--scope <scope>]
-```
-
-- `--scope`: The scope to set the setting in (`user` or `workspace`). This is
-  optional and will default to `user`.
 
 ### Custom commands
 
-Extensions can provide [custom commands](../cli/custom-commands.md) by placing
-TOML files in a `commands/` subdirectory within the extension directory. These
-commands follow the same format as user and project custom commands and use
-standard naming conventions.
+Provide [custom commands](../cli/custom-commands.md) by placing TOML files in a
+`commands/` subdirectory. Gemini CLI uses the directory structure to determine
+the command name.
 
-**Example**
+For an extension named `gcp`:
 
-An extension named `gcp` with the following structure:
-
-```
-.gemini/extensions/gcp/
-├── gemini-extension.json
-└── commands/
-    ├── deploy.toml
-    └── gcs/
-        └── sync.toml
-```
-
-Would provide these commands:
-
-- `/deploy` - Shows as `[gcp] Custom command from deploy.toml` in help
-- `/gcs:sync` - Shows as `[gcp] Custom command from sync.toml` in help
+- `commands/deploy.toml` becomes `/deploy`
+- `commands/gcs/sync.toml` becomes `/gcs:sync` (namespaced with a colon)
 
 ### Hooks
 
-Extensions can provide [hooks](../hooks/index.md) to intercept and customize
-Gemini CLI behavior at specific lifecycle events. Hooks provided by an extension
-must be defined in a `hooks/hooks.json` file within the extension directory.
+Intercept and customize CLI behavior using [hooks](../hooks/index.md). Define
+hooks in a `hooks/hooks.json` file within your extension directory. Note that
+hooks are not defined in the `gemini-extension.json` manifest.
 
-> [!IMPORTANT] Hooks are not defined directly in `gemini-extension.json`. The
-> CLI specifically looks for the `hooks/hooks.json` file.
+### Agent skills
 
-### Agent Skills
-
-Extensions can bundle [Agent Skills](../cli/skills.md) to provide specialized
-workflows. Skills must be placed in a `skills/` directory within the extension.
-
-**Example**
-
-An extension with the following structure:
-
-```
-.gemini/extensions/my-extension/
-├── gemini-extension.json
-└── skills/
-    └── security-audit/
-        └── SKILL.md
-```
-
-Will expose a `security-audit` skill that the model can activate.
+Bundle [agent skills](../cli/skills.md) to provide specialized workflows. Place
+skill definitions in a `skills/` directory. For example,
+`skills/security-audit/SKILL.md` exposes a `security-audit` skill.
 
 ### Sub-agents
 
-> **Note: Sub-agents are currently an experimental feature.**
+> **Note:** Sub-agents are a preview feature currently under active development.
 
-Extensions can provide [sub-agents](../core/subagents.md) that users can
-delegate tasks to.
+Provide [sub-agents](../core/subagents.md) that users can delegate tasks to. Add
+agent definition files (`.md`) to an `agents/` directory in your extension root.
 
-To bundle sub-agents with your extension, create an `agents/` directory in your
-extension's root folder and add your agent definition files (`.md`) there.
+### <a id="policy-engine"></a>Policy Engine
+
+Extensions can contribute policy rules and safety checkers to the Gemini CLI
+[Policy Engine](../reference/policy-engine.md). These rules are defined in
+`.toml` files and take effect when the extension is activated.
+
+To add policies, create a `policies/` directory in your extension's root and
+place your `.toml` policy files inside it. Gemini CLI automatically loads all
+`.toml` files from this directory.
+
+Rules contributed by extensions run in their own tier (tier 2), alongside
+workspace-defined policies. This tier has higher priority than the default rules
+but lower priority than user or admin policies.
+
+> **Warning:** For security, Gemini CLI ignores any `allow` decisions or `yolo`
+> mode configurations in extension policies. This ensures that an extension
+> cannot automatically approve tool calls or bypass security measures without
+> your confirmation.
+
+**Example `policies.toml`**
+
+```toml
+[[rule]]
+toolName = "my_server__dangerous_tool"
+decision = "ask_user"
+priority = 100
+
+[[safety_checker]]
+toolName = "my_server__write_data"
+priority = 200
+[safety_checker.checker]
+type = "in-process"
+name = "allowed-path"
+required_context = ["environment"]
+```
+
+### Themes
+
+Extensions can provide custom themes to personalize the CLI UI. Themes are
+defined in the `themes` array in `gemini-extension.json`.
 
 **Example**
 
-```
-.gemini/extensions/my-extension/
-├── gemini-extension.json
-└── agents/
-    ├── security-auditor.md
-    └── database-expert.md
+```json
+{
+  "name": "my-green-extension",
+  "version": "1.0.0",
+  "themes": [
+    {
+      "name": "shades-of-green",
+      "type": "custom",
+      "background": {
+        "primary": "#1a362a"
+      },
+      "text": {
+        "primary": "#a6e3a1",
+        "secondary": "#6e8e7a",
+        "link": "#89e689"
+      },
+      "status": {
+        "success": "#76c076",
+        "warning": "#d9e689",
+        "error": "#b34e4e"
+      },
+      "border": {
+        "default": "#4a6c5a"
+      },
+      "ui": {
+        "comment": "#6e8e7a"
+      }
+    }
+  ]
+}
 ```
 
-Gemini CLI will automatically discover and load these agents when the extension
-is installed and enabled.
+Custom themes provided by extensions can be selected using the `/theme` command
+or by setting the `ui.theme` property in your `settings.json` file. Note that
+when referring to a theme from an extension, the extension name is appended to
+the theme name in parentheses, e.g., `shades-of-green (my-green-extension)`.
 
 ### Conflict resolution
 
-Extension commands have the lowest precedence. When a conflict occurs with user
-or project commands:
-
-1. **No conflict**: Extension command uses its natural name (e.g., `/deploy`)
-2. **With conflict**: Extension command is renamed with the extension prefix
-   (e.g., `/gcp.deploy`)
-
-For example, if both a user and the `gcp` extension define a `deploy` command:
-
-- `/deploy` - Executes the user's deploy command
-- `/gcp.deploy` - Executes the extension's deploy command (marked with `[gcp]`
-  tag)
+Extension commands have the lowest precedence. If an extension command name
+conflicts with a user or project command, the extension command is prefixed with
+the extension name (e.g., `/gcp.deploy`) using a dot separator.
 
 ## Variables
 
-Gemini CLI extensions allow variable substitution in both
-`gemini-extension.json` and `hooks/hooks.json`. This can be useful if e.g., you
-need the current directory to run an MCP server using an argument like
-`"args": ["${extensionPath}${/}dist${/}server.js"]`.
+Gemini CLI supports variable substitution in `gemini-extension.json` and
+`hooks/hooks.json`.
 
-**Supported variables:**
-
-| variable                   | description                                                                                                                                                     |
-| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `${extensionPath}`         | The fully-qualified path of the extension in the user's filesystem e.g., '/Users/username/.gemini/extensions/example-extension'. This will not unwrap symlinks. |
-| `${workspacePath}`         | The fully-qualified path of the current workspace.                                                                                                              |
-| `${/} or ${pathSeparator}` | The path separator (differs per OS).                                                                                                                            |
+| Variable           | Description                                     |
+| :----------------- | :---------------------------------------------- |
+| `${extensionPath}` | The absolute path to the extension's directory. |
+| `${workspacePath}` | The absolute path to the current workspace.     |
+| `${/}`             | The platform-specific path separator.           |

docs/extensions/releasing.md

@@ -1,146 +1,117 @@
-# Extension releasing
+# Release extensions
 
-There are two primary ways of releasing extensions to users:
+Release Gemini CLI extensions to your users through a Git repository or GitHub
+Releases.
 
-- [Git repository](#releasing-through-a-git-repository)
-- [Github Releases](#releasing-through-github-releases)
+Git repository releases are the simplest approach and offer the most flexibility
+for managing development branches. GitHub Releases are more efficient for
+initial installations because they ship as single archives rather than requiring
+a full `git clone`. Use GitHub Releases if you need to include platform-specific
+binary files.
 
-Git repository releases tend to be the simplest and most flexible approach,
-while GitHub releases can be more efficient on initial install as they are
-shipped as single archives instead of requiring a git clone which downloads each
-file individually. Github releases may also contain platform specific archives
-if you need to ship platform specific binary files.
+## List your extension in the gallery
 
-## Releasing through a git repository
+The [Gemini CLI extension gallery](https://geminicli.com/extensions/browse/)
+automatically indexes public extensions to help users discover your work. You
+don't need to submit an issue or email us to list your extension.
 
-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>`.
-They can optionally depend on a specific ref (branch/tag/commit) using the
-`--ref=<some-ref>` argument, this defaults to the default branch.
+To have your extension automatically discovered and listed:
 
-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,
-the HEAD commit is always treated as the latest version regardless of the actual
-version in the `gemini-extension.json` file.
+1.  **Use a public repository:** Ensure your extension is hosted in a public
+    GitHub repository.
+2.  **Add the GitHub topic:** Add the `gemini-cli-extension` topic to your
+    repository's **About** section. Our crawler uses this topic to find new
+    extensions.
+3.  **Place the manifest at the root:** Ensure your `gemini-extension.json` file
+    is in the absolute root of the repository or the release archive.
 
-### Managing release channels using a git repository
+Our system crawls tagged repositories daily. Once you tag your repository, your
+extension will appear in the gallery if it passes validation.
 
-Users can depend on any ref from your git repo, such as a branch or tag, which
-allows you to manage multiple release channels.
+## Release through a Git repository
 
-For instance, you can maintain a `stable` branch, which users can install this
-way `gemini extensions install <your-repo-uri> --ref=stable`. Or, you could make
-this the default by treating your default branch as your stable release branch,
-and doing development in a different branch (for instance called `dev`). You can
-maintain as many branches or tags as you like, providing maximum flexibility for
-you and your users.
+Releasing through Git is the most flexible option. Create a public Git
+repository and provide the URL to your users. They can then install your
+extension using `gemini extensions install <your-repo-uri>`.
 
-Note that these `ref` arguments can be tags, branches, or even specific commits,
-which allows users to depend on a specific version of your extension. It is up
-to you how you want to manage your tags and branches.
+Users can optionally depend on a specific branch, tag, or commit using the
+`--ref` argument. For example:
 
-### Example releasing flow using a git repo
+```bash
+gemini extensions install <your-repo-uri> --ref=stable
+```
 
-While there are many options for how you want to manage releases using a git
-flow, we recommend treating your default branch as your "stable" release branch.
-This means that the default behavior for
-`gemini extensions install <your-repo-uri>` is to be on the stable release
-branch.
+Whenever you push commits to the referenced branch, the CLI prompts users to
+update their installation. The `HEAD` commit is always treated as the latest
+version.
 
-Lets say you want to maintain three standard release channels, `stable`,
-`preview`, and `dev`. You would do all your standard development in the `dev`
-branch. When you are ready to do a preview release, you merge that branch into
-your `preview` branch. When you are ready to promote your preview branch to
-stable, you merge `preview` into your stable branch (which might be your default
-branch or a different branch).
+### Manage release channels
 
-You can also cherry pick changes from one branch into another using
-`git cherry-pick`, but do note that this will result in your branches having a
-slightly divergent history from each other, unless you force push changes to
-your branches on each release to restore the history to a clean slate (which may
-not be possible for the default branch depending on your repository settings).
-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.
+You can use branches or tags to manage different release channels, such as
+`stable`, `preview`, or `dev`.
 
-## Releasing through GitHub releases
+We recommend using your default branch as the stable release channel. This
+ensures that the default installation command always provides the most reliable
+version of your extension. You can then use a `dev` branch for active
+development and merge it into the default branch when you are ready for a
+release.
 
-Gemini CLI extensions can be distributed through
-[GitHub Releases](https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases).
-This provides a faster and more reliable initial installation experience for
-users, as it avoids the need to clone the repository.
+## Release through GitHub Releases
 
-Each release includes at least one archive file, which contains the full
-contents of the repo at the tag that it was linked to. Releases may also include
-[pre-built archives](#custom-pre-built-archives) if your extension requires some
-build step or has platform specific binaries attached to it.
+Distributing extensions through
+[GitHub Releases](https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases)
+provides a faster installation experience by avoiding a repository clone.
 
-When checking for updates, gemini will just look for the "latest" release on
-github (you must mark it as such when creating the release), unless the user
-installed a specific release by passing `--ref=<some-release-tag>`.
-
-You may also install extensions with the `--pre-release` flag in order to get
-the latest release regardless of whether it has been marked as "latest". This
-allows you to test that your release works before actually pushing it to all
-users.
+Gemini CLI checks for updates by looking for the **Latest** release on GitHub.
+Users can also install specific versions using the `--ref` argument with a
+release tag. Use the `--pre-release` flag to install the latest version even if
+it isn't marked as **Latest**.
 
 ### Custom pre-built archives
 
-Custom archives must be attached directly to the github release as assets and
-must be fully self-contained. This means they should include the entire
-extension, see [archive structure](#archive-structure).
+You can attach custom archives directly to your GitHub Release as assets. This
+is useful if your extension requires a build step or includes platform-specific
+binaries.
 
-If your extension is platform-independent, you can provide a single generic
-asset. In this case, there should be only one asset attached to the release.
+Custom archives must be fully self-contained and follow the required
+[archive structure](#archive-structure). If your extension is
+platform-independent, provide a single generic asset.
 
-Custom archives may also be used if you want to develop your extension within a
-larger repository, you can build an archive which has a different layout from
-the repo itself (for instance it might just be an archive of a subdirectory
-containing the extension).
+#### Platform-specific archives
 
-#### Platform specific archives
+To let Gemini CLI find the correct asset for a user's platform, use the
+following naming convention:
 
-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}`
-3.  **Generic:** If only one asset is provided, it will be used as a generic
-    fallback.
+3.  **Generic:** A single asset will be used as a fallback if no specific match
+    is found.
 
-- `{name}`: The name of your extension.
-- `{platform}`: The operating system. Supported values are:
-  - `darwin` (macOS)
-  - `linux`
-  - `win32` (Windows)
-- `{arch}`: The architecture. Supported values are:
-  - `x64`
-  - `arm64`
-- `{extension}`: The file extension of the archive (e.g., `.tar.gz` or `.zip`).
+Use these values for the placeholders:
+
+- `{name}`: Your extension name.
+- `{platform}`: Use `darwin` (macOS), `linux`, or `win32` (Windows).
+- `{arch}`: Use `x64` or `arm64`.
+- `{extension}`: Use `.tar.gz` or `.zip`.
 
 **Examples:**
 
 - `darwin.arm64.my-tool.tar.gz` (specific to Apple Silicon Macs)
-- `darwin.my-tool.tar.gz` (for all Macs)
+- `darwin.my-tool.tar.gz` (fallback for all Macs, e.g. Intel)
 - `linux.x64.my-tool.tar.gz`
 - `win32.my-tool.zip`
 
 #### Archive structure
 
-Archives must be fully contained extensions and have all the standard
-requirements - specifically the `gemini-extension.json` file must be at the root
-of the archive.
-
-The rest of the layout should look exactly the same as a typical extension, see
-[extensions.md](./index.md).
+Archives must be fully contained extensions. The `gemini-extension.json` file
+must be at the root of the archive. The rest of the layout should match a
+standard extension structure.
 
 #### Example GitHub Actions workflow
 
-Here is an example of a GitHub Actions workflow that builds and releases a
-Gemini CLI extension for multiple platforms:
+Use this example workflow to build and release your extension for multiple
+platforms:
 
 ```yaml
 name: Release Extension

docs/extensions/writing-extensions.md

@@ -1,18 +1,19 @@
-# Getting started with Gemini CLI extensions
+# Build 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,
-create a custom command, and provide context to the model with a `GEMINI.md`
-file.
+Gemini CLI extensions let you expand the capabilities of Gemini CLI by adding
+custom tools, commands, and context. This guide walks you through creating your
+first extension, from setting up a template to adding custom functionality and
+linking it for local development.
 
 ## Prerequisites
 
-Before you start, make sure you have the Gemini CLI installed and a basic
+Before you start, ensure you have the Gemini CLI installed and a basic
 understanding of Node.js.
 
-## When to use what
+## Extension features
 
-Extensions offer a variety of ways to customize Gemini CLI.
+Extensions offer several ways to customize Gemini CLI. Use this table to decide
+which features your extension needs.
 
 | Feature                                                        | What it is                                                                                                         | When to use it                                                                                                                                                                                                                                                                                 | Invoked by            |
 | :------------------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :-------------------- |
@@ -21,11 +22,12 @@ Extensions offer a variety of ways to customize Gemini CLI.
 | **[Context file (`GEMINI.md`)](reference.md#contextfilename)** | A markdown file containing instructions that are loaded into the model's context at the start of every session.    | Use this to define the "personality" of your extension, set coding standards, or provide essential knowledge that the model should always have.                                                                                                                                                | CLI provides to model |
 | **[Agent skills](../cli/skills.md)**                           | A specialized set of instructions and workflows that the model activates only when needed.                         | Use this for complex, occasional tasks (like "create a PR" or "audit security") to avoid cluttering the main context window when the skill isn't being used.                                                                                                                                   | Model                 |
 | **[Hooks](../hooks/index.md)**                                 | A way to intercept and customize the CLI's behavior at specific lifecycle events (e.g., before/after a tool call). | Use this when you want to automate actions based on what the model is doing, like validating tool arguments, logging activity, or modifying the model's input/output.                                                                                                                          | CLI                   |
+| **[Custom themes](reference.md#themes)**                       | A set of color definitions to personalize the CLI UI.                                                              | Use this to provide a unique visual identity for your extension or to offer specialized high-contrast or thematic color schemes.                                                                                                                                                               | User (via /theme)     |
 
 ## 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.
+The easiest way to start is by using a built-in template. We'll use the
+`mcp-server` example as our foundation.
 
 Run the following command to create a new directory called `my-first-extension`
 with the template files:
@@ -34,7 +36,7 @@ with the template files:
 gemini extensions new my-first-extension mcp-server
 ```
 
-This will create a new directory with the following structure:
+This creates a directory with the following structure:
 
 ```
 my-first-extension/
@@ -45,12 +47,11 @@ my-first-extension/
 
 ## Step 2: Understand the extension files
 
-Let's look at the key files in your new extension.
+Your new extension contains several key files that define its behavior.
 
 ### `gemini-extension.json`
 
-This is the manifest file for your extension. It tells Gemini CLI how to load
-and use your extension.
+The manifest file tells Gemini CLI how to load and use your extension.
 
 ```json
 {
@@ -68,17 +69,15 @@ and use your extension.
 
 - `name`: The unique name for your extension.
 - `version`: The version of your extension.
-- `mcpServers`: This section defines one or more Model Context Protocol (MCP)
-  servers. MCP servers are how you can add new tools for the model to use.
-  - `command`, `args`, `cwd`: These fields specify how to start your server.
-    Notice the use of the `${extensionPath}` variable, which Gemini CLI replaces
-    with the absolute path to your extension's installation directory. This
-    allows your extension to work regardless of where it's installed.
+- `mcpServers`: Defines Model Context Protocol (MCP) servers to add new tools.
+  - `command`, `args`, `cwd`: Specify how to start your server. The
+    `${extensionPath}` variable is replaced with the absolute path to your
+    extension's directory.
 
 ### `example.js`
 
-This file contains the source code for your MCP server. It's a simple Node.js
-server that uses the `@modelcontextprotocol/sdk`.
+This file contains the source code for your MCP server. It uses the
+`@modelcontextprotocol/sdk` to define tools.
 
 ```javascript
 /**
@@ -120,24 +119,49 @@ server.registerTool(
   },
 );
 
-// ... (prompt registration omitted for brevity)
-
 const transport = new StdioServerTransport();
 await server.connect(transport);
 ```
 
-This server defines a single tool called `fetch_posts` that fetches data from a
-public API.
-
 ### `package.json`
 
-This is the standard configuration file for a Node.js project. It defines
-dependencies and scripts.
+The standard configuration file for a Node.js project. It defines dependencies
+and scripts for your extension.
 
-## Step 3: Link your extension
+## Step 3: Add extension settings
 
-Before you can use the extension, you need to link it to your Gemini CLI
-installation for local development.
+Some extensions need configuration, such as API keys or user preferences. Let's
+add a setting for an API key.
+
+1.  Open `gemini-extension.json`.
+2.  Add a `settings` array to the configuration:
+
+    ```json
+    {
+      "name": "mcp-server-example",
+      "version": "1.0.0",
+      "settings": [
+        {
+          "name": "API Key",
+          "description": "The API key for the service.",
+          "envVar": "MY_SERVICE_API_KEY",
+          "sensitive": true
+        }
+      ],
+      "mcpServers": {
+        // ...
+      }
+    }
+    ```
+
+When a user installs this extension, Gemini CLI will prompt them to enter the
+"API Key". The value will be stored securely in the system keychain (because
+`sensitive` is true) and injected into the MCP server's process as the
+`MY_SERVICE_API_KEY` environment variable.
+
+## Step 4: Link your extension
+
+Link your extension to your Gemini CLI installation for local development.
 
 1.  **Install dependencies:**
 
@@ -149,20 +173,19 @@ installation for local development.
 2.  **Link the extension:**
 
     The `link` command creates a symbolic link from the Gemini CLI extensions
-    directory to your development directory. This means any changes you make
-    will be reflected immediately without needing to reinstall.
+    directory to your development directory. Changes you make are reflected
+    immediately.
 
     ```bash
     gemini extensions link .
     ```
 
-Now, restart your Gemini CLI session. The new `fetch_posts` tool will be
-available. You can test it by asking: "fetch posts".
+Restart your Gemini CLI session to use the new `fetch_posts` tool. Test it by
+asking: "fetch posts".
 
-## Step 4: Add a custom command
+## Step 5: 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.
+Custom commands create shortcuts for complex prompts.
 
 1.  Create a `commands` directory and a subdirectory for your command group:
 
@@ -181,18 +204,17 @@ a command that searches for a pattern in your code.
     """
     ```
 
-    This command, `/fs:grep-code`, will take an argument, run the `grep` shell
-    command with it, and pipe the results into a prompt for summarization.
+    This command, `/fs:grep-code`, takes an argument, runs the `grep` shell
+    command, and pipes the results into a prompt for summarization.
 
-After saving the file, restart the Gemini CLI. You can now run
-`/fs:grep-code "some pattern"` to use your new command.
+After saving the file, restart Gemini CLI. Run `/fs:grep-code "some pattern"` to
+use your new command.
 
-## Step 5: Add a custom `GEMINI.md`
+## Step 6: 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
-behave or information about your extension's tools. Note that you may not always
-need this for extensions built to expose commands and prompts.
+Provide persistent context to the model by adding a `GEMINI.md` file to your
+extension. This is useful for setting behavior or providing essential tool
+information.
 
 1.  Create a file named `GEMINI.md` in the root of your extension directory:
 
@@ -203,7 +225,7 @@ need this for extensions built to expose commands and prompts.
     posts, use the `fetch_posts` tool. Be concise in your responses.
     ```
 
-2.  Update your `gemini-extension.json` to tell the CLI to load this file:
+2.  Update your `gemini-extension.json` to load this file:
 
     ```json
     {
@@ -220,14 +242,13 @@ 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.
+Restart Gemini CLI. The model now has the context from your `GEMINI.md` file in
+every session where the extension is active.
 
-## (Optional) Step 6: Add an Agent Skill
+## (Optional) Step 7: Add an Agent Skill
 
-[Agent Skills](../cli/skills.md) let you bundle specialized expertise and
-procedural workflows. Unlike `GEMINI.md`, which provides persistent context,
-skills are activated only when needed, saving context tokens.
+[Agent Skills](../cli/skills.md) bundle specialized expertise and workflows.
+Skills are activated only when needed, which saves context tokens.
 
 1.  Create a `skills` directory and a subdirectory for your skill:
 
@@ -254,28 +275,18 @@ skills are activated only when needed, saving context tokens.
     3. Suggest remediation steps for any findings.
     ```
 
-Skills bundled with your extension are automatically discovered and can be
-activated by the model during a session when it identifies a relevant task.
+Gemini CLI automatically discovers skills bundled with your extension. The model
+activates them when it identifies a relevant task.
 
-## Step 7: Release your extension
+## Step 8: Release your extension
 
-Once you're 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
-Releases. Using a public Git repository is the simplest method.
+When your extension is ready, share it with others via a Git repository or
+GitHub Releases. Refer to the [Extension Releasing Guide](./releasing.md) for
+detailed instructions and learn how to list your extension in the gallery.
 
-For detailed instructions on both methods, please refer to the
-[Extension Releasing Guide](./releasing.md).
+## Next steps
 
-## Conclusion
-
-You've successfully created a Gemini CLI extension! You learned how to:
-
-- Bootstrap a new extension from a template.
-- Add custom tools with an MCP server.
-- Create convenient custom commands.
-- Provide persistent context to the model.
-- Bundle specialized Agent Skills.
-- Link your extension for local development.
-
-From here, you can explore more advanced features and build powerful new
-capabilities into the Gemini CLI.
+- [Extension reference](reference.md): Deeply understand the extension format,
+  commands, and configuration.
+- [Best practices](best-practices.md): Learn strategies for building great
+  extensions.