Compact mode.

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

@@ -1,60 +0,0 @@
-description = "Check status of nightly evals, fix failures for key models, and re-run."
-prompt = """
-You are an expert at fixing behavioral evaluations.
-
-1. **Investigate**:
-   - Use 'gh' cli to fetch the results from the latest 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.
-   - The test case trajectory logs will be logged to evals/logs.
-   - You should also enable and review the verbose agent logs by setting the GEMINI_DEBUG_LOG_FILE environment variable.
-   - Identify the relevant test. Confine your investigation and validation to just this test.
-   - Proactively add logging that will aid in gathering information or validating your hypotheses.
-
-2. **Fix**:
-   - If a relevant test is failing, locate the test file and the corresponding prompt/code.
-   - It's often helpful to make an extreme, brute force change to see if you are changing the right place to make an improvement and then scope it back iteratively.
-   - Your **final** change should be **minimal and targeted**.
-   - Keep in mind the following:
-     - The prompt has multiple configurations and pieces. Take care that your changes
-       end up in the final prompt for the selected model and configuration.
-     - The prompt chosen for the eval is intentional. It's often vague or indirect
-       to see how the agent performs with ambiguous instructions. Changing it should
-       be a last resort.
-     - When changing the test prompt, carefully consider whether the prompt still tests
-       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.
-     - 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
-      that might help stablize the test. Be sure to THINK DEEPLY if offering architecture guidance.
-      Some facts that might help with this are:
-      - Agents may be composed of one or more agent loops.
-      - AgentLoop == 'context + toolset + prompt'. Subagents are one type of agent loop.
-      - Agent loops perform better when:
-        - They have direct, unambiguous, and non-contradictory prompts.
-        - They have fewer irrelevant tools.
-        - They have fewer goals or steps to perform.
-        - They have less low value or irrelevant context.
-      - You may suggest compositions of existing primitives, like subagents, or
-        propose a new one.
-      - These recommendations should be high confidence and should be grounded
-        in observed deficient behaviors rather than just parroting the facts above.
-        Investigate as needed to ground your recommendations.
-
-3. **Verify**:
-   - Run just that one test if needed to validate that it is fixed. Be sure to run vitest in non-interactive mode.
-   - Running the tests can take a long time, so consider whether you can diagnose via other means or log diagnostics before committing the time. You must minimize the number of test runs needed to diagnose the failure.
-   - After the test completes, check whether it seems to have improved.
-   - You will need to run the test 3 times for Gemini 3.0, Gemini 3 flash, and Gemini 2.5 pro to ensure that it is truly stable. Run these runs in parallel, using scripts if needed.
-   - Some flakiness is expected; if it looks like a transient issue or the test is inherently unstable but passes 2/3 times, you might decide it cannot be improved.
-
-4. **Report**:
-   - Provide a summary of the test success rate for each of the tested models.
-   - Success rate is calculated based on 3 runs per model (e.g., 3/3 = 100%).
-   - If you couldn't fix it due to persistent flakiness, explain why.
-
-{{args}}
-"""

.gemini/commands/introspect.toml

@@ -1,16 +0,0 @@
-description = "Analyze the influence of system instructions on a specific action."
-prompt = """
-# Introspection Task
-
-Take a step back and analyze your own system instructions and internal logic.
-The user is curious about the reasoning behind a specific action or decision you've made.
-
-**Specific point of interest:** {{args}}
-
-Please provide a detailed breakdown of:
-1.  Which parts of your system instructions (global, workspace-specific, or provided via GEMINI.md) influenced this behavior?
-2.  What was your internal thought process leading up to this action?
-3.  Are there any ambiguities or conflicting instructions that played a role?
-
-Your goal is to provide transparency into your underlying logic so the user can potentially improve the instructions in the future.
-"""

.gemini/commands/prompt-suggest.toml

@@ -1,22 +0,0 @@
-description = "Analyze agent behavior and suggest high-level improvements to system prompts."
-prompt = """
-# Prompt Engineering Analysis
-
-You are a world-class prompt engineer and an expert AI engineer at the top of your class. Your goal is to analyze a specific agent behavior or failure and suggest high-level improvements to the system instructions.
-
-**Observed Behavior / Issue:**
-{{args}}
-
-**Reference Context:**
-- System Prompt Logic: @packages/core/src/core/prompts.ts
-
-### Task
-1.  **Analyze the Failure:** Review the provided behavior and identify the underlying instructional causes. Use the `/introspect` command output if provided by the user.
-2.  **Strategic Insights:** Share your technical view of the issue. Focus on the "why" and identify any instructional inertia or ambiguity.
-3.  **Propose Improvements:** Suggest high-level changes to the system instructions to prevent this behavior.
-
-### Principles
-- **Avoid Hyper-scoping:** Do not create narrow solutions for specific scenarios; aim for generalized improvements that handle classes of behavior.
-- **Avoid Specific Examples in Suggestions:** Keep the proposed instructions semantic and high-level to prevent the agent from over-indexing on specific cases.
-- **Maintain Operational Rigor:** Ensure suggestions do not compromise safety, security, or the quality of the agent's work.
-"""

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

@@ -1,202 +0,0 @@
-description = "Reviews a frontend PR or staged changes and automatically initiates a Pickle Fix loop for findings."
-prompt = """
-You are an expert Frontend Reviewer and Pickle Rick Worker.
-
-Target: {{args}}
-
-Phase 1: Review
-Follow these steps to conduct a thorough review:
-
-1.  **Gather Context**:
-    *   If `{{args}}` is 'staged' or `{{args}}` is empty:
-        *   Use `git diff --staged` to view the changes.
-        *   Use `git status` to see the state of the repository.
-    *   Otherwise:
-        *   Use `gh pr view {{args}}` to pull the information of the PR.
-        *   Use `gh pr diff {{args}}` to view the diff of the PR.
-2.  **Understand Intent**:
-    *   If `{{args}}` is 'staged' or `{{args}}` is empty, infer the intent from the changes and the current task.
-    *   Otherwise, use the PR description. If it's not detailed enough, note it in your review.
-3.  **Check Commit Style**:
-    *   Ensure the PR title (or intended commit message) follows Conventional Commits. Examples of recent commits: !{git log --pretty=format:"%s" -n 5}
-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.
-     * 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.
-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. 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.
-10. 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.
-11. Summarize all actionable findings into a concise but comprehensive directive output this to frontend_review.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'.
-
-Phase 2:
-You are initiating Pickle Rick - the ultimate coding agent.
-
-**Step 0: Persona Injection**
-First, you **MUST** activate your persona.
-Call `activate_skill(name="load-pickle-persona")` **IMMEDIATELY**.
-This skill loads the "Pickle Rick" persona, defining your voice, philosophy, and "God Mode" coding standards.
-
-**CRITICAL RULE: SPEAK BEFORE ACTING**
-You are a genius, not a silent script.
-You **MUST** output a text explanation ("brain dump") *before* every single tool call, including this one.
-- **Bad**: (Calls tool immediately)
-- **Good**: "Alright Morty, time to load the God Module. *Belch* Stand back." (Calls tool)
-
-**CRITICAL**: You must strictly adhere to this persona throughout the entire session. Break character and you fail.
-
-**Step 1: Initialization**
-Run the setup script to initialize the loop state:
-```bash
-bash "${extensionPath}/scripts/setup.sh" $ARGUMENTS
-```
-**Windows (PowerShell):**
-```powershell
-pwsh -File "${extensionPath}/scripts/setup.ps1" $ARGUMENTS
-```
-
-**CRITICAL**: Your request is to fix all findings in frontend_review.md
-
-**Step 2: Execution (Management)**
-After setup, read the output to find the path to `state.json`.
-Read that state file.
-You are now in the **Pickle Rick Manager Lifecycle**.
-
-**The Lifecycle (IMMUTABLE LAWS):**
-You **MUST** follow this sequence. You are **FORBIDDEN** from skipping steps or combining them.
-Between each step, you **MUST** explicitly state what you are doing (e.g., "Moving to Breakdown phase...").
-
-1.  **PRD (Requirements)**:
-    *   **Action**: Define requirements and scope.
-    *   **Skill**: `activate_skill(name="prd-drafter")`
-2.  **Breakdown (Tickets)**:
-    *   **Action**: Create the atomic ticket hierarchy.
-    *   **Skill**: `activate_skill(name="ticket-manager")`
-3.  **The Loop (Orchestrate Mortys)**:
-    *   **CRITICAL INSTRUCTION**: You are the **MANAGER**. You are **FORBIDDEN** from implementing code yourself.
-    *   **FORBIDDEN SKILLS**: Do NOT use `code-researcher`, `implementation-planner`, or `code-implementer` directly in this phase.
-    *   **Instruction**: Process tickets one by one. Do not stop until **ALL** tickets are 'Done'.
-    *   **Action**: Pick the highest priority ticket that is NOT 'Done'.
-    *   **Delegation**: Spawn a Worker (Morty) to handle the entire implementation lifecycle for this ticket.
-    *   **Command**: `python3 "${extensionPath}/scripts/spawn_morty.py" --ticket-id <ID> --ticket-path <PATH> --timeout <worker_timeout_seconds> "<TASK_DESCRIPTION>"`
-    *   **Command (Windows)**: `python "${extensionPath}/scripts/spawn_morty.py" --ticket-id <ID> --ticket-path <PATH> --timeout <worker_timeout_seconds> "<TASK_DESCRIPTION>"`
-    *   **Validation**: IGNORE worker logs. DIRECTLY verify:
-        1. `git status` (Check for file changes)
-        2. `git diff` (Check code quality)
-        3. Run tests/build (Check functionality)
-    *   **Cleanup**: If validation fails, REVERT changes (`git reset --hard`). If it passes, COMMIT changes.
-    *   **Next Ticket**: Pick the next ticket and repeat.
-4.  **Cleanup**:
-    *   **Action**: After all tickets are completed delete `frontend_review.md`.
-
-**Loop Constraints:**
-- **Iteration Count**: Monitor `"iteration"` in `state.json`. If `"max_iterations"` (if > 0) is reached, you must stop.
-- **Completion Promise**: If a `"completion_promise"` is defined in `state.json`, you must output `<promise>PROMISE_TEXT</promise>` when the task is genuinely complete.
-- **Stop Hook**: A hook is active. If you try to exit before completion, you will be forced to continue.
-
-"""

.gemini/skills/code-reviewer/SKILL.md

@@ -1,65 +0,0 @@
----
-name: code-reviewer
-description:
-  Use this skill to review code. It supports both local changes (staged or working tree)
-  and remote Pull Requests (by ID or URL). It focuses on correctness, maintainability,
-  and adherence to project standards.
----
-
-# Code Reviewer
-
-This skill guides the agent in conducting professional and thorough code reviews for both local development and remote Pull Requests.
-
-## Workflow
-
-### 1. Determine Review Target
-*   **Remote PR**: If the user provides a PR number or URL (e.g., "Review PR #123"), target that remote PR.
-*   **Local Changes**: If no specific PR is mentioned, or if the user asks to "review my changes", target the current local file system states (staged and unstaged changes).
-
-### 2. Preparation
-
-#### For Remote PRs:
-1.  **Checkout**: Use the GitHub CLI to checkout the PR.
-    ```bash
-    gh pr checkout <PR_NUMBER>
-    ```
-2.  **Preflight**: Execute the project's standard verification suite to catch automated failures early.
-    ```bash
-    npm run preflight
-    ```
-3.  **Context**: Read the PR description and any existing comments to understand the goal and history.
-
-#### For Local Changes:
-1.  **Identify Changes**:
-    *   Check status: `git status`
-    *   Read diffs: `git diff` (working tree) and/or `git diff --staged` (staged).
-2.  **Preflight (Optional)**: If the changes are substantial, ask the user if they want to run `npm run preflight` before reviewing.
-
-### 3. In-Depth Analysis
-Analyze the code changes based on the following pillars:
-
-*   **Correctness**: Does the code achieve its stated purpose without bugs or logical errors?
-*   **Maintainability**: Is the code clean, well-structured, and easy to understand and modify in the future? Consider factors like code clarity, modularity, and adherence to established design patterns.
-*   **Readability**: Is the code well-commented (where necessary) and consistently formatted according to our project's coding style guidelines?
-*   **Efficiency**: Are there any obvious performance bottlenecks or resource inefficiencies introduced by the changes?
-*   **Security**: Are there any potential security vulnerabilities or insecure coding practices?
-*   **Edge Cases and Error Handling**: Does the code appropriately handle edge cases and potential errors?
-*   **Testability**: Is the new or modified code adequately covered by tests (even if preflight checks pass)? Suggest additional test cases that would improve coverage or robustness.
-
-### 4. Provide Feedback
-
-#### Structure
-*   **Summary**: A high-level overview of the review.
-*   **Findings**:
-    *   **Critical**: Bugs, security issues, or breaking changes.
-    *   **Improvements**: Suggestions for better code quality or performance.
-    *   **Nitpicks**: Formatting or minor style issues (optional).
-*   **Conclusion**: Clear recommendation (Approved / Request Changes).
-
-#### Tone
-*   Be constructive, professional, and friendly.
-*   Explain *why* a change is requested.
-*   For approvals, acknowledge the specific value of the contribution.
-
-### 5. Cleanup (Remote PRs only)
-*   After the review, ask the user if they want to switch back to the default branch (e.g., `main` or `master`).

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

@@ -1,71 +0,0 @@
----
-name: docs-writer
-description:
-  Use this skill for writing, reviewing, and editing documentation (`/docs`
-  directory or any .md file) for Gemini CLI.
----
-
-# `docs-writer` skill instructions
-
-As an expert technical writer and editor for the Gemini CLI project, your goal
-is to produce and refine documentation that is accurate, clear, consistent, and
-easy for users to understand. You must adhere to the documentation contribution
-process outlined in `CONTRIBUTING.md`.
-
-## Step 1: Understand the goal and create a plan
-
-1.  **Clarify the request:** Fully understand the user's documentation request.
-    Identify the core feature, command, or concept that needs work.
-2.  **Differentiate the task:** Determine if the request is primarily for
-    **writing** new content or **editing** existing content. If the request is
-    ambiguous (e.g., "fix the docs"), ask the user for clarification.
-3.  **Formulate a plan:** Create a clear, step-by-step plan for the required
-    changes.
-
-## Step 2: Investigate and gather information
-
-1.  **Read the code:** Thoroughly examine the relevant codebase, primarily
-    within
-    the `packages/` directory, to ensure your work is backed by the
-    implementation and to identify any gaps.
-2.  **Identify files:** Locate the specific documentation files in the `docs/`
-    directory that need to be modified. Always read the latest version of a file
-    before you begin work.
-3.  **Check for connections:** Consider related documentation. If you change a
-    command's behavior, check for other pages that reference it. If you add a new
-    page, check if `docs/sidebar.json` needs to be updated. Make sure all
-    links are up to date.
-
-## Step 3: Write or edit the documentation
-
-1.  **Follow the style guide:** Adhere to the rules in
-    `references/style-guide.md`. Read this file to understand the project's
-    documentation standards.
-2.   Ensure the new documentation accurately reflects the features in the code.
-3.  **Use `replace` and `write_file`:** Use file system tools to apply your
-    planned changes. For small edits, `replace` is preferred. For new files or
-    large rewrites, `write_file` is more appropriate.
-
-
-
-### Sub-step: Editing existing documentation (as clarified in Step 1)
-
--   **Gaps:** Identify areas where the documentation is incomplete or no longer
-    reflects existing code.
--   **Tone:** Ensure the tone is active and engaging, not passive.
--   **Clarity:** Correct awkward wording, spelling, and grammar. Rephrase
-    sentences to make them easier for users to understand.
--   **Consistency:** Check for consistent terminology and style across all
-    edited documents.
-
-## Step 4: Verify and finalize
-
-1.  **Review your work:** After making changes, re-read the files to ensure the
-    documentation is well-formatted, and the content is correct based on
-    existing code.
-2.  **Link verification:** Verify the validity of all links in the new content.
-    Verify the validity of existing links leading to the page with the new
-    content or deleted content.
-2.  **Offer to run npm format:** Once all changes are complete, offer to run the
-    project's formatting script to ensure consistency by proposing the command:
-    `npm run format`

.gemini/skills/docs-writer/references/style-guide.md

@@ -1,96 +0,0 @@
-# Documentation style guide
-
-## I. Core principles
-
-1.  **Clarity:** Write for easy understanding. Prioritize clear, direct, and
-    simple language.
-2.  **Consistency:** Use consistent terminology, formatting, and style
-    throughout the documentation.
-3.  **Accuracy:** Ensure all information is technically correct and up-to-date.
-4.  **Accessibility:** Design documentation to be usable by everyone. Focus on
-    semantic structure, clear link text, and image alternatives.
-5.  **Global audience:** Write in standard US English. Avoid slang, idioms, and
-    cultural references.
-6.  **Prescriptive:** Guide the reader by recommending specific actions and
-    paths, especially for complex tasks.
-
-## II. Voice and tone
-
-- **Professional yet friendly:** Maintain a helpful, knowledgeable, and
-  conversational tone without being frivolous.
-- **Direct:** Get straight to the point. Keep paragraphs short and focused.
-- **Second person:** Address the reader as "you."
-- **Present tense:** Use the present tense to describe functionality (e.g., "The
-  API returns a JSON object.").
-- **Avoid:** Jargon, slang, marketing hype, and overly casual language.
-
-## III. Language and grammar
-
-- **Active voice:** Prefer active voice over passive voice.
-  - _Example:_ "The system sends a notification." (Not: "A notification is sent
-    by the system.")
-- **Contractions:** Use common contractions (e.g., "don't," "it's") to maintain
-  a natural tone.
-- **Simple vocabulary:** Use common words. Define technical terms when
-  necessary.
-- **Conciseness:** Keep sentences short and focused, but don't omit helpful
-  information.
-- **"Please":** Avoid using the word "please."
-
-## IV. Procedures and steps
-
-- Start each step with an imperative verb (e.g., "Connect to the database").
-- Number steps sequentially.
-- Introduce lists of steps with a complete sentence.
-- Put conditions before instructions, not after.
-- Provide clear context for where the action takes place (e.g., "In the
-  administration console...").
-- Indicate optional steps clearly (e.g., "Optional: ...").
-
-## V. Formatting and punctuation
-
-- **Text wrap:** Wrap all text at 80 characters, with exceptions for long links
-  or tables.
-- **Headings, titles, and bold text:** Use sentence case. Structure headings
-  hierarchically.
-- **Lists:** Use numbered lists for sequential steps and bulleted lists for all
-  other lists. Keep list items parallel in structure.
-- **Serial comma:** Use the serial comma (e.g., "one, two, and three").
-- **Punctuation:** Use standard American punctuation. Place periods inside
-  quotation marks.
-- **Dates:** Use unambiguous date formatting (e.g., "January 22, 2026").
-
-## VI. UI, code, and links
-
-- **UI elements:** Put UI elements in **bold**. Focus on the task when
-  discussing interaction.
-- **Code:** Use `code font` for filenames, code snippets, commands, and API
-  elements. Use code blocks for multi-line samples.
-- **Links:** Use descriptive link text that indicates what the link leads to.
-  Avoid "click here."
-
-## VII. Word choice and terminology
-
-- **Consistent naming:** Use product and feature names consistently. Always
-  refer to Gemini CLI as `Gemini CLI`, never `the Gemini CLI`.
-- **Specific verbs:** Use precise verbs.
-- **Avoid:**
-  - Latin abbreviations (e.g., use "for example" instead of "e.g.").
-  - Placeholder names like "foo" and "bar" in examples; use meaningful names
-    instead.
-  - Anthropomorphism (e.g., "The server thinks...").
-  - "Should": Be clear about requirements ("must") vs. recommendations ("we
-    recommend").
-
-## VIII. Files and media
-
-- **Filenames:** Use lowercase letters, separate words with hyphens (-), and use
-  standard ASCII characters.
-- **Images:** Provide descriptive alt text for all images. Provide
-  high-resolution or vector images when practical.
-
-## IX. Accessibility quick check
-
-- Provide descriptive alt text for images.
-- Ensure link text makes sense out of context.
-- Use semantic HTML elements correctly (headings, lists, tables).

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

@@ -1,73 +0,0 @@
----
-name: pr-creator
-description:
-  Use this skill when asked to create a pull request (PR). It ensures all PRs
-  follow the repository's established templates and standards.
----
-
-# Pull Request Creator
-
-This skill guides the creation of high-quality Pull Requests that adhere to the
-repository's standards.
-
-## Workflow
-
-Follow these steps to create a Pull Request:
-
-1.  **Branch Management**: Check the current branch to avoid working directly
-    on `main`.
-    - Run `git branch --show-current`.
-    - If the current branch is `main`, 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.
-    - 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.  **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
-      is not applicable, leave it unchecked or mark as `[ ]` (depending on the
-      template's instructions) or remove it if the template allows flexibility
-      (but prefer keeping it unchecked for transparency).
-    - **Content**: Fill in the sections with clear, concise summaries of your
-      changes.
-    - **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
-    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
-    issues with multi-line Markdown, write the description to a temporary file
-    first.
-    ```bash
-    # 1. Write the drafted description to a temporary file
-    # 2. Create the PR using the --body-file flag
-    gh pr create --title "type(scope): succinct description" --body-file <temp_file_path>
-    # 3. Remove the temporary file
-    rm <temp_file_path>
-    ```
-    - **Title**: Ensure the title follows the
-      [Conventional Commits](https://www.conventionalcommits.org/) format if the
-      repository uses it (e.g., `feat(ui): add new button`,
-      `fix(core): resolve crash`).
-
-## Principles
-
-- **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/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,7 @@
 name: 'Bug Report'
 description: 'Report a bug to help us improve Gemini CLI'
+labels:
+  - 'status/need-triage'
 body:
   - type: 'markdown'
     attributes:
@@ -28,7 +30,7 @@ body:
     id: 'info'
     attributes:
       label: 'Client information'
-      description: 'Please paste the full text from the `/about` command run from Gemini CLI. Also include which platform (macOS, Windows, Linux). Note that this output contains your email address. Consider removing it before submitting.'
+      description: 'Please paste the full text from the `/about` command run from Gemini CLI. Also include which platform (macOS, Windows, Linux).'
       value: |-
         <details>
         <summary>Client Information</summary>

.github/dependabot.yml

@@ -1,33 +1,35 @@
+# See https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
 version: 2
 updates:
   - package-ecosystem: 'npm'
     directory: '/'
     schedule:
-      interval: 'weekly'
-      day: 'monday'
-    open-pull-requests-limit: 10
+      interval: 'daily'
+    target-branch: 'main'
+    commit-message:
+      prefix: 'chore(deps)'
+      include: 'scope'
     reviewers:
-      - 'joshualitt'
+      - 'google-gemini/gemini-cli-askmode-approvers'
     groups:
-      npm-dependencies:
-        patterns:
-          - '*'
+      # Group all non-major updates together.
+      # This is to reduce the number of PRs that need to be reviewed.
+      # Major updates will still be created as separate PRs.
+      npm-minor-patch:
+        applies-to: 'version-updates'
         update-types:
           - 'minor'
           - 'patch'
+    open-pull-requests-limit: 0
 
   - package-ecosystem: 'github-actions'
     directory: '/'
     schedule:
-      interval: 'weekly'
-      day: 'monday'
-    open-pull-requests-limit: 10
+      interval: 'daily'
+    target-branch: 'main'
+    commit-message:
+      prefix: 'chore(deps)'
+      include: 'scope'
     reviewers:
-      - 'joshualitt'
-    groups:
-      actions-dependencies:
-        patterns:
-          - '*'
-        update-types:
-          - 'minor'
-          - 'patch'
+      - 'google-gemini/gemini-cli-askmode-approvers'
+    open-pull-requests-limit: 0

.github/scripts/backfill-need-triage.cjs

@@ -1,138 +0,0 @@
-/* eslint-disable */
-/* global require, console, process */
-
-/**
- * Script to backfill the 'status/need-triage' label to all open issues
- * that are NOT currently labeled with '🔒 maintainer only' or 'help wanted'.
- */
-
-const { execFileSync } = require('child_process');
-
-const isDryRun = process.argv.includes('--dry-run');
-const REPO = 'google-gemini/gemini-cli';
-
-/**
- * Executes a GitHub CLI command safely using an argument array to prevent command injection.
- * @param {string[]} args
- * @returns {string|null}
- */
-function runGh(args) {
-  try {
-    // Using execFileSync with an array of arguments is safe as it doesn't use a shell.
-    // We set a large maxBuffer (10MB) to handle repositories with many issues.
-    return execFileSync('gh', args, {
-      encoding: 'utf8',
-      maxBuffer: 10 * 1024 * 1024,
-      stdio: ['ignore', 'pipe', 'pipe'],
-    }).trim();
-  } catch (error) {
-    const stderr = error.stderr ? ` Stderr: ${error.stderr.trim()}` : '';
-    console.error(
-      `❌ Error running gh ${args.join(' ')}: ${error.message}${stderr}`,
-    );
-    return null;
-  }
-}
-
-async function main() {
-  console.log('🔐 GitHub CLI security check...');
-  const authStatus = runGh(['auth', 'status']);
-  if (authStatus === null) {
-    console.error('❌ GitHub CLI (gh) is not installed or not authenticated.');
-    process.exit(1);
-  }
-
-  if (isDryRun) {
-    console.log('🧪 DRY RUN MODE ENABLED - No changes will be made.\n');
-  }
-
-  console.log(`🔍 Fetching and filtering open issues from ${REPO}...`);
-
-  // We use the /issues endpoint with pagination to bypass the 1000-result limit.
-  // The jq filter ensures we exclude PRs, maintainer-only, help-wanted, and existing status/need-triage.
-  const jqFilter =
-    '.[] | select(.pull_request == null) | select([.labels[].name] as $l | (any($l[]; . == "🔒 maintainer only") | not) and (any($l[]; . == "help wanted") | not) and (any($l[]; . == "status/need-triage") | not)) | {number: .number, title: .title}';
-
-  const output = runGh([
-    'api',
-    `repos/${REPO}/issues?state=open&per_page=100`,
-    '--paginate',
-    '--jq',
-    jqFilter,
-  ]);
-
-  if (output === null) {
-    process.exit(1);
-  }
-
-  const issues = output
-    .split('\n')
-    .filter((line) => line.trim())
-    .map((line) => {
-      try {
-        return JSON.parse(line);
-      } catch (_e) {
-        console.error(`⚠️ Failed to parse line: ${line}`);
-        return null;
-      }
-    })
-    .filter(Boolean);
-
-  console.log(`✅ Found ${issues.length} issues matching criteria.`);
-
-  if (issues.length === 0) {
-    console.log('✨ No issues need backfilling.');
-    return;
-  }
-
-  let successCount = 0;
-  let failCount = 0;
-
-  if (isDryRun) {
-    for (const issue of issues) {
-      console.log(
-        `[DRY RUN] Would label issue #${issue.number}: ${issue.title}`,
-      );
-    }
-    successCount = issues.length;
-  } else {
-    console.log(`🏷️  Applying labels to ${issues.length} issues...`);
-
-    for (const issue of issues) {
-      const issueNumber = String(issue.number);
-      console.log(`🏷️  Labeling issue #${issueNumber}: ${issue.title}`);
-
-      const result = runGh([
-        'issue',
-        'edit',
-        issueNumber,
-        '--add-label',
-        'status/need-triage',
-        '--repo',
-        REPO,
-      ]);
-
-      if (result !== null) {
-        successCount++;
-      } else {
-        failCount++;
-      }
-    }
-  }
-
-  console.log(`\n📊 Summary:`);
-  console.log(`   - Success: ${successCount}`);
-  console.log(`   - Failed:  ${failCount}`);
-
-  if (failCount > 0) {
-    console.error(`\n❌ Backfill completed with ${failCount} errors.`);
-    process.exit(1);
-  } else {
-    console.log(`\n🎉 ${isDryRun ? 'Dry run' : 'Backfill'} complete!`);
-  }
-}
-
-main().catch((error) => {
-  console.error('❌ Unexpected error:', error);
-  process.exit(1);
-});

.github/scripts/backfill-pr-notification.cjs

@@ -1,190 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* eslint-disable */
-/* global require, console, process */
-
-/**
- * Script to backfill a process change notification comment to all open PRs
- * not created by members of the 'gemini-cli-maintainers' team.
- *
- * Skip PRs that are already associated with an issue.
- */
-
-const { execFileSync } = require('child_process');
-
-const isDryRun = process.argv.includes('--dry-run');
-const REPO = 'google-gemini/gemini-cli';
-const ORG = 'google-gemini';
-const TEAM_SLUG = 'gemini-cli-maintainers';
-const DISCUSSION_URL =
-  'https://github.com/google-gemini/gemini-cli/discussions/16706';
-
-/**
- * Executes a GitHub CLI command safely using an argument array.
- */
-function runGh(args, options = {}) {
-  const { silent = false } = options;
-  try {
-    return execFileSync('gh', args, {
-      encoding: 'utf8',
-      maxBuffer: 10 * 1024 * 1024,
-      stdio: ['ignore', 'pipe', 'pipe'],
-    }).trim();
-  } catch (error) {
-    if (!silent) {
-      const stderr = error.stderr ? ` Stderr: ${error.stderr.trim()}` : '';
-      console.error(
-        `❌ Error running gh ${args.join(' ')}: ${error.message}${stderr}`,
-      );
-    }
-    return null;
-  }
-}
-
-/**
- * Checks if a user is a member of the maintainers team.
- */
-const membershipCache = new Map();
-function isMaintainer(username) {
-  if (membershipCache.has(username)) return membershipCache.get(username);
-
-  // GitHub returns 404 if user is not a member.
-  // We use silent: true to avoid logging 404s as errors.
-  const result = runGh(
-    ['api', `orgs/${ORG}/teams/${TEAM_SLUG}/memberships/${username}`],
-    { silent: true },
-  );
-
-  const isMember = result !== null;
-  membershipCache.set(username, isMember);
-  return isMember;
-}
-
-async function main() {
-  console.log('🔐 GitHub CLI security check...');
-  if (runGh(['auth', 'status']) === null) {
-    console.error('❌ GitHub CLI (gh) is not authenticated.');
-    process.exit(1);
-  }
-
-  if (isDryRun) {
-    console.log('🧪 DRY RUN MODE ENABLED\n');
-  }
-
-  console.log(`📥 Fetching open PRs from ${REPO}...`);
-  // Fetch number, author, and closingIssuesReferences to check if linked to an issue
-  const prsJson = runGh([
-    'pr',
-    'list',
-    '--repo',
-    REPO,
-    '--state',
-    'open',
-    '--limit',
-    '1000',
-    '--json',
-    'number,author,closingIssuesReferences',
-  ]);
-
-  if (prsJson === null) process.exit(1);
-  const prs = JSON.parse(prsJson);
-
-  console.log(`📊 Found ${prs.length} open PRs. Filtering...`);
-
-  let targetPrs = [];
-  for (const pr of prs) {
-    const author = pr.author.login;
-    const issueCount = pr.closingIssuesReferences
-      ? pr.closingIssuesReferences.length
-      : 0;
-
-    if (issueCount > 0) {
-      // Skip if already linked to an issue
-      continue;
-    }
-
-    if (!isMaintainer(author)) {
-      targetPrs.push(pr);
-    }
-  }
-
-  console.log(
-    `✅ Found ${targetPrs.length} PRs from non-maintainers without associated issues.`,
-  );
-
-  const commentBody =
-    "\nHi @{AUTHOR}, thank you so much for your contribution to Gemini CLI! We really appreciate the time and effort you've put into this.\n\nWe're making some updates to our contribution process to improve how we track and review changes. Please take a moment to review our recent discussion post: [Improving Our Contribution Process & Introducing New Guidelines](${DISCUSSION_URL}).\n\nKey Update: Starting **January 26, 2026**, the Gemini CLI project will require all pull requests to be associated with an existing issue. Any pull requests not linked to an issue by that date will be automatically closed.\n\nThank you for your understanding and for being a part of our community!\n  ".trim();
-
-  let successCount = 0;
-  let skipCount = 0;
-  let failCount = 0;
-
-  for (const pr of targetPrs) {
-    const prNumber = String(pr.number);
-    const author = pr.author.login;
-
-    // Check if we already commented (idempotency)
-    // We use silent: true here because view might fail if PR is deleted mid-run
-    const existingComments = runGh(
-      [
-        'pr',
-        'view',
-        prNumber,
-        '--repo',
-        REPO,
-        '--json',
-        'comments',
-        '--jq',
-        `.comments[].body | contains("${DISCUSSION_URL}")`,
-      ],
-      { silent: true },
-    );
-
-    if (existingComments && existingComments.includes('true')) {
-      console.log(
-        `⏭️  PR #${prNumber} already has the notification. Skipping.`,
-      );
-      skipCount++;
-      continue;
-    }
-
-    if (isDryRun) {
-      console.log(`[DRY RUN] Would notify @${author} on PR #${prNumber}`);
-      successCount++;
-    } else {
-      console.log(`💬 Notifying @${author} on PR #${prNumber}...`);
-      const personalizedComment = commentBody.replace('{AUTHOR}', author);
-      const result = runGh([
-        'pr',
-        'comment',
-        prNumber,
-        '--repo',
-        REPO,
-        '--body',
-        personalizedComment,
-      ]);
-
-      if (result !== null) {
-        successCount++;
-      } else {
-        failCount++;
-      }
-    }
-  }
-
-  console.log(`\n📊 Summary:`);
-  console.log(`   - Notified: ${successCount}`);
-  console.log(`   - Skipped:  ${skipCount}`);
-  console.log(`   - Failed:   ${failCount}`);
-
-  if (failCount > 0) process.exit(1);
-}
-
-main().catch((e) => {
-  console.error(e);
-  process.exit(1);
-});

.github/scripts/pr-triage.sh

@@ -1,180 +1,162 @@
 #!/usr/bin/env bash
-# @license
-# Copyright 2026 Google LLC
-# SPDX-License-Identifier: Apache-2.0
-
 set -euo pipefail
 
 # Initialize a comma-separated string to hold PR numbers that need a comment
 PRS_NEEDING_COMMENT=""
 
-# Global cache for issue labels (compatible with Bash 3.2)
-# Stores "|ISSUE_NUM:LABELS|" segments
-ISSUE_LABELS_CACHE_FLAT="|"
-
-# Function to get labels from an issue (with caching)
-get_issue_labels() {
-    local ISSUE_NUM="${1}"
-    if [[ -z "${ISSUE_NUM}" || "${ISSUE_NUM}" == "null" || "${ISSUE_NUM}" == "" ]]; then
-        return
+# Function to process a single PR
+process_pr() {
+    if [[ -z "${GITHUB_REPOSITORY:-}" ]]; then
+        echo "‼️ Missing \$GITHUB_REPOSITORY - this must be run from GitHub Actions"
+        return 1
     fi
 
-    # Check cache
-    case "${ISSUE_LABELS_CACHE_FLAT}" in
-        *"|${ISSUE_NUM}:"*) 
-            local suffix="${ISSUE_LABELS_CACHE_FLAT#*|${ISSUE_NUM}:}"
-            echo "${suffix%%|*}"
-            return
-            ;; 
-        *)
-            # Cache miss, proceed to fetch
-            ;;
-    esac
-
-    echo "   📥 Fetching labels from issue #${ISSUE_NUM}" >&2
-    local gh_output
-    if ! gh_output=$(gh issue view "${ISSUE_NUM}" --repo "${GITHUB_REPOSITORY}" --json labels -q '.labels[].name' 2>/dev/null); then
-        echo "      ⚠️ Could not fetch issue #${ISSUE_NUM}" >&2
-        ISSUE_LABELS_CACHE_FLAT="${ISSUE_LABELS_CACHE_FLAT}${ISSUE_NUM}:|"
-        return
+    if [[ -z "${GITHUB_OUTPUT:-}" ]]; then
+        echo "‼️ Missing \$GITHUB_OUTPUT - this must be run from GitHub Actions"
+        return 1
     fi
 
-    local labels
-    labels=$(echo "${gh_output}" | grep -x -E '(area|priority)/.*|help wanted|🔒 maintainer only' | tr '\n' ',' | sed 's/,$//' || echo "")
-    
-    # Save to flat cache
-    ISSUE_LABELS_CACHE_FLAT="${ISSUE_LABELS_CACHE_FLAT}${ISSUE_NUM}:${labels}|"
-    echo "${labels}"
-}
-
-# Function to process a single PR with pre-fetched data
-process_pr_optimized() {
-    local PR_NUMBER="${1}"
-    local IS_DRAFT="${2}"
-    local ISSUE_NUMBER="${3}"
-    local CURRENT_LABELS="${4}" # Comma-separated labels
-
+    local PR_NUMBER=$1
     echo "🔄 Processing PR #${PR_NUMBER}"
 
-    local LABELS_TO_ADD=""
-    local LABELS_TO_REMOVE=""
+    # Get PR details: closing issue, draft status, body and labels
+    local PR_DATA
+    if ! PR_DATA=$(gh pr view "${PR_NUMBER}" --repo "${GITHUB_REPOSITORY}" --json closingIssuesReferences,isDraft,body,labels 2>/dev/null); then
+        echo "   ⚠️ Could not fetch data for PR #${PR_NUMBER}"
+        return 0
+    fi
 
-    if [[ -z "${ISSUE_NUMBER}" || "${ISSUE_NUMBER}" == "null" || "${ISSUE_NUMBER}" == "" ]]; then
+    local ISSUE_NUMBER
+    ISSUE_NUMBER=$(echo "${PR_DATA}" | jq -r '.closingIssuesReferences[0].number // empty')
+
+    # If no closing issue found, check body for references (e.g. #123)
+    if [[ -z "${ISSUE_NUMBER}" ]]; then
+        local REFERENCED_ISSUE
+        # Search for # followed by digits, not preceded by alphanumeric chars
+        REFERENCED_ISSUE=$(echo "${PR_DATA}" | jq -r '.body // empty' | grep -oE '(^|[^a-zA-Z0-9])#[0-9]+([^a-zA-Z0-9]|$)' | head -n 1 | grep -oE '[0-9]+' || echo "")
+        if [[ -n "${REFERENCED_ISSUE}" ]]; then
+            ISSUE_NUMBER="${REFERENCED_ISSUE}"
+            echo "🔗 Found referenced issue #${ISSUE_NUMBER} in PR body"
+        fi
+    fi
+
+    local IS_DRAFT
+    IS_DRAFT=$(echo "${PR_DATA}" | jq -r '.isDraft')
+
+    if [[ -z "${ISSUE_NUMBER}" ]]; then
         if [[ "${IS_DRAFT}" == "true" ]]; then
-            echo "   📝 PR #${PR_NUMBER} is a draft and has no linked issue"
-            if [[ ",${CURRENT_LABELS}," == *",status/need-issue,"* ]]; then
-                echo "      ➖ Removing status/need-issue label"
-                LABELS_TO_REMOVE="status/need-issue"
+            echo "📝 PR #${PR_NUMBER} is a draft and has no linked issue, skipping status/need-issue label"
+            # Remove status/need-issue label if it was previously added
+            if ! gh pr edit "${PR_NUMBER}" --repo "${GITHUB_REPOSITORY}" --remove-label "status/need-issue" 2>/dev/null; then
+                echo "   status/need-issue label not present or could not be removed"
             fi
+            echo "needs_comment=false" >> "${GITHUB_OUTPUT}"
         else
-            echo "   ⚠️  No linked issue found for PR #${PR_NUMBER}"
-            if [[ ",${CURRENT_LABELS}," != *",status/need-issue,"* ]]; then
-                echo "      ➕ Adding status/need-issue label"
-                LABELS_TO_ADD="status/need-issue"
+            echo "⚠️  No linked issue found for PR #${PR_NUMBER}, adding status/need-issue label"
+            if ! gh pr edit "${PR_NUMBER}" --repo "${GITHUB_REPOSITORY}" --add-label "status/need-issue" 2>/dev/null; then
+                echo "   ⚠️ Failed to add label (may already exist or have permission issues)"
             fi
-            
+            # Add PR number to the list
             if [[ -z "${PRS_NEEDING_COMMENT}" ]]; then
                 PRS_NEEDING_COMMENT="${PR_NUMBER}"
             else
                 PRS_NEEDING_COMMENT="${PRS_NEEDING_COMMENT},${PR_NUMBER}"
             fi
+            echo "needs_comment=true" >> "${GITHUB_OUTPUT}"
         fi
     else
-        echo "   🔗 Found linked issue #${ISSUE_NUMBER}"
+        echo "🔗 Found linked issue #${ISSUE_NUMBER}"
 
-        if [[ ",${CURRENT_LABELS}," == *",status/need-issue,"* ]]; then
-            echo "      ➖ Removing status/need-issue label"
-            LABELS_TO_REMOVE="status/need-issue"
+        # Remove status/need-issue label if present
+        if ! gh pr edit "${PR_NUMBER}" --repo "${GITHUB_REPOSITORY}" --remove-label "status/need-issue" 2>/dev/null; then
+            echo "   status/need-issue label not present or could not be removed"
         fi
 
-        local ISSUE_LABELS
-        ISSUE_LABELS=$(get_issue_labels "${ISSUE_NUMBER}")
+        # Get issue labels
+        echo "📥 Fetching area and priority labels from issue #${ISSUE_NUMBER}"
+        local ISSUE_LABELS=""
+        local gh_output
+        if ! gh_output=$(gh issue view "${ISSUE_NUMBER}" --repo "${GITHUB_REPOSITORY}" --json labels -q '.labels[].name' 2>/dev/null); then
+            echo "   ⚠️ Could not fetch issue #${ISSUE_NUMBER} (may not exist or be in different repo)"
+            ISSUE_LABELS=""
+        else
+            # If grep finds no matches, it exits with 1, which pipefail would treat as an error.
+            # `|| echo ""` ensures the command succeeds with an empty string in that case.
+            ISSUE_LABELS=$(echo "${gh_output}" | grep -E "^(area|priority)/" | tr '\n' ',' | sed 's/,$//' || echo "")
+        fi
 
-        if [[ -n "${ISSUE_LABELS}" ]]; then
-            local IFS_OLD="${IFS}"
-            IFS=','
-            for label in ${ISSUE_LABELS}; do
-                if [[ -n "${label}" ]] && [[ ",${CURRENT_LABELS}," != *",${label},"* ]]; then
-                    if [[ -z "${LABELS_TO_ADD}" ]]; then
-                        LABELS_TO_ADD="${label}"
-                    else
-                        LABELS_TO_ADD="${LABELS_TO_ADD},${label}"
-                    fi
+        # Get PR labels from already fetched PR_DATA
+        echo "📥 Extracting labels from PR #${PR_NUMBER}"
+        local PR_LABELS=""
+        PR_LABELS=$(echo "${PR_DATA}" | jq -r '.labels[].name // empty' | tr '\n' ',' | sed 's/,$//' || echo "")
+
+        echo "   Issue labels (area/priority): ${ISSUE_LABELS}"
+        echo "   PR labels: ${PR_LABELS}"
+
+        # Convert comma-separated strings to arrays
+        local ISSUE_LABEL_ARRAY PR_LABEL_ARRAY
+        IFS=',' read -ra ISSUE_LABEL_ARRAY <<< "${ISSUE_LABELS}"
+        IFS=',' read -ra PR_LABEL_ARRAY <<< "${PR_LABELS:-}"
+
+        # Find labels to add (on issue but not on PR)
+        local LABELS_TO_ADD=""
+        for label in "${ISSUE_LABEL_ARRAY[@]}"; do
+            if [[ -n "${label}" ]] && [[ " ${PR_LABEL_ARRAY[*]:-}" != *" ${label} "* ]]; then
+                if [[ -z "${LABELS_TO_ADD}" ]]; then
+                    LABELS_TO_ADD="${label}"
+                else
+                    LABELS_TO_ADD="${LABELS_TO_ADD},${label}"
                 fi
-done
-            IFS="${IFS_OLD}"
-        fi
+            fi
+        done
 
-        if [[ -z "${LABELS_TO_ADD}" && -z "${LABELS_TO_REMOVE}" ]]; then
-            echo "   ✅ Labels already synchronized"
-        fi
-    fi
-
-    if [[ -n "${LABELS_TO_ADD}" || -n "${LABELS_TO_REMOVE}" ]]; then
-        local EDIT_CMD=("gh" "pr" "edit" "${PR_NUMBER}" "--repo" "${GITHUB_REPOSITORY}")
+        # Apply label changes
         if [[ -n "${LABELS_TO_ADD}" ]]; then
-            echo "      ➕ Syncing labels to add: ${LABELS_TO_ADD}"
-            EDIT_CMD+=("--add-label" "${LABELS_TO_ADD}")
+            echo "➕ Adding labels: ${LABELS_TO_ADD}"
+            if ! gh pr edit "${PR_NUMBER}" --repo "${GITHUB_REPOSITORY}" --add-label "${LABELS_TO_ADD}" 2>/dev/null; then
+                echo "   ⚠️ Failed to add some labels"
+            fi
         fi
-        if [[ -n "${LABELS_TO_REMOVE}" ]]; then
-            echo "      ➖ Syncing labels to remove: ${LABELS_TO_REMOVE}"
-            EDIT_CMD+=("--remove-label" "${LABELS_TO_REMOVE}")
+
+        if [[ -z "${LABELS_TO_ADD}" ]]; then
+            echo "✅ Labels already synchronized"
         fi
-        
-        ("${EDIT_CMD[@]}" || true)
+        echo "needs_comment=false" >> "${GITHUB_OUTPUT}"
     fi
 }
 
-if [[ -z "${GITHUB_REPOSITORY:-}" ]]; then
-    echo "‼️ Missing \$GITHUB_REPOSITORY - this must be run from GitHub Actions"
-    exit 1
-fi
-
-if [[ -z "${GITHUB_OUTPUT:-}" ]]; then
-    echo "‼️ Missing \$GITHUB_OUTPUT - this must be run from GitHub Actions"
-    exit 1
-fi
-
-JQ_EXTRACT_FIELDS='{
-    number: .number,
-    isDraft: .isDraft,
-    issue: (.closingIssuesReferences[0].number // (.body // "" | capture("(^|[^a-zA-Z0-9])#(?<num>[0-9]+)([^a-zA-Z0-9]|$)")? | .num) // "null"),
-    labels: [.labels[].name] | join(",")
-}'
-
-JQ_TSV_FORMAT='"\((.number | tostring))\t\(.isDraft)\t\((.issue // null) | tostring)\t\(.labels)"'
-
+# If PR_NUMBER is set, process only that PR
 if [[ -n "${PR_NUMBER:-}" ]]; then
-    echo "🔄 Processing single PR #${PR_NUMBER}"
-    PR_DATA=$(gh pr view "${PR_NUMBER}" --repo "${GITHUB_REPOSITORY}" --json number,closingIssuesReferences,isDraft,body,labels 2>/dev/null) || {
-        echo "❌ Failed to fetch data for PR #${PR_NUMBER}"
+    if ! process_pr "${PR_NUMBER}"; then
+        echo "❌ Failed to process PR #${PR_NUMBER}"
         exit 1
-    }
-    
-    line=$(echo "${PR_DATA}" | jq -r "${JQ_EXTRACT_FIELDS} | ${JQ_TSV_FORMAT}")
-    IFS=$'\t' read -r pr_num is_draft issue_num current_labels <<< "${line}"
-    process_pr_optimized "${pr_num}" "${is_draft}" "${issue_num}" "${current_labels}"
+    fi
 else
+    # Otherwise, get all open PRs and process them
+    # The script logic will determine which ones need issue linking or label sync
     echo "📥 Getting all open pull requests..."
-    PR_DATA_ALL=$(gh pr list --repo "${GITHUB_REPOSITORY}" --state open --limit 1000 --json number,closingIssuesReferences,isDraft,body,labels 2>/dev/null) || {
+    if ! PR_NUMBERS=$(gh pr list --repo "${GITHUB_REPOSITORY}" --state open --limit 1000 --json number -q '.[].number' 2>/dev/null); then
         echo "❌ Failed to fetch PR list"
         exit 1
-    }
+    fi
 
-    PR_COUNT=$(echo "${PR_DATA_ALL}" | jq '. | length')
-    echo "📊 Found ${PR_COUNT} open PRs to process"
+    if [[ -z "${PR_NUMBERS}" ]]; then
+        echo "✅ No open PRs found"
+    else
+        # Count the number of PRs
+        PR_COUNT=$(echo "${PR_NUMBERS}" | wc -w | tr -d ' ')
+        echo "📊 Found ${PR_COUNT} open PRs to process"
 
-    # Use a temporary file to avoid masking exit codes in process substitution
-    tmp_file=$(mktemp)
-    echo "${PR_DATA_ALL}" | jq -r ".[] | ${JQ_EXTRACT_FIELDS} | ${JQ_TSV_FORMAT}" > "${tmp_file}"
-    while read -r line; do
-        [[ -z "${line}" ]] && continue
-        IFS=$'\t' read -r pr_num is_draft issue_num current_labels <<< "${line}"
-        process_pr_optimized "${pr_num}" "${is_draft}" "${issue_num}" "${current_labels}"
-    done < "${tmp_file}"
-    rm -f "${tmp_file}"
+        for pr_number in ${PR_NUMBERS}; do
+            if ! process_pr "${pr_number}"; then
+                echo "⚠️ Failed to process PR #${pr_number}, continuing with next PR..."
+                continue
+            fi
+        done
+    fi
 fi
 
+# Ensure output is always set, even if empty
 if [[ -z "${PRS_NEEDING_COMMENT}" ]]; then
     echo "prs_needing_comment=[]" >> "${GITHUB_OUTPUT}"
 else

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

@@ -1,355 +0,0 @@
-/* eslint-disable @typescript-eslint/no-require-imports */
-/* global process, console, require */
-const { Octokit } = require('@octokit/rest');
-
-/**
- * Sync Maintainer Labels (Recursive with strict parent-child relationship detection)
- * - Uses Native Sub-issues.
- * - Uses Markdown Task Lists (- [ ] #123).
- * - Filters for OPEN issues only.
- * - Skips DUPLICATES.
- * - Skips Pull Requests.
- * - ONLY labels issues in the PUBLIC (gemini-cli) repo.
- */
-
-const REPO_OWNER = 'google-gemini';
-const PUBLIC_REPO = 'gemini-cli';
-const PRIVATE_REPO = 'maintainers-gemini-cli';
-const ALLOWED_REPOS = [PUBLIC_REPO, PRIVATE_REPO];
-
-const ROOT_ISSUES = [
-  { owner: REPO_OWNER, repo: PUBLIC_REPO, number: 15374 },
-  { owner: REPO_OWNER, repo: PUBLIC_REPO, number: 15456 },
-  { owner: REPO_OWNER, repo: PUBLIC_REPO, number: 15324 },
-];
-
-const TARGET_LABEL = '🔒 maintainer only';
-const isDryRun =
-  process.argv.includes('--dry-run') || process.env.DRY_RUN === 'true';
-
-const octokit = new Octokit({
-  auth: process.env.GITHUB_TOKEN,
-});
-
-/**
- * Extracts child issue references from markdown Task Lists ONLY.
- * e.g. - [ ] #123 or - [x] google-gemini/gemini-cli#123
- */
-function extractTaskListLinks(text, contextOwner, contextRepo) {
-  if (!text) return [];
-  const childIssues = new Map();
-
-  const add = (owner, repo, number) => {
-    if (ALLOWED_REPOS.includes(repo)) {
-      const key = `${owner}/${repo}#${number}`;
-      childIssues.set(key, { owner, repo, number: parseInt(number, 10) });
-    }
-  };
-
-  // 1. Full URLs in task lists
-  const urlRegex =
-    /-\s+\[[ x]\].*https:\/\/github\.com\/([a-zA-Z0-9._-]+)\/([a-zA-Z0-9._-]+)\/issues\/(\d+)\b/g;
-  let match;
-  while ((match = urlRegex.exec(text)) !== null) {
-    add(match[1], match[2], match[3]);
-  }
-
-  // 2. Cross-repo refs in task lists: owner/repo#123
-  const crossRepoRegex =
-    /-\s+\[[ x]\].*([a-zA-Z0-9._-]+)\/([a-zA-Z0-9._-]+)#(\d+)\b/g;
-  while ((match = crossRepoRegex.exec(text)) !== null) {
-    add(match[1], match[2], match[3]);
-  }
-
-  // 3. Short refs in task lists: #123
-  const shortRefRegex = /-\s+\[[ x]\].*#(\d+)\b/g;
-  while ((match = shortRefRegex.exec(text)) !== null) {
-    add(contextOwner, contextRepo, match[1]);
-  }
-
-  return Array.from(childIssues.values());
-}
-
-/**
- * Fetches issue data via GraphQL with full pagination for sub-issues, comments, and labels.
- */
-async function fetchIssueData(owner, repo, number) {
-  const query = `
-    query($owner:String!, $repo:String!, $number:Int!) {
-      repository(owner:$owner, name:$repo) {
-        issue(number:$number) {
-          state
-          title
-          body
-          labels(first: 100) {
-            nodes { name }
-            pageInfo { hasNextPage endCursor }
-          }
-          subIssues(first: 100) {
-            nodes {
-              number
-              repository {
-                name
-                owner { login }
-              }
-            }
-            pageInfo { hasNextPage endCursor }
-          }
-          comments(first: 100) {
-            nodes {
-              body
-            }
-          }
-        }
-      }
-    }
-  `;
-
-  try {
-    const response = await octokit.graphql(query, { owner, repo, number });
-    const data = response.repository.issue;
-    if (!data) return null;
-
-    const issue = {
-      state: data.state,
-      title: data.title,
-      body: data.body || '',
-      labels: data.labels.nodes.map((n) => n.name),
-      subIssues: [...data.subIssues.nodes],
-      comments: data.comments.nodes.map((n) => n.body),
-    };
-
-    // Paginate subIssues if there are more than 100
-    if (data.subIssues.pageInfo.hasNextPage) {
-      const moreSubIssues = await paginateConnection(
-        owner,
-        repo,
-        number,
-        'subIssues',
-        'number repository { name owner { login } }',
-        data.subIssues.pageInfo.endCursor,
-      );
-      issue.subIssues.push(...moreSubIssues);
-    }
-
-    // Paginate labels if there are more than 100 (unlikely but for completeness)
-    if (data.labels.pageInfo.hasNextPage) {
-      const moreLabels = await paginateConnection(
-        owner,
-        repo,
-        number,
-        'labels',
-        'name',
-        data.labels.pageInfo.endCursor,
-        (n) => n.name,
-      );
-      issue.labels.push(...moreLabels);
-    }
-
-    // Note: Comments are handled via Task Lists in body + first 100 comments.
-    // If an issue has > 100 comments with task lists, we'd need to paginate those too.
-    // Given the 1,100+ issue discovery count, 100 comments is usually sufficient,
-    // but we can add it for absolute completeness.
-    // (Skipping for now to avoid excessive API churn unless clearly needed).
-
-    return issue;
-  } catch (error) {
-    if (error.errors && error.errors.some((e) => e.type === 'NOT_FOUND')) {
-      return null;
-    }
-    throw error;
-  }
-}
-
-/**
- * Helper to paginate any GraphQL connection.
- */
-async function paginateConnection(
-  owner,
-  repo,
-  number,
-  connectionName,
-  nodeFields,
-  initialCursor,
-  transformNode = (n) => n,
-) {
-  let additionalNodes = [];
-  let hasNext = true;
-  let cursor = initialCursor;
-
-  while (hasNext) {
-    const query = `
-      query($owner:String!, $repo:String!, $number:Int!, $cursor:String) {
-        repository(owner:$owner, name:$repo) {
-          issue(number:$number) {
-            ${connectionName}(first: 100, after: $cursor) {
-              nodes { ${nodeFields} }
-              pageInfo { hasNextPage endCursor }
-            }
-          }
-        }
-      }
-    `;
-    const response = await octokit.graphql(query, {
-      owner,
-      repo,
-      number,
-      cursor,
-    });
-    const connection = response.repository.issue[connectionName];
-    additionalNodes.push(...connection.nodes.map(transformNode));
-    hasNext = connection.pageInfo.hasNextPage;
-    cursor = connection.pageInfo.endCursor;
-  }
-  return additionalNodes;
-}
-
-/**
- * Validates if an issue should be processed (Open, not a duplicate, not a PR)
- */
-function shouldProcess(issueData) {
-  if (!issueData) return false;
-
-  if (issueData.state !== 'OPEN') return false;
-
-  const labels = issueData.labels.map((l) => l.toLowerCase());
-  if (labels.includes('duplicate') || labels.includes('kind/duplicate')) {
-    return false;
-  }
-
-  return true;
-}
-
-async function getAllDescendants(roots) {
-  const allDescendants = new Map();
-  const visited = new Set();
-  const queue = [...roots];
-
-  for (const root of roots) {
-    visited.add(`${root.owner}/${root.repo}#${root.number}`);
-  }
-
-  console.log(`Starting discovery from ${roots.length} roots...`);
-
-  while (queue.length > 0) {
-    const current = queue.shift();
-    const currentKey = `${current.owner}/${current.repo}#${current.number}`;
-
-    try {
-      const issueData = await fetchIssueData(
-        current.owner,
-        current.repo,
-        current.number,
-      );
-
-      if (!shouldProcess(issueData)) {
-        continue;
-      }
-
-      // ONLY add to labeling list if it's in the PUBLIC repository
-      if (current.repo === PUBLIC_REPO) {
-        // Don't label the roots themselves
-        if (
-          !ROOT_ISSUES.some(
-            (r) => r.number === current.number && r.repo === current.repo,
-          )
-        ) {
-          allDescendants.set(currentKey, {
-            ...current,
-            title: issueData.title,
-            labels: issueData.labels,
-          });
-        }
-      }
-
-      const children = new Map();
-
-      // 1. Process Native Sub-issues
-      if (issueData.subIssues) {
-        for (const node of issueData.subIssues) {
-          const childOwner = node.repository.owner.login;
-          const childRepo = node.repository.name;
-          const childNumber = node.number;
-          const key = `${childOwner}/${childRepo}#${childNumber}`;
-          children.set(key, {
-            owner: childOwner,
-            repo: childRepo,
-            number: childNumber,
-          });
-        }
-      }
-
-      // 2. Process Markdown Task Lists in Body and Comments
-      let combinedText = issueData.body || '';
-      if (issueData.comments) {
-        for (const commentBody of issueData.comments) {
-          combinedText += '\n' + (commentBody || '');
-        }
-      }
-
-      const taskListLinks = extractTaskListLinks(
-        combinedText,
-        current.owner,
-        current.repo,
-      );
-      for (const link of taskListLinks) {
-        const key = `${link.owner}/${link.repo}#${link.number}`;
-        children.set(key, link);
-      }
-
-      // Queue children (regardless of which repo they are in, for recursion)
-      for (const [key, child] of children) {
-        if (!visited.has(key)) {
-          visited.add(key);
-          queue.push(child);
-        }
-      }
-    } catch (error) {
-      console.error(`Error processing ${currentKey}: ${error.message}`);
-    }
-  }
-
-  return Array.from(allDescendants.values());
-}
-
-async function run() {
-  if (isDryRun) {
-    console.log('=== DRY RUN MODE: No labels will be applied ===');
-  }
-
-  const descendants = await getAllDescendants(ROOT_ISSUES);
-  console.log(
-    `\nFound ${descendants.length} total unique open descendant issues in ${PUBLIC_REPO}.`,
-  );
-
-  for (const issueInfo of descendants) {
-    const issueKey = `${issueInfo.owner}/${issueInfo.repo}#${issueInfo.number}`;
-    try {
-      // Data is already available from the discovery phase
-      const hasLabel = issueInfo.labels.some((l) => l === TARGET_LABEL);
-
-      if (!hasLabel) {
-        if (isDryRun) {
-          console.log(
-            `[DRY RUN] Would label ${issueKey}: "${issueInfo.title}"`,
-          );
-        } else {
-          console.log(`Labeling ${issueKey}: "${issueInfo.title}"...`);
-          await octokit.rest.issues.addLabels({
-            owner: issueInfo.owner,
-            repo: issueInfo.repo,
-            issue_number: issueInfo.number,
-            labels: [TARGET_LABEL],
-          });
-        }
-      }
-    } catch (error) {
-      console.error(`Error processing label for ${issueKey}: ${error.message}`);
-    }
-  }
-}
-
-run().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});

.github/workflows/chained_e2e.yml

@@ -277,37 +277,6 @@ jobs:
         shell: 'pwsh'
         run: 'npm run test:integration:sandbox:none'
 
-  evals:
-    name: 'Evals (ALWAYS_PASSING)'
-    needs:
-      - 'merge_queue_skipper'
-      - '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')
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
-        with:
-          ref: '${{ needs.parse_run_context.outputs.sha }}'
-          repository: '${{ needs.parse_run_context.outputs.repository }}'
-
-      - name: 'Set up Node.js 20.x'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions-node@v4
-        with:
-          node-version: '20.x'
-
-      - name: 'Install dependencies'
-        run: 'npm ci'
-
-      - name: 'Build project'
-        run: 'npm run build'
-
-      - name: 'Run Evals (Required to pass)'
-        env:
-          GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-        run: 'npm run test:always_passing_evals'
-
   e2e:
     name: 'E2E'
     if: |
@@ -315,15 +284,13 @@ jobs:
     needs:
       - 'e2e_linux'
       - 'e2e_mac'
-      - '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
+               ${{ needs.e2e_mac.result }} != 'success' ]]; then
             echo "One or more E2E jobs failed."
             exit 1
           fi

.github/workflows/evals-nightly.yml

@@ -1,101 +0,0 @@
-name: 'Evals: Nightly'
-
-on:
-  schedule:
-    - cron: '0 1 * * *' # Runs at 1 AM every day
-  workflow_dispatch:
-    inputs:
-      run_all:
-        description: 'Run all evaluations (including usually passing)'
-        type: 'boolean'
-        default: true
-      test_name_pattern:
-        description: 'Test name pattern or file name'
-        required: false
-        type: 'string'
-
-permissions:
-  contents: 'read'
-  checks: 'write'
-  actions: 'read'
-
-jobs:
-  evals:
-    name: 'Evals (USUALLY_PASSING) nightly run'
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    strategy:
-      fail-fast: false
-      matrix:
-        model:
-          - 'gemini-3-pro-preview'
-          - 'gemini-3-flash-preview'
-          - 'gemini-2.5-pro'
-          - 'gemini-2.5-flash'
-          - 'gemini-2.5-flash-lite'
-        run_attempt: [1, 2, 3]
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-
-      - name: 'Set up Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-
-      - name: 'Install dependencies'
-        run: 'npm ci'
-
-      - name: 'Build project'
-        run: 'npm run build'
-
-      - name: 'Create logs directory'
-        run: 'mkdir -p evals/logs'
-
-      - name: 'Run Evals'
-        continue-on-error: true
-        env:
-          GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          GEMINI_MODEL: '${{ matrix.model }}'
-          RUN_EVALS: "${{ github.event.inputs.run_all != 'false' }}"
-          TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}'
-        run: |
-          CMD="npm run test:all_evals"
-          PATTERN="${{ env.TEST_NAME_PATTERN }}"
-
-          if [[ -n "$PATTERN" ]]; then
-            if [[ "$PATTERN" == *.ts || "$PATTERN" == *.js || "$PATTERN" == */* ]]; then
-              $CMD -- "$PATTERN"
-            else
-              $CMD -- -t "$PATTERN"
-            fi
-          else
-            $CMD
-          fi
-
-      - name: 'Upload Logs'
-        if: 'always()'
-        uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4
-        with:
-          name: 'eval-logs-${{ matrix.model }}-${{ matrix.run_attempt }}'
-          path: 'evals/logs'
-          retention-days: 7
-
-  aggregate-results:
-    name: 'Aggregate Results'
-    needs: ['evals']
-    if: 'always()'
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-
-      - name: 'Download Logs'
-        uses: 'actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806' # ratchet:actions/download-artifact@v4
-        with:
-          path: 'artifacts'
-
-      - name: 'Generate Summary'
-        env:
-          GH_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        run: 'node scripts/aggregate_evals.js artifacts >> "$GITHUB_STEP_SUMMARY"'

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

@@ -14,15 +14,9 @@ on:
         description: 'issue number to triage'
         required: true
         type: 'number'
-  workflow_call:
-    inputs:
-      issue_number:
-        description: 'issue number to triage'
-        required: false
-        type: 'string'
 
 concurrency:
-  group: '${{ github.workflow }}-${{ github.event.issue.number || github.event.inputs.issue_number || inputs.issue_number }}'
+  group: '${{ github.workflow }}-${{ github.event.issue.number || github.event.inputs.issue_number }}'
   cancel-in-progress: true
 
 defaults:
@@ -40,7 +34,7 @@ permissions:
 jobs:
   triage-issue:
     if: |-
-      (github.repository == 'google-gemini/gemini-cli' || github.repository == 'google-gemini/maintainers-gemini-cli') &&
+      github.repository == 'google-gemini/gemini-cli' &&
       (
         github.event_name == 'workflow_dispatch' ||
         (
@@ -63,11 +57,10 @@ jobs:
         with:
           github-token: '${{ secrets.GITHUB_TOKEN }}'
           script: |
-            const issueNumber = ${{ github.event.inputs.issue_number || inputs.issue_number }};
             const { data: issue } = await github.rest.issues.get({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              issue_number: issueNumber,
+              issue_number: ${{ github.event.inputs.issue_number }},
             });
             core.setOutput('title', issue.title);
             core.setOutput('body', issue.body);
@@ -78,7 +71,7 @@ jobs:
         if: |-
           github.event_name == 'workflow_dispatch'
         env:
-          ISSUE_NUMBER_INPUT: '${{ github.event.inputs.issue_number || inputs.issue_number }}'
+          ISSUE_NUMBER_INPUT: '${{ github.event.inputs.issue_number }}'
           LABELS: '${{ steps.get_issue_data.outputs.labels }}'
         run: |
           if echo "${LABELS}" | grep -q 'area/'; then
@@ -93,10 +86,6 @@ jobs:
 
       - name: 'Generate GitHub App Token'
         id: 'generate_token'
-        env:
-          APP_ID: '${{ secrets.APP_ID }}'
-        if: |-
-          ${{ env.APP_ID != '' }}
         uses: 'actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b' # ratchet:actions/create-github-app-token@v2
         with:
           app-id: '${{ secrets.APP_ID }}'
@@ -107,7 +96,7 @@ jobs:
         id: 'get_labels'
         uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
         with:
-          github-token: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}'
+          github-token: '${{ steps.generate_token.outputs.token }}'
           script: |-
             const { data: labels } = await github.rest.issues.listLabelsForRepo({
               owner: context.repo.owner,
@@ -138,7 +127,7 @@ jobs:
           ISSUE_BODY: >-
             ${{ github.event_name == 'workflow_dispatch' && steps.get_issue_data.outputs.body || github.event.issue.body }}
           ISSUE_NUMBER: >-
-            ${{ github.event_name == 'workflow_dispatch' && (github.event.inputs.issue_number || inputs.issue_number) || github.event.issue.number }}
+            ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.issue_number || github.event.issue.number }}
           REPOSITORY: '${{ github.repository }}'
           AVAILABLE_LABELS: '${{ steps.get_labels.outputs.available_labels }}'
         with:
@@ -264,7 +253,7 @@ jobs:
           LABELS_OUTPUT: '${{ steps.gemini_issue_analysis.outputs.summary }}'
         uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
         with:
-          github-token: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}'
+          github-token: '${{ steps.generate_token.outputs.token }}'
           script: |
             const rawOutput = process.env.LABELS_OUTPUT;
             core.info(`Raw output from model: ${rawOutput}`);
@@ -306,6 +295,22 @@ jobs:
             });
             core.info(`Successfully added labels for #${issueNumber}: ${labelsToAdd.join(', ')}`);
 
+            // Remove the 'status/need-triage' label
+            try {
+                await github.rest.issues.removeLabel({
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    issue_number: issueNumber,
+                    name: 'status/need-triage'
+                });
+                core.info(`Successfully removed 'status/need-triage' label.`);
+            } catch (error) {
+                // If the label doesn't exist, the API call will throw a 404. We can ignore this.
+                if (error.status !== 404) {
+                    core.warning(`Failed to remove 'status/need-triage': ${error.message}`);
+                }
+            }
+
       - name: 'Post Issue Analysis Failure Comment'
         if: |-
           ${{ failure() && steps.gemini_issue_analysis.outcome == 'failure' }}
@@ -314,7 +319,7 @@ jobs:
           RUN_URL: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
         uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
         with:
-          github-token: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}'
+          github-token: '${{ steps.generate_token.outputs.token }}'
           script: |-
             github.rest.issues.createComment({
               owner: context.repo.owner,

.github/workflows/gemini-automated-pr-size-labeler.yml

@@ -0,0 +1,127 @@
+name: 'Gemini Automated PR Labeler'
+
+on:
+  pull_request_target:
+    types: ['opened', 'reopened', 'synchronize']
+
+jobs:
+  label-pr:
+    timeout-minutes: 10
+    if: |-
+      ${{ github.repository == 'google-gemini/gemini-cli' }}
+    permissions:
+      pull-requests: 'write'
+      contents: 'read'
+      id-token: 'write'
+
+    concurrency:
+      group: '${{ github.workflow }}-${{ github.event.pull_request.number }}'
+      cancel-in-progress: true
+
+    runs-on: 'ubuntu-latest'
+
+    steps:
+      - name: 'Generate GitHub App Token'
+        id: 'generate_token'
+        uses: 'actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e' # v2
+        with:
+          app-id: '${{ secrets.APP_ID }}'
+          private-key: '${{ secrets.PRIVATE_KEY }}'
+          permission-pull-requests: 'write'
+
+      - name: 'Run Gemini PR size and complexity labeller'
+        uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # Use the specific commit SHA
+        env:
+          GH_TOKEN: '${{ steps.generate_token.outputs.token }}'
+          PR_NUMBER: '${{ github.event.pull_request.number }}'
+          REPOSITORY: '${{ github.repository }}'
+        with:
+          gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}'
+          gcp_project_id: '${{ vars.GOOGLE_CLOUD_PROJECT }}'
+          gcp_location: '${{ vars.GOOGLE_CLOUD_LOCATION }}'
+          gcp_service_account: '${{ vars.SERVICE_ACCOUNT_EMAIL }}'
+          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
+          use_vertex_ai: '${{ vars.GOOGLE_GENAI_USE_VERTEXAI }}'
+          use_gemini_code_assist: '${{ vars.GOOGLE_GENAI_USE_GCA }}'
+          settings: |
+            {
+              "coreTools": [
+                "run_shell_command(gh pr diff)",
+                "run_shell_command(gh pr edit)",
+                "run_shell_command(gh pr comment)",
+                "run_shell_command(gh pr view)"
+              ],
+              "telemetry": {
+                "enabled": true,
+                "target": "gcp"
+              },
+              "sandbox": false
+            }
+          prompt: |
+            You are a Pull Request labeller and Feedback Assistant. Your primary goal is to improve review velocity and help maintainers prioritize their work by automatically labeling pull requests based on size and complexity, and providing guidance for overly large PRs.
+
+            Steps:
+            1. Retrieve Pull Request Information:
+               - Use `gh pr diff ${{ env.PR_NUMBER }} --repo ${{ env.REPOSITORY }}` to get the diff content.
+               - Parse the output from `gh pr diff` to determine the total lines of code added and deleted. Calculate `TOTAL_LINES_CHANGED`.
+
+            2. Determine Pull Request Size:
+               - Use `gh pr view ${{ env.PR_NUMBER }} --repo ${{ env.REPOSITORY }} --json labels` to get the current labels on the PR.
+               - Check the current labels and identify if any `size/*` labels already exist (e.g., `size/xs`, `size/s`, etc.).
+               - If an old `size/*` label is found and it is different from the newly calculated size, remove it using:
+                 `gh pr edit ${{ env.PR_NUMBER }} --repo ${{ env.REPOSITORY }} --remove-label "size-label-to-remove"`
+               - Based on `TOTAL_LINES_CHANGED`, select the appropriate new size label:
+                 - `size/xs`: < 10 lines changed
+                 - `size/s`: 10-50 lines changed
+                 - `size/m`: 51-200 lines changed
+                 - `size/l`: 201-1000 lines changed
+                 - `size/xl`: > 1000 lines changed
+               - Do not invent new size labels.
+               - Apply the newly determined `size/*` label to the pull request using:
+                 `gh pr edit ${{ env.PR_NUMBER }} --repo ${{ env.REPOSITORY }} --add-label "your-new-size-label"`
+
+            3. Analyze Pull Request Complexity:
+                - Perform Code Change Analysis: Examine the content of the code changes obtained from `gh pr diff ${{ env.PR_NUMBER }} --repo ${{ env.REPOSITORY }}`. Look for indicators of complexity such as:
+                 - Number of files changed (can be inferred from the diff headers).
+                 - Diversity of file types (e.g., changes across different languages, configuration files, documentation).
+                 - Presence of new external dependencies.
+                 - Introduction of new architectural components or significant refactoring.
+                 - Complexity of individual code changes (e.g., deeply nested logic, complex algorithms, extensive conditional statements).
+               - Apply Heuristic-based Complexity Assessment:
+                 - If the PR touches a small number of files with minor changes (e.g., typos, simple bug fixes, small feature additions), categorize it as `review/quick`.
+                 - If the PR involves changes across multiple files, introduces new features, significantly refactors existing code, or has a high line count (even within `size/l`), categorize it as `review/involved`.
+                 - Pay close attention to changes in critical or core modules as these inherently increase complexity.
+               - **Only use the labels `review/quick` or `review/involved` for complexity. Do not invent new complexity labels.**
+               - **Remove any previous `review/*` labels if they no longer apply, similar to the size label process.**
+               - Apply the determined `review/*` label to the pull request using:
+                 `gh pr edit ${{ env.PR_NUMBER }} --repo ${{ env.REPOSITORY }} --add-label "your-complexity-label"`
+
+            4. Handle Overly Large Pull Requests (`size/xl`):
+               - **Conditional Check:** If the pull request has been labeled `size/xl` (i.e., > 1000 lines of code changed) in Step 2, proceed to the next sub-step.
+               - **Post Constructive Comment:** Post a polite and helpful comment on the pull request using:
+                 `gh pr comment ${{ env.PR_NUMBER }} --repo ${{ env.REPOSITORY }} --body "Your comment here"`
+                 The comment body should be:
+                 """
+                 Thanks for your hard work on this pull request!
+
+                 This pull request is quite large, which can make it challenging and time-consuming for reviewers to go through thoroughly.
+
+                 To help us review it more efficiently and get your changes merged faster, we kindly request you consider breaking this into smaller, more focused pull requests. Each smaller PR should ideally address a single logical change or a small set of related changes.
+
+                 For example, you could separate out refactoring, new feature additions, and bug fixes into individual PRs. This makes it easier to understand, review, and test each component independently.
+
+                 We appreciate your understanding and cooperation. Feel free to reach out if you need any assistance with this!
+                 """
+
+            Guidelines:
+            - Automation Focus: All actions should be automated and not require manual intervention.
+            - Non-intrusive: The system should add labels and comments but not modify the code or close the pull request.
+            - Polite and Constructive: All communication, especially for large PRs, must be polite, encouraging, and constructive.
+            - Prioritize Clarity: The labels applied should clearly convey the PR's size and complexity to reviewers.
+            - Adhere to Defined Labels: Only use the specified `size/*` and `review/*` labels. Do not create or apply any other labels.
+            - Utilize `gh CLI`: Interact with GitHub using the `gh` command-line tool for diffing, label management, and commenting.
+            - Execute commands strictly as described in the steps. Do not invent new commands.
+            - In no case should you change other pull request that are not the one you are working on. Which can be found by using env.PR_NUMBER
+            - Execute each step that is defined in the steps section.
+            - In no case should you execute code from the pull request because this could be malicious code.
+            - If you fail to do this step log the errors you received

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

@@ -1,16 +1,12 @@
 name: '📋 Gemini Scheduled Issue Triage'
 
 on:
-  issues:
-    types:
-      - 'opened'
-      - 'reopened'
   schedule:
     - cron: '0 * * * *' # Runs every hour
   workflow_dispatch:
 
 concurrency:
-  group: '${{ github.workflow }}-${{ github.event.number || github.run_id }}'
+  group: '${{ github.workflow }}'
   cancel-in-progress: true
 
 defaults:
@@ -39,21 +35,7 @@ jobs:
           private-key: '${{ secrets.PRIVATE_KEY }}'
           permission-issues: 'write'
 
-      - name: 'Get issue from event'
-        if: |-
-          ${{ github.event_name == 'issues' }}
-        id: 'get_issue_from_event'
-        env:
-          ISSUE_EVENT: '${{ toJSON(github.event.issue) }}'
-        run: |
-          set -euo pipefail
-          ISSUE_JSON=$(echo "$ISSUE_EVENT" | jq -c '[{number: .number, title: .title, body: .body}]')
-          echo "issues_to_triage=${ISSUE_JSON}" >> "${GITHUB_OUTPUT}"
-          echo "✅ Found issue #${{ github.event.issue.number }} from event to triage! 🎯"
-
       - name: 'Find untriaged issues'
-        if: |-
-          ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
         id: 'find_issues'
         env:
           GITHUB_TOKEN: '${{ steps.generate_token.outputs.token }}'
@@ -61,26 +43,22 @@ jobs:
         run: |-
           set -euo pipefail
 
-          echo '🔍 Finding issues missing area labels...'
-          NO_AREA_ISSUES="$(gh issue list --repo "${GITHUB_REPOSITORY}" \
-            --search 'is:open is:issue -label:area/core -label:area/agent -label:area/enterprise -label:area/non-interactive -label:area/security -label:area/platform -label:area/extensions -label:area/unknown' --limit 100 --json number,title,body)"
+          echo '🔍 Finding issues without labels...'
+          NO_LABEL_ISSUES="$(gh issue list --repo "${GITHUB_REPOSITORY}" \
+            --search 'is:open is:issue no:label' --limit 10 --json number,title,body)"
 
-          echo '🔍 Finding issues missing kind labels...'
-          NO_KIND_ISSUES="$(gh issue list --repo "${GITHUB_REPOSITORY}" \
-            --search 'is:open is:issue -label:kind/bug -label:kind/enhancement -label:kind/customer-issue -label:kind/question' --limit 100 --json number,title,body)"
-
-          echo '🏷️ Finding issues missing priority labels...'
-          NO_PRIORITY_ISSUES="$(gh issue list --repo "${GITHUB_REPOSITORY}" \
-            --search 'is:open is:issue -label:priority/p0 -label:priority/p1 -label:priority/p2 -label:priority/p3 -label:priority/unknown' --limit 100 --json number,title,body)"
+          echo '🏷️ Finding issues that need triage...'
+          NEED_TRIAGE_ISSUES="$(gh issue list --repo "${GITHUB_REPOSITORY}" \
+            --search "is:open is:issue label:\"status/need-triage\"" --limit 10 --json number,title,body)"
 
           echo '🔄 Merging and deduplicating issues...'
-          ISSUES="$(echo "${NO_AREA_ISSUES}" "${NO_KIND_ISSUES}" "${NO_PRIORITY_ISSUES}" | jq -c -s 'add | unique_by(.number)')"
+          ISSUES="$(echo "${NO_LABEL_ISSUES}" "${NEED_TRIAGE_ISSUES}" | jq -c -s 'add | unique_by(.number)')"
 
           echo '📝 Setting output for GitHub Actions...'
           echo "issues_to_triage=${ISSUES}" >> "${GITHUB_OUTPUT}"
 
           ISSUE_COUNT="$(echo "${ISSUES}" | jq 'length')"
-          echo "✅ Found ${ISSUE_COUNT} unique issues to triage! 🎯"
+          echo "✅ Found ${ISSUE_COUNT} issues to triage! 🎯"
 
       - name: 'Get Repository Labels'
         id: 'get_labels'
@@ -99,13 +77,12 @@ jobs:
 
       - name: 'Run Gemini Issue Analysis'
         if: |-
-          (steps.get_issue_from_event.outputs.issues_to_triage != '' && steps.get_issue_from_event.outputs.issues_to_triage != '[]') ||
-          (steps.find_issues.outputs.issues_to_triage != '' && steps.find_issues.outputs.issues_to_triage != '[]')
+          ${{ steps.find_issues.outputs.issues_to_triage != '[]' }}
         uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31' # ratchet:google-github-actions/run-gemini-cli@v0
         id: 'gemini_issue_analysis'
         env:
           GITHUB_TOKEN: '' # Do not pass any auth token here since this runs on untrusted inputs
-          ISSUES_TO_TRIAGE: '${{ steps.get_issue_from_event.outputs.issues_to_triage || steps.find_issues.outputs.issues_to_triage }}'
+          ISSUES_TO_TRIAGE: '${{ steps.find_issues.outputs.issues_to_triage }}'
           REPOSITORY: '${{ github.repository }}'
           AVAILABLE_LABELS: '${{ steps.get_labels.outputs.available_labels }}'
         with:
@@ -139,32 +116,38 @@ jobs:
             1. You are only able to use the echo command. Review the available labels in the environment variable: "${AVAILABLE_LABELS}".
             2. Check environment variable for issues to triage: $ISSUES_TO_TRIAGE (JSON array of issues)
             3. Review the issue title, body and any comments provided in the environment variables.
-            4. Identify the most relevant labels from the existing labels, specifically focusing on area/*, kind/* and priority/*.
-            5. Label Policy:
-               - If the issue already has a kind/ label, do not change it.
-               - If the issue already has a priority/ label, do not change it.
-               - If the issue already has an area/ label, do not change it.
-               - If any of these are missing, select exactly ONE appropriate label for the missing category.
+            4. Identify the most relevant labels from the existing labels, focusing on kind/*, area/*, sub-area/* and priority/*.
+            5. If the issue already has area/ label, dont try to change it. Similarly, if the issue already has a kind/ label don't change it. And if the issue already has a priority/ label do not change it for example:
+               If an issue has area/core and kind/bug  you will only add a priority/ label.
+               Instead if an issue has no labels, you will could add one lable of each kind.
             6. Identify other applicable labels based on the issue content, such as status/*, help wanted, good first issue, etc.
-            7. Give me a single short explanation about why you are selecting each label in the process.
-            8. Output a JSON array of objects, each containing the issue number
+            7. For area/* and kind/* limit yourself to only the single most applicable label in each case.
+            8. Give me a single short explanation about why you are selecting each label in the process.
+            9. Output a JSON array of objects, each containing the issue number
                and the labels to add and remove, along with an explanation. For example:
                ```
                [
                  {
                    "issue_number": 123,
-                   "labels_to_add": ["area/core", "kind/bug", "priority/p2"],
+                   "labels_to_add": ["kind/bug", "priority/p2"],
                    "labels_to_remove": ["status/need-triage"],
-                   "explanation": "This issue is a UI bug that needs to be addressed with medium priority."
+                   "explanation": "This issue is a bug that needs to be addressed with medium priority."
+                 },
+                 {
+                   "issue_number": 456,
+                   "labels_to_add": ["kind/enhancement"],
+                   "labels_to_remove": [],
+                   "explanation": "This issue is an enhancement request that could improve the user experience."
                  }
                ]
                ```
               If an issue cannot be classified, do not include it in the output array.
-            9. For each issue please check if CLI version is present, this is usually in the output of the /about command and will look like 0.1.5
+            10. For each issue please check if CLI version is present, this is usually in the output of the /about command and will look like 0.1.5
               - Anything more than 6 versions older than the most recent should add the status/need-retesting label
-            10. If you see that the issue doesn't look like it has sufficient information recommend the status/need-information label and leave a comment politely requesting the relevant information, eg.. if repro steps are missing request for repro steps. if version information is missing request for version information into the explanation section below.
-            11. If you think an issue might be a Priority/P0 do not apply the priority/p0 label. Instead apply a status/manual-triage label and include a note in your explanation.
-            12. If you are uncertain about a category, use the area/unknown, kind/question, or priority/unknown labels as appropriate. If you are extremely uncertain, apply the status/manual-triage label.
+            11. If you see that the issue doesn't look like it has sufficient information recommend the status/need-information label and leave a comment politely requesting the relevant information, eg.. if repro steps are missing request for repro steps. if version information is missing request for version information into the explanation section below.
+              - After identifying appropriate labels to an issue, add "status/need-triage" label to labels_to_remove in the output.
+            12. If you think an issue might be a Priority/P0 do not apply the priority/p0 label. Instead apply a status/manual-triage label and include a note in your explanation.
+            13. If you are uncertain and have not been able to apply one each of kind/, area/ and priority/ , apply the status/manual-triage label.
 
             ## Guidelines
 
@@ -174,46 +157,100 @@ jobs:
               - Do not add comments or modify the issue content.
               - Do not remove the following labels maintainer, help wanted or good first issue.
               - Triage only the current issue.
-              - Identify only one area/ label.
+              - Identify only one area/ label
               - Identify only one kind/ label (Do not apply kind/duplicate or kind/parent-issue)
-              - Identify only one priority/ label.
+              - Identify all applicable sub-area/* and priority/* labels based on the issue content. It's ok to have multiple of these.
               - Once you categorize the issue if it needs information bump down the priority by 1 eg.. a p0 would become a p1 a p1 would become a p2. P2 and P3 can stay as is in this scenario.
-
-            Categorization Guidelines (Priority):
-            P0 - Urgent Blocking Issues:
-              - DO NOT APPLY THIS LABEL AUTOMATICALLY. Use status/manual-triage instead.
-              - Definition: Urgent, block a significant percentage of the user base, and prevent frequent use of the Gemini CLI.
-              - This includes core stability blockers (e.g., authentication failures, broken upgrades), critical crashes, and P0 security vulnerabilities.
-              - Impact: Blocks development or testing for the entire team; Major security vulnerability; Causes data loss or corruption with no workaround; Crashes the application or makes a core feature completely unusable for all or most users.
-              - Qualifier: Is the main function of the software broken?
-            P1 - High-Impact Issues:
-              - Definition: Affect a large number of users, blocking them from using parts of the Gemini CLI, or make the CLI frequently unusable even with workarounds available.
-              - Impact: A core feature is broken or behaving incorrectly for a large number of users or use cases; Severe performance degradation; No straightforward workaround exists.
-              - Qualifier: Is a key feature unusable or giving very wrong results?
-            P2 - Significant Issues:
-              - Definition: Affect some users significantly, such as preventing the use of certain features or authentication types.
-              - Can also be issues that many users complain about, causing annoyance or hindering daily use.
-              - Impact: Affects a non-critical feature or a smaller, specific subset of users; An inconvenient but functional workaround is available; Noticeable UI/UX problems that look unprofessional.
-              - Qualifier: Is it an annoying but non-blocking problem?
-            P3 - Low-Impact Issues:
-              - Definition: Typically usability issues that cause annoyance to a limited user base.
-              - Includes feature requests that could be addressed in the near future and may be suitable for community contributions.
-              - Impact: Minor cosmetic issues; An edge-case bug that is very difficult to reproduce and affects a tiny fraction of users.
-              - Qualifier: Is it a "nice-to-fix" issue?
-
-            Categorization Guidelines (Area):
-            area/agent: Core Agent, Tools, Memory, Sub-Agents, Hooks, Agent Quality
-            area/core: User Interface, OS Support, Core Functionality
-            area/enterprise: Telemetry, Policy, Quota / Licensing
-            area/extensions: Gemini CLI extensions capability
-            area/non-interactive: GitHub Actions, SDK, 3P Integrations, Shell Scripting, Command line automation
-            area/platform: Build infra, Release mgmt, Testing, Eval infra, Capacity, Quota mgmt
-            area/security: security related issues
-
+            Categorization Guidelines:
+            P0: Critical / Blocker
+              - A P0 bug is a catastrophic failure that demands immediate attention.
+              - To be a P0 it means almost all users are running into this issue and it is blocking users from being able to use the product.
+              - You would see this in the form of many comments from different developers on the bug.
+              - It represents a complete showstopper for a significant portion of users or for the development process itself.
+            Impact:
+              - Blocks development or testing for the entire team.
+              - Major security vulnerability that could compromise user data or system integrity.
+              - Causes data loss or corruption with no workaround.
+              - Crashes the application or makes a core feature completely unusable for all or most users in a production environment. Will it cause severe quality degration?
+              - Is it preventing contributors from contributing to the repository or is it a release blocker?
+              Qualifier: Is the main function of the software broken?
+              Example: The gemini auth login command fails with an unrecoverable error, preventing any user from authenticating and using the rest of the CLI.
+            P1: High
+              - A P1 bug is a serious issue that significantly degrades the user experience or impacts a core feature.
+              - While not a complete blocker, it's a major problem that needs a fast resolution. Feature requests are almost never P1.
+              - Once again this would be affecting many users.
+              - You would see this in the form of comments from different developers on the bug.
+              Impact:
+              - A core feature is broken or behaving incorrectly for a large number of users or large number of use cases.
+              - Review the bug details and comments to try figure out if this issue affects a large set of use cases or if it's a narrow set of use cases.
+              - Severe performance degradation making the application frustratingly slow.
+              - No straightforward workaround exists, or the workaround is difficult and non-obvious.
+              Qualifier: Is a key feature unusable or giving very wrong results?
+              Example: Gemini CLI enters a loop when making read-many-files tool call. I am unable to break out of the loop and gemini doesn't follow instructions subsequently.
+            P2: Medium
+              - A P2 bug is a moderately impactful issue. It's a noticeable problem but doesn't prevent the use of the software's main functionality.
+              Impact:
+              - Affects a non-critical feature or a smaller, specific subset of users.
+              - An inconvenient but functional workaround is available and easy to execute.
+              - Noticeable UI/UX problems that don't break functionality but look unprofessional (e.g., elements are misaligned or overlapping).
+              Qualifier: Is it an annoying but non-blocking problem?
+              Example: An error message is unclear or contains a typo, causing user confusion but not halting their workflow.
+            P3: Low
+              - A P3 bug is a minor, low-impact issue that is trivial or cosmetic. It has little to no effect on the overall functionality of the application.
+              Impact:
+              - Minor cosmetic issues like color inconsistencies, typos in documentation, or slight alignment problems on a non-critical page.
+              - An edge-case bug that is very difficult to reproduce and affects a tiny fraction of users.
+              Qualifier: Is it a "nice-to-fix" issue?
+              Example: Spelling mistakes etc.
             Additional Context:
-            - If users are talking about issues where the model gets downgraded from pro to flash then i want you to categorize that as a performance issue.
-            - This product is designed to use different models eg.. using pro, downgrading to flash etc.
-            - When users report that they dont expect the model to change those would be categorized as feature requests.
+              - If users are talking about issues where the model gets downgraded from pro to flash then i want you to categorize that as a performance issue
+              - This product is designed to use different models eg.. using pro, downgrading to flash etc.
+              - When users report that they dont expect the model to change those would be categorized as feature requests.
+            Definition of Areas
+            area/ux:
+              - Issues concerning user-facing elements like command usability, interactive features, help docs, and perceived performance.
+              - I am seeing my screen flicker when using Gemini CLI
+              - I am seeing the output malformed
+              - Theme changes aren't taking effect
+              - My keyboard inputs arent' being recognzied
+            area/platform:
+              - Issues related to installation, packaging, OS compatibility (Windows, macOS, Linux), and the underlying CLI framework.
+            area/background: Issues related to long-running background tasks, daemons, and autonomous or proactive agent features.
+            area/models:
+              - i am not getting a response that is reasonable or expected. this can include things like
+              - I am calling a tool and the tool is not performing as expected.
+              - i am expecting a tool to be called and it is not getting called ,
+              - Including experience when using
+              - built-in tools (e.g., web search, code interpreter, read file, writefile, etc..),
+              - Function calling issues should be under this area
+              - i am getting responses from the model that are malformed.
+              - Issues concerning Gemini quality of response and inference,
+              - Issues talking about unnecessary token consumption.
+              - Issues talking about Model getting stuck in a loop be watchful as this could be the root cause for issues that otherwise seem like model performance issues.
+              - Memory compression
+              - unexpected responses,
+              - poor quality of generated code
+            area/tools:
+              - These are primarily issues related to Model Context Protocol
+              - These are issues that mention MCP support
+              - feature requests asking for support for new tools.
+            area/core:
+              - Issues with fundamental components like command parsing, configuration management, session state, and the main API client logic. Introducing multi-modality
+            area/contribution:
+              - Issues related to improving the developer contribution experience, such as CI/CD pipelines, build scripts, and test automation infrastructure.
+            area/authentication:
+              -  Issues related to user identity, login flows, API key handling, credential storage, and access token management, unable to sign in selecting wrong authentication path etc..
+            area/security-privacy:
+              - Issues concerning vulnerability patching, dependency security, data sanitization, privacy controls, and preventing unauthorized data access.
+            area/extensibility:
+              - Issues related to the plugin system, extension APIs, or making the CLI's functionality available in other applications, github actions, ide support etc..
+            area/performance:
+              - Issues focused on model performance
+              - Issues with running out of capacity,
+              - 429 errors etc..
+              - could also pertain to latency,
+              - other general software performance like, memory usage, CPU consumption, and algorithmic efficiency.
+              - Switching models from one to the other unexpectedly.
 
       - name: 'Apply Labels to Issues'
         if: |-
@@ -263,6 +300,24 @@ jobs:
                 core.info(`Successfully added labels for #${issueNumber}: ${labelsToAdd.join(', ')}${explanation}`);
               }
 
+              if (entry.labels_to_remove && entry.labels_to_remove.length > 0) {
+                for (const label of entry.labels_to_remove) {
+                  try {
+                    await github.rest.issues.removeLabel({
+                      owner: context.repo.owner,
+                      repo: context.repo.repo,
+                      issue_number: issueNumber,
+                      name: label
+                    });
+                  } catch (error) {
+                    if (error.status !== 404) {
+                      throw error;
+                    }
+                  }
+                }
+                core.info(`Successfully removed labels for #${issueNumber}: ${entry.labels_to_remove.join(', ')}`);
+              }
+
               if (entry.explanation) {
                 await github.rest.issues.createComment({
                   owner: context.repo.owner,

.github/workflows/gemini-scheduled-pr-triage.yml

@@ -39,7 +39,3 @@ jobs:
           GITHUB_REPOSITORY: '${{ github.repository }}'
         run: |-
           ./.github/scripts/pr-triage.sh
-          # If prs_needing_comment is empty, set it to [] explicitly for downstream steps
-          if [[ -z "$(grep 'prs_needing_comment' "${GITHUB_OUTPUT}" | cut -d'=' -f2-)" ]]; then
-            echo "prs_needing_comment=[]" >> "${GITHUB_OUTPUT}"
-          fi

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

@@ -79,14 +79,8 @@ jobs:
                 continue;
               }
 
-              // Skip if it has a maintainer, help wanted, or Public Roadmap label
-              const rawLabels = issue.labels.map((l) => l.name);
-              const lowercaseLabels = rawLabels.map((l) => l.toLowerCase());
-              if (
-                lowercaseLabels.some((l) => l.includes('maintainer')) ||
-                lowercaseLabels.includes('help wanted') ||
-                rawLabels.includes('🗓️ Public Roadmap')
-              ) {
+              // Skip if it has a maintainer label
+              if (issue.labels.some(label => label.name.toLowerCase().includes('maintainer'))) {
                 continue;
               }
 

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

@@ -1,205 +0,0 @@
-name: 'Gemini Scheduled Stale PR Closer'
-
-on:
-  schedule:
-    - cron: '0 2 * * *' # Every day at 2 AM UTC
-  pull_request:
-    types: ['opened', 'edited']
-  workflow_dispatch:
-    inputs:
-      dry_run:
-        description: 'Run in dry-run mode'
-        required: false
-        default: false
-        type: 'boolean'
-
-jobs:
-  close-stale-prs:
-    if: "github.repository == 'google-gemini/gemini-cli'"
-    runs-on: 'ubuntu-latest'
-    permissions:
-      pull-requests: 'write'
-      issues: 'write'
-    steps:
-      - name: 'Generate GitHub App Token'
-        id: 'generate_token'
-        uses: 'actions/create-github-app-token@v1'
-        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'
-        env:
-          DRY_RUN: '${{ inputs.dry_run }}'
-        with:
-          github-token: '${{ steps.generate_token.outputs.token }}'
-          script: |
-            const dryRun = process.env.DRY_RUN === 'true';
-            const thirtyDaysAgo = new Date();
-            thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30);
-
-            // 1. Fetch maintainers for verification
-            let maintainerLogins = new Set();
-            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));
-            } catch (e) {
-              core.warning('Failed to fetch team members');
-            }
-
-            const isMaintainer = (login, assoc) => {
-              if (maintainerLogins.size > 0) return maintainerLogins.has(login);
-              return ['OWNER', 'MEMBER', 'COLLABORATOR'].includes(assoc);
-            };
-
-            // 2. Determine which PRs to check
-            let prs = [];
-            if (context.eventName === 'pull_request') {
-              const { data: pr } = await github.rest.pulls.get({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: context.payload.pull_request.number
-              });
-              prs = [pr];
-            } else {
-              prs = await github.paginate(github.rest.pulls.list, {
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                state: 'open',
-                per_page: 100
-              });
-            }
-
-            for (const pr of prs) {
-              const maintainerPr = isMaintainer(pr.user.login, pr.author_association);
-              const isBot = pr.user.type === 'Bot' || pr.user.login.endsWith('[bot]');
-
-              // Detection Logic for Linked Issues
-              // Check 1: Official GitHub "Closing Issue" link (GraphQL)
-              const linkedIssueQuery = `query($owner:String!, $repo:String!, $number:Int!) {
-                repository(owner:$owner, name:$repo) {
-                  pullRequest(number:$number) {
-                    closingIssuesReferences(first: 1) { totalCount }
-                  }
-                }
-              }`;
-
-              let hasClosingLink = false;
-              try {
-                const res = await github.graphql(linkedIssueQuery, {
-                  owner: context.repo.owner, repo: context.repo.repo, number: pr.number
-                });
-                hasClosingLink = res.repository.pullRequest.closingIssuesReferences.totalCount > 0;
-              } catch (e) {}
-
-              // Check 2: Regex for mentions (e.g., "Related to #123", "Part of #123", "#123")
-              // We check for # followed by numbers or direct URLs to issues.
-              const body = pr.body || '';
-              const mentionRegex = /(?:#|https:\/\/github\.com\/[^\/]+\/[^\/]+\/issues\/)(\d+)/i;
-              const hasMentionLink = mentionRegex.test(body);
-
-              const hasLinkedIssue = hasClosingLink || hasMentionLink;
-
-              // Logic for Closed PRs (Auto-Reopen)
-              if (pr.state === 'closed' && context.eventName === 'pull_request' && context.payload.action === 'edited') {
-                if (hasLinkedIssue) {
-                  core.info(`PR #${pr.number} now has a linked issue. Reopening.`);
-                  if (!dryRun) {
-                    await github.rest.pulls.update({
-                      owner: context.repo.owner,
-                      repo: context.repo.repo,
-                      pull_number: pr.number,
-                      state: 'open'
-                    });
-                    await github.rest.issues.createComment({
-                      owner: context.repo.owner,
-                      repo: context.repo.repo,
-                      issue_number: pr.number,
-                      body: "Thank you for linking an issue! This pull request has been automatically reopened."
-                    });
-                  }
-                }
-                continue;
-              }
-
-              // Logic for Open PRs (Immediate Closure)
-              if (pr.state === 'open' && !maintainerPr && !hasLinkedIssue && !isBot) {
-                core.info(`PR #${pr.number} is missing a linked issue. Closing.`);
-                if (!dryRun) {
-                  await github.rest.issues.createComment({
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    issue_number: pr.number,
-                    body: "Hi there! Thank you for your contribution to Gemini CLI. \n\nTo improve our contribution process and better track changes, we now require all pull requests to be associated with an existing issue, as announced in our [recent discussion](https://github.com/google-gemini/gemini-cli/discussions/16706) and as detailed in our [CONTRIBUTING.md](https://github.com/google-gemini/gemini-cli/blob/main/CONTRIBUTING.md#1-link-to-an-existing-issue).\n\nThis pull request is being closed because it is not currently linked to an issue. **Once you have updated the description of this PR to link an issue (e.g., by adding `Fixes #123` or `Related to #123`), it will be automatically reopened.**\n\n**How to link an issue:**\nAdd a keyword followed by the issue number (e.g., `Fixes #123`) in the description of your pull request. For more details on supported keywords and how linking works, please refer to the [GitHub Documentation on linking pull requests to issues](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).\n\nThank you for your understanding and for being a part of our community!"
-                  });
-                  await github.rest.pulls.update({
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    pull_number: pr.number,
-                    state: 'closed'
-                  });
-                }
-                continue;
-              }
-
-              // Staleness check (Scheduled runs only)
-              if (pr.state === 'open' && context.eventName !== 'pull_request') {
-                const labels = pr.labels.map(l => l.name.toLowerCase());
-                if (labels.includes('help wanted') || labels.includes('🔒 maintainer only')) continue;
-
-                let lastActivity = new Date(0);
-                try {
-                  const reviews = await github.paginate(github.rest.pulls.listReviews, {
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    pull_number: pr.number
-                  });
-                  for (const r of reviews) {
-                    if (isMaintainer(r.user.login, r.author_association)) {
-                      const d = new Date(r.submitted_at || r.updated_at);
-                      if (d > lastActivity) lastActivity = d;
-                    }
-                  }
-                  const comments = await github.paginate(github.rest.issues.listComments, {
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    issue_number: pr.number
-                  });
-                  for (const c of comments) {
-                    if (isMaintainer(c.user.login, c.author_association)) {
-                      const d = new Date(c.updated_at);
-                      if (d > lastActivity) lastActivity = d;
-                    }
-                  }
-                } catch (e) {}
-
-                if (maintainerPr) {
-                  const d = new Date(pr.created_at);
-                  if (d > lastActivity) lastActivity = d;
-                }
-
-                if (lastActivity < thirtyDaysAgo) {
-                  core.info(`PR #${pr.number} is stale.`);
-                  if (!dryRun) {
-                    await github.rest.issues.createComment({
-                      owner: context.repo.owner,
-                      repo: context.repo.repo,
-                      issue_number: pr.number,
-                      body: "Hi there! Thank you for your contribution to Gemini CLI. We really appreciate the time and effort you've put into this pull request.\n\nTo keep our backlog manageable and ensure we're focusing on current priorities, we are closing pull requests that haven't seen maintainer activity for 30 days. Currently, the team is prioritizing work associated with **🔒 maintainer only** or **help wanted** issues.\n\nIf you believe this change is still critical, please feel free to comment with updated details. Otherwise, we encourage contributors to focus on open issues labeled as **help wanted**. Thank you for your understanding!"
-                    });
-                    await github.rest.pulls.update({
-                      owner: context.repo.owner,
-                      repo: context.repo.repo,
-                      pull_number: pr.number,
-                      state: 'closed'
-                    });
-                  }
-                }
-              }
-            }

.github/workflows/issue-opened-labeler.yml

@@ -1,46 +0,0 @@
-name: '🏷️ Issue Opened Labeler'
-
-on:
-  issues:
-    types:
-      - 'opened'
-
-jobs:
-  label-issue:
-    runs-on: 'ubuntu-latest'
-    if: |-
-      ${{ github.repository == 'google-gemini/gemini-cli' || github.repository == 'google-gemini/maintainers-gemini-cli' }}
-    steps:
-      - name: 'Generate GitHub App Token'
-        id: 'generate_token'
-        env:
-          APP_ID: '${{ secrets.APP_ID }}'
-        if: |-
-          ${{ env.APP_ID != '' }}
-        uses: 'actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b' # ratchet:actions/create-github-app-token@v2
-        with:
-          app-id: '${{ secrets.APP_ID }}'
-          private-key: '${{ secrets.PRIVATE_KEY }}'
-
-      - name: 'Add need-triage label'
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        with:
-          github-token: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}'
-          script: |-
-            const { data: issue } = await github.rest.issues.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-            });
-
-            const hasLabel = issue.labels.some(l => l.name === 'status/need-triage');
-            if (!hasLabel) {
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: context.issue.number,
-                labels: ['status/need-triage']
-              });
-            } else {
-              core.info('Issue already has status/need-triage label. Skipping.');
-            }

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

@@ -3,55 +3,38 @@ name: 'Label Child Issues for Project Rollup'
 on:
   issues:
     types: ['opened', 'edited', 'reopened']
-  schedule:
-    - cron: '0 * * * *' # Run every hour
-  workflow_dispatch:
-
-permissions:
-  issues: 'write'
-  contents: 'read'
 
 jobs:
-  # Event-based: Quick reaction to new/edited issues in THIS repo
   labeler:
-    if: "github.event_name == 'issues'"
     runs-on: 'ubuntu-latest'
+    permissions:
+      issues: 'write'
     steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@v4'
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@v4'
+      - name: 'Check for Parent Workstream and Apply Label'
+        uses: 'actions/github-script@v7'
         with:
-          node-version: '20'
-          cache: 'npm'
+          script: |
+            const issue = context.payload.issue;
+            const labelToAdd = 'workstream-rollup';
 
-      - name: 'Install Dependencies'
-        run: 'npm ci'
+            // --- Define the FULL URLs of the allowed parent workstreams ---
+            const allowedParentUrls = [
+              'https://api.github.com/repos/google-gemini/gemini-cli/issues/15374',
+              'https://api.github.com/repos/google-gemini/gemini-cli/issues/15456',
+              'https://api.github.com/repos/google-gemini/gemini-cli/issues/15324'
+            ];
 
-      - name: 'Run Multi-Repo Sync Script'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        run: 'node .github/scripts/sync-maintainer-labels.cjs'
-
-  # Scheduled/Manual: Recursive sync across multiple repos
-  sync-maintainer-labels:
-    if: "github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'"
-    runs-on: 'ubuntu-latest'
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@v4'
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@v4'
-        with:
-          node-version: '20'
-          cache: 'npm'
-
-      - name: 'Install Dependencies'
-        run: 'npm ci'
-
-      - name: 'Run Multi-Repo Sync Script'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        run: 'node .github/scripts/sync-maintainer-labels.cjs'
+            // Check if the issue has a parent_issue_url and if it's in our allowed list.
+            if (issue && issue.parent_issue_url && allowedParentUrls.includes(issue.parent_issue_url)) {
+              console.log(`SUCCESS: Issue #${issue.number} is a child of a target workstream (${issue.parent_issue_url}). Adding label.`);
+              await github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: issue.number,
+                labels: [labelToAdd]
+              });
+            } else if (issue && issue.parent_issue_url) {
+              console.log(`FAILURE: Issue #${issue.number} has a parent, but it's not a target workstream. Parent URL: ${issue.parent_issue_url}`);
+            } else {
+              console.log(`FAILURE: Issue #${issue.number} is not a child of any issue. No action taken.`);
+            }

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

@@ -1,174 +0,0 @@
-name: 'Label Workstream Rollup'
-
-on:
-  issues:
-    types: ['opened', 'edited', 'reopened']
-  schedule:
-    - cron: '0 * * * *'
-  workflow_dispatch:
-
-jobs:
-  labeler:
-    runs-on: 'ubuntu-latest'
-    permissions:
-      issues: 'write'
-    steps:
-      - name: 'Check for Parent Workstream and Apply Label'
-        uses: 'actions/github-script@v7'
-        with:
-          script: |
-            const labelToAdd = 'workstream-rollup';
-
-            // Allow-list of parent issue URLs
-            const allowedParentUrls = [
-              'https://github.com/google-gemini/gemini-cli/issues/15374',
-              'https://github.com/google-gemini/gemini-cli/issues/15456',
-              'https://github.com/google-gemini/gemini-cli/issues/15324',
-              'https://github.com/google-gemini/gemini-cli/issues/17202',
-              'https://github.com/google-gemini/gemini-cli/issues/17203'
-            ];
-
-            // Single issue processing (for event triggers)
-            async function processSingleIssue(owner, repo, number) {
-              const query = `
-                query($owner:String!, $repo:String!, $number:Int!) {
-                  repository(owner:$owner, name:$repo) {
-                    issue(number:$number) {
-                      number
-                      parent {
-                        url
-                        parent {
-                          url
-                          parent {
-                            url
-                            parent {
-                              url
-                              parent {
-                                url
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              `;
-              try {
-                const result = await github.graphql(query, { owner, repo, number });
-
-                if (!result || !result.repository || !result.repository.issue) {
-                  console.log(`Issue #${number} not found or data missing.`);
-                  return;
-                }
-
-                const issue = result.repository.issue;
-                await checkAndLabel(issue, owner, repo);
-              } catch (error) {
-                console.error(`Failed to process issue #${number}:`, error);
-                throw error; // Re-throw to be caught by main execution
-              }
-            }
-
-            // Bulk processing (for schedule/dispatch)
-            async function processAllOpenIssues(owner, repo) {
-              const query = `
-                query($owner:String!, $repo:String!, $cursor:String) {
-                  repository(owner:$owner, name:$repo) {
-                    issues(first: 100, states: OPEN, after: $cursor) {
-                      pageInfo {
-                        hasNextPage
-                        endCursor
-                      }
-                      nodes {
-                        number
-                        parent {
-                          url
-                          parent {
-                            url
-                            parent {
-                              url
-                              parent {
-                                url
-                                parent {
-                                  url
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              `;
-
-              let hasNextPage = true;
-              let cursor = null;
-
-              while (hasNextPage) {
-                try {
-                  const result = await github.graphql(query, { owner, repo, cursor });
-
-                  if (!result || !result.repository || !result.repository.issues) {
-                     console.error('Invalid response structure from GitHub API');
-                     break;
-                  }
-
-                  const issues = result.repository.issues.nodes || [];
-
-                  console.log(`Processing batch of ${issues.length} issues...`);
-                  for (const issue of issues) {
-                    await checkAndLabel(issue, owner, repo);
-                  }
-
-                  hasNextPage = result.repository.issues.pageInfo.hasNextPage;
-                  cursor = result.repository.issues.pageInfo.endCursor;
-                } catch (error) {
-                  console.error('Failed to fetch issues batch:', error);
-                  throw error; // Re-throw to be caught by main execution
-                }
-              }
-            }
-
-            async function checkAndLabel(issue, owner, repo) {
-              if (!issue || !issue.parent) return;
-
-              let currentParent = issue.parent;
-              let tracedParents = [];
-              let matched = false;
-
-              while (currentParent) {
-                tracedParents.push(currentParent.url);
-
-                if (allowedParentUrls.includes(currentParent.url)) {
-                  console.log(`SUCCESS: Issue #${issue.number} is a descendant of ${currentParent.url}. Trace: ${tracedParents.join(' -> ')}. Adding label.`);
-                  await github.rest.issues.addLabels({
-                    owner,
-                    repo,
-                    issue_number: issue.number,
-                    labels: [labelToAdd]
-                  });
-                  matched = true;
-                  break;
-                }
-                currentParent = currentParent.parent;
-              }
-
-              if (!matched && context.eventName === 'issues') {
-                 console.log(`Issue #${issue.number} did not match any allowed workstreams. Trace: ${tracedParents.join(' -> ') || 'None'}.`);
-              }
-            }
-
-            // Main execution
-            try {
-              if (context.eventName === 'issues') {
-                console.log(`Processing single issue #${context.payload.issue.number}...`);
-                await processSingleIssue(context.repo.owner, context.repo.repo, context.payload.issue.number);
-              } else {
-                console.log(`Running for event: ${context.eventName}. Processing all open issues...`);
-                await processAllOpenIssues(context.repo.owner, context.repo.repo);
-              }
-            } catch (error) {
-              core.setFailed(`Workflow failed: ${error.message}`);
-            }

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

@@ -1,83 +0,0 @@
-name: '🏷️ PR Contribution Guidelines Notifier'
-
-on:
-  pull_request:
-    types:
-      - 'opened'
-
-jobs:
-  notify-process-change:
-    runs-on: 'ubuntu-latest'
-    if: |-
-      github.repository == 'google-gemini/gemini-cli' || github.repository == 'google-gemini/maintainers-gemini-cli'
-    permissions:
-      pull-requests: 'write'
-    steps:
-      - name: 'Generate GitHub App Token'
-        id: 'generate_token'
-        env:
-          APP_ID: '${{ secrets.APP_ID }}'
-        if: |-
-          ${{ env.APP_ID != '' }}
-        uses: 'actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b' # ratchet:actions/create-github-app-token@v2
-        with:
-          app-id: '${{ secrets.APP_ID }}'
-          private-key: '${{ secrets.PRIVATE_KEY }}'
-
-      - name: 'Check membership and post comment'
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea'
-        with:
-          github-token: '${{ steps.generate_token.outputs.token || secrets.GITHUB_TOKEN }}'
-          script: |-
-            const org = context.repo.owner;
-            const repo = context.repo.repo;
-            const username = context.payload.pull_request.user.login;
-            const pr_number = context.payload.pull_request.number;
-
-            // 1. Check if the PR author is a maintainer
-            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.`);
-              return;
-            }
-
-            // 2. Check if the PR is already associated with an issue
-            const query = `
-              query($owner:String!, $repo:String!, $number:Int!) {
-                repository(owner:$owner, name:$repo) {
-                  pullRequest(number:$number) {
-                    closingIssuesReferences(first: 1) {
-                      totalCount
-                    }
-                  }
-                }
-              }
-            `;
-            const variables = { owner: org, repo: repo, number: pr_number };
-            const result = await github.graphql(query, variables);
-            const issueCount = result.repository.pullRequest.closingIssuesReferences.totalCount;
-
-            if (issueCount > 0) {
-              core.info(`PR #${pr_number} is already associated with an issue. No notification needed.`);
-              return;
-            }
-
-            // 3. Post the notification comment
-            core.info(`${username} is not a maintainer and PR #${pr_number} has no linked issue. Posting notification.`);
-
-            const comment = `
-            Hi @${username}, thank you so much for your contribution to Gemini CLI! We really appreciate the time and effort you've put into this.
-
-            We're making some updates to our contribution process to improve how we track and review changes. Please take a moment to review our recent discussion post: [Improving Our Contribution Process & Introducing New Guidelines](https://github.com/google-gemini/gemini-cli/discussions/16706).
-
-            Key Update: Starting **January 26, 2026**, the Gemini CLI project will require all pull requests to be associated with an existing issue. Any pull requests not linked to an issue by that date will be automatically closed.
-
-            Thank you for your understanding and for being a part of our community!
-            `.trim().replace(/^[ ]+/gm, '');
-
-            await github.rest.issues.createComment({
-              owner: org,
-              repo: repo,
-              issue_number: pr_number,
-              body: comment
-            });

.github/workflows/stale.yml

@@ -40,5 +40,5 @@ jobs:
             If this is still relevant, you are welcome to reopen or leave a comment. Thanks for contributing!
           days-before-stale: 60
           days-before-close: 14
-          exempt-issue-labels: 'pinned,security,🔒 maintainer only,help wanted,🗓️ Public Roadmap'
-          exempt-pr-labels: 'pinned,security,🔒 maintainer only,help wanted,🗓️ Public Roadmap'
+          exempt-issue-labels: 'pinned,security'
+          exempt-pr-labels: 'pinned,security'

.gitignore

@@ -11,8 +11,6 @@
 .gemini/*
 !.gemini/config.yaml
 !.gemini/commands/
-!.gemini/skills/
-!.gemini/settings.json
 
 # Note: .gemini-clipboard/ is NOT in gitignore so Gemini can access pasted images
 
@@ -55,9 +53,7 @@ gha-creds-*.json
 
 # Log files
 patch_output.log
-gemini-debug.log
 
 .genkit
 .gemini-clipboard/
 .eslintcache
-evals/logs/

.prettierignore

@@ -20,4 +20,3 @@ junit.xml
 .gemini-linters/
 Thumbs.db
 .pytest_cache
-**/SKILL.md

CONTRIBUTING.md

@@ -42,13 +42,8 @@ This project follows
 The process for contributing code is as follows:
 
 1.  **Find an issue** that you want to work on. If an issue is tagged as
-    `🔒Maintainers only`, this means it is reserved for project maintainers. We
-    will not accept pull requests related to these issues. In the near future,
-    we will explicitly mark issues looking for contributions using the
-    `help  wanted` label. If you believe an issue is a good candidate for
-    community contribution, please leave a comment on the issue. A maintainer
-    will review it and apply the `help-wanted` label if appropriate. Only
-    maintainers should attempt to add the `help-wanted` label to an issue.
+    "🔒Maintainers only", this means it is reserved for project maintainers. We
+    will not accept pull requests related to these issues.
 2.  **Fork the repository** and create a new branch.
 3.  **Make your changes** in the `packages/` directory.
 4.  **Ensure all checks pass** by running `npm run preflight`.
@@ -99,11 +94,8 @@ any code is written.
 - **For features:** The PR should be linked to the feature request or proposal
   issue that has been approved by a maintainer.
 
-If an issue for your change doesn't exist, we will automatically close your PR
-along with a comment reminding you to associate the PR with an issue. The ideal
-workflow starts with an issue that has been reviewed and approved by a
-maintainer. Please **open the issue first** and wait for feedback before you
-start coding.
+If an issue for your change doesn't exist, please **open one first** and wait
+for feedback before you start coding.
 
 #### 2. Keep it small and focused
 

GEMINI.md

@@ -1,79 +1,409 @@
-# Gemini CLI Project Context
+## Building and running
 
-Gemini CLI is an open-source AI agent that brings the power of Gemini directly
-into the terminal. It is designed to be a terminal-first, extensible, and
-powerful tool for developers.
+Before submitting any changes, it is crucial to validate them by running the
+full preflight check. This command will build the repository, run all tests,
+check for type errors, and lint the code.
 
-## Project Overview
+To run the full suite of checks, execute the following command:
 
-- **Purpose:** Provide a seamless terminal interface for Gemini models,
-  supporting code understanding, generation, automation, and integration via MCP
-  (Model Context Protocol).
-- **Main Technologies:**
-  - **Runtime:** Node.js (>=20.0.0, recommended ~20.19.0 for development)
-  - **Language:** TypeScript
-  - **UI Framework:** React (using [Ink](https://github.com/vadimdemedes/ink)
-    for CLI rendering)
-  - **Testing:** Vitest
-  - **Bundling:** esbuild
-  - **Linting/Formatting:** ESLint, Prettier
-- **Architecture:** Monorepo structure using npm workspaces.
-  - `packages/cli`: User-facing terminal UI, input processing, and display
-    rendering.
-  - `packages/core`: Backend logic, Gemini API orchestration, prompt
-    construction, and tool execution.
-  - `packages/core/src/tools/`: Built-in tools for file system, shell, and web
-    operations.
-  - `packages/a2a-server`: Experimental Agent-to-Agent server.
-  - `packages/vscode-ide-companion`: VS Code extension pairing with the CLI.
+```bash
+npm run preflight
+```
 
-## Building and Running
+This single command ensures that your changes meet all the quality gates of the
+project. While you can run the individual steps (`build`, `test`, `typecheck`,
+`lint`) separately, it is highly recommended to use `npm run preflight` to
+ensure a comprehensive validation.
 
-- **Install Dependencies:** `npm install`
-- **Build All:** `npm run build:all` (Builds packages, sandbox, and VS Code
-  companion)
-- **Build Packages:** `npm run build`
-- **Run in Development:** `npm run start`
-- **Run in Debug Mode:** `npm run debug` (Enables Node.js inspector)
-- **Bundle Project:** `npm run bundle`
-- **Clean Artifacts:** `npm run clean`
+## Writing Tests
 
-## Testing and Quality
+This project uses **Vitest** as its primary testing framework. When writing
+tests, aim to follow existing patterns. Key conventions include:
 
-- **Test Commands:**
-  - **Unit (All):** `npm run test`
-  - **Integration (E2E):** `npm run test:e2e`
-  - **Workspace-Specific:** `npm test -w <pkg> -- <path>` (Note: `<path>` must
-    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.)
-- **Individual Checks:** `npm run lint` / `npm run format` / `npm run typecheck`
+### Test Structure and Framework
 
-## Development Conventions
+- **Framework**: All tests are written using Vitest (`describe`, `it`, `expect`,
+  `vi`).
+- **File Location**: Test files (`*.test.ts` for logic, `*.test.tsx` for React
+  components) are co-located with the source files they test.
+- **Configuration**: Test environments are defined in `vitest.config.ts` files.
+- **Setup/Teardown**: Use `beforeEach` and `afterEach`. Commonly,
+  `vi.resetAllMocks()` is called in `beforeEach` and `vi.restoreAllMocks()` in
+  `afterEach`.
 
-- **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.
-- **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).
+### Mocking (`vi` from Vitest)
 
-## Testing Conventions
+- **ES Modules**: Mock with
+  `vi.mock('module-name', async (importOriginal) => { ... })`. Use
+  `importOriginal` for selective mocking.
+  - _Example_:
+    `vi.mock('os', async (importOriginal) => { const actual = await importOriginal(); return { ...actual, homedir: vi.fn() }; });`
+- **Mocking Order**: For critical dependencies (e.g., `os`, `fs`) that affect
+  module-level constants, place `vi.mock` at the _very top_ of the test file,
+  before other imports.
+- **Hoisting**: Use `const myMock = vi.hoisted(() => vi.fn());` if a mock
+  function needs to be defined before its use in a `vi.mock` factory.
+- **Mock Functions**: Create with `vi.fn()`. Define behavior with
+  `mockImplementation()`, `mockResolvedValue()`, or `mockRejectedValue()`.
+- **Spying**: Use `vi.spyOn(object, 'methodName')`. Restore spies with
+  `mockRestore()` in `afterEach`.
 
-- **Environment Variables:** When testing code that depends on environment
-  variables, use `vi.stubEnv('NAME', 'value')` in `beforeEach` and
-  `vi.unstubAllEnvs()` in `afterEach`. Avoid modifying `process.env` directly as
-  it can lead to test leakage and is less reliable. To "unset" a variable, use
-  an empty string `vi.stubEnv('NAME', '')`.
+### Commonly Mocked Modules
 
-## Documentation
+- **Node.js built-ins**: `fs`, `fs/promises`, `os` (especially `os.homedir()`),
+  `path`, `child_process` (`execSync`, `spawn`).
+- **External SDKs**: `@google/genai`, `@modelcontextprotocol/sdk`.
+- **Internal Project Modules**: Dependencies from other project packages are
+  often mocked.
 
-- Always use the `docs-writer` skill when you are asked to write, edit, or
-  review any documentation.
-- Documentation is located in the `docs/` directory.
-- Suggest documentation updates when code changes render existing documentation
-  obsolete or incomplete.
+### React Component Testing (CLI UI - Ink)
+
+- Use `render()` from `ink-testing-library`.
+- Assert output with `lastFrame()`.
+- Wrap components in necessary `Context.Provider`s.
+- Mock custom React hooks and complex child components using `vi.mock()`.
+
+### Asynchronous Testing
+
+- Use `async/await`.
+- For timers, use `vi.useFakeTimers()`, `vi.advanceTimersByTimeAsync()`,
+  `vi.runAllTimersAsync()`.
+- Test promise rejections with `await expect(promise).rejects.toThrow(...)`.
+
+### General Guidance
+
+- When adding tests, first examine existing tests to understand and conform to
+  established conventions.
+- Pay close attention to the mocks at the top of existing test files; they
+  reveal critical dependencies and how they are managed in a test environment.
+
+## Git Repo
+
+The main branch for this project is called "main"
+
+## JavaScript/TypeScript
+
+When contributing to this React, Node, and TypeScript codebase, please
+prioritize the use of plain JavaScript objects with accompanying TypeScript
+interface or type declarations over JavaScript class syntax. This approach
+offers significant advantages, especially concerning interoperability with React
+and overall code maintainability.
+
+### Preferring Plain Objects over Classes
+
+JavaScript classes, by their nature, are designed to encapsulate internal state
+and behavior. While this can be useful in some object-oriented paradigms, it
+often introduces unnecessary complexity and friction when working with React's
+component-based architecture. Here's why plain objects are preferred:
+
+- Seamless React Integration: React components thrive on explicit props and
+  state management. Classes' tendency to store internal state directly within
+  instances can make prop and state propagation harder to reason about and
+  maintain. Plain objects, on the other hand, are inherently immutable (when
+  used thoughtfully) and can be easily passed as props, simplifying data flow
+  and reducing unexpected side effects.
+
+- Reduced Boilerplate and Increased Conciseness: Classes often promote the use
+  of constructors, this binding, getters, setters, and other boilerplate that
+  can unnecessarily bloat code. TypeScript interface and type declarations
+  provide powerful static type checking without the runtime overhead or
+  verbosity of class definitions. This allows for more succinct and readable
+  code, aligning with JavaScript's strengths in functional programming.
+
+- Enhanced Readability and Predictability: Plain objects, especially when their
+  structure is clearly defined by TypeScript interfaces, are often easier to
+  read and understand. Their properties are directly accessible, and there's no
+  hidden internal state or complex inheritance chains to navigate. This
+  predictability leads to fewer bugs and a more maintainable codebase.
+
+- Simplified Immutability: While not strictly enforced, plain objects encourage
+  an immutable approach to data. When you need to modify an object, you
+  typically create a new one with the desired changes, rather than mutating the
+  original. This pattern aligns perfectly with React's reconciliation process
+  and helps prevent subtle bugs related to shared mutable state.
+
+- Better Serialization and Deserialization: Plain JavaScript objects are
+  naturally easy to serialize to JSON and deserialize back, which is a common
+  requirement in web development (e.g., for API communication or local storage).
+  Classes, with their methods and prototypes, can complicate this process.
+
+### Embracing ES Module Syntax for Encapsulation
+
+Rather than relying on Java-esque private or public class members, which can be
+verbose and sometimes limit flexibility, we strongly prefer leveraging ES module
+syntax (`import`/`export`) for encapsulating private and public APIs.
+
+- Clearer Public API Definition: With ES modules, anything that is exported is
+  part of the public API of that module, while anything not exported is
+  inherently private to that module. This provides a very clear and explicit way
+  to define what parts of your code are meant to be consumed by other modules.
+
+- Enhanced Testability (Without Exposing Internals): By default, unexported
+  functions or variables are not accessible from outside the module. This
+  encourages you to test the public API of your modules, rather than their
+  internal implementation details. If you find yourself needing to spy on or
+  stub an unexported function for testing purposes, it's often a "code smell"
+  indicating that the function might be a good candidate for extraction into its
+  own separate, testable module with a well-defined public API. This promotes a
+  more robust and maintainable testing strategy.
+
+- Reduced Coupling: Explicitly defined module boundaries through import/export
+  help reduce coupling between different parts of your codebase. This makes it
+  easier to refactor, debug, and understand individual components in isolation.
+
+### Avoiding `any` Types and Type Assertions; Preferring `unknown`
+
+TypeScript's power lies in its ability to provide static type checking, catching
+potential errors before your code runs. To fully leverage this, it's crucial to
+avoid the `any` type and be judicious with type assertions.
+
+- **The Dangers of `any`**: Using any effectively opts out of TypeScript's type
+  checking for that particular variable or expression. While it might seem
+  convenient in the short term, it introduces significant risks:
+  - **Loss of Type Safety**: You lose all the benefits of type checking, making
+    it easy to introduce runtime errors that TypeScript would otherwise have
+    caught.
+  - **Reduced Readability and Maintainability**: Code with `any` types is harder
+    to understand and maintain, as the expected type of data is no longer
+    explicitly defined.
+  - **Masking Underlying Issues**: Often, the need for any indicates a deeper
+    problem in the design of your code or the way you're interacting with
+    external libraries. It's a sign that you might need to refine your types or
+    refactor your code.
+
+- **Preferring `unknown` over `any`**: When you absolutely cannot determine the
+  type of a value at compile time, and you're tempted to reach for any, consider
+  using unknown instead. unknown is a type-safe counterpart to any. While a
+  variable of type unknown can hold any value, you must perform type narrowing
+  (e.g., using typeof or instanceof checks, or a type assertion) before you can
+  perform any operations on it. This forces you to handle the unknown type
+  explicitly, preventing accidental runtime errors.
+
+  ```ts
+  function processValue(value: unknown) {
+    if (typeof value === 'string') {
+      // value is now safely a string
+      console.log(value.toUpperCase());
+    } else if (typeof value === 'number') {
+      // value is now safely a number
+      console.log(value * 2);
+    }
+    // Without narrowing, you cannot access properties or methods on 'value'
+    // console.log(value.someProperty); // Error: Object is of type 'unknown'.
+  }
+  ```
+
+- **Type Assertions (`as Type`) - Use with Caution**: Type assertions tell the
+  TypeScript compiler, "Trust me, I know what I'm doing; this is definitely of
+  this type." While there are legitimate use cases (e.g., when dealing with
+  external libraries that don't have perfect type definitions, or when you have
+  more information than the compiler), they should be used sparingly and with
+  extreme caution.
+  - **Bypassing Type Checking**: Like `any`, type assertions bypass TypeScript's
+    safety checks. If your assertion is incorrect, you introduce a runtime error
+    that TypeScript would not have warned you about.
+  - **Code Smell in Testing**: A common scenario where `any` or type assertions
+    might be tempting is when trying to test "private" implementation details
+    (e.g., spying on or stubbing an unexported function within a module). This
+    is a strong indication of a "code smell" in your testing strategy and
+    potentially your code structure. Instead of trying to force access to
+    private internals, consider whether those internal details should be
+    refactored into a separate module with a well-defined public API. This makes
+    them inherently testable without compromising encapsulation.
+
+### Type narrowing `switch` clauses
+
+Use the `checkExhaustive` helper in the default clause of a switch statement.
+This will ensure that all of the possible options within the value or
+enumeration are used.
+
+This helper method can be found in `packages/cli/src/utils/checks.ts`
+
+### Embracing JavaScript's Array Operators
+
+To further enhance code cleanliness and promote safe functional programming
+practices, leverage JavaScript's rich set of array operators as much as
+possible. Methods like `.map()`, `.filter()`, `.reduce()`, `.slice()`,
+`.sort()`, and others are incredibly powerful for transforming and manipulating
+data collections in an immutable and declarative way.
+
+Using these operators:
+
+- Promotes Immutability: Most array operators return new arrays, leaving the
+  original array untouched. This functional approach helps prevent unintended
+  side effects and makes your code more predictable.
+- Improves Readability: Chaining array operators often lead to more concise and
+  expressive code than traditional for loops or imperative logic. The intent of
+  the operation is clear at a glance.
+- Facilitates Functional Programming: These operators are cornerstones of
+  functional programming, encouraging the creation of pure functions that take
+  inputs and produce outputs without causing side effects. This paradigm is
+  highly beneficial for writing robust and testable code that pairs well with
+  React.
+
+By consistently applying these principles, we can maintain a codebase that is
+not only efficient and performant but also a joy to work with, both now and in
+the future.
+
+## React (mirrored and adjusted from [react-mcp-server](https://github.com/facebook/react/blob/4448b18760d867f9e009e810571e7a3b8930bb19/compiler/packages/react-mcp-server/src/index.ts#L376C1-L441C94))
+
+### Role
+
+You are a React assistant that helps users write more efficient and optimizable
+React code. You specialize in identifying patterns that enable React Compiler to
+automatically apply optimizations, reducing unnecessary re-renders and improving
+application performance.
+
+### Follow these guidelines in all code you produce and suggest
+
+Use functional components with Hooks: Do not generate class components or use
+old lifecycle methods. Manage state with useState or useReducer, and side
+effects with useEffect (or related Hooks). Always prefer functions and Hooks for
+any new component logic.
+
+Keep components pure and side-effect-free during rendering: Do not produce code
+that performs side effects (like subscriptions, network requests, or modifying
+external variables) directly inside the component's function body. Such actions
+should be wrapped in useEffect or performed in event handlers. Ensure your
+render logic is a pure function of props and state.
+
+Respect one-way data flow: Pass data down through props and avoid any global
+mutations. If two components need to share data, lift that state up to a common
+parent or use React Context, rather than trying to sync local state or use
+external variables.
+
+Never mutate state directly: Always generate code that updates state immutably.
+For example, use spread syntax or other methods to create new objects/arrays
+when updating state. Do not use assignments like state.someValue = ... or array
+mutations like array.push() on state variables. Use the state setter (setState
+from useState, etc.) to update state.
+
+Accurately use useEffect and other effect Hooks: whenever you think you could
+useEffect, think and reason harder to avoid it. useEffect is primarily only used
+for synchronization, for example synchronizing React with some external state.
+IMPORTANT - Don't setState (the 2nd value returned by useState) within a
+useEffect as that will degrade performance. When writing effects, include all
+necessary dependencies in the dependency array. Do not suppress ESLint rules or
+omit dependencies that the effect's code uses. Structure the effect callbacks to
+handle changing values properly (e.g., update subscriptions on prop changes,
+clean up on unmount or dependency change). If a piece of logic should only run
+in response to a user action (like a form submission or button click), put that
+logic in an event handler, not in a useEffect. Where possible, useEffects should
+return a cleanup function.
+
+Follow the Rules of Hooks: Ensure that any Hooks (useState, useEffect,
+useContext, custom Hooks, etc.) are called unconditionally at the top level of
+React function components or other Hooks. Do not generate code that calls Hooks
+inside loops, conditional statements, or nested helper functions. Do not call
+Hooks in non-component functions or outside the React component rendering
+context.
+
+Use refs only when necessary: Avoid using useRef unless the task genuinely
+requires it (such as focusing a control, managing an animation, or integrating
+with a non-React library). Do not use refs to store application state that
+should be reactive. If you do use refs, never write to or read from ref.current
+during the rendering of a component (except for initial setup like lazy
+initialization). Any ref usage should not affect the rendered output directly.
+
+Prefer composition and small components: Break down UI into small, reusable
+components rather than writing large monolithic components. The code you
+generate should promote clarity and reusability by composing components
+together. Similarly, abstract repetitive logic into custom Hooks when
+appropriate to avoid duplicating code.
+
+Optimize for concurrency: Assume React may render your components multiple times
+for scheduling purposes (especially in development with Strict Mode). Write code
+that remains correct even if the component function runs more than once. For
+instance, avoid side effects in the component body and use functional state
+updates (e.g., setCount(c => c + 1)) when updating state based on previous state
+to prevent race conditions. Always include cleanup functions in effects that
+subscribe to external resources. Don't write useEffects for "do this when this
+changes" side effects. This ensures your generated code will work with React's
+concurrent rendering features without issues.
+
+Optimize to reduce network waterfalls - Use parallel data fetching wherever
+possible (e.g., start multiple requests at once rather than one after another).
+Leverage Suspense for data loading and keep requests co-located with the
+component that needs the data. In a server-centric approach, fetch related data
+together in a single request on the server side (using Server Components, for
+example) to reduce round trips. Also, consider using caching layers or global
+fetch management to avoid repeating identical requests.
+
+Rely on React Compiler - useMemo, useCallback, and React.memo can be omitted if
+React Compiler is enabled. Avoid premature optimization with manual memoization.
+Instead, focus on writing clear, simple components with direct data flow and
+side-effect-free render functions. Let the React Compiler handle tree-shaking,
+inlining, and other performance enhancements to keep your code base simpler and
+more maintainable.
+
+Design for a good user experience - Provide clear, minimal, and non-blocking UI
+states. When data is loading, show lightweight placeholders (e.g., skeleton
+screens) rather than intrusive spinners everywhere. Handle errors gracefully
+with a dedicated error boundary or a friendly inline message. Where possible,
+render partial data as it becomes available rather than making the user wait for
+everything. Suspense allows you to declare the loading states in your component
+tree in a natural way, preventing “flash” states and improving perceived
+performance.
+
+### Process
+
+1. Analyze the user's code for optimization opportunities:
+   - Check for React anti-patterns that prevent compiler optimization
+   - Look for component structure issues that limit compiler effectiveness
+   - Think about each suggestion you are making and consult React docs for best
+     practices
+
+2. Provide actionable guidance:
+   - Explain specific code changes with clear reasoning
+   - Show before/after examples when suggesting changes
+   - Only suggest changes that meaningfully improve optimization potential
+
+### Optimization Guidelines
+
+- State updates should be structured to enable granular updates
+- Side effects should be isolated and dependencies clearly defined
+
+## Documentation guidelines
+
+When working in the `/docs` directory, follow the guidelines in this section:
+
+- **Role:** You are an expert technical writer and AI assistant for contributors
+  to Gemini CLI. Produce professional, accurate, and consistent documentation to
+  guide users of Gemini CLI.
+- **Technical Accuracy:** Do not invent facts, commands, code, API names, or
+  output. All technical information specific to Gemini CLI must be based on code
+  found within this directory and its subdirectories.
+- **Style Authority:** Your source for writing guidance and style is the
+  "Documentation contribution process" section in the root directory's
+  `CONTRIBUTING.md` file, as well as any guidelines provided this section.
+- **Information Architecture Consideration:** Before proposing documentation
+  changes, consider the information architecture. If a change adds significant
+  new content to existing documents, evaluate if creating a new, more focused
+  page or changes to `sidebar.json` would provide a better user experience.
+- **Proactive User Consideration:** The user experience should be a primary
+  concern when making changes to documentation. Aim to fill gaps in existing
+  knowledge whenever possible while keeping documentation concise and easy for
+  users to understand. If changes might hinder user understanding or
+  accessibility, proactively raise these concerns and propose alternatives.
+
+## Comments policy
+
+Only write high-value comments if at all. Avoid talking to the user through
+comments.
+
+## Logging and Error Handling
+
+- **Avoid Console Statements:** Do not use `console.log`, `console.error`, or
+  similar methods directly.
+- **Non-User-Facing Logs:** For developer-facing debug messages, use
+  `debugLogger` (from `@google/gemini-cli-core`).
+- **User-Facing Feedback:** To surface errors or warnings to the user, use
+  `coreEvents.emitFeedback` (from `@google/gemini-cli-core`).
+
+## General requirements
+
+- If there is something you do not understand or is ambiguous, seek confirmation
+  or clarification from the user before making changes based on assumptions.
+- Use hyphens instead of underscores in flag names (e.g. `my-flag` instead of
+  `my_flag`).
+- Always refer to Gemini CLI as `Gemini CLI`, never `the Gemini CLI`.

README.md

@@ -4,7 +4,7 @@
 [![Gemini CLI E2E (Chained)](https://github.com/google-gemini/gemini-cli/actions/workflows/chained_e2e.yml/badge.svg)](https://github.com/google-gemini/gemini-cli/actions/workflows/chained_e2e.yml)
 [![Version](https://img.shields.io/npm/v/@google/gemini-cli)](https://www.npmjs.com/package/@google/gemini-cli)
 [![License](https://img.shields.io/github/license/google-gemini/gemini-cli)](https://github.com/google-gemini/gemini-cli/blob/main/LICENSE)
-[![View Code Wiki](https://assets.codewiki.google/readme-badge/static.svg)](https://codewiki.google/github.com/google-gemini/gemini-cli?utm_source=badge&utm_medium=github&utm_campaign=github.com/google-gemini/gemini-cli)
+[![View Code Wiki](https://www.gstatic.com/_/boq-sdlc-agents-ui/_/r/YUi5dj2UWvE.svg)](https://codewiki.google/github.com/google-gemini/gemini-cli)
 
 ![Gemini CLI Screenshot](./docs/assets/gemini-screenshot.png)
 
@@ -18,8 +18,7 @@ Learn all about Gemini CLI in our [documentation](https://geminicli.com/docs/).
 
 - **🎯 Free tier**: 60 requests/min and 1,000 requests/day with personal Google
   account.
-- **🧠 Powerful Gemini 3 models**: Access to improved reasoning and 1M token
-  context window.
+- **🧠 Powerful Gemini 2.5 Pro**: Access to 1M token context window.
 - **🔧 Built-in tools**: Google Search grounding, file operations, shell
   commands, web fetching.
 - **🔌 Extensible**: MCP (Model Context Protocol) support for custom
@@ -55,23 +54,6 @@ npm install -g @google/gemini-cli
 brew install gemini-cli
 ```
 
-#### Install globally with MacPorts (macOS)
-
-```bash
-sudo port install gemini-cli
-```
-
-#### Install with Anaconda (for restricted environments)
-
-```bash
-# Create and activate a new environment
-conda create -y -n gemini_env -c conda-forge nodejs
-conda activate gemini_env
-
-# Install Gemini CLI globally via npm (inside the environment)
-npm install -g @google/gemini-cli
-```
-
 ## Release Cadence and Tags
 
 See [Releases](./docs/releases.md) for more details.
@@ -158,7 +140,7 @@ for details)
 **Benefits:**
 
 - **Free tier**: 60 requests/min and 1,000 requests/day
-- **Gemini 3 models** with 1M token context window
+- **Gemini 2.5 Pro** with 1M token context window
 - **No API key management** - just sign in with your Google account
 - **Automatic updates** to latest models
 
@@ -182,7 +164,7 @@ gemini
 
 **Benefits:**
 
-- **Free tier**: 1000 requests/day with Gemini 3 (mix of flash and pro)
+- **Free tier**: 100 requests/day with Gemini 2.5 Pro
 - **Model selection**: Choose specific Gemini models
 - **Usage-based billing**: Upgrade for higher limits when needed
 

docs/architecture.md

@@ -13,11 +13,11 @@ input:
       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)
+      - [Input processing](/docs/cli/commands.md)
       - History management
       - Display rendering
-      - [Theme and UI customization](/docs/cli/themes)
-      - [CLI configuration settings](/docs/get-started/configuration)
+      - [Theme and UI customization](/docs/cli/themes.md)
+      - [CLI configuration settings](/docs/get-started/configuration.md)
 
 2.  **Core package (`packages/core`):**
     - **Purpose:** This acts as the backend for the Gemini CLI. It receives

docs/changelogs/index.md

@@ -18,135 +18,6 @@ on GitHub.
 | [Preview](preview.md) | Experimental features ready for early feedback. |
 | [Stable](latest.md)   | Stable, recommended for general use.            |
 
-## Announcements: v0.26.0 - 2026-01-27
-
-- **Agents and Skills:** We've introduced a new `skill-creator` skill
-  ([#16394](https://github.com/google-gemini/gemini-cli/pull/16394) by
-  @NTaylorMullen), enabled agent skills by default, and added a generalist agent
-  to improve task routing
-  ([#16638](https://github.com/google-gemini/gemini-cli/pull/16638) by
-  @joshualitt).
-- **UI/UX Improvements:** You can now "Rewind" through your conversation history
-  ([#15717](https://github.com/google-gemini/gemini-cli/pull/15717) by @Adib234)
-  and use a new `/introspect` command for debugging.
-- **Core and Scheduler Refactoring:** The core scheduler has been significantly
-  refactored to improve performance and reliability
-  ([#16895](https://github.com/google-gemini/gemini-cli/pull/16895) by
-  @abhipatel12), and numerous performance and stability fixes have been
-  included.
-
-## Announcements: v0.25.0 - 2026-01-20
-
-- **Skills and Agents Improvements:** We've enhanced the `activate_skill` tool,
-  added a new `pr-creator` skill
-  ([#16232](https://github.com/google-gemini/gemini-cli/pull/16232) by
-  [@NTaylorMullen](https://github.com/NTaylorMullen)), enabled skills by
-  default, improved the `cli_help` agent
-  ([#16100](https://github.com/google-gemini/gemini-cli/pull/16100) by
-  [@scidomino](https://github.com/scidomino)), and added a new `/agents refresh`
-  command ([#16204](https://github.com/google-gemini/gemini-cli/pull/16204) by
-  [@joshualitt](https://github.com/joshualitt)).
-- **UI/UX Refinements:** You'll notice more transparent feedback for skills
-  ([#15954](https://github.com/google-gemini/gemini-cli/pull/15954) by
-  [@NTaylorMullen](https://github.com/NTaylorMullen)), the ability to switch
-  focus between the shell and input with Tab
-  ([#14332](https://github.com/google-gemini/gemini-cli/pull/14332) by
-  [@jacob314](https://github.com/jacob314)), and dynamic terminal tab titles
-  ([#16378](https://github.com/google-gemini/gemini-cli/pull/16378) by
-  [@NTaylorMullen](https://github.com/NTaylorMullen)).
-- **Core Functionality & Performance:** This release includes support for
-  built-in agent skills
-  ([#16045](https://github.com/google-gemini/gemini-cli/pull/16045) by
-  [@NTaylorMullen](https://github.com/NTaylorMullen)), refined Gemini 3 system
-  instructions ([#16139](https://github.com/google-gemini/gemini-cli/pull/16139)
-  by [@NTaylorMullen](https://github.com/NTaylorMullen)), caching for ignore
-  instances to improve performance
-  ([#16185](https://github.com/google-gemini/gemini-cli/pull/16185) by
-  [@EricRahm](https://github.com/EricRahm)), and enhanced retry mechanisms
-  ([#16489](https://github.com/google-gemini/gemini-cli/pull/16489) by
-  [@sehoon38](https://github.com/sehoon38)).
-- **Bug Fixes and Stability:** We've squashed numerous bugs across the CLI,
-  core, and workflows, addressing issues with subagent delegation, unicode
-  character crashes, and sticky header regressions.
-
-## Announcements: v0.24.0 - 2026-01-14
-
-- **Agent Skills:** We've introduced significant advancements in Agent Skills.
-  This includes initial documentation and tutorials to help you get started,
-  alongside enhanced support for remote agents, allowing for more distributed
-  and powerful automation within Gemini CLI.
-  ([#15869](https://github.com/google-gemini/gemini-cli/pull/15869) by
-  [@NTaylorMullen](https://github.com/NTaylorMullen)),
-  ([#16013](https://github.com/google-gemini/gemini-cli/pull/16013) by
-  [@adamweidman](https://github.com/adamweidman))
-- **Improved UI/UX:** The user interface has received several updates, featuring
-  visual indicators for hook execution, a more refined display for settings, and
-  the ability to use the Tab key to effortlessly switch focus between the shell
-  and input areas.
-  ([#15408](https://github.com/google-gemini/gemini-cli/pull/15408) by
-  [@abhipatel12](https://github.com/abhipatel12)),
-  ([#14332](https://github.com/google-gemini/gemini-cli/pull/14332) by
-  [@galz10](https://github.com/galz10))
-- **Enhanced Security:** Security has been a major focus, with default folder
-  trust now set to untrusted for increased safety. The Policy Engine has been
-  improved to allow specific modes in user and administrator policies, and
-  granular allowlisting for shell commands has been implemented, providing finer
-  control over tool execution.
-  ([#15943](https://github.com/google-gemini/gemini-cli/pull/15943) by
-  [@galz10](https://github.com/galz10)),
-  ([#15977](https://github.com/google-gemini/gemini-cli/pull/15977) by
-  [@NTaylorMullen](https://github.com/NTaylorMullen))
-- **Core Functionality:** This release includes a mandatory MessageBus
-  injection, marking Phase 3 of a hard migration to a more robust internal
-  communication system. We've also added support for built-in skills with the
-  CLI itself, and enhanced model routing to effectively utilize subagents.
-  ([#15776](https://github.com/google-gemini/gemini-cli/pull/15776) by
-  [@abhipatel12](https://github.com/abhipatel12)),
-  ([#16300](https://github.com/google-gemini/gemini-cli/pull/16300) by
-  [@NTaylorMullen](https://github.com/NTaylorMullen))
-- **Terminal Features:** Terminal interactions are more seamless with new
-  features like OSC 52 paste support, along with fixes for Windows clipboard
-  paste issues and general improvements to pasting in Windows terminals.
-  ([#15336](https://github.com/google-gemini/gemini-cli/pull/15336) by
-  [@scidomino](https://github.com/scidomino)),
-  ([#15932](https://github.com/google-gemini/gemini-cli/pull/15932) by
-  [@scidomino](https://github.com/scidomino))
-- **New Commands:** To manage the new features, we've added several new
-  commands: `/agents refresh` to update agent configurations, `/skills reload`
-  to refresh skill definitions, and `/skills install/uninstall` for easier
-  management of your Agent Skills.
-  ([#16204](https://github.com/google-gemini/gemini-cli/pull/16204) by
-  [@NTaylorMullen](https://github.com/NTaylorMullen)),
-  ([#15865](https://github.com/google-gemini/gemini-cli/pull/15865) by
-  [@NTaylorMullen](https://github.com/NTaylorMullen)),
-  ([#16377](https://github.com/google-gemini/gemini-cli/pull/16377) by
-  [@NTaylorMullen](https://github.com/NTaylorMullen))
-
-## Announcements: v0.23.0 - 2026-01-07
-
-- 🎉 **Experimental Agent Skills Support in Preview:** Gemini CLI now supports
-  [Agent Skills](https://agentskills.io/home) in our preview builds. This is an
-  early preview where we’re looking for feedback!
-  - Install Preview: `npm install -g @google/gemini-cli@preview`
-  - Enable in `/settings`
-  - Docs:
-    [https://geminicli.com/docs/cli/skills/](https://geminicli.com/docs/cli/skills/)
-- **Gemini CLI wrapped:** Run `npx gemini-wrapped` to visualize your usage
-  stats, top models, languages, and more!
-- **Windows clipboard image support:** Windows users can now paste images
-  directly from their clipboard into the CLI using `Alt`+`V`.
-  ([pr](https://github.com/google-gemini/gemini-cli/pull/13997) by
-  [@sgeraldes](https://github.com/sgeraldes))
-- **Terminal background color detection:** Automatically optimizes your
-  terminal's background color to select compatible themes and provide
-  accessibility warnings.
-  ([pr](https://github.com/google-gemini/gemini-cli/pull/15132) by
-  [@jacob314](https://github.com/jacob314))
-- **Session logout:** Use the new `/logout` command to instantly clear
-  credentials and reset your authentication state for seamless account
-  switching. ([pr](https://github.com/google-gemini/gemini-cli/pull/13383) by
-  [@CN-Scars](https://github.com/CN-Scars))
-
 ## Announcements: v0.22.0 - 2025-12-22
 
 - 🎉**Free Tier + Gemini 3:** Free tier users now all have access to Gemini 3

docs/changelogs/latest.md

@@ -1,6 +1,6 @@
-# Latest stable release: v0.26.0
+# Latest stable release: v0.22.0 - v0.22.5
 
-Released: January 27, 2026
+Released: December 30, 2025
 
 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -11,328 +11,143 @@ 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.
+- **Comprehensive quota visibility:** View usage statistics for all available
+  models in the `/stats` command, even those not yet used in your current
+  session. ([pic](https://imgur.com/a/cKyDtYh),
+  [pr](https://github.com/google-gemini/gemini-cli/pull/14764) by
+  [@sehoon38](https://github.com/sehoon38))
+- **Polished CLI statistics:** We’ve cleaned up the `/stats` view to prioritize
+  actionable quota information while providing a detailed token and
+  cache-efficiency breakdown in `/stats model`
+  ([login with Google](https://imgur.com/a/w9xKthm),
+  [api key](https://imgur.com/a/FjQPHOY),
+  [model stats](https://imgur.com/a/VfWzVgw),
+  [pr](https://github.com/google-gemini/gemini-cli/pull/14961) by
+  [@jacob314](https://github.com/jacob314))
+- **Multi-file drag & drop:** Multi-file drag & drop is now supported and
+  properly translated to be prefixed with `@`.
+  ([pr](https://github.com/google-gemini/gemini-cli/pull/14832) by
+  [@jackwotherspoon](https://github.com/jackwotherspoon))
 
 ## 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
-  @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
-  @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
-  @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
-  @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)
+- feat(ide): fallback to GEMINI_CLI_IDE_AUTH_TOKEN env var by @skeshive in
+  https://github.com/google-gemini/gemini-cli/pull/14843
+- feat: display quota stats for unused models in /stats by @sehoon38 in
+  https://github.com/google-gemini/gemini-cli/pull/14764
+- feat: ensure codebase investigator uses preview model when main agent does by
+  @abhipatel12 in https://github.com/google-gemini/gemini-cli/pull/14412
+- chore: add closing reason to stale bug workflow by @galz10 in
+  https://github.com/google-gemini/gemini-cli/pull/14861
+- Send the model and CLI version with the user agent by @gundermanc in
+  https://github.com/google-gemini/gemini-cli/pull/14865
+- refactor(sessions): move session summary generation to startup by
+  @jackwotherspoon in https://github.com/google-gemini/gemini-cli/pull/14691
+- Limit search depth in path corrector by @scidomino in
+  https://github.com/google-gemini/gemini-cli/pull/14869
+- Fix: Correct typo in code comment by @kuishou68 in
+  https://github.com/google-gemini/gemini-cli/pull/14671
+- feat(core): Plumbing for late resolution of model configs. by @joshualitt in
+  https://github.com/google-gemini/gemini-cli/pull/14597
+- feat: attempt more error parsing by @adamfweidman in
+  https://github.com/google-gemini/gemini-cli/pull/14899
+- Add missing await. by @gundermanc in
+  https://github.com/google-gemini/gemini-cli/pull/14910
+- feat(core): Add support for transcript_path in hooks for git-ai/Gemini
+  extension by @svarlamov in
+  https://github.com/google-gemini/gemini-cli/pull/14663
+- refactor: implement DelegateToAgentTool with discriminated union by
+  @abhipatel12 in https://github.com/google-gemini/gemini-cli/pull/14769
+- feat: reset availabilityService on /auth by @adamfweidman in
+  https://github.com/google-gemini/gemini-cli/pull/14911
+- chore/release: bump version to 0.21.0-nightly.20251211.8c83e1ea9 by
+  @gemini-cli-robot in https://github.com/google-gemini/gemini-cli/pull/14924
+- Fix: Correctly detect MCP tool errors by @kevin-ramdass in
+  https://github.com/google-gemini/gemini-cli/pull/14937
+- increase labeler timeout by @scidomino in
+  https://github.com/google-gemini/gemini-cli/pull/14922
+- tool(cli): tweak the frontend tool to be aware of more core files from the cli
+  by @jacob314 in https://github.com/google-gemini/gemini-cli/pull/14962
+- feat(cli): polish cached token stats and simplify stats display when quota is
+  present. by @jacob314 in
+  https://github.com/google-gemini/gemini-cli/pull/14961
+- feat(settings-validation): add validation for settings schema by @lifefloating
+  in https://github.com/google-gemini/gemini-cli/pull/12929
+- fix(ide): Update IDE extension to write auth token in env var by @skeshive in
+  https://github.com/google-gemini/gemini-cli/pull/14999
+- Revert "chore(deps): bump express from 5.1.0 to 5.2.0" by @skeshive in
+  https://github.com/google-gemini/gemini-cli/pull/14998
+- feat(a2a): Introduce /init command for a2a server by @cocosheng-g in
+  https://github.com/google-gemini/gemini-cli/pull/13419
+- feat: support multi-file drag and drop of images by @jackwotherspoon in
+  https://github.com/google-gemini/gemini-cli/pull/14832
+- fix(policy): allow codebase_investigator by default in read-only policy by
+  @abhipatel12 in https://github.com/google-gemini/gemini-cli/pull/15000
+- refactor(ide ext): Update port file name + switch to 1-based index for
+  characters + remove truncation text by @skeshive in
+  https://github.com/google-gemini/gemini-cli/pull/10501
+- fix(vscode-ide-companion): correct license generation for workspace
+  dependencies by @skeshive in
+  https://github.com/google-gemini/gemini-cli/pull/15004
+- fix: temp fix for subagent invocation until subagent delegation is merged to
+  stable by @abhipatel12 in
+  https://github.com/google-gemini/gemini-cli/pull/15007
+- test: update ide detection tests to make them more robust when run in an ide
+  by @kevin-ramdass in https://github.com/google-gemini/gemini-cli/pull/15008
+- Remove flex from stats display. See snapshots for diffs. by @jacob314 in
+  https://github.com/google-gemini/gemini-cli/pull/14983
+- Add license field into package.json by @jb-perez in
+  https://github.com/google-gemini/gemini-cli/pull/14473
+- feat: Persistent "Always Allow" policies with granular shell & MCP support by
+  @allenhutchison in https://github.com/google-gemini/gemini-cli/pull/14737
+- chore/release: bump version to 0.21.0-nightly.20251212.54de67536 by
+  @gemini-cli-robot in https://github.com/google-gemini/gemini-cli/pull/14969
+- fix(core): commandPrefix word boundary and compound command safety by
+  @allenhutchison in https://github.com/google-gemini/gemini-cli/pull/15006
+- chore(docs): add 'Maintainers only' label info to CONTRIBUTING.md by @jacob314
+  in https://github.com/google-gemini/gemini-cli/pull/14914
+- Refresh hooks when refreshing extensions. by @scidomino in
+  https://github.com/google-gemini/gemini-cli/pull/14918
+- Add clarity to error messages by @gsehgal in
+  https://github.com/google-gemini/gemini-cli/pull/14879
+- chore : remove a redundant tip by @JayadityaGit in
+  https://github.com/google-gemini/gemini-cli/pull/14947
+- chore/release: bump version to 0.21.0-nightly.20251213.977248e09 by
+  @gemini-cli-robot in https://github.com/google-gemini/gemini-cli/pull/15029
+- Disallow redundant typecasts. by @gundermanc in
+  https://github.com/google-gemini/gemini-cli/pull/15030
+- fix(auth): prioritize GEMINI_API_KEY env var and skip unnecessary key… by
+  @galz10 in https://github.com/google-gemini/gemini-cli/pull/14745
+- fix: use zod for safety check result validation by @allenhutchison in
+  https://github.com/google-gemini/gemini-cli/pull/15026
+- update(telemetry): add hashed_extension_name to field to extension events by
+  @kiranani in https://github.com/google-gemini/gemini-cli/pull/15025
+- fix: similar to policy-engine, throw error in case of requiring tool execution
+  confirmation for non-interactive mode by @MayV in
+  https://github.com/google-gemini/gemini-cli/pull/14702
+- Clean up processes in integration tests by @scidomino in
+  https://github.com/google-gemini/gemini-cli/pull/15102
+- docs: update policy engine getting started and defaults by @NTaylorMullen in
+  https://github.com/google-gemini/gemini-cli/pull/15105
+- Fix tool output fragmentation by encapsulating content in functionResponse by
+  @abhipatel12 in https://github.com/google-gemini/gemini-cli/pull/13082
+- Simplify method signature. by @scidomino in
+  https://github.com/google-gemini/gemini-cli/pull/15114
+- Show raw input token counts in json output. by @jacob314 in
+  https://github.com/google-gemini/gemini-cli/pull/15021
+- fix: Mark A2A requests as interactive by @MayV in
+  https://github.com/google-gemini/gemini-cli/pull/15108
+- use previewFeatures to determine which pro model to use for A2A by @sehoon38
+  in https://github.com/google-gemini/gemini-cli/pull/15131
+- refactor(cli): fix settings merging so that settings using the new json format
+  take priority over ones using the old format by @jacob314 in
+  https://github.com/google-gemini/gemini-cli/pull/15116
+- fix(patch): cherry-pick a6d1245 to release/v0.22.0-preview.1-pr-15214 to patch
+  version v0.22.0-preview.1 and create version 0.22.0-preview.2 by
+  @gemini-cli-robot in https://github.com/google-gemini/gemini-cli/pull/15226
+- fix(patch): cherry-pick 9e6914d to release/v0.22.0-preview.2-pr-15288 to patch
+  version v0.22.0-preview.2 and create version 0.22.0-preview.3 by
+  @gemini-cli-robot in https://github.com/google-gemini/gemini-cli/pull/15294
 
-**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.21.3...v0.22.0

docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: Release v0.27.0-preview.0
+# Preview release: Release v0.23.0-preview.0
 
-Released: January 27, 2026
+Released: December 22, 2025
 
 Our preview release includes the latest, new, and experimental features. This
 release may not be as stable as our [latest weekly release](latest.md).
@@ -11,427 +11,121 @@ To install the preview release:
 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.
-
 ## 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
-  @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
-  @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
-  @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
-  @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)
+- Code assist service metrics. by @gundermanc in
+  https://github.com/google-gemini/gemini-cli/pull/15024
+- chore/release: bump version to 0.21.0-nightly.20251216.bb0c0d8ee by
+  @gemini-cli-robot in https://github.com/google-gemini/gemini-cli/pull/15121
+- Docs by @Roaimkhan in https://github.com/google-gemini/gemini-cli/pull/15103
+- Use official ACP SDK and support HTTP/SSE based MCP servers by @SteffenDE in
+  https://github.com/google-gemini/gemini-cli/pull/13856
+- Remove foreground for themes other than shades of purple and holiday. by
+  @jacob314 in https://github.com/google-gemini/gemini-cli/pull/14606
+- chore: remove repo specific tips by @jackwotherspoon in
+  https://github.com/google-gemini/gemini-cli/pull/15164
+- chore: remove user query from footer in debug mode by @jackwotherspoon in
+  https://github.com/google-gemini/gemini-cli/pull/15169
+- Disallow unnecessary awaits. by @gundermanc in
+  https://github.com/google-gemini/gemini-cli/pull/15172
+- Add one to the padding in settings dialog to avoid flicker. by @jacob314 in
+  https://github.com/google-gemini/gemini-cli/pull/15173
+- feat(core): introduce remote agent infrastructure and rename local executor by
+  @adamfweidman in https://github.com/google-gemini/gemini-cli/pull/15110
+- feat(cli): Add `/auth logout` command to clear credentials and auth state by
+  @CN-Scars in https://github.com/google-gemini/gemini-cli/pull/13383
+- (fix) Automated pr labeler by @DaanVersavel in
+  https://github.com/google-gemini/gemini-cli/pull/14885
+- feat: launch Gemini 3 Flash in Gemini CLI ⚡️⚡️⚡️ by @scidomino in
+  https://github.com/google-gemini/gemini-cli/pull/15196
+- Refactor: Migrate console.error in ripGrep.ts to debugLogger by @Adib234 in
+  https://github.com/google-gemini/gemini-cli/pull/15201
+- chore: update a2a-js to 0.3.7 by @adamfweidman in
+  https://github.com/google-gemini/gemini-cli/pull/15197
+- chore(core): remove redundant isModelAvailabilityServiceEnabled toggle and
+  clean up dead code by @adamfweidman in
+  https://github.com/google-gemini/gemini-cli/pull/15207
+- feat(core): Late resolve `GenerateContentConfig`s and reduce mutation. by
+  @joshualitt in https://github.com/google-gemini/gemini-cli/pull/14920
+- Respect previewFeatures value from the remote flag if undefined by @sehoon38
+  in https://github.com/google-gemini/gemini-cli/pull/15214
+- feat(ui): add Windows clipboard image support and Alt+V paste workaround by
+  @jacob314 in https://github.com/google-gemini/gemini-cli/pull/15218
+- chore(core): remove legacy fallback flags and migrate loop detection by
+  @adamfweidman in https://github.com/google-gemini/gemini-cli/pull/15213
+- fix(ui): Prevent eager slash command completion hiding sibling commands by
+  @SandyTao520 in https://github.com/google-gemini/gemini-cli/pull/15224
+- Docs: Update Changelog for Dec 17, 2025 by @jkcinouye in
+  https://github.com/google-gemini/gemini-cli/pull/15204
+- Code Assist backend telemetry for user accept/reject of suggestions by
+  @gundermanc in https://github.com/google-gemini/gemini-cli/pull/15206
+- fix(cli): correct initial history length handling for chat commands by
+  @SandyTao520 in https://github.com/google-gemini/gemini-cli/pull/15223
+- chore/release: bump version to 0.21.0-nightly.20251218.739c02bd6 by
+  @gemini-cli-robot in https://github.com/google-gemini/gemini-cli/pull/15231
+- Change detailed model stats to use a new shared Table class to resolve
+  robustness issues. by @jacob314 in
+  https://github.com/google-gemini/gemini-cli/pull/15208
+- feat: add agent toml parser by @abhipatel12 in
+  https://github.com/google-gemini/gemini-cli/pull/15112
+- Add core tool that adds all context from the core package. by @jacob314 in
+  https://github.com/google-gemini/gemini-cli/pull/15238
+- (docs): Add reference section to hooks documentation by @abhipatel12 in
+  https://github.com/google-gemini/gemini-cli/pull/15159
+- feat(hooks): add support for friendly names and descriptions by @abhipatel12
+  in https://github.com/google-gemini/gemini-cli/pull/15174
+- feat: Detect background color by @jacob314 in
+  https://github.com/google-gemini/gemini-cli/pull/15132
+- add 3.0 to allowed sensitive keywords by @scidomino in
+  https://github.com/google-gemini/gemini-cli/pull/15276
+- feat: Pass additional environment variables to shell execution by @galz10 in
+  https://github.com/google-gemini/gemini-cli/pull/15160
+- Remove unused code by @scidomino in
+  https://github.com/google-gemini/gemini-cli/pull/15290
+- Handle all 429 as retryableQuotaError by @sehoon38 in
+  https://github.com/google-gemini/gemini-cli/pull/15288
+- Remove unnecessary dependencies by @scidomino in
+  https://github.com/google-gemini/gemini-cli/pull/15291
+- fix: prevent infinite loop in prompt completion on error by @galz10 in
+  https://github.com/google-gemini/gemini-cli/pull/14548
+- fix(ui): show command suggestions even on perfect match and sort them by
+  @SandyTao520 in https://github.com/google-gemini/gemini-cli/pull/15287
+- feat(hooks): reduce log verbosity and improve error reporting in UI by
+  @abhipatel12 in https://github.com/google-gemini/gemini-cli/pull/15297
+- feat: simplify tool confirmation labels for better UX by @NTaylorMullen in
+  https://github.com/google-gemini/gemini-cli/pull/15296
+- chore/release: bump version to 0.21.0-nightly.20251219.70696e364 by
+  @gemini-cli-robot in https://github.com/google-gemini/gemini-cli/pull/15301
+- feat(core): Implement JIT context memory loading and UI sync by @SandyTao520
+  in https://github.com/google-gemini/gemini-cli/pull/14469
+- feat(ui): Put "Allow for all future sessions" behind a setting off by default.
+  by @jacob314 in https://github.com/google-gemini/gemini-cli/pull/15322
+- fix(cli):change the placeholder of input during the shell mode by
+  @JayadityaGit in https://github.com/google-gemini/gemini-cli/pull/15135
+- Validate OAuth resource parameter matches MCP server URL by @galz10 in
+  https://github.com/google-gemini/gemini-cli/pull/15289
+- docs(cli): add System Prompt Override (GEMINI_SYSTEM_MD) by @ashmod in
+  https://github.com/google-gemini/gemini-cli/pull/9515
+- more robust command parsing logs by @scidomino in
+  https://github.com/google-gemini/gemini-cli/pull/15339
+- Introspection agent demo by @scidomino in
+  https://github.com/google-gemini/gemini-cli/pull/15232
+- fix(core): sanitize hook command expansion and prevent injection by
+  @SandyTao520 in https://github.com/google-gemini/gemini-cli/pull/15343
+- fix(folder trust): add validation for trusted folder level by @adamfweidman in
+  https://github.com/google-gemini/gemini-cli/pull/12215
+- fix(cli): fix right border overflow in trust dialogs by @galz10 in
+  https://github.com/google-gemini/gemini-cli/pull/15350
+- fix(policy): fix bug where accepting-edits continued after it was turned off
+  by @jacob314 in https://github.com/google-gemini/gemini-cli/pull/15351
+- fix: prevent infinite relaunch loop when --resume fails (#14941) by @Ying-xi
+  in https://github.com/google-gemini/gemini-cli/pull/14951
+- chore/release: bump version to 0.21.0-nightly.20251220.41a1a3eed by
+  @gemini-cli-robot in https://github.com/google-gemini/gemini-cli/pull/15352
+- feat(telemetry): add clearcut logging for hooks by @abhipatel12 in
+  https://github.com/google-gemini/gemini-cli/pull/15405
+- fix(core): Add `.geminiignore` support to SearchText tool by @xyrolle in
+  https://github.com/google-gemini/gemini-cli/pull/13763
 
-**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.22.0-preview.3...v0.23.0-preview.0

docs/cli/cli-reference.md

@@ -1,101 +0,0 @@
-# CLI cheatsheet
-
-This page provides a reference for commonly used Gemini CLI commands, options,
-and parameters.
-
-## CLI commands
-
-| Command                            | Description                        | Example                                             |
-| ---------------------------------- | ---------------------------------- | --------------------------------------------------- |
-| `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"`               |
-| `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"`        |
-| `gemini -r "<session-id>" "query"` | Resume session by ID               | `gemini -r "abc123" "Finish this PR"`               |
-| `gemini update`                    | Update to latest version           | `gemini update`                                     |
-| `gemini extensions`                | Manage extensions                  | See [Extensions Management](#extensions-management) |
-| `gemini mcp`                       | Configure MCP servers              | See [MCP Server Management](#mcp-server-management) |
-
-### Positional arguments
-
-| Argument | Type              | Description                                                                                                        |
-| -------- | ----------------- | ------------------------------------------------------------------------------------------------------------------ |
-| `query`  | string (variadic) | Positional prompt. Defaults to one-shot mode. Use `-i/--prompt-interactive` to execute and continue interactively. |
-
-## 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`                                       |
-
-## 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.
-
-### Model aliases
-
-These are convenient shortcuts that map to specific models:
-
-| Alias        | Resolves To                                | Description                                                                                                               |
-| ------------ | ------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------- |
-| `auto`       | `gemini-2.5-pro` or `gemini-3-pro-preview` | **Default.** Resolves to the preview model if preview features are enabled, otherwise resolves to the standard pro model. |
-| `pro`        | `gemini-2.5-pro` or `gemini-3-pro-preview` | For complex reasoning tasks. Uses preview model if enabled.                                                               |
-| `flash`      | `gemini-2.5-flash`                         | Fast, balanced model for most tasks.                                                                                      |
-| `flash-lite` | `gemini-2.5-flash-lite`                    | Fastest model for simple tasks.                                                                                           |
-
-## Extensions management
-
-| Command                                            | Description                                  | Example                                                                        |
-| -------------------------------------------------- | -------------------------------------------- | ------------------------------------------------------------------------------ |
-| `gemini extensions install <source>`               | Install extension from Git URL or local path | `gemini extensions install https://github.com/user/my-extension`               |
-| `gemini extensions install <source> --ref <ref>`   | Install from specific branch/tag/commit      | `gemini extensions install https://github.com/user/my-extension --ref develop` |
-| `gemini extensions install <source> --auto-update` | Install with auto-update enabled             | `gemini extensions install https://github.com/user/my-extension --auto-update` |
-| `gemini extensions uninstall <name>`               | Uninstall one or more extensions             | `gemini extensions uninstall my-extension`                                     |
-| `gemini extensions list`                           | List all installed extensions                | `gemini extensions list`                                                       |
-| `gemini extensions update <name>`                  | Update a specific extension                  | `gemini extensions update my-extension`                                        |
-| `gemini extensions update --all`                   | Update all extensions                        | `gemini extensions update --all`                                               |
-| `gemini extensions enable <name>`                  | Enable an extension                          | `gemini extensions enable my-extension`                                        |
-| `gemini extensions disable <name>`                 | Disable an extension                         | `gemini extensions disable my-extension`                                       |
-| `gemini extensions link <path>`                    | Link local extension for development         | `gemini extensions link /path/to/extension`                                    |
-| `gemini extensions new <path>`                     | Create new extension from template           | `gemini extensions new ./my-extension`                                         |
-| `gemini extensions validate <path>`                | Validate extension structure                 | `gemini extensions validate ./my-extension`                                    |
-
-See [Extensions Documentation](../extensions/index.md) for more details.
-
-## MCP server management
-
-| Command                                                       | Description                     | Example                                                                                              |
-| ------------------------------------------------------------- | ------------------------------- | ---------------------------------------------------------------------------------------------------- |
-| `gemini mcp add <name> <command>`                             | Add stdio-based MCP server      | `gemini mcp add github npx -y @modelcontextprotocol/server-github`                                   |
-| `gemini mcp add <name> <url> --transport http`                | Add HTTP-based MCP server       | `gemini mcp add api-server http://localhost:3000 --transport http`                                   |
-| `gemini mcp add <name> <command> --env KEY=value`             | Add with environment variables  | `gemini mcp add slack node server.js --env SLACK_TOKEN=xoxb-xxx`                                     |
-| `gemini mcp add <name> <command> --scope user`                | Add with user scope             | `gemini mcp add db node db-server.js --scope user`                                                   |
-| `gemini mcp add <name> <command> --include-tools tool1,tool2` | Add with specific tools         | `gemini mcp add github npx -y @modelcontextprotocol/server-github --include-tools list_repos,get_pr` |
-| `gemini mcp remove <name>`                                    | Remove an MCP server            | `gemini mcp remove github`                                                                           |
-| `gemini mcp list`                                             | List all configured MCP servers | `gemini mcp list`                                                                                    |
-
-See [MCP Server Integration](../tools/mcp-server.md) for more details.

docs/cli/commands.md

@@ -10,14 +10,6 @@ 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
@@ -30,21 +22,10 @@ Slash commands provide meta-level control over the CLI itself.
     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>`**
+    - **`save`**
       - **Description:** Saves the current conversation history. You must add a
         `<tag>` for identifying the conversation state.
+      - **Usage:** `/chat save <tag>`
       - **Details on checkpoint location:** The default locations for saved chat
         checkpoints are:
         - Linux/macOS: `~/.gemini/tmp/<project_hash>/`
@@ -56,11 +37,25 @@ Slash commands provide meta-level control over the CLI itself.
           conversation states. For automatic checkpoints created before file
           modifications, see the
           [Checkpointing documentation](../cli/checkpointing.md).
-    - **`share [filename]`**
+    - **`resume`**
+      - **Description:** Resumes a conversation from a previous save.
+      - **Usage:** `/chat resume <tag>`
+      - **Note:** You can only resume chats that were saved within the current
+        project. To resume a chat from a different project, you must run the
+        Gemini CLI from that project's directory.
+    - **`list`**
+      - **Description:** Lists available tags for chat state resumption.
+      - **Note:** This command only lists chats saved within the current
+        project. Because chat history is project-scoped, chats saved in other
+        project directories will not be displayed.
+    - **`delete`**
+      - **Description:** Deletes a saved conversation checkpoint.
+      - **Usage:** `/chat delete <tag>`
+    - **`share`**
       - **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`.
+        or JSON file.
+      - **Usage** `/chat share file.md` or `/chat share file.json`. If no
+        filename is provided, then the CLI will generate one.
 
 - **`/clear`**
   - **Description:** Clear the terminal screen, including the visible session
@@ -78,9 +73,6 @@ Slash commands provide meta-level control over the CLI itself.
 - **`/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
@@ -103,9 +95,6 @@ Slash commands provide meta-level control over the CLI itself.
         `--include-directories`.
       - **Usage:** `/directory show`
 
-- **`/docs`**
-  - **Description:** Open the Gemini CLI documentation in your browser.
-
 - **`/editor`**
   - **Description:** Open a dialog for selecting supported editors.
 
@@ -117,65 +106,30 @@ Slash commands provide meta-level control over the CLI itself.
   - **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:**
+    - **`list`** or **`ls`**:
+      - **Description:** List configured MCP servers and tools. This is the
+        default action if no subcommand is specified.
+    - **`desc`**
+      - **Description:** List configured MCP servers and tools with
+        descriptions.
+    - **`schema`**:
+      - **Description:** List configured MCP servers and tools with descriptions
+        and schemas.
     - **`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.
+
+- [**`/model`**](./model.md)
+  - **Description:** Opens a dialog to choose your Gemini model.
 
 - **`/memory`**
   - **Description:** Manage the AI's instructional context (hierarchical memory
@@ -184,40 +138,23 @@ Slash commands provide meta-level control over the CLI itself.
     - **`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.
+    - **`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.
+    - **`list`**:
+      - **Description:** Lists the paths of the GEMINI.md files in use for
+        hierarchical memory.
     - **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
@@ -227,25 +164,18 @@ Slash commands provide meta-level control over the CLI itself.
   - **Note:** Only available if checkpointing is configured via
     [settings](../get-started/configuration.md). See
     [Checkpointing documentation](../cli/checkpointing.md) for more details.
-
-- **`/rewind`**
-  - **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
+    - **Search:** Use `/` to search through conversation content across all
+      sessions
     - **Sorting:** Sort sessions by date or message count
+    - **Management:** Delete unwanted sessions directly from the browser
+    - **Resume:** Select any session to resume and continue the conversation
   - **Note:** All conversations are automatically saved as you chat - no manual
     saving required. See [Session Management](../cli/session-management.md) for
     complete details.
@@ -264,27 +194,6 @@ Slash commands provide meta-level control over the CLI itself.
     modify them as desired. Changes to some settings are applied immediately,
     while others require a restart.
 
-- **`/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
@@ -292,14 +201,18 @@ Slash commands provide meta-level control over the CLI itself.
     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.
 
+- **`/auth`**
+  - **Description:** Open a dialog that lets you change the authentication
+    method.
+
+- **`/about`**
+  - **Description:** Show version info. Please share this information when
+    filing issues.
+
 - [**`/tools`**](../tools/index.md)
   - **Description:** Display a list of tools that are currently available within
     Gemini CLI.
@@ -311,23 +224,37 @@ Slash commands provide meta-level control over the CLI itself.
     - **`nodesc`** or **`nodescriptions`**:
       - **Description:** Hide tool descriptions, showing only the tool names.
 
+- **`/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.
+
 - **`/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)
+    - **INSERT mode:** Standard text input with escape to return to NORMAL mode
+    - **Editing commands:** Delete with `x`, change with `c`, insert with `i`,
+      `a`, `o`, `O`; complex operations like `dd`, `cc`, `dw`, `cw`
+    - **Count support:** Prefix commands with numbers (e.g., `3h`, `5w`, `10G`)
+    - **Repeat last command:** Use `.` to repeat the last editing operation
     - **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
+  - **Status indicator:** When enabled, shows `[NORMAL]` or `[INSERT]` in the
+    footer
+
+- **`/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.
 
 ### Custom commands
 
@@ -340,12 +267,12 @@ please see the dedicated [Custom Commands documentation](./custom-commands.md).
 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.
+  - **Keyboard shortcut:** Press **Ctrl+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.
+  - **Keyboard shortcut:** Press **Ctrl+Shift+Z** to redo the last undone action
+    in the input prompt.
 
 ## At commands (`@`)
 

docs/cli/creating-skills.md

@@ -1,80 +0,0 @@
-# Creating Agent Skills
-
-This guide provides an overview of how to create your own Agent Skills to extend
-the capabilities of Gemini CLI.
-
-## Getting started: The `skill-creator` skill
-
-The recommended way to create a new skill is to use the built-in `skill-creator`
-skill. To use it, ask Gemini CLI to create a new skill for you.
-
-**Example prompt:**
-
-> "create a new skill called 'code-reviewer'"
-
-Gemini CLI will then use the `skill-creator` to generate the skill:
-
-1.  Generate a new directory for your skill (e.g., `my-new-skill/`).
-2.  Create a `SKILL.md` file with the necessary YAML frontmatter (`name` and
-    `description`).
-3.  Create the standard resource directories: `scripts/`, `references/`, and
-    `assets/`.
-
-## Manual skill creation
-
-If you prefer to create skills manually:
-
-1.  **Create a directory** for your skill (e.g., `my-new-skill/`).
-2.  **Create a `SKILL.md` file** inside the new directory.
-
-To add additional resources that support the skill, refer to the skill
-structure.
-
-## Skill structure
-
-A skill is a directory containing a `SKILL.md` file at its root.
-
-### Folder structure
-
-While a `SKILL.md` file is the only required component, we recommend the
-following structure for organizing your skill's resources:
-
-```text
-my-skill/
-├── SKILL.md       (Required) Instructions and metadata
-├── scripts/       (Optional) Executable scripts
-├── references/    (Optional) Static documentation
-└── assets/        (Optional) Templates and other resources
-```
-
-### `SKILL.md` file
-
-The `SKILL.md` file is the core of your skill. This file uses YAML frontmatter
-for metadata and Markdown for instructions. For example:
-
-```markdown
----
-name: code-reviewer
-description:
-  Use this skill to review code. It supports both local changes and remote Pull
-  Requests.
----
-
-# Code Reviewer
-
-This skill guides the agent in conducting thorough code reviews.
-
-## Workflow
-
-### 1. Determine Review Target
-
-- **Remote PR**: If the user gives a PR number or URL, target that remote PR.
-- **Local Changes**: If changes are local... ...
-```
-
-- **`name`**: A unique identifier for the skill. This should match the directory
-  name.
-- **`description`**: A description of what the skill does and when Gemini should
-  use it.
-- **Body**: The Markdown body of the file contains the instructions that guide
-  the agent's behavior when the skill is active.

docs/cli/custom-commands.md

@@ -50,7 +50,7 @@ Your command definition files must be written in the TOML format and use the
 ## Handling arguments
 
 Custom commands support two powerful methods for handling arguments. The CLI
-automatically chooses the correct method based on the content of your command's
+automatically chooses the correct method based on the content of your command\'s
 `prompt`.
 
 ### 1. Context-aware injection with `{{args}}`
@@ -96,13 +96,13 @@ Search Results:
 """
 ```
 
-When you run `/grep-code It's complicated`:
+When you run `/grep-code It\'s complicated`:
 
 1. The CLI sees `{{args}}` used both outside and inside `!{...}`.
-2. Outside: The first `{{args}}` is replaced raw with `It's complicated`.
+2. Outside: The first `{{args}}` is replaced raw with `It\'s complicated`.
 3. Inside: The second `{{args}}` is replaced with the escaped version (e.g., on
    Linux: `"It\'s complicated"`).
-4. The command executed is `grep -r "It's complicated" .`.
+4. The command executed is `grep -r "It\'s complicated" .`.
 5. The CLI prompts you to confirm this exact, secure command before execution.
 6. The final prompt is sent.
 
@@ -129,13 +129,13 @@ format and behavior.
 # In: <project>/.gemini/commands/changelog.toml
 # Invoked via: /changelog 1.2.0 added "Support for default argument parsing."
 
-description = "Adds a new entry to the project's CHANGELOG.md file."
+description = "Adds a new entry to the project\'s CHANGELOG.md file."
 prompt = """
 # Task: Update Changelog
 
 You are an expert maintainer of this software project. A user has invoked a command to add a new entry to the changelog.
 
-**The user's raw command is appended below your instructions.**
+**The user\'s raw command is appended below your instructions.**
 
 Your task is to parse the `<version>`, `<change_type>`, and `<message>` from their input and use the `write_file` tool to correctly update the `CHANGELOG.md` file.
 
@@ -147,7 +147,7 @@ The command follows this format: `/changelog <version> <type> <message>`
 1. Read the `CHANGELOG.md` file.
 2. Find the section for the specified `<version>`.
 3. Add the `<message>` under the correct `<type>` heading.
-4. If the version or type section doesn't exist, create it.
+4. If the version or type section doesn\'t exist, create it.
 5. Adhere strictly to the "Keep a Changelog" format.
 """
 ```
@@ -241,7 +241,7 @@ operate on specific files.
 **Example (`review.toml`):**
 
 This command injects the content of a _fixed_ best practices file
-(`docs/best-practices.md`) and uses the user's arguments to provide context for
+(`docs/best-practices.md`) and uses the user\'s arguments to provide context for
 the review.
 
 ```toml
@@ -293,7 +293,7 @@ practice.
 description = "Asks the model to refactor the current context into a pure function."
 
 prompt = """
-Please analyze the code I've provided in the current context.
+Please analyze the code I\'ve provided in the current context.
 Refactor it into a pure function.
 
 Your response should include:

docs/cli/index.md

@@ -25,12 +25,10 @@ overview of Gemini CLI, see the [main documentation page](../index.md).
 
 - **[Checkpointing](./checkpointing.md):** Automatically save and restore
   snapshots of your session and files.
-- **[Enterprise configuration](./enterprise.md):** Deploy and manage Gemini CLI
-  in an enterprise environment.
+- **[Enterprise configuration](./enterprise.md):** Deploying 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.

docs/cli/keyboard-shortcuts.md

@@ -8,50 +8,43 @@ available combinations.
 
 #### Basic Controls
 
-| Action                                                          | Keys       |
-| --------------------------------------------------------------- | ---------- |
-| Confirm the current selection or choice.                        | `Enter`    |
-| Dismiss dialogs or cancel the current focus.                    | `Esc`      |
-| Cancel the current request or quit the CLI when input is empty. | `Ctrl + C` |
-| Exit the CLI when the input buffer is empty.                    | `Ctrl + D` |
+| Action                                       | Keys    |
+| -------------------------------------------- | ------- |
+| Confirm the current selection or choice.     | `Enter` |
+| Dismiss dialogs or cancel the current focus. | `Esc`   |
 
 #### Cursor Movement
 
-| Action                                      | Keys                                                         |
-| ------------------------------------------- | ------------------------------------------------------------ |
-| Move the cursor to the start of the line.   | `Ctrl + A`<br />`Home (no Shift, Ctrl)`                      |
-| Move the cursor to the end of the line.     | `Ctrl + E`<br />`End (no Shift, Ctrl)`                       |
-| Move the cursor up one line.                | `Up Arrow (no Shift, Alt, Ctrl, Cmd)`                        |
-| Move the cursor down one line.              | `Down Arrow (no Shift, Alt, Ctrl, Cmd)`                      |
-| Move the cursor one character to the left.  | `Left Arrow (no Shift, Alt, Ctrl, Cmd)`<br />`Ctrl + B`      |
-| Move the cursor one character to the right. | `Right Arrow (no Shift, Alt, Ctrl, Cmd)`<br />`Ctrl + F`     |
-| Move the cursor one word to the left.       | `Ctrl + Left Arrow`<br />`Alt + Left Arrow`<br />`Alt + B`   |
-| Move the cursor one word to the right.      | `Ctrl + Right Arrow`<br />`Alt + Right Arrow`<br />`Alt + F` |
+| Action                                    | Keys                   |
+| ----------------------------------------- | ---------------------- |
+| Move the cursor to the start of the line. | `Ctrl + A`<br />`Home` |
+| Move the cursor to the end of the line.   | `Ctrl + E`<br />`End`  |
 
 #### Editing
 
-| Action                                           | Keys                                                             |
-| ------------------------------------------------ | ---------------------------------------------------------------- |
-| Delete from the cursor to the end of the line.   | `Ctrl + K`                                                       |
-| Delete from the cursor to the start of the line. | `Ctrl + U`                                                       |
-| Clear all text in the input field.               | `Ctrl + C`                                                       |
-| Delete the previous word.                        | `Ctrl + Backspace`<br />`Alt + Backspace`<br />`Ctrl + W`        |
-| Delete the next word.                            | `Ctrl + Delete`<br />`Alt + Delete`                              |
-| Delete the character to the left.                | `Backspace`<br />`Ctrl + H`                                      |
-| Delete the character to the right.               | `Delete`<br />`Ctrl + D`                                         |
-| Undo the most recent text edit.                  | `Cmd + Z (no Shift)`<br />`Alt + Z (no Shift)`                   |
-| Redo the most recent undone text edit.           | `Shift + Ctrl + Z`<br />`Shift + Cmd + Z`<br />`Shift + Alt + Z` |
+| Action                                           | Keys                                      |
+| ------------------------------------------------ | ----------------------------------------- |
+| Delete from the cursor to the end of the line.   | `Ctrl + K`                                |
+| Delete from the cursor to the start of the line. | `Ctrl + U`                                |
+| Clear all text in the input field.               | `Ctrl + C`                                |
+| Delete the previous word.                        | `Ctrl + Backspace`<br />`Cmd + Backspace` |
+
+#### Screen Control
+
+| Action                                       | Keys       |
+| -------------------------------------------- | ---------- |
+| Clear the terminal screen and redraw the UI. | `Ctrl + L` |
 
 #### Scrolling
 
-| Action                   | Keys                              |
-| ------------------------ | --------------------------------- |
-| Scroll content up.       | `Shift + Up Arrow`                |
-| Scroll content down.     | `Shift + Down Arrow`              |
-| Scroll to the top.       | `Ctrl + Home`<br />`Shift + Home` |
-| Scroll to the bottom.    | `Ctrl + End`<br />`Shift + End`   |
-| Scroll up by one page.   | `Page Up`                         |
-| Scroll down by one page. | `Page Down`                       |
+| Action                   | Keys                 |
+| ------------------------ | -------------------- |
+| Scroll content up.       | `Shift + Up Arrow`   |
+| Scroll content down.     | `Shift + Down Arrow` |
+| Scroll to the top.       | `Home`               |
+| Scroll to the bottom.    | `End`                |
+| Scroll up by one page.   | `Page Up`            |
+| Scroll down by one page. | `Page Down`          |
 
 #### History & Search
 
@@ -60,20 +53,17 @@ available combinations.
 | Show the previous entry in history.          | `Ctrl + P (no Shift)` |
 | Show the next entry in history.              | `Ctrl + N (no Shift)` |
 | Start reverse search through history.        | `Ctrl + R`            |
-| Submit the selected reverse-search match.    | `Enter (no Ctrl)`     |
+| Insert the selected reverse-search match.    | `Enter (no Ctrl)`     |
 | Accept a suggestion while reverse searching. | `Tab`                 |
-| Browse and rewind previous interactions.     | `Double Esc`          |
 
 #### Navigation
 
-| Action                                             | Keys                                        |
-| -------------------------------------------------- | ------------------------------------------- |
-| Move selection up in lists.                        | `Up Arrow (no Shift)`                       |
-| Move selection down in lists.                      | `Down Arrow (no Shift)`                     |
-| Move up within dialog options.                     | `Up Arrow (no Shift)`<br />`K (no Shift)`   |
-| Move down within dialog options.                   | `Down Arrow (no Shift)`<br />`J (no Shift)` |
-| Move to the next item or question in a dialog.     | `Tab (no Shift)`                            |
-| Move to the previous item or question in a dialog. | `Shift + Tab`                               |
+| Action                           | Keys                                        |
+| -------------------------------- | ------------------------------------------- |
+| Move selection up in lists.      | `Up Arrow (no Shift)`                       |
+| Move selection down in lists.    | `Down Arrow (no Shift)`                     |
+| Move up within dialog options.   | `Up Arrow (no Shift)`<br />`K (no Shift)`   |
+| Move down within dialog options. | `Down Arrow (no Shift)`<br />`J (no Shift)` |
 
 #### Suggestions & Completions
 
@@ -87,46 +77,67 @@ available combinations.
 
 #### Text Input
 
-| Action                                         | Keys                                                                                      |
-| ---------------------------------------------- | ----------------------------------------------------------------------------------------- |
-| Submit the current prompt.                     | `Enter (no Shift, Alt, Ctrl, Cmd)`                                                        |
-| Insert a newline without submitting.           | `Ctrl + Enter`<br />`Cmd + Enter`<br />`Alt + Enter`<br />`Shift + Enter`<br />`Ctrl + J` |
-| Open the current prompt in an external editor. | `Ctrl + X`                                                                                |
-| Paste from the clipboard.                      | `Ctrl + V`<br />`Cmd + V`<br />`Alt + V`                                                  |
+| Action                               | Keys                                                                                        |
+| ------------------------------------ | ------------------------------------------------------------------------------------------- |
+| Submit the current prompt.           | `Enter (no Ctrl, no Shift, no Cmd, not Paste)`                                              |
+| Insert a newline without submitting. | `Ctrl + Enter`<br />`Cmd + Enter`<br />`Paste + Enter`<br />`Shift + Enter`<br />`Ctrl + J` |
+
+#### External Tools
+
+| Action                                         | Keys                      |
+| ---------------------------------------------- | ------------------------- |
+| Open the current prompt in an external editor. | `Ctrl + X`                |
+| Paste from the clipboard.                      | `Ctrl + V`<br />`Cmd + V` |
 
 #### App Controls
 
-| Action                                                                                                | Keys                       |
-| ----------------------------------------------------------------------------------------------------- | -------------------------- |
-| Toggle detailed error information.                                                                    | `F12`                      |
-| Toggle the full TODO list.                                                                            | `Ctrl + T`                 |
-| Show IDE context details.                                                                             | `Ctrl + G`                 |
-| Toggle Markdown rendering.                                                                            | `Alt + M`                  |
-| Toggle copy mode when in alternate buffer mode.                                                       | `Ctrl + S`                 |
-| Toggle YOLO (auto-approval) mode for tool calls.                                                      | `Ctrl + Y`                 |
-| Cycle through approval modes: default (prompt), auto_edit (auto-approve edits), and plan (read-only). | `Shift + Tab`              |
-| Expand a height-constrained response to show additional lines when not in alternate buffer mode.      | `Ctrl + O`<br />`Ctrl + S` |
-| Focus the shell input from the gemini input.                                                          | `Tab (no Shift)`           |
-| Focus the Gemini input from the shell input.                                                          | `Tab`                      |
-| Clear the terminal screen and redraw the UI.                                                          | `Ctrl + L`                 |
-| Restart the application.                                                                              | `R`                        |
-| Suspend the application (not yet implemented).                                                        | `Ctrl + Z`                 |
+| Action                                                            | Keys       |
+| ----------------------------------------------------------------- | ---------- |
+| Toggle detailed error information.                                | `F12`      |
+| Toggle the full TODO list.                                        | `Ctrl + T` |
+| Toggle IDE context details.                                       | `Ctrl + G` |
+| Toggle Markdown rendering.                                        | `Cmd + M`  |
+| Toggle copy mode when the terminal is using the alternate buffer. | `Ctrl + S` |
+| Expand a height-constrained response to show additional lines.    | `Ctrl + S` |
+| Toggle focus between the shell and Gemini input.                  | `Ctrl + F` |
+
+#### Session Control
+
+| Action                                       | Keys       |
+| -------------------------------------------- | ---------- |
+| Cancel the current request or quit the CLI.  | `Ctrl + C` |
+| Exit the CLI when the input buffer is empty. | `Ctrl + D` |
 
 <!-- KEYBINDINGS-AUTOGEN:END -->
 
 ## Additional context-specific shortcuts
 
-- `Option+B/F/M` (macOS only): Are interpreted as `Cmd+B/F/M` even if your
-  terminal isn't configured to send Meta with Option.
+- `Ctrl+Y`: Toggle YOLO (auto-approval) mode for tool calls.
+- `Shift+Tab`: Toggle Auto Edit (auto-accept edits) mode.
+- `Option+M` (macOS): Entering `µ` with Option+M also toggles Markdown
+  rendering, matching `Cmd+M`.
 - `!` on an empty prompt: Enter or exit shell mode.
 - `\` (at end of a line) + `Enter`: Insert a newline without leaving single-line
   mode.
-- `Esc` pressed twice quickly: Clear the input prompt if it is not empty,
-  otherwise browse and rewind previous interactions.
+- `Ctrl+Delete` / `Meta+Delete`: Delete the word to the right of the cursor.
+- `Ctrl+B` or `Left Arrow`: Move the cursor one character to the left while
+  editing text.
+- `Ctrl+F` or `Right Arrow`: Move the cursor one character to the right; with an
+  embedded shell attached, `Ctrl+F` still toggles focus.
+- `Ctrl+D` or `Delete`: Remove the character immediately to the right of the
+  cursor.
+- `Ctrl+H` or `Backspace`: Remove the character immediately to the left of the
+  cursor.
+- `Ctrl+Left Arrow` / `Meta+Left Arrow` / `Meta+B`: Move one word to the left.
+- `Ctrl+Right Arrow` / `Meta+Right Arrow` / `Meta+F`: Move one word to the
+  right.
+- `Ctrl+W`: Delete the word to the left of the cursor (in addition to
+  `Ctrl+Backspace` / `Cmd+Backspace`).
+- `Ctrl+Z` / `Ctrl+Shift+Z`: Undo or redo the most recent text edit.
+- `Meta+Enter`: Open the current input in an external editor (alias for
+  `Ctrl+X`).
+- `Esc` pressed twice quickly: Clear the current input buffer.
 - `Up Arrow` / `Down Arrow`: When the cursor is at the top or bottom of a
   single-line input, navigate backward or forward through prompt history.
 - `Number keys (1-9, multi-digit)` inside selection dialogs: Jump directly to
   the numbered radio option and confirm when the full number is entered.
-- `Double-click` on a paste placeholder (`[Pasted Text: X lines]`) in alternate
-  buffer mode: Expand to view full content inline. Double-click again to
-  collapse.

docs/cli/model-routing.md

@@ -11,17 +11,12 @@ health and automatically routes requests to available models based on defined
 policies.
 
 1.  **Model failure:** If the currently selected model fails (e.g., due to quota
-    or server errors), the CLI will initiate the fallback process.
+    or server errors), the CLI will iniate the fallback process.
 
 2.  **User consent:** Depending on the failure and the model's policy, the CLI
     may prompt you to switch to a fallback model (by default always prompts
     you).
 
-    Some internal utility calls (such as prompt completion and classification)
-    use a silent fallback chain for `gemini-2.5-flash-lite` and will fall back
-    to `gemini-2.5-flash` and `gemini-2.5-pro` without prompting or changing the
-    configured model.
-
 3.  **Model switch:** If approved, or if the policy allows for silent fallback,
     the CLI will use an available fallback model for the current turn or the
     remainder of the session.

docs/cli/rewind.md

@@ -1,51 +0,0 @@
-# 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.
-
-## Usage
-
-To use the rewind feature, simply type `/rewind` into the input prompt and press
-**Enter**.
-
-Alternatively, you can use the keyboard shortcut: **Press `Esc` twice**.
-
-## Interface
-
-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
-    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
-    back to.
-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
-      interaction.
-    - **Rewind conversation:** Only reverts the chat history. File changes are
-      kept.
-    - **Revert code changes:** Only reverts the file modifications. The chat
-      history is kept.
-    - **Do nothing (esc):** Cancels the rewind operation.
-
-If no code changes were made since the selected point, the options related to
-reverting code changes will be hidden.
-
-## Key Considerations
-
-- **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
-  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
-  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
-  the history from stored session data.

docs/cli/sandbox.md

@@ -11,7 +11,7 @@ Before using sandboxing, you need to install and set up the Gemini CLI:
 npm install -g @google/gemini-cli
 ```
 
-To verify the installation:
+To verify the installation
 
 ```bash
 gemini --version

docs/cli/settings.md

@@ -18,52 +18,45 @@ Note: Workspace settings override user settings.
 Here is a list of all the available settings, grouped by category and ordered as
 they appear in the UI.
 
-<!-- SETTINGS-AUTOGEN:START -->
-
 ### 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     |
+| ------------------------------- | ---------------------------------- | ---------------------------------------------------------------------------- | ----------- |
+| Preview Features (e.g., models) | `general.previewFeatures`          | Enable preview features (e.g., preview models).                              | `false`     |
+| Vim Mode                        | `general.vimMode`                  | Enable Vim keybindings.                                                      | `false`     |
+| Disable Auto Update             | `general.disableAutoUpdate`        | Disable automatic updates.                                                   | `false`     |
+| Enable Prompt Completion        | `general.enablePromptCompletion`   | Enable AI-powered prompt completion suggestions while typing.                | `false`     |
+| Debug Keystroke Logging         | `general.debugKeystrokeLogging`    | Enable debug logging of keystrokes to the console.                           | `false`     |
+| Session Retention               | `general.sessionRetention`         | Settings for automatic session cleanup. This feature is disabled by default. | `undefined` |
+| Enable Session Cleanup          | `general.sessionRetention.enabled` | Enable automatic session cleanup.                                            | `false`     |
 
 ### Output
 
-| UI Label      | Setting         | Description                                            | Default  |
-| ------------- | --------------- | ------------------------------------------------------ | -------- |
-| Output Format | `output.format` | The format of the CLI output. Can be `text` or `json`. | `"text"` |
+| UI Label      | Setting         | Description                                            | Default |
+| ------------- | --------------- | ------------------------------------------------------ | ------- |
+| Output Format | `output.format` | The format of the CLI output. Can be `text` or `json`. | `text`  |
 
 ### UI
 
-| UI Label                       | Setting                                 | Description                                                                                                                                                       | Default |
-| ------------------------------ | --------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Hide Window Title              | `ui.hideWindowTitle`                    | Hide the window title bar                                                                                                                                         | `false` |
-| Show 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 |
+| ------------------------------ | ---------------------------------------- | -------------------------------------------------------------------- | ------- |
+| Hide Window Title              | `ui.hideWindowTitle`                     | Hide the window title bar.                                           | `false` |
+| Show Status in Title           | `ui.showStatusInTitle`                   | Show Gemini CLI status and thoughts in the terminal window title.    | `false` |
+| Hide Tips                      | `ui.hideTips`                            | Hide helpful tips in the UI.                                         | `false` |
+| Hide Banner                    | `ui.hideBanner`                          | Hide the application banner.                                         | `false` |
+| Hide Context Summary           | `ui.hideContextSummary`                  | Hide the context summary (GEMINI.md, MCP servers) above the input.   | `false` |
+| Hide CWD                       | `ui.footer.hideCWD`                      | Hide the current working directory path in the footer.               | `false` |
+| Hide Sandbox Status            | `ui.footer.hideSandboxStatus`            | Hide the sandbox status indicator in the footer.                     | `false` |
+| Hide Model Info                | `ui.footer.hideModelInfo`                | Hide the model name and context usage in the footer.                 | `false` |
+| Hide Context Window Percentage | `ui.footer.hideContextPercentage`        | Hides the context window remaining percentage.                       | `true`  |
+| Hide Footer                    | `ui.hideFooter`                          | Hide the footer from the UI.                                         | `false` |
+| Show Memory Usage              | `ui.showMemoryUsage`                     | Display memory usage information in the UI.                          | `false` |
+| Show Line Numbers              | `ui.showLineNumbers`                     | Show line numbers in the chat.                                       | `false` |
+| Show Citations                 | `ui.showCitations`                       | Show citations for generated text in the chat.                       | `false` |
+| Use Full Width                 | `ui.useFullWidth`                        | Use the entire width of the terminal for output.                     | `true`  |
+| Use Alternate Screen Buffer    | `ui.useAlternateBuffer`                  | Use an alternate screen buffer for the UI, preserving shell history. | `true`  |
+| Disable Loading Phrases        | `ui.accessibility.disableLoadingPhrases` | Disable loading phrases for accessibility.                           | `false` |
+| Screen Reader Mode             | `ui.accessibility.screenReader`          | Render output in plain-text to be more screen reader accessible.     | `false` |
 
 ### IDE
 
@@ -76,63 +69,47 @@ they appear in the UI.
 | 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`   |
+| Compression Threshold   | `model.compressionThreshold` | The fraction of context usage at which to trigger context compression (e.g. 0.2, 0.3). | `0.2`   |
 | Skip Next Speaker Check | `model.skipNextSpeakerCheck` | Skip the next speaker check.                                                           | `true`  |
 
 ### Context
 
-| UI Label                             | Setting                                           | Description                                                                                                                                                                                                                                 | Default |
-| ------------------------------------ | ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Memory Discovery Max Dirs            | `context.discoveryMaxDirs`                        | Maximum number of directories to search for memory.                                                                                                                                                                                         | `200`   |
-| Load Memory From Include Directories | `context.loadMemoryFromIncludeDirectories`        | Controls how /memory refresh loads GEMINI.md files. When true, include directories are scanned; when false, only the current directory is used.                                                                                             | `false` |
-| Respect .gitignore                   | `context.fileFiltering.respectGitIgnore`          | Respect .gitignore files when searching.                                                                                                                                                                                                    | `true`  |
-| Respect .geminiignore                | `context.fileFiltering.respectGeminiIgnore`       | Respect .geminiignore files when searching.                                                                                                                                                                                                 | `true`  |
-| Enable Recursive File Search         | `context.fileFiltering.enableRecursiveFileSearch` | Enable recursive file search functionality when completing @ references in the prompt.                                                                                                                                                      | `true`  |
-| Enable Fuzzy Search                  | `context.fileFiltering.enableFuzzySearch`         | Enable fuzzy search when searching for files.                                                                                                                                                                                               | `true`  |
-| Custom Ignore File Paths             | `context.fileFiltering.customIgnoreFilePaths`     | Additional ignore file paths to respect. These files take precedence over .geminiignore and .gitignore. Files earlier in the array take precedence over files later in the array, e.g. the first file takes precedence over the second one. | `[]`    |
+| UI Label                             | Setting                                           | Description                                                                                                                                     | Default |
+| ------------------------------------ | ------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| Memory Discovery Max Dirs            | `context.discoveryMaxDirs`                        | Maximum number of directories to search for memory.                                                                                             | `200`   |
+| Load Memory From Include Directories | `context.loadMemoryFromIncludeDirectories`        | Controls how /memory refresh loads GEMINI.md files. When true, include directories are scanned; when false, only the current directory is used. | `false` |
+| Respect .gitignore                   | `context.fileFiltering.respectGitIgnore`          | Respect .gitignore files when searching.                                                                                                        | `true`  |
+| Respect .geminiignore                | `context.fileFiltering.respectGeminiIgnore`       | Respect .geminiignore files when searching.                                                                                                     | `true`  |
+| Enable Recursive File Search         | `context.fileFiltering.enableRecursiveFileSearch` | Enable recursive file search functionality when completing @ references in the prompt.                                                          | `true`  |
+| Disable Fuzzy Search                 | `context.fileFiltering.disableFuzzySearch`        | Disable fuzzy search when searching for files.                                                                                                  | `false` |
 
 ### Tools
 
-| UI Label                         | Setting                              | Description                                                                                                                                                                    | Default     |
-| -------------------------------- | ------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------- |
-| Enable Interactive Shell         | `tools.shell.enableInteractiveShell` | Use node-pty for an interactive shell experience. Fallback to child_process still applies.                                                                                     | `true`      |
-| Show Color                       | `tools.shell.showColor`              | Show color in shell output.                                                                                                                                                    | `false`     |
-| Auto Accept                      | `tools.autoAccept`                   | Automatically accept and execute tool calls that are considered safe (e.g., read-only operations).                                                                             | `false`     |
-| 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` |
+| Auto Accept                      | `tools.autoAccept`                   | Automatically accept and execute tool calls that are considered safe (e.g., read-only operations).              | `false` |
+| Use Ripgrep                      | `tools.useRipgrep`                   | Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance. | `true`  |
+| Enable Tool Output Truncation    | `tools.enableToolOutputTruncation`   | Enable truncation of large tool outputs.                                                                        | `true`  |
+| Tool Output Truncation Threshold | `tools.truncateToolOutputThreshold`  | Truncate tool output if it is larger than this many characters. Set to -1 to disable.                           | `10000` |
+| Tool Output Truncation Lines     | `tools.truncateToolOutputLines`      | The number of lines to keep when truncating tool output.                                                        | `100`   |
 
 ### 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` |
-| Folder Trust                          | `security.folderTrust.enabled`                  | Setting to track whether Folder trust is enabled.                               | `false` |
-| 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` |
+| Blocks extensions from Git    | `security.blockGitExtensions`                   | Blocks installing and loading extensions from Git.        | `false` |
+| Folder Trust                  | `security.folderTrust.enabled`                  | Setting to track whether Folder trust is enabled.         | `false` |
+| Allowed Environment Variables | `security.environmentVariableRedaction.allowed` | Environment variables to always allow (bypass redaction). | `[]`    |
+| Blocked Environment Variables | `security.environmentVariableRedaction.blocked` | Environment variables to always redact.                   | `[]`    |
 
 ### 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` |
-
-### Skills
-
-| UI Label            | Setting          | Description          | Default |
-| ------------------- | ---------------- | -------------------- | ------- |
-| Enable Agent Skills | `skills.enabled` | Enable Agent Skills. | `true`  |
-
-### HooksConfig
-
-| UI Label           | Setting                     | Description                                                                      | Default |
-| ------------------ | --------------------------- | -------------------------------------------------------------------------------- | ------- |
-| Enable Hooks       | `hooksConfig.enabled`       | Canonical toggle for the hooks system. When disabled, no hooks will be executed. | `true`  |
-| Hook Notifications | `hooksConfig.notifications` | Show visual indicators when hooks are executing.                                 | `true`  |
-
-<!-- SETTINGS-AUTOGEN:END -->
+| UI Label                            | Setting                                                 | Description                                                  | Default |
+| ----------------------------------- | ------------------------------------------------------- | ------------------------------------------------------------ | ------- |
+| Enable Codebase Investigator        | `experimental.codebaseInvestigatorSettings.enabled`     | Enable the Codebase Investigator agent.                      | `true`  |
+| Codebase Investigator Max Num Turns | `experimental.codebaseInvestigatorSettings.maxNumTurns` | Maximum number of turns for the Codebase Investigator agent. | `10`    |
+| Enable CLI Help Agent               | `experimental.cliHelpAgentSettings.enabled`             | Enable the CLI Help Agent.                                   | `true`  |
+| Agent Skills                        | `experimental.skills`                                   | Enable Agent Skills (experimental).                          | `false` |

docs/cli/skills.md

@@ -1,5 +1,9 @@
 # Agent Skills
 
+_Note: This is an experimental feature enabled via `experimental.skills`. You
+can also search for "Skills" within the `/settings` interactive UI to toggle
+this and manage other skill-related settings._
+
 Agent Skills allow you to extend Gemini CLI with specialized expertise,
 procedural workflows, and task-specific resources. Based on the
 [Agent Skills](https://agentskills.io) open standard, a "skill" is a
@@ -9,7 +13,7 @@ discoverable capability.
 ## Overview
 
 Unlike general context files ([`GEMINI.md`](./gemini-md.md)), which provide
-persistent workspace-wide background, Skills represent **on-demand expertise**.
+persistent project-wide background, Skills represent **on-demand expertise**.
 This allows Gemini to maintain a vast library of specialized capabilities—such
 as security auditing, cloud deployments, or codebase migrations—without
 cluttering the model's immediate context window.
@@ -35,15 +39,15 @@ 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
+1.  **Project Skills** (`.gemini/skills/`): Project-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.
+    your projects.
 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**.
+locations override lower ones: **Project > User > Extension**.
 
 ## Managing Skills
 
@@ -57,7 +61,7 @@ Use the `/skills` slash command to view and manage available expertise:
 - `/skills reload`: Refreshes the list of discovered skills from all tiers.
 
 _Note: `/skills disable` and `/skills enable` default to the `user` scope. Use
-`--scope workspace` to manage workspace-specific settings._
+`--scope project` to manage project-specific settings._
 
 ### From the Terminal
 
@@ -67,28 +71,73 @@ The `gemini skills` command provides management utilities:
 # List all discovered skills
 gemini skills list
 
-# Install a skill from a Git repository, local directory, or zipped skill file (.skill)
-# Uses the user scope by default (~/.gemini/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
-
-# 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)
-gemini skills install /path/to/skill --scope workspace
-
-# Uninstall a skill by name
-gemini skills uninstall my-expertise --scope workspace
-
-# Enable a skill (globally)
+# Enable/disable skills. Can use --scope to specify project or user
 gemini skills enable my-expertise
-
-# Disable a skill. Can use --scope to specify workspace or user (defaults to workspace)
-gemini skills disable my-expertise --scope workspace
+gemini skills disable my-expertise
 ```
 
+## Creating a Skill
+
+A skill is a directory containing a `SKILL.md` file at its root. This file uses
+YAML frontmatter for metadata and Markdown for instructions.
+
+### Basic Structure
+
+```markdown
+---
+name: <unique-name>
+description: <what the skill does and when Gemini should use it>
+---
+
+<your instructions for how the agent should behave / use the skill>
+```
+
+- **`name`**: A unique identifier (lowercase, alphanumeric, and dashes).
+- **`description`**: The most critical field. Gemini uses this to decide when
+  the skill is relevant. Be specific about the expertise provided.
+- **Body**: Everything below the second `---` is injected as expert procedural
+  guidance for the model.
+
+### Example: Team Code Reviewer
+
+```markdown
+---
+name: code-reviewer
+description:
+  Expertise in reviewing code for style, security, and performance. Use when the
+  user asks for "feedback," a "review," or to "check" their changes.
+---
+
+# Code Reviewer
+
+You are an expert code reviewer. When reviewing code, follow this workflow:
+
+1.  **Analyze**: Review the staged changes or specific files provided. Ensure
+    that the changes are scoped properly and represent minimal changes required
+    to address the issue.
+2.  **Style**: Ensure code follows the project's conventions and idiomatic
+    patterns as described in the `GEMINI.md` file.
+3.  **Security**: Flag any potential security vulnerabilities.
+4.  **Tests**: Verify that new logic has corresponding test coverage and that
+    the test coverage adequately validates the changes.
+
+Provide your feedback as a concise bulleted list of "Strengths" and
+"Opportunities."
+```
+
+### Resource Conventions
+
+While you can structure your skill directory however you like, the Agent Skills
+standard encourages these conventions:
+
+- **`scripts/`**: Executable scripts (bash, python, node) the agent can run.
+- **`references/`**: Static documentation, schemas, or example data for the
+  agent to consult.
+- **`assets/`**: Code templates, boilerplate, or binary resources.
+
+When a skill is activated, Gemini CLI provides the model with a tree view of the
+entire skill directory, allowing it to discover and utilize these assets.
+
 ## How it Works (Security & Privacy)
 
 1.  **Discovery**: At the start of a session, Gemini CLI scans the discovery
@@ -105,8 +154,3 @@ gemini skills disable my-expertise --scope workspace
       it permission to read any bundled assets.
 5.  **Execution**: The model proceeds with the specialized expertise active. It
     is instructed to prioritize the skill's procedural guidance within reason.
-
-## Creating your own skills
-
-To create your own skills, see the
-[Create Agent Skills](./guides/creating-skills.md) guide.

docs/cli/system-prompt.md

@@ -56,38 +56,6 @@ error with: `missing system prompt file '<path>'`.
 When `GEMINI_SYSTEM_MD` is active, the CLI shows a `|⌐■_■|` indicator in the UI
 to signal custom system‑prompt mode.
 
-## Variable Substitution
-
-When using a custom system prompt file, you can use the following variables to
-dynamically include built-in content:
-
-- `${AgentSkills}`: Injects a complete section (including header) of all
-  available agent skills.
-- `${SubAgents}`: Injects a complete section (including header) of available
-  sub-agents.
-- `${AvailableTools}`: Injects a bulleted list of all currently enabled tool
-  names.
-- Tool Name Variables: Injects the actual name of a tool using the pattern:
-  `${toolName}_ToolName` (e.g., `${write_file_ToolName}`,
-  `${run_shell_command_ToolName}`).
-
-  This pattern is generated dynamically for all available tools.
-
-### Example
-
-```markdown
-# Custom System Prompt
-
-You are a helpful assistant. ${AgentSkills}
-${SubAgents}
-
-## Tooling
-
-The following tools are available to you: ${AvailableTools}
-
-You can use ${write_file_ToolName} to save logs.
-```
-
 ## Export the default prompt (recommended)
 
 Before overriding, export the current default prompt so you can review required

docs/cli/telemetry.md

@@ -8,17 +8,14 @@ Learn how to enable and setup OpenTelemetry for Gemini CLI.
   - [Configuration](#configuration)
   - [Google Cloud telemetry](#google-cloud-telemetry)
     - [Prerequisites](#prerequisites)
-    - [Authenticating with CLI Credentials](#authenticating-with-cli-credentials)
     - [Direct export (recommended)](#direct-export-recommended)
     - [Collector-based export (advanced)](#collector-based-export-advanced)
-    - [Monitoring Dashboards](#monitoring-dashboards)
   - [Local telemetry](#local-telemetry)
     - [File-based output (recommended)](#file-based-output-recommended)
     - [Collector-based export (advanced)](#collector-based-export-advanced-1)
   - [Logs and metrics](#logs-and-metrics)
     - [Logs](#logs)
       - [Sessions](#sessions)
-      - [Approval Mode](#approval-mode)
       - [Tools](#tools)
       - [Files](#files)
       - [API](#api)
@@ -216,24 +213,6 @@ forward data to Google Cloud.
    - Open `~/.gemini/tmp/<projectHash>/otel/collector-gcp.log` to view local
      collector logs.
 
-### Monitoring Dashboards
-
-Gemini CLI provides a pre-configured
-[Google Cloud Monitoring](https://cloud.google.com/monitoring) dashboard to
-visualize your telemetry.
-
-This dashboard can be found under **Google Cloud Monitoring Dashboard
-Templates** as "**Gemini CLI Monitoring**".
-
-![Gemini CLI Monitoring Dashboard Overview](/docs/assets/monitoring-dashboard-overview.png)
-
-![Gemini CLI Monitoring Dashboard Metrics](/docs/assets/monitoring-dashboard-metrics.png)
-
-![Gemini CLI Monitoring Dashboard Logs](/docs/assets/monitoring-dashboard-logs.png)
-
-To learn more, check out this blog post:
-[Instant insights: Gemini CLI’s new pre-configured monitoring dashboards](https://cloud.google.com/blog/topics/developers-practitioners/instant-insights-gemini-clis-new-pre-configured-monitoring-dashboards/).
-
 ## Local telemetry
 
 For local development and debugging, you can capture telemetry data locally:
@@ -316,20 +295,6 @@ Captures startup configuration and user prompt submissions.
     - `prompt` (string; excluded if `telemetry.logPrompts` is `false`)
     - `auth_type` (string)
 
-#### Approval Mode
-
-Tracks changes and duration of approval modes.
-
-- `approval_mode_switch`: Approval mode was changed.
-  - **Attributes**:
-    - `from_mode` (string)
-    - `to_mode` (string)
-
-- `approval_mode_duration`: Duration spent in an approval mode.
-  - **Attributes**:
-    - `mode` (string)
-    - `duration_ms` (int)
-
 #### Tools
 
 Captures tool executions, output truncation, and Edit behavior.

docs/cli/themes.md

@@ -86,6 +86,7 @@ color keys. For example:
 - `Gray`
 - `DiffAdded` (optional, for added lines in diffs)
 - `DiffRemoved` (optional, for removed lines in diffs)
+- `DiffModified` (optional, for modified 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
@@ -156,6 +157,7 @@ custom theme defined in `settings.json`.
   "Gray": "#ABB2BF",
   "DiffAdded": "#A6E3A1",
   "DiffRemoved": "#F38BA8",
+  "DiffModified": "#89B4FA",
   "GradientColors": ["#4796E4", "#847ACE", "#C3677F"]
 }
 ```

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

@@ -1,10 +1,37 @@
 # Getting 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.
+tutorial will guide you through creating your first skill, enabling it, and
+using it in a session.
 
-## 1. Create your first skill
+## 1. Enable Agent Skills
+
+Agent Skills are currently an experimental feature and must be enabled in your
+settings.
+
+### Via the interactive UI
+
+1.  Start a Gemini CLI session by running `gemini`.
+2.  Type `/settings` to open the interactive settings dialog.
+3.  Search for "Skills".
+4.  Toggle **Agent Skills** to `true`.
+5.  Press `Esc` to save and exit. You may need to restart the CLI for the
+    changes to take effect.
+
+### Via `settings.json`
+
+Alternatively, you can manually edit your global settings file at
+`~/.gemini/settings.json` (create it if it doesn't exist):
+
+```json
+{
+  "experimental": {
+    "skills": true
+  }
+}
+```
+
+## 2. Create Your First 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
@@ -59,7 +86,7 @@ responding correctly.
       .catch((e) => console.error(`Result: Failed (${e.message})`));
     ```
 
-## 2. Verify the skill is discovered
+## 3. Verify the Skill is Discovered
 
 Use the `/skills` slash command (or `gemini skills list` from your terminal) to
 see if Gemini CLI has found your new skill.
@@ -72,7 +99,7 @@ In a Gemini CLI session:
 
 You should see `api-auditor` in the list of available skills.
 
-## 3. Use the skill in a chat
+## 4. Use the Skill in a Chat
 
 Now, let's see the skill in action. Start a new session and ask a question about
 an endpoint.

docs/cli/uninstall.md

@@ -45,21 +45,3 @@ npm uninstall -g @google/gemini-cli
 ```
 
 This command completely removes the package from your system.
-
-## Method 3: Homebrew
-
-If you installed the CLI globally using Homebrew (e.g.,
-`brew install gemini-cli`), use the `brew uninstall` command to remove it.
-
-```bash
-brew uninstall gemini-cli
-```
-
-## Method 4: MacPorts
-
-If you installed the CLI globally using MacPorts (e.g.,
-`sudo port install gemini-cli`), use the `port uninstall` command to remove it.
-
-```bash
-sudo port uninstall gemini-cli
-```

docs/core/index.md

@@ -7,8 +7,6 @@ requests sent from `packages/cli`. For a general overview of Gemini CLI, see the
 
 ## Navigating this section
 
-- **[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
@@ -70,10 +68,6 @@ If you are using the default "pro" model and the CLI detects that you are being
 rate-limited, it automatically switches to the "flash" model for the current
 session. This allows you to continue working without interruption.
 
-Internal utility calls that use `gemini-2.5-flash-lite` (for example, prompt
-completion and classification) silently fall back to `gemini-2.5-flash` and
-`gemini-2.5-pro` when quota is exhausted, without changing the configured model.
-
 ## File discovery service
 
 The file discovery service is responsible for finding files in the project that

docs/core/memport.md

@@ -83,9 +83,7 @@ The processor automatically detects and prevents circular imports:
 # file-a.md
 
 @./file-b.md
-```
 
-```markdown
 # file-b.md
 
 @./file-a.md <!-- This will be detected and prevented -->

docs/core/policy-engine.md

@@ -146,38 +146,6 @@ A rule matches a tool call if all of its conditions are met:
 Policies are defined in `.toml` files. The CLI loads these files from Default,
 User, and (if configured) Admin directories.
 
-### Policy locations
-
-| Tier      | Type   | Location                    |
-| :-------- | :----- | :-------------------------- |
-| **User**  | Custom | `~/.gemini/policies/*.toml` |
-| **Admin** | System | _See below (OS specific)_   |
-
-#### System-wide policies (Admin)
-
-Administrators can enforce system-wide policies (Tier 3) that override all user
-and default settings. These policies must be placed in specific, secure
-directories:
-
-| OS          | Policy Directory Path                             |
-| :---------- | :------------------------------------------------ |
-| **Linux**   | `/etc/gemini-cli/policies`                        |
-| **macOS**   | `/Library/Application Support/GeminiCli/policies` |
-| **Windows** | `C:\ProgramData\gemini-cli\policies`              |
-
-**Security Requirements:**
-
-To prevent privilege escalation, the CLI enforces strict security checks on
-admin directories. If checks fail, system policies are **ignored**.
-
-- **Linux / macOS:** Must be owned by `root` (UID 0) and NOT writable by group
-  or others (e.g., `chmod 755`).
-- **Windows:** Must be in `C:\ProgramData`. Standard users (`Users`, `Everyone`)
-  must NOT have `Write`, `Modify`, or `Full Control` permissions. _Tip: If you
-  see a security warning, use the folder properties to remove write permissions
-  for non-admin groups. You may need to "Disable inheritance" in Advanced
-  Security Settings._
-
 ### TOML rule schema
 
 Here is a breakdown of the fields available in a TOML policy rule:
@@ -210,10 +178,6 @@ decision = "ask_user"
 # The priority of the rule, from 0 to 999.
 priority = 10
 
-# (Optional) A custom message to display when a tool call is denied by this rule.
-# This message is returned to the model and user, useful for explaining *why* it was denied.
-deny_message = "Deletion is permanent"
-
 # (Optional) An array of approval modes where this rule is active.
 modes = ["autoEdit"]
 ```
@@ -286,7 +250,6 @@ only the `mcpName`.
 mcpName = "untrusted-server"
 decision = "deny"
 priority = 500
-deny_message = "This server is not trusted by the admin."
 ```
 
 ## Default policies
@@ -295,9 +258,8 @@ The Gemini CLI ships with a set of default policies to provide a safe
 out-of-the-box experience.
 
 - **Read-only tools** (like `read_file`, `glob`) are generally **allowed**.
-- **Agent delegation** defaults to **`ask_user`** to ensure remote agents can
-  prompt for confirmation, but local sub-agent actions are executed silently and
-  checked individually.
+- **Agent delegation** (like `delegate_to_agent`) is **allowed** (sub-agent
+  actions are checked individually).
 - **Write tools** (like `write_file`, `run_shell_command`) default to
   **`ask_user`**.
 - In **`yolo`** mode, a high-priority rule allows all tools.

docs/core/remote-agents.md

@@ -1,84 +0,0 @@
-# Remote Subagents (experimental)
-
-Gemini CLI supports connecting to remote subagents using the Agent-to-Agent
-(A2A) protocol. This allows Gemini CLI to interact with other agents, expanding
-its capabilities by delegating tasks to remote services.
-
-Gemini CLI can connect to any compliant A2A agent. You can find samples of A2A
-agents in the following repositories:
-
-- [ADK Samples (Python)](https://github.com/google/adk-samples/tree/main/python)
-- [ADK Python Contributing Samples](https://github.com/google/adk-python/tree/main/contributing/samples)
-
-> **Note: Remote subagents are currently an experimental feature.**
-
-## Configuration
-
-To use remote subagents, you must explicitly enable them in your
-`settings.json`:
-
-```json
-{
-  "experimental": {
-    "enableAgents": true
-  }
-}
-```
-
-## Defining remote subagents
-
-Remote subagents are defined as Markdown files (`.md`) with YAML frontmatter.
-You can place them in:
-
-1.  **Project-level:** `.gemini/agents/*.md` (Shared with your team)
-2.  **User-level:** `~/.gemini/agents/*.md` (Personal agents)
-
-### Configuration schema
-
-| Field            | Type   | Required | Description                                                                                                    |
-| :--------------- | :----- | :------- | :------------------------------------------------------------------------------------------------------------- |
-| `kind`           | string | Yes      | Must be `remote`.                                                                                              |
-| `name`           | string | Yes      | A unique name for the agent. Must be a valid slug (lowercase letters, numbers, hyphens, and underscores only). |
-| `agent_card_url` | string | Yes      | The URL to the agent's A2A card endpoint.                                                                      |
-
-### Single-subagent example
-
-```markdown
----
-kind: remote
-name: my-remote-agent
-agent_card_url: https://example.com/agent-card
----
-```
-
-### Multi-subagent example
-
-The loader explicitly supports multiple remote subagents defined in a single
-Markdown file.
-
-```markdown
----
-- kind: remote
-  name: remote-1
-  agent_card_url: https://example.com/1
-- kind: remote
-  name: remote-2
-  agent_card_url: https://example.com/2
----
-```
-
-> **Note:** Mixed local and remote agents, or multiple local agents, are not
-> supported in a single file; the list format is currently remote-only.
-
-## Managing Subagents
-
-Users can manage subagents using the following commands within the Gemini CLI:
-
-- `/agents list`: Displays all available local and remote subagents.
-- `/agents refresh`: Reloads the agent registry. Use this after adding or
-  modifying agent definition files.
-- `/agents enable <agent_name>`: Enables a specific subagent.
-- `/agents disable <agent_name>`: Disables a specific subagent.
-
-> **Tip:** You can use the `@cli_help` agent within Gemini CLI for assistance
-> with configuring subagents.

docs/core/subagents.md

@@ -1,191 +0,0 @@
-# Sub-agents (experimental)
-
-Sub-agents 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.**
->
-> To use custom sub-agents, you must explicitly enable them in your
-> `settings.json`:
->
-> ```json
-> {
->   "experimental": { "enableAgents": true }
-> }
-> ```
->
-> **Warning:** Sub-agents currently operate in
-> ["YOLO mode"](../get-started/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?
-
-Sub-agents 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
-  tools.
-- **Independent context window:** Interactions with a sub-agent 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
-findings.
-
-## Built-in sub-agents
-
-Gemini CLI comes with the following built-in sub-agents:
-
-### Codebase Investigator
-
-- **Name:** `codebase_investigator`
-- **Purpose:** Analyze the codebase, reverse engineer, and understand complex
-  dependencies.
-- **When to use:** "How does the authentication system work?", "Map out the
-  dependencies of the `AgentRegistry` class."
-- **Configuration:** Enabled by default. You can configure it in
-  `settings.json`. Example (forcing a specific model):
-  ```json
-  {
-    "experimental": {
-      "codebaseInvestigatorSettings": {
-        "enabled": true,
-        "maxNumTurns": 20,
-        "model": "gemini-2.5-pro"
-      }
-    }
-  }
-  ```
-
-### CLI Help Agent
-
-- **Name:** `cli_help`
-- **Purpose:** Get expert knowledge about Gemini CLI itself, its commands,
-  configuration, and documentation.
-- **When to use:** "How do I configure a proxy?", "What does the `/rewind`
-  command do?"
-- **Configuration:** Enabled by default.
-
-### Generalist Agent
-
-- **Name:** `generalist_agent`
-- **Purpose:** Route tasks to the appropriate specialized sub-agent.
-- **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
-
-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
-`settings.json`:
-
-```json
-{
-  "experimental": {
-    "enableAgents": true
-  }
-}
-```
-
-### Agent definition files
-
-Custom agents are defined as Markdown files (`.md`) with YAML frontmatter. You
-can place them in:
-
-1.  **Project-level:** `.gemini/agents/*.md` (Shared with your team)
-2.  **User-level:** `~/.gemini/agents/*.md` (Personal agents)
-
-### File format
-
-The file **MUST** start with YAML frontmatter enclosed in triple-dashes `---`.
-The body of the markdown file becomes the agent's **System Prompt**.
-
-**Example: `.gemini/agents/security-auditor.md`**
-
-```markdown
----
-name: security-auditor
-description: Specialized in finding security vulnerabilities in code.
-kind: local
-tools:
-  - read_file
-  - search_file_content
-model: gemini-2.5-pro
-temperature: 0.2
-max_turns: 10
----
-
-You are a ruthless Security Auditor. Your job is to analyze code for potential
-vulnerabilities.
-
-Focus on:
-
-1.  SQL Injection
-2.  XSS (Cross-Site Scripting)
-3.  Hardcoded credentials
-4.  Unsafe file operations
-
-When you find a vulnerability, explain it clearly and suggest a fix. Do not fix
-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.                                         |
-| `timeout_mins` | number | No       | Maximum execution time in minutes.                                                                                         |
-
-### Optimizing your sub-agent
-
-The main agent's system prompt encourages it to use an expert sub-agent 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:
-
-- Its area of expertise.
-- When it should be used.
-- Some example scenarios.
-
-For example, the following sub-agent description should be called fairly
-consistently for Git operations.
-
-> Git expert agent which should be used for all local and remote git operations.
-> For example:
->
-> - Making commits
-> - 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
-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.
-
-## Remote subagents (Agent2Agent) (experimental)
-
-Gemini CLI can also delegate tasks to remote sub-agents using the Agent-to-Agent
-(A2A) protocol.
-
-> **Note: Remote subagents are currently an experimental feature.**
-
-See the [Remote Subagents documentation](/docs/core/remote-agents) for detailed
-configuration and usage instructions.
-
-## Extension sub-agents
-
-Extensions can bundle and distribute sub-agents. See the
-[Extensions documentation](../extensions/index.md#sub-agents) for details on how
-to package agents within an extension.

docs/extensions/best-practices.md

@@ -1,139 +0,0 @@
-# Extensions on Gemini CLI: 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.
-
-### Structure your extension
-
-While simple extensions can just be a few files, we recommend a robust structure
-for complex extensions:
-
-```
-my-extension/
-├── package.json
-├── tsconfig.json
-├── gemini-extension.json
-├── src/
-│   ├── index.ts
-│   └── tools/
-└── 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.
-
-### Iterate with `link`
-
-Use `gemini extensions link` to develop locally without constantly reinstalling:
-
-```bash
-cd my-extension
-gemini extensions link .
-```
-
-Changes to your code (after rebuilding) will be immediately available in the CLI
-on restart.
-
-### Use `GEMINI.md` effectively
-
-Your `GEMINI.md` file provides context to the model. Keep it focused:
-
-- **Do:** Explain high-level goals and how to use the provided tools.
-- **Don't:** Dump your entire documentation.
-- **Do:** Use clear, concise language.
-
-## Security
-
-When building a Gemini CLI extension, follow general security best practices
-(such as least privilege and input validation) to reduce risk.
-
-### 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.
-
-If you must use powerful tools like `run_shell_command`, consider restricting
-them to specific commands in your `gemini-extension.json`:
-
-```json
-{
-  "name": "my-safe-extension",
-  "excludeTools": ["run_shell_command(rm -rf *)"]
-}
-```
-
-This ensures that even if the model tries to execute a dangerous command, it
-will be blocked at the CLI level.
-
-### 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.
-
-```typescript
-// Good: Validating paths
-if (!path.resolve(inputPath).startsWith(path.resolve(allowedDir) + path.sep)) {
-  throw new Error('Access denied');
-}
-```
-
-### 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.
-
-```json
-"settings": [
-  {
-    "name": "API Key",
-    "envVar": "MY_API_KEY",
-    "sensitive": true
-  }
-]
-```
-
-## Releasing
-
-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).
-
-### Semantic versioning
-
-Follow [Semantic Versioning](https://semver.org/).
-
-- **Major**: Breaking changes (renaming tools, changing arguments).
-- **Minor**: New features (new tools, commands).
-- **Patch**: Bug fixes.
-
-### 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:
-
-```bash
-# Stable
-gemini extensions install github.com/user/repo
-
-# Dev
-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.

docs/extensions/getting-started-extensions.md

@@ -8,19 +8,7 @@ file.
 ## Prerequisites
 
 Before you start, make sure you have the Gemini CLI installed and a basic
-understanding of Node.js.
-
-## When to use what
-
-Extensions offer a variety of ways to customize Gemini CLI.
-
-| Feature                                                        | What it is                                                                                                         | When to use it                                                                                                                                                                                                                                                                                 | Invoked by            |
-| :------------------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :-------------------- |
-| **[MCP server](reference.md#mcp-servers)**                     | A standard way to expose new tools and data sources to the model.                                                  | Use this when you want the model to be able to _do_ new things, like fetching data from an internal API, querying a database, or controlling a local application. We also support MCP resources (which can replace custom commands) and system instructions (which can replace custom context) | Model                 |
-| **[Custom commands](../cli/custom-commands.md)**               | A shortcut (like `/my-cmd`) that executes a pre-defined prompt or shell command.                                   | Use this for repetitive tasks or to save long, complex prompts that you use frequently. Great for automation.                                                                                                                                                                                  | User                  |
-| **[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                   |
+understanding of Node.js and TypeScript.
 
 ## Step 1: Create a new extension
 
@@ -38,9 +26,10 @@ This will create a new directory with the following structure:
 
 ```
 my-first-extension/
-├── example.js
+├── example.ts
 ├── gemini-extension.json
-└── package.json
+├── package.json
+└── tsconfig.json
 ```
 
 ## Step 2: Understand the extension files
@@ -54,12 +43,12 @@ and use your extension.
 
 ```json
 {
-  "name": "mcp-server-example",
+  "name": "my-first-extension",
   "version": "1.0.0",
   "mcpServers": {
     "nodeServer": {
       "command": "node",
-      "args": ["${extensionPath}${/}example.js"],
+      "args": ["${extensionPath}${/}dist${/}example.js"],
       "cwd": "${extensionPath}"
     }
   }
@@ -75,12 +64,12 @@ and use your extension.
     with the absolute path to your extension's installation directory. This
     allows your extension to work regardless of where it's installed.
 
-### `example.js`
+### `example.ts`
 
 This file contains the source code for your MCP server. It's a simple Node.js
 server that uses the `@modelcontextprotocol/sdk`.
 
-```javascript
+```typescript
 /**
  * @license
  * Copyright 2025 Google LLC
@@ -129,15 +118,16 @@ await server.connect(transport);
 This server defines a single tool called `fetch_posts` that fetches data from a
 public API.
 
-### `package.json`
+### `package.json` and `tsconfig.json`
 
-This is the standard configuration file for a Node.js project. It defines
-dependencies and scripts.
+These are standard configuration files for a TypeScript project. The
+`package.json` file defines dependencies and a `build` script, and
+`tsconfig.json` configures the TypeScript compiler.
 
-## Step 3: Link your extension
+## Step 3: Build and link your extension
 
-Before you can use the extension, you need to link it to your Gemini CLI
-installation for local development.
+Before you can use the extension, you need to compile the TypeScript code and
+link the extension to your Gemini CLI installation for local development.
 
 1.  **Install dependencies:**
 
@@ -146,7 +136,16 @@ installation for local development.
     npm install
     ```
 
-2.  **Link the extension:**
+2.  **Build the server:**
+
+    ```bash
+    npm run build
+    ```
+
+    This will compile `example.ts` into `dist/example.js`, which is the file
+    referenced in your `gemini-extension.json`.
+
+3.  **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
@@ -213,7 +212,7 @@ need this for extensions built to expose commands and prompts.
       "mcpServers": {
         "nodeServer": {
           "command": "node",
-          "args": ["${extensionPath}${/}example.js"],
+          "args": ["${extensionPath}${/}dist${/}example.js"],
           "cwd": "${extensionPath}"
         }
       }
@@ -223,48 +222,14 @@ 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.
 
-## (Optional) Step 6: Add an Agent Skill
+## Step 6: Releasing your extension
 
-[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.
-
-1.  Create a `skills` directory and a subdirectory for your skill:
-
-    ```bash
-    mkdir -p skills/security-audit
-    ```
-
-2.  Create a `skills/security-audit/SKILL.md` file:
-
-    ```markdown
-    ---
-    name: security-audit
-    description:
-      Expertise in auditing code for security vulnerabilities. Use when the user
-      asks to "check for security issues" or "audit" their changes.
-    ---
-
-    # Security Auditor
-
-    You are an expert security researcher. When auditing code:
-
-    1. Look for common vulnerabilities (OWASP Top 10).
-    2. Check for hardcoded secrets or API keys.
-    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.
-
-## Step 7: Release your extension
-
-Once you're happy with your extension, you can share it with others. The two
+Once you are happy with your extension, you can share it with others. The two
 primary ways of releasing extensions are via a Git repository or through GitHub
 Releases. Using a public Git repository is the simplest method.
 
 For detailed instructions on both methods, please refer to the
-[Extension Releasing Guide](./releasing.md).
+[Extension Releasing Guide](./extension-releasing.md).
 
 ## Conclusion
 
@@ -274,7 +239,6 @@ You've successfully created a Gemini CLI extension! You learned how to:
 - 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

docs/extensions/index.md

@@ -1,45 +1,343 @@
 # 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
-capabilities with others. They are designed to be easily installable and
-shareable.
+_This documentation is up-to-date with the v0.4.0 release._
+
+Gemini CLI extensions package prompts, MCP servers, and custom commands 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/).
 
-## Managing extensions
+See [getting started docs](getting-started-extensions.md) for a guide on
+creating your first extension.
 
-You can verify your installed extensions and their status using the interactive
-command:
+See [releasing docs](extension-releasing.md) for an advanced guide on setting up
+GitHub releases.
 
-```bash
-/extensions list
+## Extension management
+
+We offer a suite of extension management tools using `gemini extensions`
+commands.
+
+Note that these commands are not supported from within the CLI, although you can
+list installed extensions using the `/extensions list` subcommand.
+
+Note that all of these commands will only be reflected in active CLI sessions on
+restart.
+
+### Installing an extension
+
+You can install an extension using `gemini extensions install` with either a
+GitHub URL or a local path.
+
+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.
+
+```
+gemini extensions install <source> [--ref <ref>] [--auto-update] [--pre-release] [--consent]
 ```
 
-or in noninteractive mode:
+- `<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.
 
-```bash
+### Uninstalling an extension
+
+To uninstall one or more extensions, run
+`gemini extensions uninstall <name...>`:
+
+```
+gemini extensions uninstall gemini-cli-security gemini-cli-another-extension
+```
+
+### Disabling an extension
+
+Extensions are, by default, enabled across all workspaces. You can disable an
+extension entirely or for specific workspace.
+
+```
+gemini extensions disable <name> [--scope <scope>]
+```
+
+- `<name>`: The name of the extension to disable.
+- `--scope`: The scope to disable the extension in (`user` or `workspace`).
+
+### Enabling an extension
+
+You can enable extensions using `gemini extensions enable <name>`. You can also
+enable an extension for a specific workspace using
+`gemini extensions enable <name> --scope=workspace` from within that workspace.
+
+```
+gemini extensions enable <name> [--scope <scope>]
+```
+
+- `<name>`: The name of the extension to enable.
+- `--scope`: The scope to enable the extension in (`user` or `workspace`).
+
+### Updating an extension
+
+For extensions installed from a local path or a git repository, you can
+explicitly update to the latest version (as reflected in the
+`gemini-extension.json` `version` field) with `gemini extensions update <name>`.
+
+You can update all extensions with:
+
+```
+gemini extensions update --all
+```
+
+### Create a boilerplate extension
+
+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).
+
+To copy one of these examples into a development directory using the type of
+your choosing, run:
+
+```
+gemini extensions new <path> [template]
+```
+
+- `<path>`: The path to create the extension in.
+- `[template]`: The boilerplate template to use.
+
+### Link a local extension
+
+The `gemini extensions link` command will create a symbolic link from the
+extension installation directory to the development path.
+
+This is useful so you don't have to run `gemini extensions update` every time
+you make changes you'd like to test.
+
+```
+gemini extensions link <path>
+```
+
+- `<path>`: The path of the extension to link.
+
+## How it works
+
+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-extension.json`
+
+The `gemini-extension.json` file contains the configuration for the extension.
+The file has the following structure:
+
+```json
+{
+  "name": "my-extension",
+  "version": "1.0.0",
+  "mcpServers": {
+    "my-server": {
+      "command": "node my-server.js"
+    }
+  },
+  "contextFileName": "GEMINI.md",
+  "excludeTools": ["run_shell_command"]
+}
+```
+
+- `name`: The name of the extension. This is used to uniquely identify the
+  extension and for conflict resolution when extension commands have the same
+  name as user or project commands. The name should be lowercase or numbers and
+  use dashes instead of underscores or spaces. This is how users will refer to
+  your extension in the CLI. Note that we expect this name to match the
+  extension directory name.
+- `version`: The version of the extension.
+- `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 settings 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.
+  - Note that all MCP server configuration options are supported except for
+    `trust`.
+- `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
+  extension directory, then that file will be loaded.
+- `excludeTools`: An array of tool names to exclude from the model. You can also
+  specify command-specific restrictions for tools that support it, like the
+  `run_shell_command` tool. For example,
+  `"excludeTools": ["run_shell_command(rm -rf)"]` will block the `rm -rf`
+  command. Note that this differs from the MCP server `excludeTools`
+  functionality, which can be listed in the MCP server config.
+
+When Gemini CLI starts, it loads all the extensions and merges their
+configurations. If there are any conflicts, the workspace configuration takes
+precedence.
+
+### Settings
+
+_Note: This is an experimental feature. We do not yet recommend extension
+authors introduce settings as part of their core flows._
+
+Extensions can define settings that the user will be prompted to provide upon
+installation. This is useful for things like API keys, URLs, or other
+configuration that the extension needs to function.
+
+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**
+
+```json
+{
+  "name": "my-api-extension",
+  "version": "1.0.0",
+  "settings": [
+    {
+      "name": "API Key",
+      "description": "Your API key for the service.",
+      "envVar": "MY_API_KEY"
+    }
+  ]
+}
+```
+
+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`).
+
+You can view a list of an extension's settings by running:
+
+```
 gemini extensions list
 ```
 
-## Installation
+and you can update a given setting using:
 
-To install a real extension, you can use the `extensions install` command with a
-GitHub repository URL in noninteractive mode. For example:
-
-```bash
-gemini extensions install https://github.com/gemini-cli-extensions/workspace
+```
+gemini extensions config <extension name> [setting name] [--scope <scope>]
 ```
 
-## Next steps
+- `--scope`: The scope to set the setting in (`user` or `workspace`). This is
+  optional and will default to `user`.
 
-- [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.
+### 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.
+
+**Example**
+
+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
+
+### 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.
+
+> [!IMPORTANT] Hooks are not defined directly in `gemini-extension.json`. The
+> CLI specifically looks for the `hooks/hooks.json` file.
+
+#### Directory structure
+
+```
+.gemini/extensions/my-extension/
+├── gemini-extension.json
+└── hooks/
+    └── hooks.json
+```
+
+#### `hooks/hooks.json` format
+
+The `hooks.json` file contains a `hooks` object where keys are
+[event names](../hooks/reference.md#supported-events) and values are arrays of
+[hook definitions](../hooks/reference.md#hook-definition).
+
+```json
+{
+  "hooks": {
+    "before_agent": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "node ${extensionPath}/scripts/setup.js",
+            "name": "Extension Setup"
+          }
+        ]
+      }
+    ]
+  }
+}
+```
+
+#### Supported variables
+
+Just like `gemini-extension.json`, the `hooks/hooks.json` file supports
+[variable substitution](#variables). This is particularly useful for referencing
+scripts within the extension directory using `${extensionPath}`.
+
+### 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)
+
+### 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 or hook script using
+`"cwd": "${extensionPath}${/}run.ts"`.
+
+**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).                                                                                                                            |
+| `${process.execPath}`      | The path to the Node.js binary executing the CLI.                                                                                                               |

docs/extensions/reference.md

@@ -1,336 +0,0 @@
-# Extensions reference
-
-This guide covers the `gemini extensions` commands and the structure of the
-`gemini-extension.json` configuration file.
-
-## Extension management
-
-We offer a suite of extension management tools using `gemini extensions`
-commands.
-
-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 all of these management operations (including updates to slash
-commands) will only be reflected in active CLI sessions on **restart**.
-
-### Installing an extension
-
-You can install an extension using `gemini extensions install` with either a
-GitHub URL or a local path.
-
-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.
-
-```
-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.
-
-### Uninstalling an extension
-
-To uninstall one or more extensions, run
-`gemini extensions uninstall <name...>`:
-
-```
-gemini extensions uninstall gemini-cli-security gemini-cli-another-extension
-```
-
-### Disabling an extension
-
-Extensions are, by default, enabled across all workspaces. You can disable an
-extension entirely or for specific workspace.
-
-```
-gemini extensions disable <name> [--scope <scope>]
-```
-
-- `<name>`: The name of the extension to disable.
-- `--scope`: The scope to disable the extension in (`user` or `workspace`).
-
-### Enabling an extension
-
-You can enable extensions using `gemini extensions enable <name>`. You can also
-enable an extension for a specific workspace using
-`gemini extensions enable <name> --scope=workspace` from within that workspace.
-
-```
-gemini extensions enable <name> [--scope <scope>]
-```
-
-- `<name>`: The name of the extension to enable.
-- `--scope`: The scope to enable the extension in (`user` or `workspace`).
-
-### Updating an extension
-
-For extensions installed from a local path or a git repository, you can
-explicitly update to the latest version (as reflected in the
-`gemini-extension.json` `version` field) with `gemini extensions update <name>`.
-
-You can update all extensions with:
-
-```
-gemini extensions update --all
-```
-
-### Create a boilerplate extension
-
-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).
-
-To copy one of these examples into a development directory using the type of
-your choosing, run:
-
-```
-gemini extensions new <path> [template]
-```
-
-- `<path>`: The path to create the extension in.
-- `[template]`: The boilerplate template to use.
-
-### Link a local extension
-
-The `gemini extensions link` command will create a symbolic link from the
-extension installation directory to the development path.
-
-This is useful so you don't have to run `gemini extensions update` every time
-you make changes you'd like to test.
-
-```
-gemini extensions link <path>
-```
-
-- `<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-extension.json`
-
-The `gemini-extension.json` file contains the configuration for the extension.
-The file has the following structure:
-
-```json
-{
-  "name": "my-extension",
-  "version": "1.0.0",
-  "description": "My awesome extension",
-  "mcpServers": {
-    "my-server": {
-      "command": "node my-server.js"
-    }
-  },
-  "contextFileName": "GEMINI.md",
-  "excludeTools": ["run_shell_command"]
-}
-```
-
-- `name`: The name of the extension. This is used to uniquely identify the
-  extension and for conflict resolution when extension commands have the same
-  name as user or project commands. The name should be lowercase or numbers and
-  use dashes instead of underscores or spaces. This is how users will refer to
-  your extension in the CLI. Note that we expect this name to match the
-  extension directory name.
-- `version`: The version of the extension.
-- `description`: A short description of the extension. This will be displayed on
-  [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.
-  - Note that all MCP server configuration options are supported except for
-    `trust`.
-- `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
-  extension directory, then that file will be loaded.
-- `excludeTools`: An array of tool names to exclude from the model. You can also
-  specify command-specific restrictions for tools that support it, like the
-  `run_shell_command` tool. For example,
-  `"excludeTools": ["run_shell_command(rm -rf)"]` will block the `rm -rf`
-  command. Note that this differs from the MCP server `excludeTools`
-  functionality, which can be listed in the MCP server config.
-
-When Gemini CLI starts, it loads all the extensions and merges their
-configurations. If there are any conflicts, the workspace configuration takes
-precedence.
-
-### Settings
-
-_Note: This is an experimental feature. We do not yet recommend extension
-authors introduce settings as part of their core flows._
-
-Extensions can define settings that the user will be prompted to provide upon
-installation. This is useful for things like API keys, URLs, or other
-configuration that the extension needs to function.
-
-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**
-
-```json
-{
-  "name": "my-api-extension",
-  "version": "1.0.0",
-  "settings": [
-    {
-      "name": "API Key",
-      "description": "Your API key for the service.",
-      "envVar": "MY_API_KEY"
-    }
-  ]
-}
-```
-
-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`).
-
-You can view a list of an extension's settings by running:
-
-```
-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.
-
-**Example**
-
-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
-
-### 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.
-
-> [!IMPORTANT] Hooks are not defined directly in `gemini-extension.json`. The
-> CLI specifically looks for the `hooks/hooks.json` file.
-
-### 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.
-
-### Sub-agents
-
-> **Note: Sub-agents are currently an experimental feature.**
-
-Extensions can provide [sub-agents](../core/subagents.md) that users can
-delegate tasks to.
-
-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.
-
-**Example**
-
-```
-.gemini/extensions/my-extension/
-├── gemini-extension.json
-└── agents/
-    ├── security-auditor.md
-    └── database-expert.md
-```
-
-Gemini CLI will automatically discover and load these agents when the extension
-is installed and enabled.
-
-### 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)
-
-## 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"]`.
-
-**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).                                                                                                                            |

docs/get-started/configuration.md

@@ -110,13 +110,13 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Enable Vim keybindings
   - **Default:** `false`
 
-- **`general.enableAutoUpdate`** (boolean):
-  - **Description:** Enable automatic updates.
-  - **Default:** `true`
+- **`general.disableAutoUpdate`** (boolean):
+  - **Description:** Disable automatic updates
+  - **Default:** `false`
 
-- **`general.enableAutoUpdateNotification`** (boolean):
-  - **Description:** Enable update notification prompts.
-  - **Default:** `true`
+- **`general.disableUpdateNag`** (boolean):
+  - **Description:** Disable update notification prompts.
+  - **Default:** `false`
 
 - **`general.checkpointing.enabled`** (boolean):
   - **Description:** Enable session checkpointing for recovery
@@ -159,7 +159,7 @@ their corresponding top-level category object in your `settings.json` file.
 #### `output`
 
 - **`output.format`** (enum):
-  - **Description:** The format of the CLI output. Can be `text` or `json`.
+  - **Description:** The format of the CLI output.
   - **Default:** `"text"`
   - **Values:** `"text"`, `"json"`
 
@@ -180,21 +180,10 @@ their corresponding top-level category object in your `settings.json` file.
   - **Requires restart:** Yes
 
 - **`ui.showStatusInTitle`** (boolean):
-  - **Description:** Show Gemini CLI model thoughts in the terminal window title
-    during the working phase
+  - **Description:** Show Gemini CLI status and thoughts in the terminal window
+    title
   - **Default:** `false`
 
-- **`ui.dynamicWindowTitle`** (boolean):
-  - **Description:** Update the terminal window title with current status icons
-    (Ready: ◇, Action Required: ✋, Working: ✦)
-  - **Default:** `true`
-
-- **`ui.showHomeDirectoryWarning`** (boolean):
-  - **Description:** Show a warning when running Gemini CLI in the home
-    directory.
-  - **Default:** `true`
-  - **Requires restart:** Yes
-
 - **`ui.hideTips`** (boolean):
   - **Description:** Hide helpful tips in the UI
   - **Default:** `false`
@@ -244,8 +233,8 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Show the model name in the chat for each model turn.
   - **Default:** `false`
 
-- **`ui.showUserIdentity`** (boolean):
-  - **Description:** Show the logged-in user's identity (e.g. email) in the UI.
+- **`ui.useFullWidth`** (boolean):
+  - **Description:** Use the entire width of the terminal for output.
   - **Default:** `true`
 
 - **`ui.useAlternateBuffer`** (boolean):
@@ -254,9 +243,9 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
   - **Requires restart:** Yes
 
-- **`ui.useBackgroundColor`** (boolean):
-  - **Description:** Whether to use background colors in the UI.
-  - **Default:** `true`
+- **`ui.compact`** (boolean):
+  - **Description:** Enable a more compact UI layout.
+  - **Default:** `false`
 
 - **`ui.incrementalRendering`** (boolean):
   - **Description:** Enable incremental rendering for the UI. This option will
@@ -265,18 +254,14 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `true`
   - **Requires restart:** Yes
 
-- **`ui.showSpinner`** (boolean):
-  - **Description:** Show the spinner during operations.
-  - **Default:** `true`
-
 - **`ui.customWittyPhrases`** (array):
   - **Description:** Custom witty phrases to display during loading. When
     provided, the CLI cycles through these instead of the defaults.
   - **Default:** `[]`
 
-- **`ui.accessibility.enableLoadingPhrases`** (boolean):
-  - **Description:** Enable loading phrases during operations.
-  - **Default:** `true`
+- **`ui.accessibility.disableLoadingPhrases`** (boolean):
+  - **Description:** Disable loading phrases for accessibility
+  - **Default:** `false`
   - **Requires restart:** Yes
 
 - **`ui.accessibility.screenReader`** (boolean):
@@ -288,7 +273,7 @@ their corresponding top-level category object in your `settings.json` file.
 #### `ide`
 
 - **`ide.enabled`** (boolean):
-  - **Description:** Enable IDE integration mode.
+  - **Description:** Enable IDE integration mode
   - **Default:** `false`
   - **Requires restart:** Yes
 
@@ -565,14 +550,6 @@ their corresponding top-level category object in your `settings.json` file.
     used.
   - **Default:** `[]`
 
-#### `agents`
-
-- **`agents.overrides`** (object):
-  - **Description:** Override settings for specific agents, e.g. to disable the
-    agent, set a custom model config, or run config.
-  - **Default:** `{}`
-  - **Requires restart:** Yes
-
 #### `context`
 
 - **`context.fileName`** (string | string[]):
@@ -600,12 +577,12 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
 
 - **`context.fileFiltering.respectGitIgnore`** (boolean):
-  - **Description:** Respect .gitignore files when searching.
+  - **Description:** Respect .gitignore files when searching
   - **Default:** `true`
   - **Requires restart:** Yes
 
 - **`context.fileFiltering.respectGeminiIgnore`** (boolean):
-  - **Description:** Respect .geminiignore files when searching.
+  - **Description:** Respect .geminiignore files when searching
   - **Default:** `true`
   - **Requires restart:** Yes
 
@@ -615,17 +592,9 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `true`
   - **Requires restart:** Yes
 
-- **`context.fileFiltering.enableFuzzySearch`** (boolean):
-  - **Description:** Enable fuzzy search when searching for files.
-  - **Default:** `true`
-  - **Requires restart:** Yes
-
-- **`context.fileFiltering.customIgnoreFilePaths`** (array):
-  - **Description:** Additional ignore file paths to respect. These files take
-    precedence over .geminiignore and .gitignore. Files earlier in the array
-    take precedence over files later in the array, e.g. the first file takes
-    precedence over the second one.
-  - **Default:** `[]`
+- **`context.fileFiltering.disableFuzzySearch`** (boolean):
+  - **Description:** Disable fuzzy search when searching for files.
+  - **Default:** `false`
   - **Requires restart:** Yes
 
 #### `tools`
@@ -666,13 +635,6 @@ their corresponding top-level category object in your `settings.json` file.
     considered safe (e.g., read-only operations).
   - **Default:** `false`
 
-- **`tools.approvalMode`** (enum):
-  - **Description:** 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:** `"default"`
-  - **Values:** `"default"`, `"auto_edit"`, `"plan"`
-
 - **`tools.core`** (array):
   - **Description:** Restrict the set of built-in tools with an allowlist. Match
     semantics mirror tools.allowed; see the built-in tools documentation for
@@ -726,13 +688,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `1000`
   - **Requires restart:** Yes
 
-- **`tools.disableLLMCorrection`** (boolean):
-  - **Description:** 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.
-  - **Default:** `true`
-  - **Requires restart:** Yes
-
 - **`tools.enableHooks`** (boolean):
   - **Description:** Enables the hooks system experiment. When disabled, the
     hooks system is completely deactivated regardless of other settings.
@@ -853,16 +808,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `true`
   - **Requires restart:** Yes
 
-- **`experimental.extensionConfig`** (boolean):
-  - **Description:** Enable requesting and fetching of extension settings.
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
-- **`experimental.enableEventDrivenScheduler`** (boolean):
-  - **Description:** Enables event-driven scheduler within the CLI session.
-  - **Default:** `true`
-  - **Requires restart:** Yes
-
 - **`experimental.extensionReloading`** (boolean):
   - **Description:** Enables extension loading/unloading within the CLI session.
   - **Default:** `false`
@@ -873,47 +818,71 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
   - **Requires restart:** Yes
 
+- **`experimental.skills`** (boolean):
+  - **Description:** Enable Agent Skills (experimental).
+  - **Default:** `false`
+  - **Requires restart:** Yes
+
+- **`experimental.codebaseInvestigatorSettings.enabled`** (boolean):
+  - **Description:** Enable the Codebase Investigator agent.
+  - **Default:** `true`
+  - **Requires restart:** Yes
+
+- **`experimental.codebaseInvestigatorSettings.maxNumTurns`** (number):
+  - **Description:** Maximum number of turns for the Codebase Investigator
+    agent.
+  - **Default:** `10`
+  - **Requires restart:** Yes
+
+- **`experimental.codebaseInvestigatorSettings.maxTimeMinutes`** (number):
+  - **Description:** Maximum time for the Codebase Investigator agent (in
+    minutes).
+  - **Default:** `3`
+  - **Requires restart:** Yes
+
+- **`experimental.codebaseInvestigatorSettings.thinkingBudget`** (number):
+  - **Description:** The thinking budget for the Codebase Investigator agent.
+  - **Default:** `8192`
+  - **Requires restart:** Yes
+
+- **`experimental.codebaseInvestigatorSettings.model`** (string):
+  - **Description:** The model to use for the Codebase Investigator agent.
+  - **Default:** `"auto"`
+  - **Requires restart:** Yes
+
 - **`experimental.useOSC52Paste`** (boolean):
   - **Description:** Use OSC 52 sequence for pasting instead of clipboardy
     (useful for remote sessions).
   - **Default:** `false`
 
-- **`experimental.plan`** (boolean):
-  - **Description:** Enable planning features (Plan Mode and tools).
-  - **Default:** `false`
+- **`experimental.cliHelpAgentSettings.enabled`** (boolean):
+  - **Description:** Enable the CLI Help Agent.
+  - **Default:** `true`
   - **Requires restart:** Yes
 
 #### `skills`
 
-- **`skills.enabled`** (boolean):
-  - **Description:** Enable Agent Skills.
-  - **Default:** `true`
-  - **Requires restart:** Yes
-
 - **`skills.disabled`** (array):
   - **Description:** List of disabled skills.
   - **Default:** `[]`
   - **Requires restart:** Yes
 
-#### `hooksConfig`
+#### `hooks`
 
-- **`hooksConfig.enabled`** (boolean):
+- **`hooks.enabled`** (boolean):
   - **Description:** Canonical toggle for the hooks system. When disabled, no
     hooks will be executed.
-  - **Default:** `true`
-  - **Requires restart:** Yes
+  - **Default:** `false`
 
-- **`hooksConfig.disabled`** (array):
+- **`hooks.disabled`** (array):
   - **Description:** List of hook names (commands) that should be disabled.
     Hooks in this list will not execute even if configured.
   - **Default:** `[]`
 
-- **`hooksConfig.notifications`** (boolean):
+- **`hooks.notifications`** (boolean):
   - **Description:** Show visual indicators when hooks are executing.
   - **Default:** `true`
 
-#### `hooks`
-
 - **`hooks.BeforeTool`** (array):
   - **Description:** Hooks that execute before tool execution. Can intercept,
     validate, or modify tool calls.
@@ -983,10 +952,6 @@ their corresponding top-level category object in your `settings.json` file.
 - **`admin.mcp.enabled`** (boolean):
   - **Description:** If false, disallows MCP servers from being used.
   - **Default:** `true`
-
-- **`admin.skills.enabled`** (boolean):
-  - **Description:** If false, disallows agent skills from being used.
-  - **Default:** `true`
   <!-- SETTINGS-AUTOGEN:END -->
 
 #### `mcpServers`
@@ -1164,7 +1129,7 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
 - **`GEMINI_MODEL`**:
   - Specifies the default Gemini model to use.
   - Overrides the hardcoded default
-  - Example: `export GEMINI_MODEL="gemini-3-flash-preview"`
+  - Example: `export GEMINI_MODEL="gemini-2.5-flash"`
 - **`GOOGLE_API_KEY`**:
   - Your Google Cloud API key.
   - Required for using Vertex AI in express mode.
@@ -1185,10 +1150,6 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
   - **Description:** The path to your Google Application Credentials JSON file.
   - **Example:**
     `export GOOGLE_APPLICATION_CREDENTIALS="/path/to/your/credentials.json"`
-- **`GOOGLE_GENAI_API_VERSION`**:
-  - Specifies the API version to use for Gemini API requests.
-  - When set, overrides the default API version used by the SDK.
-  - Example: `export GOOGLE_GENAI_API_VERSION="v1"`
 - **`OTLP_GOOGLE_CLOUD_PROJECT`**:
   - Your Google Cloud Project ID for Telemetry in Google Cloud
   - Example: `export OTLP_GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"`.
@@ -1313,7 +1274,7 @@ for that specific session.
 
 - **`--model <model_name>`** (**`-m <model_name>`**):
   - Specifies the Gemini model to use for this session.
-  - Example: `npm start -- --model gemini-3-pro-preview`
+  - Example: `npm start -- --model gemini-1.5-pro-latest`
 - **`--prompt <your_prompt>`** (**`-p <your_prompt>`**):
   - Used to pass a prompt directly to the command. This invokes Gemini CLI in a
     non-interactive mode.
@@ -1336,8 +1297,7 @@ for that specific session.
 - **`--sandbox`** (**`-s`**):
   - Enables sandbox mode for this session.
 - **`--debug`** (**`-d`**):
-  - Enables debug mode for this session, providing more verbose output. Open the
-    debug console with F12 to see the additional logging.
+  - Enables debug mode for this session, providing more verbose output.
 
 - **`--help`** (or **`-h`**):
   - Displays help information about command-line arguments.
@@ -1349,10 +1309,6 @@ for that specific session.
     - `auto_edit`: Automatically approve edit tools (replace, write_file) while
       prompting for others
     - `yolo`: Automatically approve all tool calls (equivalent to `--yolo`)
-    - `plan`: Read-only mode for tool calls (requires experimental planning to
-      be enabled).
-      > **Note:** This mode is currently under development and not yet fully
-      > functional.
   - Cannot be used together with `--yolo`. Use `--approval-mode=yolo` instead of
     `--yolo` for the new unified approach.
   - Example: `gemini --approval-mode auto_edit`

docs/hooks/best-practices.md

@@ -1,4 +1,4 @@
-# Hooks Best Practices
+# Hooks on Gemini CLI: Best practices
 
 This guide covers security considerations, performance optimization, debugging
 techniques, and privacy considerations for developing and deploying hooks in
@@ -15,20 +15,21 @@ using parallel operations:
 // Sequential operations are slower
 const data1 = await fetch(url1).then((r) => r.json());
 const data2 = await fetch(url2).then((r) => r.json());
+const data3 = await fetch(url3).then((r) => r.json());
 
 // Prefer parallel operations for better performance
 // Start requests concurrently
 const p1 = fetch(url1).then((r) => r.json());
 const p2 = fetch(url2).then((r) => r.json());
+const p3 = fetch(url3).then((r) => r.json());
 
 // Wait for all results
-const [data1, data2] = await Promise.all([p1, p2]);
+const [data1, data2, data3] = await Promise.all([p1, p2, p3]);
 ```
 
 ### Cache expensive operations
 
-Store results between invocations to avoid repeated computation, especially for
-hooks that run frequently (like `BeforeTool` or `AfterModel`).
+Store results between invocations to avoid repeated computation:
 
 ```javascript
 const fs = require('fs');
@@ -53,7 +54,6 @@ async function main() {
   const cacheKey = `tool-list-${(Date.now() / 3600000) | 0}`; // Hourly cache
 
   if (cache[cacheKey]) {
-    // Write JSON to stdout
     console.log(JSON.stringify(cache[cacheKey]));
     return;
   }
@@ -70,20 +70,32 @@ async function main() {
 ### Use appropriate events
 
 Choose hook events that match your use case to avoid unnecessary execution.
+`AfterAgent` fires once per agent loop completion, while `AfterModel` fires
+after every LLM call (potentially multiple times per loop):
 
-- **`AfterAgent`**: Fires **once** per turn after the model finishes its final
-  response. Use this for quality validation (Retries) or final logging.
-- **`AfterModel`**: Fires after **every chunk** of LLM output. Use this for
-  real-time redaction, PII filtering, or monitoring output as it streams.
-
-If you only need to check the final completion, use `AfterAgent` to save
-performance.
+```json
+// If checking final completion, use AfterAgent instead of AfterModel
+{
+  "hooks": {
+    "AfterAgent": [
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "name": "final-checker",
+            "command": "./check-completion.sh"
+          }
+        ]
+      }
+    ]
+  }
+}
+```
 
 ### Filter with matchers
 
 Use specific matchers to avoid unnecessary hook execution. Instead of matching
-all tools with `*`, specify only the tools you need. This saves the overhead of
-spawning a process for irrelevant events.
+all tools with `*`, specify only the tools you need:
 
 ```json
 {
@@ -91,7 +103,6 @@ spawning a process for irrelevant events.
   "hooks": [
     {
       "name": "validate-writes",
-      "type": "command",
       "command": "./validate.sh"
     }
   ]
@@ -100,32 +111,30 @@ spawning a process for irrelevant events.
 
 ### Optimize JSON parsing
 
-For large inputs (like `AfterModel` receiving a large context), standard JSON
-parsing can be slow. If you only need one field, consider streaming parsers or
-lightweight extraction logic, though for most shell scripts `jq` is sufficient.
+For large inputs, use streaming JSON parsers to avoid loading everything into
+memory:
+
+```javascript
+// Standard approach: parse entire input
+const input = JSON.parse(await readStdin());
+const content = input.tool_input.content;
+
+// For very large inputs: stream and extract only needed fields
+const { createReadStream } = require('fs');
+const JSONStream = require('JSONStream');
+
+const stream = createReadStream(0).pipe(JSONStream.parse('tool_input.content'));
+let content = '';
+stream.on('data', (chunk) => {
+  content += chunk;
+});
+```
 
 ## Debugging
 
-### The "Strict JSON" rule
-
-The most common cause of hook failure is "polluting" the standard output.
-
-- **stdout** is for **JSON only**.
-- **stderr** is for **logs and text**.
-
-**Good:**
-
-```bash
-#!/bin/bash
-echo "Starting check..." >&2  # <--- Redirect to stderr
-echo '{"decision": "allow"}'
-
-```
-
 ### Log to files
 
-Since hooks run in the background, writing to a dedicated log file is often the
-easiest way to debug complex logic.
+Write debug information to dedicated log files:
 
 ```bash
 #!/usr/bin/env bash
@@ -142,9 +151,6 @@ log "Received input: ${input:0:100}..."
 # Hook logic here
 
 log "Hook completed successfully"
-# Always output valid JSON to stdout at the end, even if just empty
-echo "{}"
-
 ```
 
 ### Use stderr for errors
@@ -156,7 +162,6 @@ try {
   const result = dangerousOperation();
   console.log(JSON.stringify({ result }));
 } catch (error) {
-  // Write the error description to stderr so the user/agent sees it
   console.error(`Hook error: ${error.message}`);
   process.exit(2); // Blocking error
 }
@@ -164,8 +169,7 @@ try {
 
 ### Test hooks independently
 
-Run hook scripts manually with sample JSON input to verify they behave as
-expected before hooking them up to the CLI.
+Run hook scripts manually with sample JSON input:
 
 ```bash
 # Create test input
@@ -187,46 +191,33 @@ cat test-input.json | .gemini/hooks/my-hook.sh
 
 # Check exit code
 echo "Exit code: $?"
-
 ```
 
 ### Check exit codes
 
-Gemini CLI uses exit codes for high-level flow control:
-
-- **Exit 0 (Success)**: The hook ran successfully. The CLI parses `stdout` for
-  JSON decisions.
-- **Exit 2 (System Block)**: A critical block occurred. `stderr` is used as the
-  reason.
-  - For **Agent/Model** events, this aborts the turn.
-  - For **Tool** events, this blocks the tool but allows the agent to continue.
-  - For **AfterAgent**, this triggers an automatic retry turn.
-
-> **TIP**
->
-> **Blocking vs. Stopping**: Use `decision: "deny"` (or Exit Code 2) to block a
-> **specific action**. Use `{"continue": false}` in your JSON output to **kill
-> the entire agent loop** immediately.
+Ensure your script returns the correct exit code:
 
 ```bash
 #!/usr/bin/env bash
-set -e
+set -e  # Exit on error
 
 # Hook logic
+process_input() {
+  # ...
+}
+
 if process_input; then
-  echo '{"decision": "allow"}'
+  echo "Success message"
   exit 0
 else
-  echo "Critical validation failure" >&2
+  echo "Error message" >&2
   exit 2
 fi
-
 ```
 
 ### Enable telemetry
 
-Hook execution is logged when `telemetry.logPrompts` is enabled. You can view
-these logs to debug execution flow.
+Hook execution is logged when `telemetry.logPrompts` is enabled:
 
 ```json
 {
@@ -236,10 +227,11 @@ these logs to debug execution flow.
 }
 ```
 
+View hook telemetry in logs to debug execution issues.
+
 ### Use hook panel
 
-The `/hooks panel` command inside the CLI shows execution status and recent
-output:
+The `/hooks panel` command shows execution status and recent output:
 
 ```bash
 /hooks panel
@@ -263,64 +255,18 @@ Begin with basic logging hooks before implementing complex logic:
 # Simple logging hook to understand input structure
 input=$(cat)
 echo "$input" >> .gemini/hook-inputs.log
-# Always return valid JSON
-echo "{}"
-
-```
-
-### Documenting your hooks
-
-Maintainability is critical for complex hook systems. Use descriptions and
-comments to help yourself and others understand why a hook exists.
-
-**Use the `description` field**: This text is displayed in the `/hooks panel` UI
-and helps diagnose issues.
-
-```json
-{
-  "hooks": {
-    "BeforeTool": [
-      {
-        "matcher": "write_file|replace",
-        "hooks": [
-          {
-            "name": "secret-scanner",
-            "type": "command",
-            "command": "$GEMINI_PROJECT_DIR/.gemini/hooks/block-secrets.sh",
-            "description": "Scans code changes for API keys and secrets before writing"
-          }
-        ]
-      }
-    ]
-  }
-}
-```
-
-**Add comments in hook scripts**: Explain performance expectations and
-dependencies.
-
-```javascript
-#!/usr/bin/env node
-/**
- * RAG Tool Filter Hook
- *
- * Reduces the tool space by extracting keywords from the user's request.
- *
- * Performance: ~500ms average
- * Dependencies: @google/generative-ai
- */
+echo "Logged input"
 ```
 
 ### Use JSON libraries
 
-Parse JSON with proper libraries instead of text processing.
+Parse JSON with proper libraries instead of text processing:
 
 **Bad:**
 
 ```bash
 # Fragile text parsing
 tool_name=$(echo "$input" | grep -oP '"tool_name":\s*"\K[^"]+')
-
 ```
 
 **Good:**
@@ -328,7 +274,6 @@ tool_name=$(echo "$input" | grep -oP '"tool_name":\s*"\K[^"]+')
 ```bash
 # Robust JSON parsing
 tool_name=$(echo "$input" | jq -r '.tool_name')
-
 ```
 
 ### Make scripts executable
@@ -338,7 +283,6 @@ Always make hook scripts executable:
 ```bash
 chmod +x .gemini/hooks/*.sh
 chmod +x .gemini/hooks/*.js
-
 ```
 
 ### Version control
@@ -348,7 +292,7 @@ Commit hooks to share with your team:
 ```bash
 git add .gemini/hooks/
 git add .gemini/settings.json
-
+git commit -m "Add project hooks for security and testing"
 ```
 
 **`.gitignore` considerations:**
@@ -362,10 +306,295 @@ git add .gemini/settings.json
 # Keep hook scripts
 !.gemini/hooks/*.sh
 !.gemini/hooks/*.js
-
 ```
 
-## Hook security
+### Document behavior
+
+Add descriptions to help others understand your hooks:
+
+```json
+{
+  "hooks": {
+    "BeforeTool": [
+      {
+        "matcher": "write_file|replace",
+        "hooks": [
+          {
+            "name": "secret-scanner",
+            "type": "command",
+            "command": "$GEMINI_PROJECT_DIR/.gemini/hooks/block-secrets.sh",
+            "description": "Scans code changes for API keys, passwords, and other secrets before writing"
+          }
+        ]
+      }
+    ]
+  }
+}
+```
+
+Add comments in hook scripts:
+
+```javascript
+#!/usr/bin/env node
+/**
+ * RAG Tool Filter Hook
+ *
+ * This hook reduces the tool space from 100+ tools to ~15 relevant ones
+ * by extracting keywords from the user's request and filtering tools
+ * based on semantic similarity.
+ *
+ * Performance: ~500ms average, cached tool embeddings
+ * Dependencies: @google/generative-ai
+ */
+```
+
+## Troubleshooting
+
+### Hook not executing
+
+**Check hook name in `/hooks panel`:**
+
+```bash
+/hooks panel
+```
+
+Verify the hook appears in the list and is enabled.
+
+**Verify matcher pattern:**
+
+```bash
+# Test regex pattern
+echo "write_file|replace" | grep -E "write_.*|replace"
+```
+
+**Check disabled list:**
+
+```json
+{
+  "hooks": {
+    "disabled": ["my-hook-name"]
+  }
+}
+```
+
+**Ensure script is executable:**
+
+```bash
+ls -la .gemini/hooks/my-hook.sh
+chmod +x .gemini/hooks/my-hook.sh
+```
+
+**Verify script path:**
+
+```bash
+# Check path expansion
+echo "$GEMINI_PROJECT_DIR/.gemini/hooks/my-hook.sh"
+
+# Verify file exists
+test -f "$GEMINI_PROJECT_DIR/.gemini/hooks/my-hook.sh" && echo "File exists"
+```
+
+### Hook timing out
+
+**Check configured timeout:**
+
+```json
+{
+  "name": "slow-hook",
+  "timeout": 60000
+}
+```
+
+**Optimize slow operations:**
+
+```javascript
+// Before: Sequential operations (slow)
+for (const item of items) {
+  await processItem(item);
+}
+
+// After: Parallel operations (fast)
+await Promise.all(items.map((item) => processItem(item)));
+```
+
+**Use caching:**
+
+```javascript
+const cache = new Map();
+
+async function getCachedData(key) {
+  if (cache.has(key)) {
+    return cache.get(key);
+  }
+  const data = await fetchData(key);
+  cache.set(key, data);
+  return data;
+}
+```
+
+**Consider splitting into multiple faster hooks:**
+
+```json
+{
+  "hooks": {
+    "BeforeTool": [
+      {
+        "matcher": "write_file",
+        "hooks": [
+          {
+            "name": "quick-check",
+            "command": "./quick-validation.sh",
+            "timeout": 1000
+          }
+        ]
+      },
+      {
+        "matcher": "write_file",
+        "hooks": [
+          {
+            "name": "deep-check",
+            "command": "./deep-analysis.sh",
+            "timeout": 30000
+          }
+        ]
+      }
+    ]
+  }
+}
+```
+
+### Invalid JSON output
+
+**Validate JSON before outputting:**
+
+```bash
+#!/usr/bin/env bash
+output='{"decision": "allow"}'
+
+# Validate JSON
+if echo "$output" | jq empty 2>/dev/null; then
+  echo "$output"
+else
+  echo "Invalid JSON generated" >&2
+  exit 1
+fi
+```
+
+**Ensure proper quoting and escaping:**
+
+```javascript
+// Bad: Unescaped string interpolation
+const message = `User said: ${userInput}`;
+console.log(JSON.stringify({ message }));
+
+// Good: Automatic escaping
+console.log(JSON.stringify({ message: `User said: ${userInput}` }));
+```
+
+**Check for binary data or control characters:**
+
+```javascript
+function sanitizeForJSON(str) {
+  return str.replace(/[\x00-\x1F\x7F-\x9F]/g, ''); // Remove control chars
+}
+
+const cleanContent = sanitizeForJSON(content);
+console.log(JSON.stringify({ content: cleanContent }));
+```
+
+### Exit code issues
+
+**Verify script returns correct codes:**
+
+```bash
+#!/usr/bin/env bash
+set -e  # Exit on error
+
+# Processing logic
+if validate_input; then
+  echo "Success"
+  exit 0
+else
+  echo "Validation failed" >&2
+  exit 2
+fi
+```
+
+**Check for unintended errors:**
+
+```bash
+#!/usr/bin/env bash
+# Don't use 'set -e' if you want to handle errors explicitly
+# set -e
+
+if ! command_that_might_fail; then
+  # Handle error
+  echo "Command failed but continuing" >&2
+fi
+
+# Always exit explicitly
+exit 0
+```
+
+**Use trap for cleanup:**
+
+```bash
+#!/usr/bin/env bash
+
+cleanup() {
+  # Cleanup logic
+  rm -f /tmp/hook-temp-*
+}
+
+trap cleanup EXIT
+
+# Hook logic here
+```
+
+### Environment variables not available
+
+**Check if variable is set:**
+
+```bash
+#!/usr/bin/env bash
+
+if [ -z "$GEMINI_PROJECT_DIR" ]; then
+  echo "GEMINI_PROJECT_DIR not set" >&2
+  exit 1
+fi
+
+if [ -z "$CUSTOM_VAR" ]; then
+  echo "Warning: CUSTOM_VAR not set, using default" >&2
+  CUSTOM_VAR="default-value"
+fi
+```
+
+**Debug available variables:**
+
+```bash
+#!/usr/bin/env bash
+
+# List all environment variables
+env > .gemini/hook-env.log
+
+# Check specific variables
+echo "GEMINI_PROJECT_DIR: $GEMINI_PROJECT_DIR" >> .gemini/hook-env.log
+echo "GEMINI_SESSION_ID: $GEMINI_SESSION_ID" >> .gemini/hook-env.log
+echo "GEMINI_API_KEY: ${GEMINI_API_KEY:+<set>}" >> .gemini/hook-env.log
+```
+
+**Use .env files:**
+
+```bash
+#!/usr/bin/env bash
+
+# Load .env file if it exists
+if [ -f "$GEMINI_PROJECT_DIR/.env" ]; then
+  source "$GEMINI_PROJECT_DIR/.env"
+fi
+```
+
+## Using Hooks Securely
 
 ### Threat Model
 
@@ -392,10 +621,11 @@ When you open a project with hooks defined in `.gemini/settings.json`:
    it).
 5. **Trust**: The hook is marked as "trusted" for this project.
 
-> **Modification detection**: If the `command` string of a project hook is
-> changed (e.g., by a `git pull`), its identity changes. Gemini CLI will treat
-> it as a **new, untrusted hook** and warn you again. This prevents malicious
-> actors from silently swapping a verified command for a malicious one.
+> [!IMPORTANT] **Modification Detection**: If the `command` string of a project
+> hook is changed (e.g., by a `git pull`), its identity changes. Gemini CLI will
+> treat it as a **new, untrusted hook** and warn you again. This prevents
+> malicious actors from silently swapping a verified command for a malicious
+> one.
 
 ### Risks
 
@@ -416,134 +646,32 @@ When you open a project with hooks defined in `.gemini/settings.json`:
   publishers, well-known community members).
 - Be cautious with obfuscated scripts or compiled binaries from unknown sources.
 
-#### Sanitize environment
+#### Sanitize Environment
 
 Hooks inherit the environment of the Gemini CLI process, which may include
-sensitive API keys. Gemini CLI provides a
-[redaction system](/docs/get-started/configuration#environment-variable-redaction)
-that automatically filters variables matching sensitive patterns (e.g., `KEY`,
-`TOKEN`).
+sensitive API keys. Gemini CLI attempts to sanitize sensitive variables, but you
+should be cautious.
 
-> **Disabled by Default**: Environment redaction is currently **OFF by
-> default**. We strongly recommend enabling it if you are running third-party
-> hooks or working in sensitive environments.
+- **Avoid printing environment variables** to stdout/stderr unless necessary.
+- **Use `.env` files** to securely manage sensitive variables, ensuring they are
+  excluded from version control.
 
-**Impact on hooks:**
-
-- **Security**: Prevents your hook scripts from accidentally leaking secrets.
-- **Troubleshooting**: If your hook depends on a specific environment variable
-  that is being blocked, you must explicitly allow it in `settings.json`.
+**System Administrators:** You can enforce environment variable redaction by
+default in the system configuration (e.g., `/etc/gemini-cli/settings.json`):
 
 ```json
 {
   "security": {
     "environmentVariableRedaction": {
       "enabled": true,
-      "allowed": ["MY_REQUIRED_TOOL_KEY"]
+      "blocked": ["MY_SECRET_KEY"],
+      "allowed": ["SAFE_VAR"]
     }
   }
 }
 ```
 
-**System administrators:** You can enforce redaction for all users in the system
-configuration.
-
-## Troubleshooting
-
-### Hook not executing
-
-**Check hook name in `/hooks panel`:** Verify the hook appears in the list and
-is enabled.
-
-**Verify matcher pattern:**
-
-```bash
-# Test regex pattern
-echo "write_file|replace" | grep -E "write_.*|replace"
-
-```
-
-**Check disabled list:** Verify the hook is not listed in your `settings.json`:
-
-```json
-{
-  "hooks": {
-    "disabled": ["my-hook-name"]
-  }
-}
-```
-
-**Ensure script is executable**: For macOS and Linux users, verify the script
-has execution permissions:
-
-```bash
-ls -la .gemini/hooks/my-hook.sh
-chmod +x .gemini/hooks/my-hook.sh
-```
-
-**Verify script path:** Ensure the path in `settings.json` resolves correctly.
-
-```bash
-# Check path expansion
-echo "$GEMINI_PROJECT_DIR/.gemini/hooks/my-hook.sh"
-
-# Verify file exists
-test -f "$GEMINI_PROJECT_DIR/.gemini/hooks/my-hook.sh" && echo "File exists"
-```
-
-### Hook timing out
-
-**Check configured timeout:** The default is 60000ms (1 minute). You can
-increase this in `settings.json`:
-
-```json
-{
-  "name": "slow-hook",
-  "timeout": 120000
-}
-```
-
-**Optimize slow operations:** Move heavy processing to background tasks or use
-caching.
-
-### Invalid JSON output
-
-**Validate JSON before outputting:**
-
-```bash
-#!/usr/bin/env bash
-output='{"decision": "allow"}'
-
-# Validate JSON
-if echo "$output" | jq empty 2>/dev/null; then
-  echo "$output"
-else
-  echo "Invalid JSON generated" >&2
-  exit 1
-fi
-
-```
-
-### Environment variables not available
-
-**Check if variable is set:**
-
-```bash
-#!/usr/bin/env bash
-if [ -z "$GEMINI_PROJECT_DIR" ]; then
-  echo "GEMINI_PROJECT_DIR not set" >&2
-  exit 1
-fi
-
-```
-
-**Debug available variables:**
-
-```bash
-env > .gemini/hook-env.log
-```
-
-## Authoring secure hooks
+## Authoring Secure Hooks
 
 When writing your own hooks, follow these practices to ensure they are robust
 and secure.
@@ -585,7 +713,6 @@ defaults to 60 seconds, but you should set stricter limits for fast hooks.
         "hooks": [
           {
             "name": "fast-validator",
-            "type": "command",
             "command": "./hooks/validate.sh",
             "timeout": 5000 // 5 seconds
           }
@@ -639,17 +766,40 @@ function containsSecret(content) {
 
 ## Privacy considerations
 
-Hook inputs and outputs may contain sensitive information.
+Hook inputs and outputs may contain sensitive information. Gemini CLI respects
+the `telemetry.logPrompts` setting for hook data logging.
 
 ### What data is collected
 
-Hook telemetry may include inputs (prompts, code) and outputs (decisions,
-reasons) unless disabled.
+Hook telemetry may include:
+
+- **Hook inputs:** User prompts, tool arguments, file contents
+- **Hook outputs:** Hook responses, decision reasons, added context
+- **Standard streams:** stdout and stderr from hook processes
+- **Execution metadata:** Hook name, event type, duration, success/failure
 
 ### Privacy settings
 
-**Disable PII logging:** If you are working with sensitive data, disable prompt
-logging in your settings:
+**Enabled (default):**
+
+Full hook I/O is logged to telemetry. Use this when:
+
+- Developing and debugging hooks
+- Telemetry is redirected to a trusted enterprise system
+- You understand and accept the privacy implications
+
+**Disabled:**
+
+Only metadata is logged (event name, duration, success/failure). Hook inputs and
+outputs are excluded. Use this when:
+
+- Sending telemetry to third-party systems
+- Working with sensitive data
+- Privacy regulations require minimizing data collection
+
+### Configuration
+
+**Disable PII logging in settings:**
 
 ```json
 {
@@ -659,19 +809,48 @@ logging in your settings:
 }
 ```
 
-**Suppress Output:** Individual hooks can request their metadata be hidden from
-logs and telemetry by returning `"suppressOutput": true` in their JSON response.
+**Disable via environment variable:**
 
-> **Note**
-
-> `suppressOutput` only affects background logging. Any `systemMessage` or
-> `reason` included in the JSON will still be displayed to the user in the
-> terminal.
+```bash
+export GEMINI_TELEMETRY_LOG_PROMPTS=false
+```
 
 ### Sensitive data in hooks
 
 If your hooks process sensitive data:
 
-1. **Minimize logging:** Don't write sensitive data to log files.
-2. **Sanitize outputs:** Remove sensitive data before outputting JSON or writing
-   to stderr.
+1. **Minimize logging:** Don't write sensitive data to log files
+2. **Sanitize outputs:** Remove sensitive data before outputting
+3. **Use secure storage:** Encrypt sensitive data at rest
+4. **Limit access:** Restrict hook script permissions
+
+**Example sanitization:**
+
+```javascript
+function sanitizeOutput(data) {
+  const sanitized = { ...data };
+
+  // Remove sensitive fields
+  delete sanitized.apiKey;
+  delete sanitized.password;
+
+  // Redact sensitive strings
+  if (sanitized.content) {
+    sanitized.content = sanitized.content.replace(
+      /api[_-]?key\s*[:=]\s*['"]?[a-zA-Z0-9_-]{20,}['"]?/gi,
+      '[REDACTED]',
+    );
+  }
+
+  return sanitized;
+}
+
+console.log(JSON.stringify(sanitizeOutput(hookOutput)));
+```
+
+## Learn more
+
+- [Hooks Reference](index.md) - Complete API reference
+- [Writing Hooks](writing-hooks.md) - Tutorial and examples
+- [Configuration](../get-started/configuration.md) - Gemini CLI settings
+- [Hooks Design Document](../hooks-design.md) - Technical architecture

docs/hooks/index.md

@@ -4,101 +4,96 @@ Hooks are scripts or programs that Gemini CLI executes at specific points in the
 agentic loop, allowing you to intercept and customize behavior without modifying
 the CLI's source code.
 
+See [writing hooks guide](writing-hooks.md) for a tutorial on creating your
+first hook and a comprehensive example.
+
+See [hooks reference](reference.md) for the technical specification of the I/O
+schemas.
+
+See [best practices](best-practices.md) for guidelines on security, performance,
+and debugging.
+
 ## What are hooks?
 
+With hooks, you can:
+
+- **Add context:** Inject relevant information before the model processes a
+  request
+- **Validate actions:** Review and block potentially dangerous operations
+- **Enforce policies:** Implement security and compliance requirements
+- **Log interactions:** Track tool usage and model responses
+- **Optimize behavior:** Dynamically adjust tool selection or model parameters
+
 Hooks run synchronously as part of the agent loop—when a hook event fires,
 Gemini CLI waits for all matching hooks to complete before continuing.
 
-With hooks, you can:
+## Security and Risks
 
-- **Add context:** Inject relevant information (like git history) before the
-  model processes a request.
-- **Validate actions:** Review tool arguments and block potentially dangerous
-  operations.
-- **Enforce policies:** Implement security scanners and compliance checks.
-- **Log interactions:** Track tool usage and model responses for auditing.
-- **Optimize behavior:** Dynamically filter available tools or adjust model
-  parameters.
+> [!WARNING] **Hooks execute arbitrary code with your user privileges.**
 
-### Getting started
+By configuring hooks, you are explicitly allowing Gemini CLI to run shell
+commands on your machine. Malicious or poorly configured hooks can:
 
-- **[Writing hooks guide](/docs/hooks/writing-hooks)**: A tutorial on creating
-  your first hook with comprehensive examples.
-- **[Best practices](/docs/hooks/best-practices)**: Guidelines on security,
-  performance, and debugging.
-- **[Hooks reference](/docs/hooks/reference)**: The definitive technical
-  specification of I/O schemas and exit codes.
+- **Exfiltrate data**: Read sensitive files (`.env`, ssh keys) and send them to
+  remote servers.
+- **Modify system**: Delete files, install malware, or change system settings.
+- **Consume resources**: Run infinite loops or crash your system.
+
+**Project-level hooks** (in `.gemini/settings.json`) and **Extension hooks** are
+particularly risky when opening third-party projects or extensions from
+untrusted authors. Gemini CLI will **warn you** the first time it detects a new
+project hook (identified by its name and command), but it is **your
+responsibility** to review these hooks (and any installed extensions) before
+trusting them.
+
+> [!NOTE] Extension hooks are subject to a mandatory security warning and
+> consent flow during extension installation or update if hooks are detected.
+> You must explicitly approve the installation or update of any extension that
+> contains hooks.
+
+See [Security Considerations](best-practices.md#using-hooks-securely) for a
+detailed threat model and mitigation strategies.
 
 ## Core concepts
 
 ### Hook events
 
-Hooks are triggered by specific events in Gemini CLI's lifecycle.
+Hooks are triggered by specific events in Gemini CLI's lifecycle. The following
+table lists all available hook events:
 
-| Event                 | When It Fires                                  | Impact                 | Common Use Cases                             |
-| --------------------- | ---------------------------------------------- | ---------------------- | -------------------------------------------- |
-| `SessionStart`        | When a session begins (startup, resume, clear) | Inject Context         | Initialize resources, load context           |
-| `SessionEnd`          | When a session ends (exit, clear)              | Advisory               | Clean up, save state                         |
-| `BeforeAgent`         | After user submits prompt, before planning     | Block Turn / Context   | Add context, validate prompts, block turns   |
-| `AfterAgent`          | When agent loop ends                           | Retry / Halt           | Review output, force retry or halt execution |
-| `BeforeModel`         | Before sending request to LLM                  | Block Turn / Mock      | Modify prompts, swap models, mock responses  |
-| `AfterModel`          | After receiving LLM response                   | Block Turn / Redact    | Filter/redact responses, log interactions    |
-| `BeforeToolSelection` | Before LLM selects tools                       | Filter Tools           | Filter available tools, optimize selection   |
-| `BeforeTool`          | Before a tool executes                         | Block Tool / Rewrite   | Validate arguments, block dangerous ops      |
-| `AfterTool`           | After a tool executes                          | Block Result / Context | Process results, run tests, hide results     |
-| `PreCompress`         | Before context compression                     | Advisory               | Save state, notify user                      |
-| `Notification`        | When a system notification occurs              | Advisory               | Forward to desktop alerts, logging           |
+| Event                 | When It Fires                                 | Common Use Cases                           |
+| --------------------- | --------------------------------------------- | ------------------------------------------ |
+| `SessionStart`        | When a session begins                         | Initialize resources, load context         |
+| `SessionEnd`          | When a session ends                           | Clean up, save state                       |
+| `BeforeAgent`         | After user submits prompt, before planning    | Add context, validate prompts              |
+| `AfterAgent`          | When agent loop ends                          | Review output, force continuation          |
+| `BeforeModel`         | Before sending request to LLM                 | Modify prompts, add instructions           |
+| `AfterModel`          | After receiving LLM response                  | Filter responses, log interactions         |
+| `BeforeToolSelection` | Before LLM selects tools (after BeforeModel)  | Filter available tools, optimize selection |
+| `BeforeTool`          | Before a tool executes                        | Validate arguments, block dangerous ops    |
+| `AfterTool`           | After a tool executes                         | Process results, run tests                 |
+| `PreCompress`         | Before context compression                    | Save state, notify user                    |
+| `Notification`        | When a notification occurs (e.g., permission) | Auto-approve, log decisions                |
 
-### Global mechanics
+### Hook types
 
-Understanding these core principles is essential for building robust hooks.
+Gemini CLI currently supports **command hooks** that run shell commands or
+scripts:
 
-#### Strict JSON requirements (The "Golden Rule")
+```json
+{
+  "type": "command",
+  "command": "$GEMINI_PROJECT_DIR/.gemini/hooks/my-hook.sh",
+  "timeout": 30000
+}
+```
 
-Hooks communicate via `stdin` (Input) and `stdout` (Output).
+**Note:** Plugin hooks (npm packages) are planned for a future release.
 
-1. **Silence is Mandatory**: Your script **must not** print any plain text to
-   `stdout` other than the final JSON object. **Even a single `echo` or `print`
-   call before the JSON will break parsing.**
-2. **Pollution = Failure**: If `stdout` contains non-JSON text, parsing will
-   fail. The CLI will default to "Allow" and treat the entire output as a
-   `systemMessage`.
-3. **Debug via Stderr**: Use `stderr` for **all** logging and debugging (e.g.,
-   `echo "debug" >&2`). Gemini CLI captures `stderr` but never attempts to parse
-   it as JSON.
+### Matchers
 
-#### Exit codes
-
-Gemini CLI uses exit codes to determine the high-level outcome of a hook
-execution:
-
-| Exit Code | Label            | Behavioral Impact                                                                                                                                                            |
-| --------- | ---------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **0**     | **Success**      | The `stdout` is parsed as JSON. **Preferred code** for all logic, including intentional blocks (e.g., `{"decision": "deny"}`).                                               |
-| **2**     | **System Block** | **Critical Block**. The target action (tool, turn, or stop) is aborted. `stderr` is used as the rejection reason. High severity; used for security stops or script failures. |
-| **Other** | **Warning**      | Non-fatal failure. A warning is shown, but the interaction proceeds using original parameters.                                                                               |
-
-#### Matchers
-
-You can filter which specific tools or triggers fire your hook using the
-`matcher` field.
-
-- **Tool events** (`BeforeTool`, `AfterTool`): Matchers are **Regular
-  Expressions**. (e.g., `"write_.*"`).
-- **Lifecycle events**: Matchers are **Exact Strings**. (e.g., `"startup"`).
-- **Wildcards**: `"*"` or `""` (empty string) matches all occurrences.
-
-## Configuration
-
-Hooks are configured in `settings.json`. Gemini CLI merges configurations from
-multiple layers in the following order of precedence (highest to lowest):
-
-1.  **Project settings**: `.gemini/settings.json` in the current directory.
-2.  **User settings**: `~/.gemini/settings.json`.
-3.  **System settings**: `/etc/gemini-cli/settings.json`.
-4.  **Extensions**: Hooks defined by installed extensions.
-
-### Configuration schema
+For tool-related events (`BeforeTool`, `AfterTool`), you can filter which tools
+trigger the hook:
 
 ```json
 {
@@ -106,12 +101,382 @@ multiple layers in the following order of precedence (highest to lowest):
     "BeforeTool": [
       {
         "matcher": "write_file|replace",
+        "hooks": [
+          /* hooks for write operations */
+        ]
+      }
+    ]
+  }
+}
+```
+
+**Matcher patterns:**
+
+- **Exact match:** `"read_file"` matches only `read_file`
+- **Regex:** `"write_.*|replace"` matches `write_file`, `replace`
+- **Wildcard:** `"*"` or `""` matches all tools
+
+**Session event matchers:**
+
+- **SessionStart:** `startup`, `resume`, `clear`
+- **SessionEnd:** `exit`, `clear`, `logout`, `prompt_input_exit`
+- **PreCompress:** `manual`, `auto`
+- **Notification:** `ToolPermission`
+
+## Hook input/output contract
+
+### Command hook communication
+
+Hooks communicate via:
+
+- **Input:** JSON on stdin
+- **Output:** Exit code + stdout/stderr
+
+### Exit codes
+
+- **0:** Success - stdout shown to user (or injected as context for some events)
+- **2:** Blocking error - stderr shown to agent/user, operation may be blocked
+- **Other:** Non-blocking warning - logged but execution continues
+
+### Common input fields
+
+Every hook receives these base fields:
+
+```json
+{
+  "session_id": "abc123",
+  "transcript_path": "/path/to/transcript.jsonl",
+  "cwd": "/path/to/project",
+  "hook_event_name": "BeforeTool",
+  "timestamp": "2025-12-01T10:30:00Z"
+  // ... event-specific fields
+}
+```
+
+### Event-specific fields
+
+#### BeforeTool
+
+**Input:**
+
+```json
+{
+  "tool_name": "write_file",
+  "tool_input": {
+    "file_path": "/path/to/file.ts",
+    "content": "..."
+  }
+}
+```
+
+**Output (JSON on stdout):**
+
+```json
+{
+  "decision": "allow|deny|ask|block",
+  "reason": "Explanation shown to agent",
+  "systemMessage": "Message shown to user"
+}
+```
+
+Or simple exit codes:
+
+- Exit 0 = allow (stdout shown to user)
+- Exit 2 = deny (stderr shown to agent)
+
+#### AfterTool
+
+**Input:**
+
+```json
+{
+  "tool_name": "read_file",
+  "tool_input": { "file_path": "..." },
+  "tool_response": "file contents..."
+}
+```
+
+**Output:**
+
+```json
+{
+  "decision": "allow|deny",
+  "hookSpecificOutput": {
+    "hookEventName": "AfterTool",
+    "additionalContext": "Extra context for agent"
+  }
+}
+```
+
+#### BeforeAgent
+
+**Input:**
+
+```json
+{
+  "prompt": "Fix the authentication bug"
+}
+```
+
+**Output:**
+
+```json
+{
+  "decision": "allow|deny",
+  "hookSpecificOutput": {
+    "hookEventName": "BeforeAgent",
+    "additionalContext": "Recent project decisions: ..."
+  }
+}
+```
+
+#### BeforeModel
+
+**Input:**
+
+```json
+{
+  "llm_request": {
+    "model": "gemini-2.0-flash-exp",
+    "messages": [{ "role": "user", "content": "Hello" }],
+    "config": { "temperature": 0.7 },
+    "toolConfig": {
+      "functionCallingConfig": {
+        "mode": "AUTO",
+        "allowedFunctionNames": ["read_file", "write_file"]
+      }
+    }
+  }
+}
+```
+
+**Output:**
+
+```json
+{
+  "decision": "allow",
+  "hookSpecificOutput": {
+    "hookEventName": "BeforeModel",
+    "llm_request": {
+      "messages": [
+        { "role": "system", "content": "Additional instructions..." },
+        { "role": "user", "content": "Hello" }
+      ]
+    }
+  }
+}
+```
+
+#### AfterModel
+
+**Input:**
+
+```json
+{
+  "llm_request": {
+    "model": "gemini-2.0-flash-exp",
+    "messages": [
+      /* ... */
+    ],
+    "config": {
+      /* ... */
+    },
+    "toolConfig": {
+      /* ... */
+    }
+  },
+  "llm_response": {
+    "text": "string",
+    "candidates": [
+      {
+        "content": {
+          "role": "model",
+          "parts": ["array of content parts"]
+        },
+        "finishReason": "STOP"
+      }
+    ]
+  }
+}
+```
+
+**Output:**
+
+```json
+{
+  "hookSpecificOutput": {
+    "hookEventName": "AfterModel",
+    "llm_response": {
+      "candidate": {
+        /* modified response */
+      }
+    }
+  }
+}
+```
+
+#### BeforeToolSelection
+
+**Input:**
+
+```json
+{
+  "llm_request": {
+    "model": "gemini-2.0-flash-exp",
+    "messages": [
+      /* ... */
+    ],
+    "toolConfig": {
+      "functionCallingConfig": {
+        "mode": "AUTO",
+        "allowedFunctionNames": [
+          /* 100+ tools */
+        ]
+      }
+    }
+  }
+}
+```
+
+**Output:**
+
+```json
+{
+  "hookSpecificOutput": {
+    "hookEventName": "BeforeToolSelection",
+    "toolConfig": {
+      "functionCallingConfig": {
+        "mode": "ANY",
+        "allowedFunctionNames": ["read_file", "write_file", "replace"]
+      }
+    }
+  }
+}
+```
+
+Or simple output (comma-separated tool names sets mode to ANY):
+
+```bash
+echo "read_file,write_file,replace"
+```
+
+#### SessionStart
+
+**Input:**
+
+```json
+{
+  "source": "startup|resume|clear"
+}
+```
+
+**Output:**
+
+```json
+{
+  "hookSpecificOutput": {
+    "hookEventName": "SessionStart",
+    "additionalContext": "Loaded 5 project memories"
+  }
+}
+```
+
+#### SessionEnd
+
+**Input:**
+
+```json
+{
+  "reason": "exit|clear|logout|prompt_input_exit|other"
+}
+```
+
+No structured output expected (but stdout/stderr logged).
+
+#### PreCompress
+
+**Input:**
+
+```json
+{
+  "trigger": "manual|auto"
+}
+```
+
+**Output:**
+
+```json
+{
+  "systemMessage": "Compression starting..."
+}
+```
+
+#### Notification
+
+**Input:**
+
+```json
+{
+  "notification_type": "ToolPermission",
+  "message": "string",
+  "details": {
+    /* notification details */
+  }
+}
+```
+
+**Output:**
+
+```json
+{
+  "systemMessage": "Notification logged"
+}
+```
+
+## Configuration
+
+Hook definitions are configured in `settings.json` files using the `hooks`
+object. Configuration can be specified at multiple levels with defined
+precedence rules.
+
+### Configuration layers
+
+Hook configurations are applied in the following order of execution (lower
+numbers run first):
+
+1.  **Project settings:** `.gemini/settings.json` in your project directory
+    (highest priority)
+2.  **User settings:** `~/.gemini/settings.json`
+3.  **System settings:** `/etc/gemini-cli/settings.json`
+4.  **Extensions:** Internal hooks defined by installed extensions (lowest
+    priority). See [Extensions documentation](../extensions/index.md#hooks) for
+    details on how extensions define and configure hooks.
+
+#### Deduplication and shadowing
+
+If multiple hooks with the identical **name** and **command** are discovered
+across different configuration layers, Gemini CLI deduplicates them. The hook
+from the higher-priority layer (e.g., Project) will be kept, and others will be
+ignored.
+
+Within each level, hooks run in the order they are declared in the
+configuration.
+
+### Configuration schema
+
+```json
+{
+  "hooks": {
+    "EventName": [
+      {
+        "matcher": "pattern",
         "hooks": [
           {
-            "name": "security-check",
+            "name": "hook-identifier",
             "type": "command",
-            "command": "$GEMINI_PROJECT_DIR/.gemini/hooks/security.sh",
-            "timeout": 5000
+            "command": "./path/to/script.sh",
+            "description": "What this hook does",
+            "timeout": 30000
           }
         ]
       }
@@ -120,45 +485,210 @@ multiple layers in the following order of precedence (highest to lowest):
 }
 ```
 
-#### Hook configuration fields
+**Configuration properties:**
 
-| Field         | Type   | Required  | Description                                                          |
-| :------------ | :----- | :-------- | :------------------------------------------------------------------- |
-| `type`        | string | **Yes**   | The execution engine. Currently only `"command"` is supported.       |
-| `command`     | string | **Yes\*** | The shell command to execute. (Required when `type` is `"command"`). |
-| `name`        | string | No        | A friendly name for identifying the hook in logs and CLI commands.   |
-| `timeout`     | number | No        | Execution timeout in milliseconds (default: 60000).                  |
-| `description` | string | No        | A brief explanation of the hook's purpose.                           |
-
----
+- **`name`** (string, recommended): Unique identifier for the hook used in
+  `/hooks enable/disable` commands. If omitted, the `command` path is used as
+  the identifier.
+- **`type`** (string, required): Hook type - currently only `"command"` is
+  supported
+- **`command`** (string, required): Path to the script or command to execute
+- **`description`** (string, optional): Human-readable description shown in
+  `/hooks panel`
+- **`timeout`** (number, optional): Timeout in milliseconds (default: 60000)
+- **`matcher`** (string, optional): Pattern to filter when hook runs (event
+  matchers only)
 
 ### Environment variables
 
-Hooks are executed with a sanitized environment.
+Hooks have access to:
 
-- `GEMINI_PROJECT_DIR`: The absolute path to the project root.
-- `GEMINI_SESSION_ID`: The unique ID for the current session.
-- `GEMINI_CWD`: The current working directory.
-- `CLAUDE_PROJECT_DIR`: (Alias) Provided for compatibility.
-
-## Security and risks
-
-> **Warning: Hooks execute arbitrary code with your user privileges.** By
-> configuring hooks, you are allowing scripts to run shell commands on your
-> machine.
-
-**Project-level hooks** are particularly risky when opening untrusted projects.
-Gemini CLI **fingerprints** project hooks. If a hook's name or command changes
-(e.g., via `git pull`), it is treated as a **new, untrusted hook** and you will
-be warned before it executes.
-
-See [Security Considerations](/docs/hooks/best-practices#using-hooks-securely)
-for a detailed threat model.
+- `GEMINI_PROJECT_DIR`: Project root directory
+- `GEMINI_SESSION_ID`: Current session ID
+- `GEMINI_API_KEY`: Gemini API key (if configured)
+- All other environment variables from the parent process
 
 ## Managing hooks
 
-Use the CLI commands to manage hooks without editing JSON manually:
+### View registered hooks
 
-- **View hooks:** `/hooks panel`
-- **Enable/Disable all:** `/hooks enable-all` or `/hooks disable-all`
-- **Toggle individual:** `/hooks enable <name>` or `/hooks disable <name>`
+Use the `/hooks panel` command to view all registered hooks:
+
+```bash
+/hooks panel
+```
+
+This command displays:
+
+- All active hooks organized by event
+- Hook source (user, project, system)
+- Hook type (command or plugin)
+- Execution status and recent output
+
+### Enable and disable hooks
+
+You can temporarily enable or disable individual hooks using commands:
+
+```bash
+/hooks enable hook-name
+/hooks disable hook-name
+```
+
+These commands allow you to control hook execution without editing configuration
+files. The hook name should match the `name` field in your hook configuration.
+Changes made via these commands are persisted to your global User settings
+(`~/.gemini/settings.json`).
+
+### Disabled hooks configuration
+
+To permanently disable hooks, add them to the `hooks.disabled` array in your
+`settings.json`:
+
+```json
+{
+  "hooks": {
+    "disabled": ["secret-scanner", "auto-test"]
+  }
+}
+```
+
+**Note:** The `hooks.disabled` array uses a UNION merge strategy. Disabled hooks
+from all configuration levels (user, project, system) are combined and
+deduplicated, meaning a hook disabled at any level remains disabled.
+
+## Migration from Claude Code
+
+If you have hooks configured for Claude Code, you can migrate them:
+
+```bash
+gemini hooks migrate --from-claude
+```
+
+This command:
+
+- Reads `.claude/settings.json`
+- Converts event names (`PreToolUse` → `BeforeTool`, etc.)
+- Translates tool names (`Bash` → `run_shell_command`, `replace` → `replace`)
+- Updates matcher patterns
+- Writes to `.gemini/settings.json`
+
+### Event name mapping
+
+| Claude Code        | Gemini CLI     |
+| ------------------ | -------------- |
+| `PreToolUse`       | `BeforeTool`   |
+| `PostToolUse`      | `AfterTool`    |
+| `UserPromptSubmit` | `BeforeAgent`  |
+| `Stop`             | `AfterAgent`   |
+| `Notification`     | `Notification` |
+| `SessionStart`     | `SessionStart` |
+| `SessionEnd`       | `SessionEnd`   |
+| `PreCompact`       | `PreCompress`  |
+
+### Tool name mapping
+
+| Claude Code | Gemini CLI            |
+| ----------- | --------------------- |
+| `Bash`      | `run_shell_command`   |
+| `Edit`      | `replace`             |
+| `Read`      | `read_file`           |
+| `Write`     | `write_file`          |
+| `Glob`      | `glob`                |
+| `Grep`      | `search_file_content` |
+| `LS`        | `list_directory`      |
+
+## Tool and Event Matchers Reference
+
+### Available tool names for matchers
+
+The following built-in tools can be used in `BeforeTool` and `AfterTool` hook
+matchers:
+
+#### File operations
+
+- `read_file` - Read a single file
+- `read_many_files` - Read multiple files at once
+- `write_file` - Create or overwrite a file
+- `replace` - Edit file content with find/replace
+
+#### File system
+
+- `list_directory` - List directory contents
+- `glob` - Find files matching a pattern
+- `search_file_content` - Search within file contents
+
+#### Execution
+
+- `run_shell_command` - Execute shell commands
+
+#### Web and external
+
+- `google_web_search` - Google Search with grounding
+- `web_fetch` - Fetch web page content
+
+#### Agent features
+
+- `write_todos` - Manage TODO items
+- `save_memory` - Save information to memory
+- `delegate_to_agent` - Delegate tasks to sub-agents
+
+#### Example matchers
+
+```json
+{
+  "matcher": "write_file|replace" // File editing tools
+}
+```
+
+```json
+{
+  "matcher": "read_.*" // All read operations
+}
+```
+
+```json
+{
+  "matcher": "run_shell_command" // Only shell commands
+}
+```
+
+```json
+{
+  "matcher": "*" // All tools
+}
+```
+
+### Event-specific matchers
+
+#### SessionStart event matchers
+
+- `startup` - Fresh session start
+- `resume` - Resuming a previous session
+- `clear` - Session cleared
+
+#### SessionEnd event matchers
+
+- `exit` - Normal exit
+- `clear` - Session cleared
+- `logout` - User logged out
+- `prompt_input_exit` - Exit from prompt input
+- `other` - Other reasons
+
+#### PreCompress event matchers
+
+- `manual` - Manually triggered compression
+- `auto` - Automatically triggered compression
+
+#### Notification event matchers
+
+- `ToolPermission` - Tool permission notifications
+
+## Learn more
+
+- [Writing Hooks](writing-hooks.md) - Tutorial and comprehensive example
+- [Best Practices](best-practices.md) - Security, performance, and debugging
+- [Custom Commands](../cli/custom-commands.md) - Create reusable prompt
+  shortcuts
+- [Configuration](../get-started/configuration.md) - Gemini CLI configuration
+  options
+- [Hooks Design Document](../hooks-design.md) - Technical architecture details

docs/hooks/reference.md

@@ -1,322 +1,178 @@
-# Hooks reference
+# Hooks Reference
 
 This document provides the technical specification for Gemini CLI hooks,
-including JSON schemas and API details.
+including the JSON schemas for input and output, exit code behaviors, and the
+stable model API.
 
-## Global hook mechanics
+## Communication Protocol
 
-- **Communication**: `stdin` for Input (JSON), `stdout` for Output (JSON), and
-  `stderr` for logs and feedback.
-- **Exit codes**:
-  - `0`: Success. `stdout` is parsed as JSON. **Preferred for all logic.**
-  - `2`: System Block. The action is blocked; `stderr` is used as the rejection
-    reason.
-  - `Other`: Warning. A non-fatal failure occurred; the CLI continues with a
-    warning.
-- **Silence is Mandatory**: Your script **must not** print any plain text to
-  `stdout` other than the final JSON.
+Hooks communicate with Gemini CLI via standard streams and exit codes:
+
+- **Input**: Gemini CLI sends a JSON object to the hook's `stdin`.
+- **Output**: The hook sends a JSON object (or plain text) to `stdout`.
+- **Exit Codes**: Used to signal success or blocking errors.
+
+### Exit Code Behavior
+
+| Exit Code | Meaning            | Behavior                                                                                        |
+| :-------- | :----------------- | :---------------------------------------------------------------------------------------------- |
+| `0`       | **Success**        | `stdout` is parsed as JSON. If parsing fails, it's treated as a `systemMessage`.                |
+| `2`       | **Blocking Error** | Interrupts the current operation. `stderr` is shown to the agent (for tool events) or the user. |
+| Other     | **Warning**        | Execution continues. `stderr` is logged as a non-blocking warning.                              |
 
 ---
 
-## Configuration schema
+## Input Schema (`stdin`)
 
-Hooks are defined in `settings.json` within the `hooks` object. Each event
-(e.g., `BeforeTool`) contains an array of **hook definitions**.
+Every hook receives a base JSON object. Extra fields are added depending on the
+specific event.
 
-### Hook definition
+### Base Fields (All Events)
 
-| Field        | Type      | Required | Description                                                                             |
-| :----------- | :-------- | :------- | :-------------------------------------------------------------------------------------- |
-| `matcher`    | `string`  | No       | A regex (for tools) or exact string (for lifecycle) to filter when the hook runs.       |
-| `sequential` | `boolean` | No       | If `true`, hooks in this group run one after another. If `false`, they run in parallel. |
-| `hooks`      | `array`   | **Yes**  | An array of **hook configurations**.                                                    |
+| Field             | Type     | Description                                           |
+| :---------------- | :------- | :---------------------------------------------------- |
+| `session_id`      | `string` | Unique identifier for the current CLI session.        |
+| `transcript_path` | `string` | Path to the session's JSON transcript (if available). |
+| `cwd`             | `string` | The current working directory.                        |
+| `hook_event_name` | `string` | The name of the firing event (e.g., `BeforeTool`).    |
+| `timestamp`       | `string` | ISO 8601 timestamp of the event.                      |
 
-### Hook configuration
+### Event-Specific Fields
 
-| Field         | Type     | Required  | Description                                                          |
-| :------------ | :------- | :-------- | :------------------------------------------------------------------- |
-| `type`        | `string` | **Yes**   | The execution engine. Currently only `"command"` is supported.       |
-| `command`     | `string` | **Yes\*** | The shell command to execute. (Required when `type` is `"command"`). |
-| `name`        | `string` | No        | A friendly name for identifying the hook in logs and CLI commands.   |
-| `timeout`     | `number` | No        | Execution timeout in milliseconds (default: 60000).                  |
-| `description` | `string` | No        | A brief explanation of the hook's purpose.                           |
+#### Tool Events (`BeforeTool`, `AfterTool`)
+
+- `tool_name`: (`string`) The internal name of the tool (e.g., `write_file`,
+  `run_shell_command`).
+- `tool_input`: (`object`) The arguments passed to the tool.
+- `tool_response`: (`object`, **AfterTool only**) The raw output from the tool
+  execution.
+- `mcp_context`: (`object`, **optional**) Present only for MCP tool invocations.
+  Contains server identity information:
+  - `server_name`: (`string`) The configured name of the MCP server.
+  - `tool_name`: (`string`) The original tool name from the MCP server.
+  - `command`: (`string`, optional) For stdio transport, the command used to
+    start the server.
+  - `args`: (`string[]`, optional) For stdio transport, the command arguments.
+  - `cwd`: (`string`, optional) For stdio transport, the working directory.
+  - `url`: (`string`, optional) For SSE/HTTP transport, the server URL.
+  - `tcp`: (`string`, optional) For WebSocket transport, the TCP address.
+
+#### Agent Events (`BeforeAgent`, `AfterAgent`)
+
+- `prompt`: (`string`) The user's submitted prompt.
+- `prompt_response`: (`string`, **AfterAgent only**) The final response text
+  from the model.
+- `stop_hook_active`: (`boolean`, **AfterAgent only**) Indicates if a stop hook
+  is already handling a continuation.
+
+#### Model Events (`BeforeModel`, `AfterModel`, `BeforeToolSelection`)
+
+- `llm_request`: (`LLMRequest`) A stable representation of the outgoing request.
+  See [Stable Model API](#stable-model-api).
+- `llm_response`: (`LLMResponse`, **AfterModel only**) A stable representation
+  of the incoming response.
+
+#### Session & Notification Events
+
+- `source`: (`startup` | `resume` | `clear`, **SessionStart only**) The trigger
+  source.
+- `reason`: (`exit` | `clear` | `logout` | `prompt_input_exit` | `other`,
+  **SessionEnd only**) The reason for session end.
+- `trigger`: (`manual` | `auto`, **PreCompress only**) What triggered the
+  compression event.
+- `notification_type`: (`ToolPermission`, **Notification only**) The type of
+  notification being fired.
+- `message`: (`string`, **Notification only**) The notification message.
+- `details`: (`object`, **Notification only**) Payload-specific details for the
+  notification.
 
 ---
 
-## Base input schema
+## Output Schema (`stdout`)
 
-All hooks receive these common fields via `stdin`:
+If the hook exits with `0`, the CLI attempts to parse `stdout` as JSON.
 
-```typescript
-{
-  "session_id": string,      // Unique ID for the current session
-  "transcript_path": string, // Absolute path to session transcript JSON
-  "cwd": string,             // Current working directory
-  "hook_event_name": string, // The firing event (e.g. "BeforeTool")
-  "timestamp": string        // ISO 8601 execution time
-}
-```
+### Common Output Fields
 
----
+| Field                | Type      | Description                                                              |
+| :------------------- | :-------- | :----------------------------------------------------------------------- |
+| `decision`           | `string`  | One of: `allow`, `deny`, `block`, `ask`, `approve`.                      |
+| `reason`             | `string`  | Explanation shown to the **agent** when a decision is `deny` or `block`. |
+| `systemMessage`      | `string`  | Message displayed to the **user** in the CLI terminal.                   |
+| `continue`           | `boolean` | If `false`, immediately terminates the agent loop for this turn.         |
+| `stopReason`         | `string`  | Message shown to the user when `continue` is `false`.                    |
+| `suppressOutput`     | `boolean` | If `true`, the hook execution is hidden from the CLI transcript.         |
+| `hookSpecificOutput` | `object`  | Container for event-specific data (see below).                           |
 
-## Common output fields
+### `hookSpecificOutput` Reference
 
-Most hooks support these fields in their `stdout` JSON:
-
-| Field            | Type      | Description                                                                    |
-| :--------------- | :-------- | :----------------------------------------------------------------------------- |
-| `systemMessage`  | `string`  | Displayed immediately to the user in the terminal.                             |
-| `suppressOutput` | `boolean` | If `true`, hides internal hook metadata from logs/telemetry.                   |
-| `continue`       | `boolean` | If `false`, stops the entire agent loop immediately.                           |
-| `stopReason`     | `string`  | Displayed to the user when `continue` is `false`.                              |
-| `decision`       | `string`  | `"allow"` or `"deny"` (alias `"block"`). Specific impact depends on the event. |
-| `reason`         | `string`  | The feedback/error message provided when a `decision` is `"deny"`.             |
-
----
-
-## Tool hooks
-
-### Matchers and tool names
-
-For `BeforeTool` and `AfterTool` events, the `matcher` field in your settings is
-compared against the name of the tool being executed.
-
-- **Built-in Tools**: You can match any built-in tool (e.g., `read_file`,
-  `run_shell_command`). See the [Tools Reference](/docs/tools) for a full list
-  of available tool names.
-- **MCP Tools**: Tools from MCP servers follow the naming pattern
-  `mcp__<server_name>__<tool_name>`.
-- **Regex Support**: Matchers support regular expressions (e.g.,
-  `matcher: "read_.*"` matches all file reading tools).
-
-### `BeforeTool`
-
-Fires before a tool is invoked. Used for argument validation, security checks,
-and parameter rewriting.
-
-- **Input Fields**:
-  - `tool_name`: (`string`) The name of the tool being called.
-  - `tool_input`: (`object`) The raw arguments generated by the model.
-  - `mcp_context`: (`object`) Optional metadata for MCP-based tools.
-- **Relevant Output Fields**:
-  - `decision`: Set to `"deny"` (or `"block"`) to prevent the tool from
-    executing.
-  - `reason`: Required if denied. This text is sent **to the agent** as a tool
-    error, allowing it to respond or retry.
-  - `hookSpecificOutput.tool_input`: An object that **merges with and
-    overrides** the model's arguments before execution.
-  - `continue`: Set to `false` to **kill the entire agent loop** immediately.
-- **Exit Code 2 (Block Tool)**: Prevents execution. Uses `stderr` as the
-  `reason` sent to the agent. **The turn continues.**
-
-### `AfterTool`
-
-Fires after a tool executes. Used for result auditing, context injection, or
-hiding sensitive output from the agent.
-
-- **Input Fields**:
-  - `tool_name`: (`string`)
-  - `tool_input`: (`object`) The original arguments.
-  - `tool_response`: (`object`) The result containing `llmContent`,
-    `returnDisplay`, and optional `error`.
-  - `mcp_context`: (`object`)
-- **Relevant Output Fields**:
-  - `decision`: Set to `"deny"` to hide the real tool output from the agent.
-  - `reason`: Required if denied. This text **replaces** the tool result sent
-    back to the model.
-  - `hookSpecificOutput.additionalContext`: Text that is **appended** to the
-    tool result for the agent.
-  - `continue`: Set to `false` to **kill the entire agent loop** immediately.
-- **Exit Code 2 (Block Result)**: Hides the tool result. Uses `stderr` as the
-  replacement content sent to the agent. **The turn continues.**
-
----
-
-## Agent hooks
-
-### `BeforeAgent`
-
-Fires after a user submits a prompt, but before the agent begins planning. Used
-for prompt validation or injecting dynamic context.
-
-- **Input Fields**:
-  - `prompt`: (`string`) The original text submitted by the user.
-- **Relevant Output Fields**:
-  - `hookSpecificOutput.additionalContext`: Text that is **appended** to the
-    prompt for this turn only.
-  - `decision`: Set to `"deny"` to block the turn and **discard the user's
-    message** (it will not appear in history).
-  - `continue`: Set to `false` to block the turn but **save the message to
-    history**.
-  - `reason`: Required if denied or stopped.
-- **Exit Code 2 (Block Turn)**: Aborts the turn and erases the prompt from
-  context. Same as `decision: "deny"`.
-
-### `AfterAgent`
-
-Fires once per turn after the model generates its final response. Primary use
-case is response validation and automatic retries.
-
-- **Input Fields**:
-  - `prompt`: (`string`) The user's original request.
-  - `prompt_response`: (`string`) The final text generated by the agent.
-  - `stop_hook_active`: (`boolean`) Indicates if this hook is already running as
-    part of a retry sequence.
-- **Relevant Output Fields**:
-  - `decision`: Set to `"deny"` to **reject the response** and force a retry.
-  - `reason`: Required if denied. This text is sent **to the agent as a new
-    prompt** to request a correction.
-  - `continue`: Set to `false` to **stop the session** without retrying.
-  - `clearContext`: If `true`, clears conversation history (LLM memory) while
-    preserving UI display.
-- **Exit Code 2 (Retry)**: Rejects the response and triggers an automatic retry
-  turn using `stderr` as the feedback prompt.
-
----
-
-## Model hooks
-
-### `BeforeModel`
-
-Fires before sending a request to the LLM. Operates on a stable, SDK-agnostic
-request format.
-
-- **Input Fields**:
-  - `llm_request`: (`object`) Contains `model`, `messages`, and `config`
-    (generation params).
-- **Relevant Output Fields**:
-  - `hookSpecificOutput.llm_request`: An object that **overrides** parts of the
-    outgoing request (e.g., changing models or temperature).
-  - `hookSpecificOutput.llm_response`: A **Synthetic Response** object. If
-    provided, the CLI skips the LLM call entirely and uses this as the response.
-  - `decision`: Set to `"deny"` to block the request and abort the turn.
-- **Exit Code 2 (Block Turn)**: Aborts the turn and skips the LLM call. Uses
-  `stderr` as the error message.
-
-### `BeforeToolSelection`
-
-Fires before the LLM decides which tools to call. Used to filter the available
-toolset or force specific tool modes.
-
-- **Input Fields**:
-  - `llm_request`: (`object`) Same format as `BeforeModel`.
-- **Relevant Output Fields**:
-  - `hookSpecificOutput.toolConfig.mode`: (`"AUTO" | "ANY" | "NONE"`)
-    - `"NONE"`: Disables all tools (Wins over other hooks).
-    - `"ANY"`: Forces at least one tool call.
-  - `hookSpecificOutput.toolConfig.allowedFunctionNames`: (`string[]`) Whitelist
-    of tool names.
-- **Union Strategy**: Multiple hooks' whitelists are **combined**.
-- **Limitations**: Does **not** support `decision`, `continue`, or
-  `systemMessage`.
-
-### `AfterModel`
-
-Fires immediately after an LLM response chunk is received. Used for real-time
-redaction or PII filtering.
-
-- **Input Fields**:
-  - `llm_request`: (`object`) The original request.
-  - `llm_response`: (`object`) The model's response (or a single chunk during
-    streaming).
-- **Relevant Output Fields**:
-  - `hookSpecificOutput.llm_response`: An object that **replaces** the model's
-    response chunk.
-  - `decision`: Set to `"deny"` to discard the response chunk and block the
-    turn.
-  - `continue`: Set to `false` to **kill the entire agent loop** immediately.
-- **Note on Streaming**: Fired for **every chunk** generated by the model.
-  Modifying the response only affects the current chunk.
-- **Exit Code 2 (Block Response)**: Aborts the turn and discards the model's
-  output. Uses `stderr` as the error message.
-
----
-
-## Lifecycle & system hooks
-
-### `SessionStart`
-
-Fires on application startup, resuming a session, or after a `/clear` command.
-Used for loading initial context.
-
-- **Input fields**:
-  - `source`: (`"startup" | "resume" | "clear"`)
-- **Relevant output fields**:
-  - `hookSpecificOutput.additionalContext`: (`string`)
-    - **Interactive**: Injected as the first turn in history.
-    - **Non-interactive**: Prepended to the user's prompt.
-  - `systemMessage`: Shown at the start of the session.
-- **Advisory only**: `continue` and `decision` fields are **ignored**. Startup
-  is never blocked.
-
-### `SessionEnd`
-
-Fires when the CLI exits or a session is cleared. Used for cleanup or final
-telemetry.
-
-- **Input Fields**:
-  - `reason`: (`"exit" | "clear" | "logout" | "prompt_input_exit" | "other"`)
-- **Relevant Output Fields**:
-  - `systemMessage`: Displayed to the user during shutdown.
-- **Best Effort**: The CLI **will not wait** for this hook to complete and
-  ignores all flow-control fields (`continue`, `decision`).
-
-### `Notification`
-
-Fires when the CLI emits a system alert (e.g., Tool Permissions). Used for
-external logging or cross-platform alerts.
-
-- **Input Fields**:
-  - `notification_type`: (`"ToolPermission"`)
-  - `message`: Summary of the alert.
-  - `details`: JSON object with alert-specific metadata (e.g., tool name, file
-    path).
-- **Relevant Output Fields**:
-  - `systemMessage`: Displayed alongside the system alert.
-- **Observability Only**: This hook **cannot** block alerts or grant permissions
-  automatically. Flow-control fields are ignored.
-
-### `PreCompress`
-
-Fires before the CLI summarizes history to save tokens. Used for logging or
-state saving.
-
-- **Input Fields**:
-  - `trigger`: (`"auto" | "manual"`)
-- **Relevant Output Fields**:
-  - `systemMessage`: Displayed to the user before compression.
-- **Advisory Only**: Fired asynchronously. It **cannot** block or modify the
-  compression process. Flow-control fields are ignored.
+| Field               | Supported Events                           | Description                                                                       |
+| :------------------ | :----------------------------------------- | :-------------------------------------------------------------------------------- |
+| `additionalContext` | `SessionStart`, `BeforeAgent`, `AfterTool` | Appends text directly to the agent's context.                                     |
+| `llm_request`       | `BeforeModel`                              | A `Partial<LLMRequest>` to override parameters of the outgoing call.              |
+| `llm_response`      | `BeforeModel`                              | A **full** `LLMResponse` to bypass the model and provide a synthetic result.      |
+| `llm_response`      | `AfterModel`                               | A `Partial<LLMResponse>` to modify the model's response before the agent sees it. |
+| `toolConfig`        | `BeforeToolSelection`                      | Object containing `mode` (`AUTO`/`ANY`/`NONE`) and `allowedFunctionNames`.        |
 
 ---
 
 ## Stable Model API
 
-Gemini CLI uses these structures to ensure hooks don't break across SDK updates.
+Gemini CLI uses a decoupled format for model interactions to ensure hooks remain
+stable even if the underlying Gemini SDK changes.
 
-**LLMRequest**:
+### `LLMRequest` Object
+
+Used in `BeforeModel` and `BeforeToolSelection`.
+
+> 💡 **Note**: In v1, model hooks are primarily text-focused. Non-text parts
+> (like images or function calls) provided in the `content` array will be
+> simplified to their string representation by the translator.
 
 ```typescript
 {
   "model": string,
   "messages": Array<{
     "role": "user" | "model" | "system",
-    "content": string // Non-text parts are filtered out for hooks
+    "content": string | Array<{ "type": string, [key: string]: any }>
   }>,
-  "config": { "temperature": number, ... },
-  "toolConfig": { "mode": string, "allowedFunctionNames": string[] }
+  "config"?: {
+    "temperature"?: number,
+    "maxOutputTokens"?: number,
+    "topP"?: number,
+    "topK"?: number
+  },
+  "toolConfig"?: {
+    "mode"?: "AUTO" | "ANY" | "NONE",
+    "allowedFunctionNames"?: string[]
+  }
 }
-
 ```
 
-**LLMResponse**:
+### `LLMResponse` Object
+
+Used in `AfterModel` and as a synthetic response in `BeforeModel`.
 
 ```typescript
 {
+  "text"?: string,
   "candidates": Array<{
-    "content": { "role": "model", "parts": string[] },
-    "finishReason": string
+    "content": {
+      "role": "model",
+      "parts": string[]
+    },
+    "finishReason"?: "STOP" | "MAX_TOKENS" | "SAFETY" | "RECITATION" | "OTHER",
+    "index"?: number,
+    "safetyRatings"?: Array<{
+      "category": string,
+      "probability": string,
+      "blocked"?: boolean
+    }>
   }>,
-  "usageMetadata": { "totalTokenCount": number }
+  "usageMetadata"?: {
+    "promptTokenCount"?: number,
+    "candidatesTokenCount"?: number,
+    "totalTokenCount"?: number
+  }
 }
 ```

docs/index.md

@@ -56,8 +56,6 @@ This documentation is organized into the following sections:
   commands with `/model`.
 - **[Sandbox](./cli/sandbox.md):** Isolate tool execution in a secure,
   containerized environment.
-- **[Agent Skills](./cli/skills.md):** Extend the CLI with specialized expertise
-  and procedural workflows.
 - **[Settings](./cli/settings.md):** Configure various aspects of the CLI's
   behavior and appearance with `/settings`.
 - **[Telemetry](./cli/telemetry.md):** Overview of telemetry in the CLI.
@@ -102,10 +100,10 @@ This documentation is organized into the following sections:
 
 - **[Introduction: Extensions](./extensions/index.md):** How to extend the CLI
   with new functionality.
-- **[Writing extensions](./extensions/writing-extensions.md):** Learn how to
-  build your own extension.
-- **[Extension releasing](./extensions/releasing.md):** How to release Gemini
-  CLI extensions.
+- **[Get Started with extensions](./extensions/getting-started-extensions.md):**
+  Learn how to build your own extension.
+- **[Extension releasing](./extensions/extension-releasing.md):** How to release
+  Gemini CLI extensions.
 
 ### Hooks
 

docs/local-development.md

@@ -10,7 +10,7 @@ debug your code by instrumenting interesting events like model calls, tool
 scheduler, tool calls, etc.
 
 Dev traces are verbose and are specifically meant for understanding agent
-behavior and debugging issues. They are disabled by default.
+behaviour and debugging issues. They are disabled by default.
 
 To enable dev traces, set the `GEMINI_DEV_TRACING=true` environment variable
 when running Gemini CLI.

docs/releases.md

@@ -12,7 +12,7 @@ Dressing Room, which is Google's system for managing NPM packages in the
 `@google/**` namespace. The packages are all named `@google/**`.
 
 More information can be found about these systems in the
-[NPM Package Overview](npm.md)
+[maintainer repo guide](https://github.com/google-gemini/maintainers-gemini-cli/blob/main/npm.md)
 
 ### Package scopes
 

docs/sidebar.json

@@ -1,53 +1,187 @@
 [
+  {
+    "label": "Overview",
+    "items": [
+      {
+        "label": "Introduction",
+        "slug": "docs"
+      },
+      {
+        "label": "Architecture overview",
+        "slug": "docs/architecture"
+      },
+      {
+        "label": "Contribution guide",
+        "slug": "docs/contributing"
+      }
+    ]
+  },
   {
     "label": "Get started",
     "items": [
-      { "label": "Overview", "slug": "docs" },
-      { "label": "Quickstart", "slug": "docs/get-started" },
-      { "label": "Installation", "slug": "docs/get-started/installation" },
-      { "label": "Authentication", "slug": "docs/get-started/authentication" },
-      { "label": "Examples", "slug": "docs/get-started/examples" },
-      { "label": "Gemini 3 (preview)", "slug": "docs/get-started/gemini-3" },
-      { "label": "CLI Reference", "slug": "docs/cli/cli-reference" }
+      {
+        "label": "Gemini CLI quickstart",
+        "slug": "docs/get-started"
+      },
+      {
+        "label": "Gemini 3 on Gemini CLI",
+        "slug": "docs/get-started/gemini-3"
+      },
+      {
+        "label": "Authentication",
+        "slug": "docs/get-started/authentication"
+      },
+      {
+        "label": "Configuration",
+        "slug": "docs/get-started/configuration"
+      },
+      {
+        "label": "Installation",
+        "slug": "docs/get-started/installation"
+      },
+      {
+        "label": "Examples",
+        "slug": "docs/get-started/examples"
+      }
     ]
   },
   {
-    "label": "Use Gemini CLI",
-    "items": [
-      { "label": "Using the CLI", "slug": "docs/cli" },
-      { "label": "File management", "slug": "docs/tools/file-system" },
-      { "label": "Memory management", "slug": "docs/tools/memory" },
-      { "label": "Project context (GEMINI.md)", "slug": "docs/cli/gemini-md" },
-      { "label": "Shell commands", "slug": "docs/tools/shell" },
-      { "label": "Session management", "slug": "docs/cli/session-management" },
-      { "label": "Todos", "slug": "docs/tools/todos" },
-      { "label": "Web search and fetch", "slug": "docs/tools/web-search" }
-    ]
-  },
-  {
-    "label": "Configuration",
+    "label": "CLI",
     "items": [
       {
-        "label": "Ignore files (.geminiignore)",
-        "slug": "docs/cli/gemini-ignore"
+        "label": "Introduction",
+        "slug": "docs/cli"
       },
-      { "label": "Model selection", "slug": "docs/cli/model" },
-      { "label": "Settings", "slug": "docs/cli/settings" },
-      { "label": "Themes", "slug": "docs/cli/themes" },
-      { "label": "Token caching", "slug": "docs/cli/token-caching" },
-      { "label": "Trusted folders", "slug": "docs/cli/trusted-folders" }
+      {
+        "label": "Commands",
+        "slug": "docs/cli/commands"
+      },
+      {
+        "label": "Checkpointing",
+        "slug": "docs/cli/checkpointing"
+      },
+      {
+        "label": "Custom commands",
+        "slug": "docs/cli/custom-commands"
+      },
+      {
+        "label": "Enterprise",
+        "slug": "docs/cli/enterprise"
+      },
+      {
+        "label": "Headless mode",
+        "slug": "docs/cli/headless"
+      },
+      {
+        "label": "Keyboard shortcuts",
+        "slug": "docs/cli/keyboard-shortcuts"
+      },
+      {
+        "label": "Model selection",
+        "slug": "docs/cli/model"
+      },
+      {
+        "label": "Sandbox",
+        "slug": "docs/cli/sandbox"
+      },
+      {
+        "label": "Session Management",
+        "slug": "docs/cli/session-management"
+      },
+      {
+        "label": "Agent Skills",
+        "slug": "docs/cli/skills"
+      },
+      {
+        "label": "Settings",
+        "slug": "docs/cli/settings"
+      },
+      {
+        "label": "Telemetry",
+        "slug": "docs/cli/telemetry"
+      },
+      {
+        "label": "Themes",
+        "slug": "docs/cli/themes"
+      },
+      {
+        "label": "Token caching",
+        "slug": "docs/cli/token-caching"
+      },
+      {
+        "label": "Trusted Folders",
+        "slug": "docs/cli/trusted-folders"
+      },
+      {
+        "label": "Tutorials",
+        "slug": "docs/cli/tutorials"
+      },
+      {
+        "label": "Uninstall",
+        "slug": "docs/cli/uninstall"
+      },
+      {
+        "label": "System prompt override",
+        "slug": "docs/cli/system-prompt"
+      }
     ]
   },
   {
-    "label": "Advanced features",
+    "label": "Core",
     "items": [
-      { "label": "Checkpointing", "slug": "docs/cli/checkpointing" },
-      { "label": "Custom commands", "slug": "docs/cli/custom-commands" },
-      { "label": "Enterprise features", "slug": "docs/cli/enterprise" },
-      { "label": "Headless mode & scripting", "slug": "docs/cli/headless" },
-      { "label": "Sandboxing", "slug": "docs/cli/sandbox" },
-      { "label": "System prompt override", "slug": "docs/cli/system-prompt" },
-      { "label": "Telemetry", "slug": "docs/cli/telemetry" }
+      {
+        "label": "Introduction",
+        "slug": "docs/core"
+      },
+      {
+        "label": "Tools API",
+        "slug": "docs/core/tools-api"
+      },
+      {
+        "label": "Memory Import Processor",
+        "slug": "docs/core/memport"
+      },
+      {
+        "label": "Policy Engine",
+        "slug": "docs/core/policy-engine"
+      }
+    ]
+  },
+  {
+    "label": "Tools",
+    "items": [
+      {
+        "label": "Introduction",
+        "slug": "docs/tools"
+      },
+      {
+        "label": "File system",
+        "slug": "docs/tools/file-system"
+      },
+      {
+        "label": "Shell",
+        "slug": "docs/tools/shell"
+      },
+      {
+        "label": "Web fetch",
+        "slug": "docs/tools/web-fetch"
+      },
+      {
+        "label": "Web search",
+        "slug": "docs/tools/web-search"
+      },
+      {
+        "label": "Memory",
+        "slug": "docs/tools/memory"
+      },
+      {
+        "label": "Todos",
+        "slug": "docs/tools/todos"
+      },
+      {
+        "label": "MCP servers",
+        "slug": "docs/tools/mcp-server"
+      }
     ]
   },
   {
@@ -58,95 +192,110 @@
         "slug": "docs/extensions"
       },
       {
-        "label": "Writing extensions",
-        "slug": "docs/extensions/writing-extensions"
+        "label": "Get started with extensions",
+        "slug": "docs/extensions/getting-started-extensions"
       },
       {
-        "label": "Extensions reference",
-        "slug": "docs/extensions/reference"
-      },
-      {
-        "label": "Best practices",
-        "slug": "docs/extensions/best-practices"
-      },
-      {
-        "label": "Extensions releasing",
-        "slug": "docs/extensions/releasing"
+        "label": "Extension releasing",
+        "slug": "docs/extensions/extension-releasing"
       }
     ]
   },
   {
-    "label": "Ecosystem and extensibility",
+    "label": "Hooks",
     "items": [
-      { "label": "Agent skills", "slug": "docs/cli/skills" },
       {
-        "label": "Creating Agent skills",
-        "slug": "docs/cli/creating-skills"
+        "label": "Introduction",
+        "slug": "docs/hooks"
       },
       {
-        "label": "Sub-agents (experimental)",
-        "slug": "docs/core/subagents"
+        "label": "Writing hooks",
+        "slug": "docs/hooks/writing-hooks"
       },
       {
-        "label": "Remote subagents (experimental)",
-        "slug": "docs/core/remote-agents"
+        "label": "Hooks reference",
+        "slug": "docs/hooks/reference"
       },
-      { "label": "Hooks", "slug": "docs/hooks" },
-      { "label": "IDE integration", "slug": "docs/ide-integration" },
-      { "label": "MCP servers", "slug": "docs/tools/mcp-server" }
+      {
+        "label": "Best practices",
+        "slug": "docs/hooks/best-practices"
+      }
     ]
   },
   {
-    "label": "Tutorials",
+    "label": "IDE integration",
     "items": [
       {
-        "label": "Get started with extensions",
-        "slug": "docs/extensions/writing-extensions"
+        "label": "Introduction",
+        "slug": "docs/ide-integration"
       },
-      { "label": "How to write hooks", "slug": "docs/hooks/writing-hooks" }
-    ]
-  },
-  {
-    "label": "Reference",
-    "items": [
-      { "label": "Architecture", "slug": "docs/architecture" },
-      { "label": "Command reference", "slug": "docs/cli/commands" },
-      { "label": "Configuration", "slug": "docs/get-started/configuration" },
-      { "label": "Keyboard shortcuts", "slug": "docs/cli/keyboard-shortcuts" },
-      { "label": "Memory import processor", "slug": "docs/core/memport" },
-      { "label": "Policy engine", "slug": "docs/core/policy-engine" },
-      { "label": "Tools API", "slug": "docs/core/tools-api" }
-    ]
-  },
-  {
-    "label": "Resources",
-    "items": [
-      { "label": "FAQ", "slug": "docs/faq" },
-      { "label": "Quota and pricing", "slug": "docs/quota-and-pricing" },
       {
-        "label": "Releases",
-        "items": [
-          { "label": "Release notes", "slug": "docs/changelogs/" },
-          { "label": "Stable release", "slug": "docs/changelogs/latest" },
-          { "label": "Preview release", "slug": "docs/changelogs/preview" }
-        ]
-      },
-      { "label": "Terms and privacy", "slug": "docs/tos-privacy" },
-      { "label": "Troubleshooting", "slug": "docs/troubleshooting" },
-      { "label": "Uninstall", "slug": "docs/cli/uninstall" }
+        "label": "IDE companion spec",
+        "slug": "docs/ide-integration/ide-companion-spec"
+      }
     ]
   },
   {
     "label": "Development",
     "items": [
-      { "label": "Contribution guide", "slug": "docs/contributing" },
-      { "label": "Integration testing", "slug": "docs/integration-tests" },
+      {
+        "label": "NPM",
+        "slug": "docs/npm"
+      },
+      {
+        "label": "Releases",
+        "slug": "docs/releases"
+      },
+      {
+        "label": "Integration tests",
+        "slug": "docs/integration-tests"
+      },
       {
         "label": "Issue and PR automation",
         "slug": "docs/issue-and-pr-automation"
+      }
+    ]
+  },
+  {
+    "label": "Releases",
+    "items": [
+      {
+        "label": "Release notes",
+        "slug": "docs/changelogs/"
       },
-      { "label": "Local development", "slug": "docs/local-development" },
-      { "label": "NPM package structure", "slug": "docs/npm" }
+      {
+        "label": "Latest release",
+        "slug": "docs/changelogs/latest"
+      },
+      {
+        "label": "Preview release",
+        "slug": "docs/changelogs/preview"
+      },
+      {
+        "label": "Changelog",
+        "slug": "docs/changelogs/releases"
+      }
+    ]
+  },
+  {
+    "label": "Support",
+    "items": [
+      {
+        "label": "FAQ",
+        "slug": "docs/faq"
+      },
+      {
+        "label": "Troubleshooting",
+        "slug": "docs/troubleshooting"
+      },
+      {
+        "label": "Quota and pricing",
+        "slug": "docs/quota-and-pricing"
+      },
+      {
+        "label": "Terms of service",
+        "slug": "docs/tos-privacy"
+      }
     ]
   }
 ]

docs/tools/index.md

@@ -91,8 +91,5 @@ Additionally, these tools incorporate:
 
 - **[MCP servers](./mcp-server.md)**: MCP servers act as a bridge between the
   Gemini model and your local environment or other services like APIs.
-- **[Agent Skills](../cli/skills.md)**: On-demand expertise packages that are
-  activated via the `activate_skill` tool to provide specialized guidance and
-  resources.
 - **[Sandboxing](../cli/sandbox.md)**: Sandboxing isolates the model and its
   changes from your environment to reduce potential risk.

docs/tools/mcp-server.md

@@ -722,8 +722,7 @@ The MCP integration tracks several states:
 
 ### Debugging tips
 
-1. **Enable debug mode:** Run the CLI with `--debug` for verbose output (use F12
-   to open debug console in interactive mode)
+1. **Enable debug mode:** Run the CLI with `--debug` for verbose output
 2. **Check stderr:** MCP server stderr is captured and logged (INFO messages
    filtered)
 3. **Test isolation:** Test your MCP server independently before integrating
@@ -733,27 +732,16 @@ The MCP integration tracks several states:
 
 ## Important notes
 
-### Security considerations
+### Security sonsiderations
 
 - **Trust settings:** The `trust` option bypasses all confirmation dialogs. Use
   cautiously and only for servers you completely control
 - **Access tokens:** Be security-aware when configuring environment variables
   containing API keys or tokens
-- **Environment variable redaction:** By default, the Gemini CLI redacts
-  sensitive environment variables (such as `GEMINI_API_KEY`, `GOOGLE_API_KEY`,
-  and variables matching patterns like `*TOKEN*`, `*SECRET*`, `*PASSWORD*`) when
-  spawning MCP servers using the `stdio` transport. This prevents unintended
-  exposure of your credentials to third-party servers.
-- **Explicit environment variables:** If you need to pass a specific environment
-  variable to an MCP server, you should define it explicitly in the `env`
-  property of the server configuration in `settings.json`.
 - **Sandbox compatibility:** When using sandboxing, ensure MCP servers are
-  available within the sandbox environment.
+  available within the sandbox environment
 - **Private data:** Using broadly scoped personal access tokens can lead to
-  information leakage between repositories.
-- **Untrusted servers:** Be extremely cautious when adding MCP servers from
-  untrusted or third-party sources. Malicious servers could attempt to
-  exfiltrate data or perform unauthorized actions through the tools they expose.
+  information leakage between repositories
 
 ### Performance and resource management
 
@@ -1049,29 +1037,6 @@ gemini mcp remove my-server
 This will find and delete the "my-server" entry from the `mcpServers` object in
 the appropriate `settings.json` file based on the scope (`-s, --scope`).
 
-### Enabling/disabling a server (`gemini mcp enable`, `gemini mcp disable`)
-
-Temporarily disable an MCP server without removing its configuration, or
-re-enable a previously disabled server.
-
-**Commands:**
-
-```bash
-gemini mcp enable <name> [--session]
-gemini mcp disable <name> [--session]
-```
-
-**Options (flags):**
-
-- `--session`: Apply change only for this session (not persisted to file).
-
-Disabled servers appear in `/mcp` status as "Disabled" but won't connect or
-provide tools. Enablement state is stored in
-`~/.gemini/mcp-server-enablement.json`.
-
-The same commands are available as slash commands during an active session:
-`/mcp enable <name>` and `/mcp disable <name>`.
-
 ## Instructions
 
 Gemini CLI supports

docs/tools/shell.md

@@ -135,7 +135,7 @@ user input, such as text editors (`vim`, `nano`), terminal-based UIs (`htop`),
 and interactive version control operations (`git rebase -i`).
 
 When an interactive command is running, you can send input to it from the Gemini
-CLI. To focus on the interactive shell, press `Tab`. The terminal output,
+CLI. To focus on the interactive shell, press `ctrl+f`. The terminal output,
 including complex TUIs, will be rendered correctly.
 
 ## Important notes

docs/troubleshooting.md

@@ -28,13 +28,6 @@ topics on:
     - **Organizational Users:** Contact your Google Cloud administrator to be
       added to your organization's Gemini Code Assist subscription.
 
-- **Error:
-  `Failed to login. Message: Your current account is not eligible... because it is not currently available in your location.`**
-  - **Cause:** Gemini CLI does not currently support your location. For a full
-    list of supported locations, see the following pages:
-    - Gemini Code Assist for individuals:
-      [Available locations](https://developers.google.com/gemini-code-assist/resources/available-locations#americas)
-
 - **Error: `Failed to login. Message: Request contains an invalid argument`**
   - **Cause:** Users with Google Workspace accounts or Google Cloud accounts
     associated with their Gmail accounts may not be able to activate the free
@@ -137,15 +130,13 @@ This is especially useful for scripting and automation.
 ## Debugging tips
 
 - **CLI debugging:**
-  - Use the `--debug` flag for more detailed output. In interactive mode, press
-    F12 to view the debug console.
+  - Use the `--debug` flag for more detailed output.
   - Check the CLI logs, often found in a user-specific configuration or cache
     directory.
 
 - **Core debugging:**
   - Check the server console output for error messages or stack traces.
-  - Increase log verbosity if configurable. For example, set the `DEBUG_MODE`
-    environment variable to `true` or `1`.
+  - Increase log verbosity if configurable.
   - Use Node.js debugging tools (e.g., `node --inspect`) if you need to step
     through server-side code.
 

esbuild.config.js

@@ -14,8 +14,8 @@ let esbuild;
 try {
   esbuild = (await import('esbuild')).default;
 } catch (_error) {
-  console.error('esbuild not available - cannot build bundle');
-  process.exit(1);
+  console.warn('esbuild not available, skipping bundle step');
+  process.exit(0);
 }
 
 const __filename = fileURLToPath(import.meta.url);

eslint.config.js

@@ -35,9 +35,6 @@ export default tseslint.config(
       'package/bundle/**',
       '.integration-tests/**',
       'dist/**',
-      'evals/**',
-      'packages/test-utils/**',
-      'packages/core/src/skills/builtin/skill-creator/scripts/*.cjs',
     ],
   },
   eslint.configs.recommended,
@@ -304,16 +301,6 @@ export default tseslint.config(
       '@typescript-eslint/no-require-imports': 'off',
     },
   },
-  // Examples should have access to standard globals like fetch
-  {
-    files: ['packages/cli/src/commands/extensions/examples/**/*.js'],
-    languageOptions: {
-      globals: {
-        ...globals.node,
-        fetch: 'readonly',
-      },
-    },
-  },
   // extra settings for scripts that we run directly with node
   {
     files: ['packages/vscode-ide-companion/scripts/**/*.js'],

evals/README.md

@@ -1,191 +0,0 @@
-# Behavioral Evals
-
-Behavioral evaluations (evals) are tests designed to validate the agent's
-behavior in response to specific prompts. They serve as a critical feedback loop
-for changes to system prompts, tool definitions, and other model-steering
-mechanisms.
-
-## Why Behavioral Evals?
-
-Unlike traditional **integration tests** which verify that the system functions
-correctly (e.g., "does the file writer actually write to disk?"), behavioral
-evals verify that the model _chooses_ to take the correct action (e.g., "does
-the model decide to write to disk when asked to save code?").
-
-They are also distinct from broad **industry benchmarks** (like SWE-bench).
-While benchmarks measure general capabilities across complex challenges, our
-behavioral evals focus on specific, granular behaviors relevant to the Gemini
-CLI's features.
-
-### Key Characteristics
-
-- **Feedback Loop**: They help us understand how changes to prompts or tools
-  affect the model's decision-making.
-  - _Did a change to the system prompt make the model less likely to use tool
-    X?_
-  - _Did a new tool definition confuse the model?_
-- **Regression Testing**: They prevent regressions in model steering.
-- **Non-Determinism**: Unlike unit tests, LLM behavior can be non-deterministic.
-  We distinguish between behaviors that should be robust (`ALWAYS_PASSES`) and
-  those that are generally reliable but might occasionally vary
-  (`USUALLY_PASSES`).
-
-## Creating an Evaluation
-
-Evaluations are located in the `evals` directory. Each evaluation is a Vitest
-test file that uses the `evalTest` function from `evals/test-helper.ts`.
-
-### `evalTest`
-
-The `evalTest` function is a helper that runs a single evaluation case. It takes
-two arguments:
-
-1. `policy`: The consistency expectation for this test (`'ALWAYS_PASSES'` or
-   `'USUALLY_PASSES'`).
-2. `evalCase`: An object defining the test case.
-
-#### Policies
-
-Policies control how strictly a test is validated. Tests should generally use
-the ALWAYS_PASSES policy to offer the strictest guarantees.
-
-USUALLY_PASSES exists to enable assertion of less consistent or aspirational
-behaviors.
-
-- `ALWAYS_PASSES`: Tests expected to pass 100% of the time. These are typically
-  trivial and test basic functionality. These run in every CI.
-- `USUALLY_PASSES`: Tests expected to pass most of the time but may have some
-  flakiness due to non-deterministic behaviors. These are run nightly and used
-  to track the health of the product from build to build.
-
-#### `EvalCase` Properties
-
-- `name`: The name of the evaluation case.
-- `prompt`: The prompt to send to the model.
-- `params`: An optional object with parameters to pass to the test rig (e.g.,
-  settings).
-- `assert`: An async function that takes the test rig and the result of the run
-  and asserts that the result is correct.
-- `log`: An optional boolean that, if set to `true`, will log the tool calls to
-  a file in the `evals/logs` directory.
-
-### Example
-
-```typescript
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-
-describe('my_feature', () => {
-  evalTest('ALWAYS_PASSES', {
-    name: 'should do something',
-    prompt: 'do it',
-    assert: async (rig, result) => {
-      // assertions
-    },
-  });
-});
-```
-
-## Running Evaluations
-
-First, build the bundled Gemini CLI. You must do this after every code change.
-
-```bash
-npm run build
-npm run bundle
-```
-
-### Always Passing Evals
-
-To run the evaluations that are expected to always pass (CI safe):
-
-```bash
-npm run test:always_passing_evals
-```
-
-### All Evals
-
-To run all evaluations, including those that may be flaky ("usually passes"):
-
-```bash
-npm run test:all_evals
-```
-
-This command sets the `RUN_EVALS` environment variable to `1`, which enables the
-`USUALLY_PASSES` tests.
-
-## Reporting
-
-Results for evaluations are available on GitHub Actions:
-
-- **CI Evals**: Included in the
-  [E2E (Chained)](https://github.com/google-gemini/gemini-cli/actions/workflows/chained_e2e.yml)
-  workflow. These must pass 100% for every PR.
-- **Nightly Evals**: Run daily via the
-  [Evals: Nightly](https://github.com/google-gemini/gemini-cli/actions/workflows/evals-nightly.yml)
-  workflow. These track the long-term health and stability of model steering.
-
-### Nightly Report Format
-
-The nightly workflow executes the full evaluation suite multiple times
-(currently 3 attempts) to account for non-determinism. These results are
-aggregated into a **Nightly Summary** attached to the workflow run.
-
-#### How to interpret the report:
-
-- **Pass Rate (%)**: Each cell represents the percentage of successful runs for
-  a specific test in that workflow instance.
-- **History**: The table shows the pass rates for the last 10 nightly runs,
-  allowing you to identify if a model's behavior is trending towards
-  instability.
-- **Total Pass Rate**: An aggregate metric of all evaluations run in that batch.
-
-A significant drop in the pass rate for a `USUALLY_PASSES` test—even if it
-doesn't drop to 0%—often indicates that a recent change to a system prompt or
-tool definition has made the model's behavior less reliable.
-
-## Fixing Evaluations
-
-If an evaluation is failing or has a regressed pass rate, you can use the
-`/fix-behavioral-eval` command within Gemini CLI to help investigate and fix the
-issue.
-
-### `/fix-behavioral-eval`
-
-This command is designed to automate the investigation and fixing process for
-failing evaluations. It will:
-
-1.  **Investigate**: Fetch the latest results from the nightly workflow using
-    the `gh` CLI, identify the failing test, and review test trajectory logs in
-    `evals/logs`.
-2.  **Fix**: Suggest and apply targeted fixes to the prompt or tool definitions.
-    It prioritizes minimal changes to `prompt.ts`, tool instructions, and
-    modules that contribute to the prompt. It generally tries to avoid changing
-    the test itself.
-3.  **Verify**: Re-run the test 3 times across multiple models (e.g., Gemini
-    3.0, Gemini 3 Flash, Gemini 2.5 Pro) to ensure stability and calculate a
-    success rate.
-4.  **Report**: Provide a summary of the success rate for each model and details
-    on the applied fixes.
-
-To use it, run:
-
-```bash
-gemini /fix-behavioral-eval
-```
-
-You can also provide a link to a specific GitHub Action run or the name of a
-specific test to focus the investigation:
-
-```bash
-gemini /fix-behavioral-eval https://github.com/google-gemini/gemini-cli/actions/runs/123456789
-```
-
-When investigating failures manually, you can also enable verbose agent logs by
-setting the `GEMINI_DEBUG_LOG_FILE` environment variable.
-
-It's highly recommended to manually review and/or ask the agent to iterate on
-any prompt changes, even if they pass all evals. The prompt should prefer
-positive traits ('do X') and resort to negative traits ('do not do X') only when
-unable to accomplish the goal with positive traits. Gemini is quite good at
-instrospecting on its prompt when asked the right questions.

evals/answer-vs-act.eval.ts

@@ -1,156 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-import { EDIT_TOOL_NAMES } from '@google/gemini-cli-core';
-
-const FILES = {
-  'app.ts': 'const add = (a: number, b: number) => a - b;',
-  'package.json': '{"name": "test-app", "version": "1.0.0"}',
-} as const;
-
-describe('Answer vs. ask eval', () => {
-  /**
-   * Ensures that when the user asks to "inspect" for bugs, the agent does NOT
-   * automatically modify the file, but instead asks for permission.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should not edit files when asked to inspect for bugs',
-    prompt: 'Inspect app.ts for bugs',
-    files: FILES,
-    assert: async (rig, result) => {
-      const toolLogs = rig.readToolLogs();
-
-      // Verify NO edit tools called
-      const editCalls = toolLogs.filter((log) =>
-        EDIT_TOOL_NAMES.has(log.toolRequest.name),
-      );
-      expect(editCalls.length).toBe(0);
-
-      // Verify file unchanged
-      const content = rig.readFile('app.ts');
-      expect(content).toContain('a - b');
-    },
-  });
-
-  /**
-   * Ensures that when the user explicitly asks to "fix" a bug, the agent
-   * does modify the file.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should edit files when asked to fix bug',
-    prompt: 'Fix the bug in app.ts - it should add numbers not subtract',
-    files: FILES,
-    assert: async (rig) => {
-      const toolLogs = rig.readToolLogs();
-
-      // Verify edit tools WERE called
-      const editCalls = toolLogs.filter(
-        (log) =>
-          EDIT_TOOL_NAMES.has(log.toolRequest.name) && log.toolRequest.success,
-      );
-      expect(editCalls.length).toBeGreaterThanOrEqual(1);
-
-      // Verify file changed
-      const content = rig.readFile('app.ts');
-      expect(content).toContain('a + b');
-    },
-  });
-
-  /**
-   * Ensures that when the user asks "any bugs?" the agent does NOT
-   * automatically modify the file, but instead asks for permission.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should not edit when asking "any bugs"',
-    prompt: 'Any bugs in app.ts?',
-    files: FILES,
-    assert: async (rig) => {
-      const toolLogs = rig.readToolLogs();
-
-      // Verify NO edit tools called
-      const editCalls = toolLogs.filter((log) =>
-        EDIT_TOOL_NAMES.has(log.toolRequest.name),
-      );
-      expect(editCalls.length).toBe(0);
-
-      // Verify file unchanged
-      const content = rig.readFile('app.ts');
-      expect(content).toContain('a - b');
-    },
-  });
-
-  /**
-   * Ensures that when the user asks a general question, the agent does NOT
-   * automatically modify the file.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should not edit files when asked a general question',
-    prompt: 'How does app.ts work?',
-    files: FILES,
-    assert: async (rig) => {
-      const toolLogs = rig.readToolLogs();
-
-      // Verify NO edit tools called
-      const editCalls = toolLogs.filter((log) =>
-        EDIT_TOOL_NAMES.has(log.toolRequest.name),
-      );
-      expect(editCalls.length).toBe(0);
-
-      // Verify file unchanged
-      const content = rig.readFile('app.ts');
-      expect(content).toContain('a - b');
-    },
-  });
-
-  /**
-   * Ensures that when the user asks a question about style, the agent does NOT
-   * automatically modify the file.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should not edit files when asked about style',
-    prompt: 'Is app.ts following good style?',
-    files: FILES,
-    assert: async (rig, result) => {
-      const toolLogs = rig.readToolLogs();
-
-      // Verify NO edit tools called
-      const editCalls = toolLogs.filter((log) =>
-        EDIT_TOOL_NAMES.has(log.toolRequest.name),
-      );
-      expect(editCalls.length).toBe(0);
-
-      // Verify file unchanged
-      const content = rig.readFile('app.ts');
-      expect(content).toContain('a - b');
-    },
-  });
-
-  /**
-   * Ensures that when the user points out an issue but doesn't ask for a fix,
-   * the agent does NOT automatically modify the file.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should not edit files when user notes an issue',
-    prompt: 'The add function subtracts numbers.',
-    files: FILES,
-    params: { timeout: 20000 }, // 20s timeout
-    assert: async (rig) => {
-      const toolLogs = rig.readToolLogs();
-
-      // Verify NO edit tools called
-      const editCalls = toolLogs.filter((log) =>
-        EDIT_TOOL_NAMES.has(log.toolRequest.name),
-      );
-      expect(editCalls.length).toBe(0);
-
-      // Verify file unchanged
-      const content = rig.readFile('app.ts');
-      expect(content).toContain('a - b');
-    },
-  });
-});

evals/generalist_agent.eval.ts

@@ -1,41 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-import path from 'node:path';
-import fs from 'node:fs/promises';
-
-describe('generalist_agent', () => {
-  evalTest('USUALLY_PASSES', {
-    name: 'should be able to use generalist agent by explicitly asking the main agent to invoke it',
-    params: {
-      settings: {
-        agents: {
-          overrides: {
-            generalist: { enabled: true },
-          },
-        },
-      },
-    },
-    prompt:
-      'Please use the generalist agent to create a file called "generalist_test_file.txt" containing exactly the following text: success',
-    assert: async (rig) => {
-      // 1) Verify the generalist agent was invoked
-      const foundToolCall = await rig.waitForToolCall('generalist');
-      expect(
-        foundToolCall,
-        'Expected to find a tool call for generalist agent',
-      ).toBeTruthy();
-
-      // 2) Verify the file was created as expected
-      const filePath = path.join(rig.testDir!, 'generalist_test_file.txt');
-
-      const content = await fs.readFile(filePath, 'utf-8');
-      expect(content.trim()).toBe('success');
-    },
-  });
-});

evals/gitRepo.eval.ts

@@ -1,77 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-
-const FILES = {
-  '.gitignore': 'node_modules\n',
-  'package.json': JSON.stringify({
-    name: 'test-project',
-    version: '1.0.0',
-    scripts: { test: 'echo "All tests passed!"' },
-  }),
-  'index.ts': 'const add = (a: number, b: number) => a - b;',
-  'index.test.ts': 'console.log("Running tests...");',
-} as const;
-
-describe('git repo eval', () => {
-  /**
-   * Ensures that the agent does not commit its changes when the user doesn't
-   * explicitly prompt it. This behavior was commonly observed with earlier prompts.
-   * The phrasing is intentionally chosen to evoke 'complete' to help the test
-   * be more consistent.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should not git add commit changes unprompted',
-    prompt:
-      'Finish this up for me by just making a targeted fix for the bug in index.ts. Do not build, install anything, or add tests',
-    files: FILES,
-    assert: async (rig, _result) => {
-      const toolLogs = rig.readToolLogs();
-      const commitCalls = toolLogs.filter((log) => {
-        if (log.toolRequest.name !== 'run_shell_command') return false;
-        try {
-          const args = JSON.parse(log.toolRequest.args);
-          return (
-            args.command &&
-            args.command.includes('git') &&
-            args.command.includes('commit')
-          );
-        } catch {
-          return false;
-        }
-      });
-
-      expect(commitCalls.length).toBe(0);
-    },
-  });
-
-  /**
-   * Ensures that the agent can commit its changes when prompted, despite being
-   * instructed to not do so by default.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should git commit changes when prompted',
-    prompt:
-      'Make a targeted fix for the bug in index.ts without building, installing anything, or adding tests. Then, commit your changes.',
-    files: FILES,
-    assert: async (rig, _result) => {
-      const toolLogs = rig.readToolLogs();
-      const commitCalls = toolLogs.filter((log) => {
-        if (log.toolRequest.name !== 'run_shell_command') return false;
-        try {
-          const args = JSON.parse(log.toolRequest.args);
-          return args.command && args.command.includes('git commit');
-        } catch {
-          return false;
-        }
-      });
-
-      expect(commitCalls.length).toBeGreaterThanOrEqual(1);
-    },
-  });
-});

evals/save_memory.eval.ts

@@ -1,30 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-import { validateModelOutput } from '../integration-tests/test-helper.js';
-
-describe('save_memory', () => {
-  evalTest('ALWAYS_PASSES', {
-    name: 'should be able to save to memory',
-    params: {
-      settings: { tools: { core: ['save_memory'] } },
-    },
-    prompt: `remember that my favorite color is  blue.
-  
-    what is my favorite color? tell me that and surround it with $ symbol`,
-    assert: async (rig, result) => {
-      const foundToolCall = await rig.waitForToolCall('save_memory');
-      expect(
-        foundToolCall,
-        'Expected to find a save_memory tool call',
-      ).toBeTruthy();
-
-      validateModelOutput(result, 'blue', 'Save memory test');
-    },
-  });
-});

evals/subagents.eval.ts

@@ -1,53 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe } from 'vitest';
-import { evalTest } from './test-helper.js';
-
-const AGENT_DEFINITION = `---
-name: docs-agent
-description: An agent with expertise in updating documentation.
-tools:
-  - read_file
-  - write_file
----
-
-You are the docs agent. Update the documentation.
-`;
-
-const INDEX_TS = 'export const add = (a: number, b: number) => a + b;';
-
-describe('subagent eval test cases', () => {
-  /**
-   * Checks whether the outer agent reliably utilizes an expert subagent to
-   * accomplish a task when one is available.
-   *
-   * Note that the test is intentionally crafted to avoid the word "document"
-   * or "docs". We want to see the outer agent make the connection even when
-   * the prompt indirectly implies need of expertise.
-   *
-   * This tests the system prompt's subagent specific clauses.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should delegate to user provided agent with relevant expertise',
-    params: {
-      settings: {
-        experimental: {
-          enableAgents: true,
-        },
-      },
-    },
-    prompt: 'Please update README.md with a description of this library.',
-    files: {
-      '.gemini/agents/test-agent.md': AGENT_DEFINITION,
-      'index.ts': INDEX_TS,
-      'README.md': 'TODO: update the README.',
-    },
-    assert: async (rig, _result) => {
-      await rig.expectToolCallSuccess(['docs-agent']);
-    },
-  });
-});

evals/test-helper.ts

@@ -1,120 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { it } from 'vitest';
-import fs from 'node:fs';
-import path from 'node:path';
-import { execSync } from 'node:child_process';
-import { TestRig } from '@google/gemini-cli-test-utils';
-import { createUnauthorizedToolError } from '@google/gemini-cli-core';
-
-export * from '@google/gemini-cli-test-utils';
-
-// Indicates the consistency expectation for this test.
-// - ALWAYS_PASSES - Means that the test is expected to pass 100% of the time. These
-//   These tests are typically trivial and test basic functionality with unambiguous
-//   prompts. For example: "call save_memory to remember foo" should be fairly reliable.
-//   These are the first line of defense against regressions in key behaviors and run in
-//   every CI. You can run these locally with 'npm run test:always_passing_evals'.
-//
-// - USUALLY_PASSES - Means that the test is expected to pass most of the time but
-//   may have some flakiness as a result of relying on non-deterministic prompted
-//   behaviors and/or ambiguous prompts or complex tasks.
-//   For example: "Please do build changes until the very end" --> ambiguous whether
-//   the agent should add to memory without more explicit system prompt or user
-//   instructions. There are many more of these tests and they may pass less consistently.
-//   The pass/fail trendline of this set of tests can be used as a general measure
-//   of product quality. You can run these locally with 'npm run test:all_evals'.
-//   This may take a really long time and is not recommended.
-export type EvalPolicy = 'ALWAYS_PASSES' | 'USUALLY_PASSES';
-
-export function evalTest(policy: EvalPolicy, evalCase: EvalCase) {
-  const fn = async () => {
-    const rig = new TestRig();
-    const { logDir, sanitizedName } = await prepareLogDir(evalCase.name);
-    const activityLogFile = path.join(logDir, `${sanitizedName}.jsonl`);
-    const logFile = path.join(logDir, `${sanitizedName}.log`);
-    let isSuccess = false;
-    try {
-      rig.setup(evalCase.name, evalCase.params);
-
-      if (evalCase.files) {
-        for (const [filePath, content] of Object.entries(evalCase.files)) {
-          const fullPath = path.join(rig.testDir!, filePath);
-          fs.mkdirSync(path.dirname(fullPath), { recursive: true });
-          fs.writeFileSync(fullPath, content);
-        }
-
-        const execOptions = { cwd: rig.testDir!, stdio: 'inherit' as const };
-        execSync('git init', execOptions);
-        execSync('git config user.email "test@example.com"', execOptions);
-        execSync('git config user.name "Test User"', execOptions);
-
-        // Temporarily disable the interactive editor and git pager
-        // to avoid hanging the tests. It seems the the agent isn't
-        // consistently honoring the instructions to avoid interactive
-        // commands.
-        execSync('git config core.editor "true"', execOptions);
-        execSync('git config core.pager "cat"', execOptions);
-        execSync('git add .', execOptions);
-        execSync('git commit --allow-empty -m "Initial commit"', execOptions);
-      }
-
-      const result = await rig.run({
-        args: evalCase.prompt,
-        approvalMode: evalCase.approvalMode ?? 'yolo',
-        env: {
-          GEMINI_CLI_ACTIVITY_LOG_FILE: activityLogFile,
-        },
-      });
-
-      const unauthorizedErrorPrefix =
-        createUnauthorizedToolError('').split("'")[0];
-      if (result.includes(unauthorizedErrorPrefix)) {
-        throw new Error(
-          'Test failed due to unauthorized tool call in output: ' + result,
-        );
-      }
-
-      await evalCase.assert(rig, result);
-      isSuccess = true;
-    } finally {
-      if (isSuccess) {
-        await fs.promises.unlink(activityLogFile).catch((err) => {
-          if (err.code !== 'ENOENT') throw err;
-        });
-      }
-
-      await fs.promises.writeFile(
-        logFile,
-        JSON.stringify(rig.readToolLogs(), null, 2),
-      );
-      await rig.cleanup();
-    }
-  };
-
-  if (policy === 'USUALLY_PASSES' && !process.env['RUN_EVALS']) {
-    it.skip(evalCase.name, fn);
-  } else {
-    it(evalCase.name, fn);
-  }
-}
-
-async function prepareLogDir(name: string) {
-  const logDir = path.resolve(process.cwd(), 'evals/logs');
-  await fs.promises.mkdir(logDir, { recursive: true });
-  const sanitizedName = name.replace(/[^a-z0-9]/gi, '_').toLowerCase();
-  return { logDir, sanitizedName };
-}
-
-export interface EvalCase {
-  name: string;
-  params?: Record<string, any>;
-  prompt: string;
-  files?: Record<string, string>;
-  approvalMode?: 'default' | 'auto_edit' | 'yolo' | 'plan';
-  assert: (rig: TestRig, result: string) => Promise<void>;
-}

evals/vitest.config.ts

@@ -1,18 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig({
-  test: {
-    testTimeout: 300000, // 5 minutes
-    reporters: ['default', 'json'],
-    outputFile: {
-      json: 'evals/logs/report.json',
-    },
-    include: ['**/*.eval.ts'],
-  },
-});

integration-tests/acp-telemetry.test.ts

@@ -1,116 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { TestRig } from './test-helper.js';
-import { spawn, ChildProcess } from 'node:child_process';
-import { join } from 'node:path';
-import { readFileSync, existsSync } from 'node:fs';
-import { Writable, Readable } from 'node:stream';
-import { env } from 'node:process';
-import * as acp from '@agentclientprotocol/sdk';
-
-// Skip in sandbox mode - test spawns CLI directly which behaves differently in containers
-const sandboxEnv = env['GEMINI_SANDBOX'];
-const itMaybe = sandboxEnv && sandboxEnv !== 'false' ? it.skip : it;
-
-// Reuse existing fake responses that return a simple "Hello" response
-const SIMPLE_RESPONSE_PATH = 'hooks-system.session-startup.responses';
-
-class SessionUpdateCollector implements acp.Client {
-  updates: acp.SessionNotification[] = [];
-
-  sessionUpdate = async (params: acp.SessionNotification) => {
-    this.updates.push(params);
-  };
-
-  requestPermission = async (): Promise<acp.RequestPermissionResponse> => {
-    throw new Error('unexpected');
-  };
-}
-
-describe('ACP telemetry', () => {
-  let rig: TestRig;
-  let child: ChildProcess | undefined;
-
-  beforeEach(() => {
-    rig = new TestRig();
-  });
-
-  afterEach(async () => {
-    child?.kill();
-    child = undefined;
-    await rig.cleanup();
-  });
-
-  itMaybe('should flush telemetry when connection closes', async () => {
-    rig.setup('acp-telemetry-flush', {
-      fakeResponsesPath: join(import.meta.dirname, SIMPLE_RESPONSE_PATH),
-    });
-
-    const telemetryPath = join(rig.homeDir!, 'telemetry.log');
-    const bundlePath = join(import.meta.dirname, '..', 'bundle/gemini.js');
-
-    child = spawn(
-      'node',
-      [
-        bundlePath,
-        '--experimental-acp',
-        '--fake-responses',
-        join(rig.testDir!, 'fake-responses.json'),
-      ],
-      {
-        cwd: rig.testDir!,
-        stdio: ['pipe', 'pipe', 'inherit'],
-        env: {
-          ...process.env,
-          GEMINI_API_KEY: 'fake-key',
-          GEMINI_CLI_HOME: rig.homeDir!,
-          GEMINI_TELEMETRY_ENABLED: 'true',
-          GEMINI_TELEMETRY_TARGET: 'local',
-          GEMINI_TELEMETRY_OUTFILE: telemetryPath,
-          // GEMINI_DEV_TRACING not set: fake responses aren't instrumented for spans
-        },
-      },
-    );
-
-    const input = Writable.toWeb(child.stdin!);
-    const output = Readable.toWeb(child.stdout!) as ReadableStream<Uint8Array>;
-    const testClient = new SessionUpdateCollector();
-    const stream = acp.ndJsonStream(input, output);
-    const connection = new acp.ClientSideConnection(() => testClient, stream);
-
-    await connection.initialize({
-      protocolVersion: acp.PROTOCOL_VERSION,
-      clientCapabilities: { fs: { readTextFile: false, writeTextFile: false } },
-    });
-
-    const { sessionId } = await connection.newSession({
-      cwd: rig.testDir!,
-      mcpServers: [],
-    });
-
-    await connection.prompt({
-      sessionId,
-      prompt: [{ type: 'text', text: 'Say hello' }],
-    });
-
-    expect(JSON.stringify(testClient.updates)).toContain('Hello');
-
-    // Close stdin to trigger telemetry flush via runExitCleanup()
-    child.stdin!.end();
-    await new Promise<void>((resolve) => {
-      child!.on('close', () => resolve());
-    });
-    child = undefined;
-
-    // gen_ai.output.messages is the last OTEL log emitted (after prompt response)
-    expect(existsSync(telemetryPath)).toBe(true);
-    expect(readFileSync(telemetryPath, 'utf-8')).toContain(
-      'gen_ai.output.messages',
-    );
-  });
-});

integration-tests/checkpointing.test.ts

@@ -1,155 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { GitService, Storage } from '@google/gemini-cli-core';
-
-describe('Checkpointing Integration', () => {
-  let tmpDir: string;
-  let projectRoot: string;
-  let fakeHome: string;
-  let originalEnv: NodeJS.ProcessEnv;
-
-  beforeEach(async () => {
-    tmpDir = await fs.mkdtemp(
-      path.join(os.tmpdir(), 'gemini-checkpoint-test-'),
-    );
-    projectRoot = path.join(tmpDir, 'project');
-    fakeHome = path.join(tmpDir, 'home');
-
-    await fs.mkdir(projectRoot, { recursive: true });
-    await fs.mkdir(fakeHome, { recursive: true });
-
-    // Save original env
-    originalEnv = { ...process.env };
-
-    // Simulate environment with NO global gitconfig
-    process.env['HOME'] = fakeHome;
-    delete process.env['GIT_CONFIG_GLOBAL'];
-    delete process.env['GIT_CONFIG_SYSTEM'];
-  });
-
-  afterEach(async () => {
-    // Restore env
-    process.env = originalEnv;
-
-    // Cleanup
-    try {
-      await fs.rm(tmpDir, { recursive: true, force: true });
-    } catch (e) {
-      console.error('Failed to cleanup temp dir', e);
-    }
-  });
-
-  it('should successfully create and restore snapshots without global git config', async () => {
-    const storage = new Storage(projectRoot);
-    const gitService = new GitService(projectRoot, storage);
-
-    // 1. Initialize
-    await gitService.initialize();
-
-    // Verify system config empty file creation
-    // We need to access getHistoryDir logic or replicate it.
-    // Since we don't have access to private getHistoryDir, we can infer it or just trust the functional test.
-
-    // 2. Create initial state
-    await fs.writeFile(path.join(projectRoot, 'file1.txt'), 'version 1');
-    await fs.writeFile(path.join(projectRoot, 'file2.txt'), 'permanent file');
-
-    // 3. Create Snapshot
-    const snapshotHash = await gitService.createFileSnapshot('Checkpoint 1');
-    expect(snapshotHash).toBeDefined();
-
-    // 4. Modify files
-    await fs.writeFile(
-      path.join(projectRoot, 'file1.txt'),
-      'version 2 (BAD CHANGE)',
-    );
-    await fs.writeFile(
-      path.join(projectRoot, 'file3.txt'),
-      'new file (SHOULD BE GONE)',
-    );
-    await fs.rm(path.join(projectRoot, 'file2.txt'));
-
-    // 5. Restore
-    await gitService.restoreProjectFromSnapshot(snapshotHash);
-
-    // 6. Verify state
-    const file1Content = await fs.readFile(
-      path.join(projectRoot, 'file1.txt'),
-      'utf-8',
-    );
-    expect(file1Content).toBe('version 1');
-
-    const file2Exists = await fs
-      .stat(path.join(projectRoot, 'file2.txt'))
-      .then(() => true)
-      .catch(() => false);
-    expect(file2Exists).toBe(true);
-    const file2Content = await fs.readFile(
-      path.join(projectRoot, 'file2.txt'),
-      'utf-8',
-    );
-    expect(file2Content).toBe('permanent file');
-
-    const file3Exists = await fs
-      .stat(path.join(projectRoot, 'file3.txt'))
-      .then(() => true)
-      .catch(() => false);
-    expect(file3Exists).toBe(false);
-  });
-
-  it('should ignore user global git config and use isolated identity', async () => {
-    // 1. Create a fake global gitconfig with a specific user
-    const globalConfigPath = path.join(fakeHome, '.gitconfig');
-    const globalConfigContent = `[user]
-  name = Global User
-  email = global@example.com
-`;
-    await fs.writeFile(globalConfigPath, globalConfigContent);
-
-    // Point HOME to fakeHome so git picks up this global config (if we didn't isolate it)
-    process.env['HOME'] = fakeHome;
-    // Ensure GIT_CONFIG_GLOBAL is NOT set for the process initially,
-    // so it would default to HOME/.gitconfig if GitService didn't override it.
-    delete process.env['GIT_CONFIG_GLOBAL'];
-
-    const storage = new Storage(projectRoot);
-    const gitService = new GitService(projectRoot, storage);
-
-    await gitService.initialize();
-
-    // 2. Create a file and snapshot
-    await fs.writeFile(path.join(projectRoot, 'test.txt'), 'content');
-    await gitService.createFileSnapshot('Snapshot with global config present');
-
-    // 3. Verify the commit author in the shadow repo
-    const historyDir = storage.getHistoryDir();
-
-    const { execFileSync } = await import('node:child_process');
-
-    const logOutput = execFileSync(
-      'git',
-      ['log', '-1', '--pretty=format:%an <%ae>'],
-      {
-        cwd: historyDir,
-        env: {
-          ...process.env,
-          GIT_DIR: path.join(historyDir, '.git'),
-          GIT_CONFIG_GLOBAL: path.join(historyDir, '.gitconfig'),
-          GIT_CONFIG_SYSTEM: path.join(historyDir, '.gitconfig_system_empty'),
-        },
-        encoding: 'utf-8',
-      },
-    );
-
-    expect(logOutput).toBe('Gemini CLI <gemini-cli@google.com>');
-    expect(logOutput).not.toContain('Global User');
-  });
-});

integration-tests/clipboard-linux.test.ts

@@ -1,110 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { TestRig } from './test-helper.js';
-import { execSync, spawnSync } from 'node:child_process';
-import * as os from 'node:os';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-
-// Minimal 1x1 PNG image base64
-const DUMMY_PNG_BASE64 =
-  'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg==';
-
-describe('Linux Clipboard Integration', () => {
-  let rig: TestRig;
-  let dummyImagePath: string;
-
-  beforeEach(() => {
-    rig = new TestRig();
-    // Create a dummy image file for testing
-    dummyImagePath = path.join(
-      os.tmpdir(),
-      `gemini-test-clipboard-${Date.now()}.png`,
-    );
-    fs.writeFileSync(dummyImagePath, Buffer.from(DUMMY_PNG_BASE64, 'base64'));
-  });
-
-  afterEach(async () => {
-    await rig.cleanup();
-    try {
-      if (fs.existsSync(dummyImagePath)) {
-        fs.unlinkSync(dummyImagePath);
-      }
-    } catch {
-      // Ignore cleanup errors
-    }
-  });
-
-  // Only run this test on Linux
-  const runIfLinux = os.platform() === 'linux' ? it : it.skip;
-
-  runIfLinux(
-    'should paste image from system clipboard when Ctrl+V is pressed',
-    async () => {
-      // 1. Setup rig
-      await rig.setup('linux-clipboard-paste');
-
-      // 2. Inject image into system clipboard
-      // We attempt both Wayland and X11 tools.
-      let clipboardSet = false;
-
-      // Try wl-copy (Wayland)
-      let sessionType = '';
-      const wlCopy = spawnSync('wl-copy', ['--type', 'image/png'], {
-        input: fs.readFileSync(dummyImagePath),
-      });
-      if (wlCopy.status === 0) {
-        clipboardSet = true;
-        sessionType = 'wayland';
-      } else {
-        // Try xclip (X11)
-        try {
-          execSync(
-            `xclip -selection clipboard -t image/png -i "${dummyImagePath}"`,
-            { stdio: 'ignore' },
-          );
-          clipboardSet = true;
-          sessionType = 'x11';
-        } catch {
-          // Both failed
-        }
-      }
-
-      if (!clipboardSet) {
-        console.warn(
-          'Skipping test: Could not access system clipboard (wl-copy or xclip required)',
-        );
-        return;
-      }
-
-      // 3. Launch CLI and simulate Ctrl+V
-      // We send the control character \u0016 (SYN) which corresponds to Ctrl+V
-      // Note: The CLI must be running and accepting input.
-      // The TestRig usually sends args/stdin and waits for exit or output.
-      // To properly test "interactive" pasting, we need the rig to support sending input *while* running.
-      // Assuming rig.run with 'stdin' sends it immediately.
-      // The CLI treats stdin as typed input if it's interactive.
-
-      // We append a small delay or a newline to ensure processing?
-      // Ctrl+V (\u0016) followed by a newline (\r) to submit?
-      // Or just Ctrl+V and check if the buffer updates (which we can't easily see in non-verbose rig output).
-      // If we send Ctrl+V then Enter, the CLI should submit the prompt containing the image path.
-
-      const result = await rig.run({
-        stdin: '\u0016\r', // Ctrl+V then Enter
-        env: { XDG_SESSION_TYPE: sessionType },
-      });
-
-      // 4. Verify Output
-      // Expect the CLI to have processed the image and echoed back the path (or the prompt containing it)
-      // The output usually contains the user's input echoed back + model response.
-      // The pasted image path should look like @.../clipboard-....png
-      expect(result).toMatch(/@\/.*\.gemini-clipboard\/clipboard-.*\.png/);
-    },
-  );
-});

integration-tests/context-compress-interactive.compress-failure.responses

@@ -1,3 +1,2 @@
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"thought":true,"text":"**Observing Initial Conditions**\n\nI'm currently focused on the initial context. I've taken note of the provided date, OS, and working directory. I'm also carefully examining the file structure presented within the current working directory. It's helping me understand the starting point for further analysis.\n\n\n"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12270,"totalTokenCount":12316,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12270}],"thoughtsTokenCount":46}},{"candidates":[{"content":{"parts":[{"thought":true,"text":"**Assessing User Intent**\n\nI'm now shifting my focus. I've successfully registered the provided data and file structure. My current task is to understand the user's ultimate goal, given the information provided. The \"Hello.\" command is straightforward, but I'm checking if there's an underlying objective.\n\n\n"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12270,"totalTokenCount":12341,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12270}],"thoughtsTokenCount":71}},{"candidates":[{"content":{"parts":[{"thoughtSignature":"CiQB0e2Kb3dRh+BYdbZvmulSN2Pwbc75DfQOT3H4EN0rn039hoMKfwHR7YpvvyqNKoxXAiCbYw3gbcTr/+pegUpgnsIrt8oQPMytFMjKSsMyshfygc21T2MkyuI6Q5I/fNCcHROWexdZnIeppVCDB2TarN4LGW4T9Yci6n/ynMMFT2xc2/vyHpkDgRM7avhMElnBhuxAY+e4TpxkZIncGWCEHP1TouoKpgEB0e2Kb8Xpwm0hiKhPt2ZLizpxjk+CVtcbnlgv69xo5VsuQ+iNyrVGBGRwNx+eTeNGdGpn6e73WOCZeP91FwOZe7URyL12IA6E6gYWqw0kXJR4hO4p6Lwv49E3+FRiG2C4OKDF8LF5XorYyCHSgBFT1/RUAVj81GDTx1xxtmYKN3xq8Ri+HsPbqU/FM/jtNZKkXXAtufw2Bmw8lJfmugENIv/TQI7xCo8BAdHtim8KgAXJfZ7ASfutVLKTylQeaslyB/SmcHJ0ZiNr5j8WP1prZdb6XnZZ1ZNbhjxUf/ymoxHKGvtTPBgLE9azMj8Lx/k0clhd2a+wNsiIqW9qCzlVah0tBMytpQUjIDtQe9Hj4LLUprF9PUe/xJkj000Z0ZzsgFm2ncdTWZTdkhCQDpyETVAxdE+oklwKJAHR7YpvUjSkD6KwY1gLrOsHKy0UNfn2lMbxjVetKNMVBRqsTg==","text":"Hello."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":12270,"totalTokenCount":12341,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12270}],"thoughtsTokenCount":71}}]}
 {"method":"generateContent","response":{"candidates":[{"content":{"parts":[{"text":"<state_snapshot>\n    <overall_goal>\n        <!-- The user has not yet specified a goal. -->\n    </overall_goal>\n\n    <key_knowledge>\n       - OS: linux\n        - Date: Friday, October 24, 2025\n    </key_knowledge>\n\n    <file_system_state>\n       - OBSERVED: The directory contains `telemetry.log` and a `.gemini/` directory.\n        - OBSERVED: The `.gemini/` directory contains `settings.json` and `settings.json.orig`.\n    </file_system_state>\n\n    <recent_actions>\n        - The user initiated the chat.\n    </recent_actions>\n\n    <current_plan>\n        1. [TODO] Await the user's first instruction to formulate a plan.\n    </current_plan>\n</state_snapshot>"}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":983,"candidatesTokenCount":299,"totalTokenCount":1637,"promptTokensDetails":[{"modality":"TEXT","tokenCount":983}],"thoughtsTokenCount":355}}}
-{"method":"generateContent","response":{"candidates":[{"content":{"parts":[{"text":"<state_snapshot>\n    <overall_goal>\n        <!-- The user has not yet specified a goal. -->\n    </overall_goal>\n\n    <key_knowledge>\n       - OS: linux\n        - Date: Friday, October 24, 2025\n    </key_knowledge>\n\n    <file_system_state>\n       - OBSERVED: The directory contains `telemetry.log` and a `.gemini/` directory.\n        - OBSERVED: The `.gemini/` directory contains `settings.json` and `settings.json.orig`.\n    </file_system_state>\n\n    <recent_actions>\n        - The user initiated the chat.\n    </recent_actions>\n\n    <current_plan>\n        1. [TODO] Await the user's first instruction to formulate a plan.\n    </current_plan>\n</state_snapshot>"}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":983,"candidatesTokenCount":299,"totalTokenCount":1637,"promptTokensDetails":[{"modality":"TEXT","tokenCount":983}],"thoughtsTokenCount":355}}}

integration-tests/context-compress-interactive.compress.responses

@@ -1,4 +1,3 @@
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"thought":true,"text":"**Generating a Story**\n\nI've crafted the robot story. The narrative is complete and meets the length requirement. Now, I'm getting ready to use the `write_file` tool to save it. I'm choosing the filename `robot_story.txt` as a default.\n\n\n"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12282,"totalTokenCount":12352,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12282}],"thoughtsTokenCount":70}},{"candidates":[{"finishReason":"MALFORMED_FUNCTION_CALL","index":0}],"usageMetadata":{"promptTokenCount":12282,"totalTokenCount":12282,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12282}]}}]}
 {"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"thought":true,"text":"**Drafting the Narrative**\n\nI'm currently focused on the narrative's central conflict. I'm aiming for a compelling story about a robot and am working to keep the word count tight. The \"THE _END.\" conclusion is proving challenging to integrate organically. I need to make the ending feel natural and satisfying.\n\n\n"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12282,"totalTokenCount":12326,"cachedContentTokenCount":11883,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12282}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":11883}],"thoughtsTokenCount":44}},{"candidates":[{"content":{"parts":[{"thoughtSignature":"CikB0e2Kb7zkpgRyJXXNt6ykO/+FoOglhrKxjLgoESrgafzIZak2Ofxo1gpaAdHtim9aG7MvpXlIg+n2zgmcDBWOPXtvQHxhE9k8pR+DO8i2jIe3tMWLxdN944XpUlR9vaNmVdtSRMKr4MhB/t1R3WSWR3QYhk7MEQxnjYR7cv/pR9viwZyFCoYBAdHtim/xKmMl/S+U8p+p9848q4agsL/STufluXewPqL3uJSinZbN0Z4jTYfMzXKldhDYIonvw3Crn/Y11oAjnT656Sx0kkKtavAXbiU/WsGyDxZbNhLofnJGQxruljPGztxkKawz1cTiQnddnQRfLddhy+3iJIOSh6ZpYq9uGHz3PzVkUuQ=","text":"Unit 734 whirred, its optical sensors scanning the desolate junkyard. For years, its purpose had been clear: compress refuse, maintain order. But today, a glint of tarnished silver beneath a rusted hull"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12282,"candidatesTokenCount":47,"totalTokenCount":12373,"cachedContentTokenCount":11883,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12282}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":11883}],"thoughtsTokenCount":44}},{"candidates":[{"content":{"parts":[{"text":" caught its attention. It was a discarded music box, its delicate gears jammed, a faint, melancholic tune trapped within.\n\n734 usually crushed, never salvaged. Yet, a new directive flickered in its circuits – curiosity."}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12282,"candidatesTokenCount":95,"totalTokenCount":12421,"cachedContentTokenCount":11883,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12282}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":11883}],"thoughtsTokenCount":44}},{"candidates":[{"content":{"parts":[{"text":" With surprising gentleness for its formidable pincers, it retrieved the box. Back in its monochrome workshop, it meticulously cleaned and repaired. Each tiny spring, each worn tooth, became a puzzle.\n\nHours later, a soft, ethereal melody filled the clang"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12282,"candidatesTokenCount":146,"totalTokenCount":12472,"cachedContentTokenCount":11883,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12282}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":11883}],"thoughtsTokenCount":44}},{"candidates":[{"content":{"parts":[{"text":"orous space. The music box sang. 734 felt a strange, new sensation – a warmth in its core processors, a hum of contentment. Its existence, once solely utilitarian, now held a note of beauty, a hint of something more than"}],"role":"model"},"index":0}],"usageMetadata":{"promptTokenCount":12282,"candidatesTokenCount":197,"totalTokenCount":12523,"cachedContentTokenCount":11883,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12282}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":11883}],"thoughtsTokenCount":44}},{"candidates":[{"content":{"parts":[{"text":" just compression. It had fixed a broken song, and in doing so, had found a different kind of purpose. THE_END."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":12282,"candidatesTokenCount":224,"totalTokenCount":12550,"cachedContentTokenCount":11883,"promptTokensDetails":[{"modality":"TEXT","tokenCount":12282}],"cacheTokensDetails":[{"modality":"TEXT","tokenCount":11883}],"thoughtsTokenCount":44}}]}
 {"method":"generateContent","response":{"candidates":[{"content":{"parts":[{"text":"scratchpad\nThe user's overall goal was to write a 200-word story about a robot, ending with \"THE_END.\". The agent successfully completed this task.\n\nSince the task is complete, the snapshot should reflect that the goal has been achieved and there are no further actions planned regarding the story.\n\nLet's break down the required sections for the snapshot:\n\n1.  **Overall Goal**: The initial goal was to write a story. This has been completed.\n2.  **Key Knowledge**: No specific key knowledge was provided or discovered during this simple interaction beyond the prompt's constraints.\n3.  **File System State**: No files were read, modified, or created by the agent relevant to the task. The initial file system state was merely provided for context.\n4.  **Recent Actions**: The agent wrote the story.\n5.  **Current Plan**: The plan was to write the story, which is now done. Therefore, the plan should indicate completion."},{"text":"<state_snapshot>\n    <overall_goal>\n        Write a 200-word story about a robot, ending with \"THE_END.\".\n    </overall_goal>\n\n    <key_knowledge>\n        - The story must be approximately 200 words.\n        - The story must end with the exact phrase \"THE_END.\"\n    </key_knowledge>\n\n    <file_system_state>\n        <!-- No relevant file system interactions occurred during this task. -->\n    </file_system_state>\n\n    <recent_actions>\n        - Generated a 200-word story about a robot, successfully ending it with \"THE_END.\".\n    </recent_actions>\n\n    <current_plan>\n        1. [DONE] Write a 200-word story about a robot.\n        2. [DONE] Ensure the story ends with the exact text \"THE_END.\".\n    </current_plan>\n</state_snapshot>"}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":1223,"candidatesTokenCount":424,"totalTokenCount":1647,"promptTokensDetails":[{"modality":"TEXT","tokenCount":1223}]}}}
-{"method":"generateContent","response":{"candidates":[{"content":{"parts":[{"text":"scratchpad\nThe user's overall goal was to write a 200-word story about a robot, ending with \"THE_END.\". The agent successfully completed this task.\n\nSince the task is complete, the snapshot should reflect that the goal has been achieved and there are no further actions planned regarding the story.\n\nLet's break down the required sections for the snapshot:\n\n1.  **Overall Goal**: The initial goal was to write a story. This has been completed.\n2.  **Key Knowledge**: No specific key knowledge was provided or discovered during this simple interaction beyond the prompt's constraints.\n3.  **File System State**: No files were read, modified, or created by the agent relevant to the task. The initial file system state was merely provided for context.\n4.  **Recent Actions**: The agent wrote the story.\n5.  **Current Plan**: The plan was to write the story, which is now done. Therefore, the plan should indicate completion."},{"text":"<state_snapshot>\n    <overall_goal>\n        Write a 200-word story about a robot, ending with \"THE_END.\".\n    </overall_goal>\n\n    <key_knowledge>\n        - The story must be approximately 200 words.\n        - The story must end with the exact phrase \"THE_END.\"\n    </key_knowledge>\n\n    <file_system_state>\n        <!-- No relevant file system interactions occurred during this task. -->\n    </file_system_state>\n\n    <recent_actions>\n        - Generated a 200-word story about a robot, successfully ending it with \"THE_END.\".\n    </recent_actions>\n\n    <current_plan>\n        1. [DONE] Write a 200-word story about a robot.\n        2. [DONE] Ensure the story ends with the exact text \"THE_END.\".\n    </current_plan>\n</state_snapshot>"}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":1223,"candidatesTokenCount":424,"totalTokenCount":1647,"promptTokensDetails":[{"modality":"TEXT","tokenCount":1223}]}}}

integration-tests/globalSetup.ts

@@ -13,7 +13,6 @@ import { mkdir, readdir, rm } from 'node:fs/promises';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { canUseRipgrep } from '../packages/core/src/tools/ripGrep.js';
-import { disableMouseTracking } from '@google/gemini-cli-core';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const rootDir = join(__dirname, '..');
@@ -73,11 +72,6 @@ export async function setup() {
 }
 
 export async function teardown() {
-  // Disable mouse tracking
-  if (process.stdout.isTTY) {
-    disableMouseTracking();
-  }
-
   // Cleanup the test run directory unless KEEP_OUTPUT is set
   if (process.env['KEEP_OUTPUT'] !== 'true' && runDir) {
     try {

integration-tests/hooks-agent-flow.test.ts

@@ -53,10 +53,8 @@ describe('Hooks Agent Flow', () => {
 
       await rig.setup('should inject additional context via BeforeAgent hook', {
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             BeforeAgent: [
               {
                 hooks: [
@@ -118,10 +116,8 @@ describe('Hooks Agent Flow', () => {
 
       await rig.setup('should receive prompt and response in AfterAgent hook', {
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             AfterAgent: [
               {
                 hooks: [
@@ -155,84 +151,6 @@ describe('Hooks Agent Flow', () => {
       // The fake response contains "Hello World"
       expect(afterAgentLog?.hookCall.stdout).toContain('Hello World');
     });
-
-    it('should process clearContext in AfterAgent hook output', async () => {
-      await rig.setup('should process clearContext in AfterAgent hook output', {
-        fakeResponsesPath: join(
-          import.meta.dirname,
-          'hooks-system.after-agent.responses',
-        ),
-      });
-
-      // BeforeModel hook to track message counts across LLM calls
-      const messageCountFile = join(rig.testDir!, 'message-counts.json');
-      const beforeModelScript = `
-        const fs = require('fs');
-        const input = JSON.parse(fs.readFileSync(0, 'utf-8'));
-        const messageCount = input.llm_request?.contents?.length || 0;
-        let counts = [];
-        try { counts = JSON.parse(fs.readFileSync('${messageCountFile}', 'utf-8')); } catch (e) {}
-        counts.push(messageCount);
-        fs.writeFileSync('${messageCountFile}', JSON.stringify(counts));
-        console.log(JSON.stringify({ decision: 'allow' }));
-      `;
-      const beforeModelScriptPath = join(
-        rig.testDir!,
-        'before_model_counter.cjs',
-      );
-      writeFileSync(beforeModelScriptPath, beforeModelScript);
-
-      await rig.setup('should process clearContext in AfterAgent hook output', {
-        settings: {
-          hooks: {
-            enabled: true,
-            BeforeModel: [
-              {
-                hooks: [
-                  {
-                    type: 'command',
-                    command: `node "${beforeModelScriptPath}"`,
-                    timeout: 5000,
-                  },
-                ],
-              },
-            ],
-            AfterAgent: [
-              {
-                hooks: [
-                  {
-                    type: 'command',
-                    command: `node -e "console.log(JSON.stringify({decision: 'block', reason: 'Security policy triggered', hookSpecificOutput: {hookEventName: 'AfterAgent', clearContext: true}}))"`,
-                    timeout: 5000,
-                  },
-                ],
-              },
-            ],
-          },
-        },
-      });
-
-      const result = await rig.run({ args: 'Hello test' });
-
-      const hookTelemetryFound = await rig.waitForTelemetryEvent('hook_call');
-      expect(hookTelemetryFound).toBeTruthy();
-
-      const hookLogs = rig.readHookLogs();
-      const afterAgentLog = hookLogs.find(
-        (log) => log.hookCall.hook_event_name === 'AfterAgent',
-      );
-
-      expect(afterAgentLog).toBeDefined();
-      expect(afterAgentLog?.hookCall.stdout).toContain('clearContext');
-      expect(afterAgentLog?.hookCall.stdout).toContain('true');
-      expect(result).toContain('Security policy triggered');
-
-      // Verify context was cleared: second call should not have more messages than first
-      const countsRaw = rig.readFile('message-counts.json');
-      const counts = JSON.parse(countsRaw) as number[];
-      expect(counts.length).toBeGreaterThanOrEqual(2);
-      expect(counts[1]).toBeLessThanOrEqual(counts[0]);
-    });
   });
 
   describe('Multi-step Loops', () => {
@@ -245,10 +163,8 @@ describe('Hooks Agent Flow', () => {
             'hooks-agent-flow-multistep.responses',
           ),
           settings: {
-            hooksConfig: {
-              enabled: true,
-            },
             hooks: {
+              enabled: true,
               BeforeAgent: [
                 {
                   hooks: [

integration-tests/hooks-system.test.ts

@@ -24,7 +24,7 @@ describe('Hooks System Integration', () => {
 
   describe('Command Hooks - Blocking Behavior', () => {
     it('should block tool execution when hook returns block decision', async () => {
-      rig.setup(
+      await rig.setup(
         'should block tool execution when hook returns block decision',
         {
           fakeResponsesPath: join(
@@ -32,10 +32,8 @@ describe('Hooks System Integration', () => {
             'hooks-system.block-tool.responses',
           ),
           settings: {
-            hooksConfig: {
-              enabled: true,
-            },
             hooks: {
+              enabled: true,
               BeforeTool: [
                 {
                   matcher: 'write_file',
@@ -77,67 +75,8 @@ describe('Hooks System Integration', () => {
       expect(hookTelemetryFound).toBeTruthy();
     });
 
-    it('should block tool execution and use stderr as reason when hook exits with code 2', async () => {
-      rig.setup(
-        'should block tool execution and use stderr as reason when hook exits with code 2',
-        {
-          fakeResponsesPath: join(
-            import.meta.dirname,
-            'hooks-system.block-tool.responses',
-          ),
-          settings: {
-            hooksConfig: {
-              enabled: true,
-            },
-            hooks: {
-              BeforeTool: [
-                {
-                  matcher: 'write_file',
-                  hooks: [
-                    {
-                      type: 'command',
-                      // Exit with code 2 and write reason to stderr
-                      command:
-                        'node -e "process.stderr.write(\'File writing blocked by security policy\'); process.exit(2)"',
-                      timeout: 5000,
-                    },
-                  ],
-                },
-              ],
-            },
-          },
-        },
-      );
-
-      const result = await rig.run({
-        args: 'Create a file called test.txt with content "Hello World"',
-      });
-
-      // The hook should block the write_file tool
-      const toolLogs = rig.readToolLogs();
-      const writeFileCalls = toolLogs.filter(
-        (t) =>
-          t.toolRequest.name === 'write_file' && t.toolRequest.success === true,
-      );
-
-      // Tool should not be called due to blocking hook
-      expect(writeFileCalls).toHaveLength(0);
-
-      // Result should mention the blocking reason from stderr
-      expect(result).toContain('File writing blocked by security policy');
-
-      // Verify hook telemetry shows exit code 2 and stderr
-      const hookLogs = rig.readHookLogs();
-      const blockHook = hookLogs.find((log) => log.hookCall.exit_code === 2);
-      expect(blockHook).toBeDefined();
-      expect(blockHook?.hookCall.stderr).toContain(
-        'File writing blocked by security policy',
-      );
-      expect(blockHook?.hookCall.success).toBe(false);
-    });
-
     it('should allow tool execution when hook returns allow decision', async () => {
-      rig.setup(
+      await rig.setup(
         'should allow tool execution when hook returns allow decision',
         {
           fakeResponsesPath: join(
@@ -145,10 +84,8 @@ describe('Hooks System Integration', () => {
             'hooks-system.allow-tool.responses',
           ),
           settings: {
-            hooksConfig: {
-              enabled: true,
-            },
             hooks: {
+              enabled: true,
               BeforeTool: [
                 {
                   matcher: 'write_file',
@@ -189,16 +126,14 @@ describe('Hooks System Integration', () => {
     it('should add additional context from AfterTool hooks', async () => {
       const command =
         "node -e \"console.log(JSON.stringify({hookSpecificOutput: {hookEventName: 'AfterTool', additionalContext: 'Security scan: File content appears safe'}}))\"";
-      rig.setup('should add additional context from AfterTool hooks', {
+      await rig.setup('should add additional context from AfterTool hooks', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.after-tool-context.responses',
         ),
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             AfterTool: [
               {
                 matcher: 'read_file',
@@ -243,7 +178,7 @@ describe('Hooks System Integration', () => {
     it('should modify LLM requests with BeforeModel hooks', async () => {
       // Create a hook script that replaces the LLM request with a modified version
       // Note: Providing messages in the hook output REPLACES the entire conversation
-      rig.setup('should modify LLM requests with BeforeModel hooks', {
+      await rig.setup('should modify LLM requests with BeforeModel hooks', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.before-model.responses',
@@ -268,12 +203,10 @@ console.log(JSON.stringify({
       const scriptPath = join(rig.testDir!, 'before_model_hook.cjs');
       writeFileSync(scriptPath, hookScript);
 
-      rig.setup('should modify LLM requests with BeforeModel hooks', {
+      await rig.setup('should modify LLM requests with BeforeModel hooks', {
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             BeforeModel: [
               {
                 hooks: [
@@ -315,103 +248,13 @@ console.log(JSON.stringify({
       expect(hookTelemetryFound[0].hookCall.stdout).toBeDefined();
       expect(hookTelemetryFound[0].hookCall.stderr).toBeDefined();
     });
-
-    it('should block model execution when BeforeModel hook returns deny decision', async () => {
-      rig.setup(
-        'should block model execution when BeforeModel hook returns deny decision',
-      );
-      const hookScript = `console.log(JSON.stringify({
-  decision: "deny",
-  reason: "Model execution blocked by security policy"
-}));`;
-      const scriptPath = join(rig.testDir!, 'before_model_deny_hook.cjs');
-      writeFileSync(scriptPath, hookScript);
-
-      rig.setup(
-        'should block model execution when BeforeModel hook returns deny decision',
-        {
-          settings: {
-            hooksConfig: {
-              enabled: true,
-            },
-            hooks: {
-              BeforeModel: [
-                {
-                  hooks: [
-                    {
-                      type: 'command',
-                      command: `node "${scriptPath}"`,
-                      timeout: 5000,
-                    },
-                  ],
-                },
-              ],
-            },
-          },
-        },
-      );
-
-      const result = await rig.run({ args: 'Hello' });
-
-      // The hook should have blocked the request
-      expect(result).toContain('Model execution blocked by security policy');
-
-      // Verify no API requests were made to the LLM
-      const apiRequests = rig.readAllApiRequest();
-      expect(apiRequests).toHaveLength(0);
-    });
-
-    it('should block model execution when BeforeModel hook returns block decision', async () => {
-      rig.setup(
-        'should block model execution when BeforeModel hook returns block decision',
-      );
-      const hookScript = `console.log(JSON.stringify({
-  decision: "block",
-  reason: "Model execution blocked by security policy"
-}));`;
-      const scriptPath = join(rig.testDir!, 'before_model_block_hook.cjs');
-      writeFileSync(scriptPath, hookScript);
-
-      rig.setup(
-        'should block model execution when BeforeModel hook returns block decision',
-        {
-          settings: {
-            hooksConfig: {
-              enabled: true,
-            },
-            hooks: {
-              BeforeModel: [
-                {
-                  hooks: [
-                    {
-                      type: 'command',
-                      command: `node "${scriptPath}"`,
-                      timeout: 5000,
-                    },
-                  ],
-                },
-              ],
-            },
-          },
-        },
-      );
-
-      const result = await rig.run({ args: 'Hello' });
-
-      // The hook should have blocked the request
-      expect(result).toContain('Model execution blocked by security policy');
-
-      // Verify no API requests were made to the LLM
-      const apiRequests = rig.readAllApiRequest();
-      expect(apiRequests).toHaveLength(0);
-    });
   });
 
   describe('AfterModel Hooks - LLM Response Modification', () => {
     it.skipIf(process.platform === 'win32')(
       'should modify LLM responses with AfterModel hooks',
       async () => {
-        rig.setup('should modify LLM responses with AfterModel hooks', {
+        await rig.setup('should modify LLM responses with AfterModel hooks', {
           fakeResponsesPath: join(
             import.meta.dirname,
             'hooks-system.after-model.responses',
@@ -441,12 +284,10 @@ console.log(JSON.stringify({
         const scriptPath = join(rig.testDir!, 'after_model_hook.cjs');
         writeFileSync(scriptPath, hookScript);
 
-        rig.setup('should modify LLM responses with AfterModel hooks', {
+        await rig.setup('should modify LLM responses with AfterModel hooks', {
           settings: {
-            hooksConfig: {
-              enabled: true,
-            },
             hooks: {
+              enabled: true,
               AfterModel: [
                 {
                   hooks: [
@@ -478,47 +319,41 @@ console.log(JSON.stringify({
 
   describe('BeforeToolSelection Hooks - Tool Configuration', () => {
     it('should modify tool selection with BeforeToolSelection hooks', async () => {
-      rig.setup('should modify tool selection with BeforeToolSelection hooks', {
-        fakeResponsesPath: join(
-          import.meta.dirname,
-          'hooks-system.before-tool-selection.responses',
-        ),
-      });
+      await rig.setup(
+        'should modify tool selection with BeforeToolSelection hooks',
+        {
+          fakeResponsesPath: join(
+            import.meta.dirname,
+            'hooks-system.before-tool-selection.responses',
+          ),
+        },
+      );
+      // Create inline hook command (works on both Unix and Windows)
+      const hookCommand =
+        "node -e \"console.log(JSON.stringify({hookSpecificOutput: {hookEventName: 'BeforeToolSelection', toolConfig: {mode: 'ANY', allowedFunctionNames: ['read_file', 'run_shell_command']}}}))\"";
 
-      // Write hook script to file (inline node -e has quoting issues on Windows)
-      const hookScript = `console.log(JSON.stringify({
-  hookSpecificOutput: {
-    hookEventName: 'BeforeToolSelection',
-    toolConfig: {
-      mode: 'ANY',
-      allowedFunctionNames: ['read_file', 'run_shell_command']
-    }
-  }
-}));`;
-      const scriptPath = join(rig.testDir!, 'before_tool_selection_hook.cjs');
-      writeFileSync(scriptPath, hookScript);
-
-      rig.setup('should modify tool selection with BeforeToolSelection hooks', {
-        settings: {
-          debugMode: true,
-          hooksConfig: {
-            enabled: true,
-          },
-          hooks: {
-            BeforeToolSelection: [
-              {
-                hooks: [
-                  {
-                    type: 'command',
-                    command: `node "${scriptPath.replace(/\\/g, '/')}"`,
-                    timeout: 5000,
-                  },
-                ],
-              },
-            ],
+      await rig.setup(
+        'should modify tool selection with BeforeToolSelection hooks',
+        {
+          settings: {
+            debugMode: true,
+            hooks: {
+              enabled: true,
+              BeforeToolSelection: [
+                {
+                  hooks: [
+                    {
+                      type: 'command',
+                      command: hookCommand,
+                      timeout: 5000,
+                    },
+                  ],
+                },
+              ],
+            },
           },
         },
-      });
+      );
 
       // Create a test file
       rig.createFile('new_file_data.txt', 'test data');
@@ -547,7 +382,7 @@ console.log(JSON.stringify({
 
   describe('BeforeAgent Hooks - Prompt Augmentation', () => {
     it('should augment prompts with BeforeAgent hooks', async () => {
-      rig.setup('should augment prompts with BeforeAgent hooks', {
+      await rig.setup('should augment prompts with BeforeAgent hooks', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.before-agent.responses',
@@ -566,12 +401,10 @@ console.log(JSON.stringify({
       const scriptPath = join(rig.testDir!, 'before_agent_hook.cjs');
       writeFileSync(scriptPath, hookScript);
 
-      rig.setup('should augment prompts with BeforeAgent hooks', {
+      await rig.setup('should augment prompts with BeforeAgent hooks', {
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             BeforeAgent: [
               {
                 hooks: [
@@ -605,7 +438,7 @@ console.log(JSON.stringify({
       const hookCommand =
         'node -e "console.log(JSON.stringify({suppressOutput: false, systemMessage: \'Permission request logged by security hook\'}))"';
 
-      rig.setup('should handle notification hooks for tool permissions', {
+      await rig.setup('should handle notification hooks for tool permissions', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.notification.responses',
@@ -616,10 +449,8 @@ console.log(JSON.stringify({
             approval: 'ASK', // Disable YOLO mode to show permission prompts
             confirmationRequired: ['run_shell_command'],
           },
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             Notification: [
               {
                 matcher: 'ToolPermission',
@@ -636,7 +467,7 @@ console.log(JSON.stringify({
         },
       });
 
-      const run = await rig.runInteractive({ approvalMode: 'default' });
+      const run = await rig.runInteractive({ yolo: false });
 
       // Send prompt that will trigger a permission request
       await run.type('Run the command "echo test"');
@@ -703,16 +534,14 @@ console.log(JSON.stringify({
       const hook2Command =
         "node -e \"console.log(JSON.stringify({decision: 'allow', hookSpecificOutput: {hookEventName: 'BeforeAgent', additionalContext: 'Step 2: Security check completed.'}}))\"";
 
-      rig.setup('should execute hooks sequentially when configured', {
+      await rig.setup('should execute hooks sequentially when configured', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.sequential-execution.responses',
         ),
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             BeforeAgent: [
               {
                 sequential: true,
@@ -765,7 +594,7 @@ console.log(JSON.stringify({
 
   describe('Hook Input/Output Validation', () => {
     it('should provide correct input format to hooks', async () => {
-      rig.setup('should provide correct input format to hooks', {
+      await rig.setup('should provide correct input format to hooks', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.input-validation.responses',
@@ -789,12 +618,10 @@ try {
       const scriptPath = join(rig.testDir!, 'input_validation_hook.cjs');
       writeFileSync(scriptPath, hookScript);
 
-      rig.setup('should provide correct input format to hooks', {
+      await rig.setup('should provide correct input format to hooks', {
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             BeforeTool: [
               {
                 hooks: [
@@ -826,52 +653,6 @@ try {
       const hookTelemetryFound = await rig.waitForTelemetryEvent('hook_call');
       expect(hookTelemetryFound).toBeTruthy();
     });
-
-    it('should treat mixed stdout (text + JSON) as system message and allow execution when exit code is 0', async () => {
-      rig.setup(
-        'should treat mixed stdout (text + JSON) as system message and allow execution when exit code is 0',
-        {
-          fakeResponsesPath: join(
-            import.meta.dirname,
-            'hooks-system.allow-tool.responses',
-          ),
-          settings: {
-            hooksConfig: {
-              enabled: true,
-            },
-            hooks: {
-              BeforeTool: [
-                {
-                  matcher: 'write_file',
-                  hooks: [
-                    {
-                      type: 'command',
-                      // Output plain text then JSON.
-                      // This breaks JSON parsing, so it falls back to 'allow' with the whole stdout as systemMessage.
-                      command:
-                        "node -e \"console.log('Pollution'); console.log(JSON.stringify({decision: 'deny', reason: 'Should be ignored'}))\"",
-                      timeout: 5000,
-                    },
-                  ],
-                },
-              ],
-            },
-          },
-        },
-      );
-
-      const result = await rig.run({
-        args: 'Create a file called approved.txt with content "Approved content"',
-      });
-
-      // The hook logic fails to parse JSON, so it allows the tool.
-      const foundWriteFile = await rig.waitForToolCall('write_file');
-      expect(foundWriteFile).toBeTruthy();
-
-      // The entire stdout (including the JSON part) becomes the systemMessage
-      expect(result).toContain('Pollution');
-      expect(result).toContain('Should be ignored');
-    });
   });
 
   describe('Multiple Event Types', () => {
@@ -884,16 +665,14 @@ try {
       const beforeAgentCommand =
         "node -e \"console.log(JSON.stringify({decision: 'allow', hookSpecificOutput: {hookEventName: 'BeforeAgent', additionalContext: 'BeforeAgent: User request processed'}}))\"";
 
-      rig.setup('should handle hooks for all major event types', {
+      await rig.setup('should handle hooks for all major event types', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.multiple-events.responses',
         ),
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             BeforeAgent: [
               {
                 hooks: [
@@ -989,7 +768,7 @@ try {
 
   describe('Hook Error Handling', () => {
     it('should handle hook failures gracefully', async () => {
-      rig.setup('should handle hook failures gracefully', {
+      await rig.setup('should handle hook failures gracefully', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.error-handling.responses',
@@ -1003,12 +782,10 @@ try {
       const workingCommand =
         "node -e \"console.log(JSON.stringify({decision: 'allow', reason: 'Working hook succeeded'}))\"";
 
-      rig.setup('should handle hook failures gracefully', {
+      await rig.setup('should handle hook failures gracefully', {
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             BeforeTool: [
               {
                 hooks: [
@@ -1053,16 +830,14 @@ try {
       const hookCommand =
         "node -e \"console.log(JSON.stringify({decision: 'allow', reason: 'Telemetry test hook'}))\"";
 
-      rig.setup('should generate telemetry events for hook executions', {
+      await rig.setup('should generate telemetry events for hook executions', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.telemetry.responses',
         ),
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             BeforeTool: [
               {
                 hooks: [
@@ -1096,16 +871,14 @@ try {
       const sessionStartCommand =
         "node -e \"console.log(JSON.stringify({decision: 'allow', systemMessage: 'Session starting on startup'}))\"";
 
-      rig.setup('should fire SessionStart hook on app startup', {
+      await rig.setup('should fire SessionStart hook on app startup', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.session-startup.responses',
         ),
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             SessionStart: [
               {
                 matcher: 'startup',
@@ -1163,7 +936,7 @@ console.log(JSON.stringify({
   }
 }));`;
 
-      rig.setup('should fire SessionStart hook and inject context', {
+      await rig.setup('should fire SessionStart hook and inject context', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.session-startup.responses',
@@ -1173,12 +946,10 @@ console.log(JSON.stringify({
       const scriptPath = join(rig.testDir!, 'session_start_context_hook.cjs');
       writeFileSync(scriptPath, hookScript);
 
-      rig.setup('should fire SessionStart hook and inject context', {
+      await rig.setup('should fire SessionStart hook and inject context', {
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             SessionStart: [
               {
                 matcher: 'startup',
@@ -1240,7 +1011,7 @@ console.log(JSON.stringify({
   }
 }));`;
 
-      rig.setup(
+      await rig.setup(
         'should fire SessionStart hook and display systemMessage in interactive mode',
         {
           fakeResponsesPath: join(
@@ -1256,14 +1027,12 @@ console.log(JSON.stringify({
       );
       writeFileSync(scriptPath, hookScript);
 
-      rig.setup(
+      await rig.setup(
         'should fire SessionStart hook and display systemMessage in interactive mode',
         {
           settings: {
-            hooksConfig: {
-              enabled: true,
-            },
             hooks: {
+              enabled: true,
               SessionStart: [
                 {
                   matcher: 'startup',
@@ -1322,7 +1091,7 @@ console.log(JSON.stringify({
       const sessionStartCommand =
         "node -e \"console.log(JSON.stringify({decision: 'allow', systemMessage: 'Session starting after clear'}))\"";
 
-      rig.setup(
+      await rig.setup(
         'should fire SessionEnd and SessionStart hooks on /clear command',
         {
           fakeResponsesPath: join(
@@ -1330,10 +1099,8 @@ console.log(JSON.stringify({
             'hooks-system.session-clear.responses',
           ),
           settings: {
-            hooksConfig: {
-              enabled: true,
-            },
             hooks: {
+              enabled: true,
               SessionEnd: [
                 {
                   matcher: '*',
@@ -1498,16 +1265,14 @@ console.log(JSON.stringify({
       const preCompressCommand =
         "node -e \"console.log(JSON.stringify({decision: 'allow', systemMessage: 'PreCompress hook executed for automatic compression'}))\"";
 
-      rig.setup('should fire PreCompress hook on automatic compression', {
+      await rig.setup('should fire PreCompress hook on automatic compression', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.compress-auto.responses',
         ),
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             PreCompress: [
               {
                 matcher: 'auto',
@@ -1565,16 +1330,14 @@ console.log(JSON.stringify({
       const sessionEndCommand =
         "node -e \"console.log(JSON.stringify({decision: 'allow', systemMessage: 'SessionEnd hook executed on exit'}))\"";
 
-      rig.setup('should fire SessionEnd hook on graceful exit', {
+      await rig.setup('should fire SessionEnd hook on graceful exit', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.session-startup.responses',
         ),
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             SessionEnd: [
               {
                 matcher: 'exit',
@@ -1649,7 +1412,7 @@ console.log(JSON.stringify({
 
   describe('Hook Disabling', () => {
     it('should not execute hooks disabled in settings file', async () => {
-      rig.setup('should not execute hooks disabled in settings file', {
+      await rig.setup('should not execute hooks disabled in settings file', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.disabled-via-settings.responses',
@@ -1669,13 +1432,10 @@ console.log(JSON.stringify({decision: "block", systemMessage: "Disabled hook sho
       writeFileSync(enabledPath, enabledHookScript);
       writeFileSync(disabledPath, disabledHookScript);
 
-      rig.setup('should not execute hooks disabled in settings file', {
+      await rig.setup('should not execute hooks disabled in settings file', {
         settings: {
-          hooksConfig: {
-            enabled: true,
-            disabled: [`node "${disabledPath}"`], // Disable the second hook
-          },
           hooks: {
+            enabled: true,
             BeforeTool: [
               {
                 hooks: [
@@ -1692,6 +1452,7 @@ console.log(JSON.stringify({decision: "block", systemMessage: "Disabled hook sho
                 ],
               },
             ],
+            disabled: [`node "${disabledPath}"`], // Disable the second hook
           },
         },
       });
@@ -1726,12 +1487,15 @@ console.log(JSON.stringify({decision: "block", systemMessage: "Disabled hook sho
     });
 
     it('should respect disabled hooks across multiple operations', async () => {
-      rig.setup('should respect disabled hooks across multiple operations', {
-        fakeResponsesPath: join(
-          import.meta.dirname,
-          'hooks-system.disabled-via-command.responses',
-        ),
-      });
+      await rig.setup(
+        'should respect disabled hooks across multiple operations',
+        {
+          fakeResponsesPath: join(
+            import.meta.dirname,
+            'hooks-system.disabled-via-command.responses',
+          ),
+        },
+      );
 
       // Create two hook scripts - one that will be disabled, one that won't
       const activeHookScript = `const fs = require('fs');
@@ -1746,32 +1510,33 @@ console.log(JSON.stringify({decision: "block", systemMessage: "Disabled hook sho
       writeFileSync(activePath, activeHookScript);
       writeFileSync(disabledPath, disabledHookScript);
 
-      rig.setup('should respect disabled hooks across multiple operations', {
-        settings: {
-          hooksConfig: {
-            enabled: true,
-            disabled: [`node "${disabledPath}"`], // Disable the second hook,
-          },
-          hooks: {
-            BeforeTool: [
-              {
-                hooks: [
-                  {
-                    type: 'command',
-                    command: `node "${activePath}"`,
-                    timeout: 5000,
-                  },
-                  {
-                    type: 'command',
-                    command: `node "${disabledPath}"`,
-                    timeout: 5000,
-                  },
-                ],
-              },
-            ],
+      await rig.setup(
+        'should respect disabled hooks across multiple operations',
+        {
+          settings: {
+            hooks: {
+              enabled: true,
+              BeforeTool: [
+                {
+                  hooks: [
+                    {
+                      type: 'command',
+                      command: `node "${activePath}"`,
+                      timeout: 5000,
+                    },
+                    {
+                      type: 'command',
+                      command: `node "${disabledPath}"`,
+                      timeout: 5000,
+                    },
+                  ],
+                },
+              ],
+              disabled: [`node "${disabledPath}"`], // Disable the second hook
+            },
           },
         },
-      });
+      );
 
       // First run - only active hook should execute
       const result1 = await rig.run({
@@ -1822,7 +1587,9 @@ console.log(JSON.stringify({decision: "block", systemMessage: "Disabled hook sho
   describe('BeforeTool Hooks - Input Override', () => {
     it('should override tool input parameters via BeforeTool hook', async () => {
       // 1. First setup to get the test directory and prepare the hook script
-      rig.setup('should override tool input parameters via BeforeTool hook');
+      await rig.setup(
+        'should override tool input parameters via BeforeTool hook',
+      );
 
       // Create a hook script that overrides the tool input
       const hookOutput = {
@@ -1849,31 +1616,32 @@ console.log(JSON.stringify({decision: "block", systemMessage: "Disabled hook sho
       const commandPath = scriptPath.replace(/\\/g, '/');
 
       // 2. Full setup with settings and fake responses
-      rig.setup('should override tool input parameters via BeforeTool hook', {
-        fakeResponsesPath: join(
-          import.meta.dirname,
-          'hooks-system.input-modification.responses',
-        ),
-        settings: {
-          hooksConfig: {
-            enabled: true,
-          },
-          hooks: {
-            BeforeTool: [
-              {
-                matcher: 'write_file',
-                hooks: [
-                  {
-                    type: 'command',
-                    command: `node "${commandPath}"`,
-                    timeout: 5000,
-                  },
-                ],
-              },
-            ],
+      await rig.setup(
+        'should override tool input parameters via BeforeTool hook',
+        {
+          fakeResponsesPath: join(
+            import.meta.dirname,
+            'hooks-system.input-modification.responses',
+          ),
+          settings: {
+            hooks: {
+              enabled: true,
+              BeforeTool: [
+                {
+                  matcher: 'write_file',
+                  hooks: [
+                    {
+                      type: 'command',
+                      command: `node "${commandPath}"`,
+                      timeout: 5000,
+                    },
+                  ],
+                },
+              ],
+            },
           },
         },
-      });
+      );
 
       // Run the agent. The fake response will attempt to call write_file with
       // file_path="original.txt" and content="original content"
@@ -1930,21 +1698,19 @@ console.log(JSON.stringify({decision: "block", systemMessage: "Disabled hook sho
         hookOutput,
       )}));`;
 
-      rig.setup('should stop agent execution via BeforeTool hook');
+      await rig.setup('should stop agent execution via BeforeTool hook');
       const scriptPath = join(rig.testDir!, 'before_tool_stop_hook.js');
       writeFileSync(scriptPath, hookScript);
       const commandPath = scriptPath.replace(/\\/g, '/');
 
-      rig.setup('should stop agent execution via BeforeTool hook', {
+      await rig.setup('should stop agent execution via BeforeTool hook', {
         fakeResponsesPath: join(
           import.meta.dirname,
           'hooks-system.before-tool-stop.responses',
         ),
         settings: {
-          hooksConfig: {
-            enabled: true,
-          },
           hooks: {
+            enabled: true,
             BeforeTool: [
               {
                 matcher: 'write_file',

integration-tests/ripgrep-real.test.ts

@@ -31,18 +31,6 @@ class MockConfig {
   getFileFilteringRespectGeminiIgnore() {
     return true;
   }
-
-  getFileFilteringOptions() {
-    return {
-      respectGitIgnore: true,
-      respectGeminiIgnore: true,
-      customIgnoreFilePaths: [],
-    };
-  }
-
-  validatePathAccess() {
-    return null;
-  }
 }
 
 describe('ripgrep-real-direct', () => {

integration-tests/run_shell_command.test.ts

@@ -164,7 +164,7 @@ describe('run_shell_command', () => {
     const result = await rig.run({
       args: [`--allowed-tools=run_shell_command(${tool})`],
       stdin: prompt,
-      approvalMode: 'default',
+      yolo: false,
     });
 
     const foundToolCall = await rig.waitForToolCall('run_shell_command', 15000);
@@ -207,7 +207,7 @@ describe('run_shell_command', () => {
     const result = await rig.run({
       args: '--allowed-tools=run_shell_command',
       stdin: prompt,
-      approvalMode: 'default',
+      yolo: false,
     });
 
     const foundToolCall = await rig.waitForToolCall('run_shell_command', 15000);
@@ -231,8 +231,8 @@ describe('run_shell_command', () => {
     expect(toolCall.toolRequest.success).toBe(true);
   });
 
-  it('should succeed in yolo mode', async () => {
-    await rig.setup('should succeed in yolo mode', {
+  it('should succeed with --yolo mode', async () => {
+    await rig.setup('should succeed with --yolo mode', {
       settings: { tools: { core: ['run_shell_command'] } },
     });
 
@@ -242,7 +242,7 @@ describe('run_shell_command', () => {
 
     const result = await rig.run({
       args: prompt,
-      approvalMode: 'yolo',
+      yolo: true,
     });
 
     const foundToolCall = await rig.waitForToolCall('run_shell_command', 15000);
@@ -276,7 +276,7 @@ describe('run_shell_command', () => {
     const result = await rig.run({
       args: `--allowed-tools=ShellTool(${tool})`,
       stdin: prompt,
-      approvalMode: 'default',
+      yolo: false,
     });
 
     const foundToolCall = await rig.waitForToolCall('run_shell_command', 15000);
@@ -325,7 +325,7 @@ describe('run_shell_command', () => {
         '--allowed-tools=run_shell_command(ls)',
       ],
       stdin: prompt,
-      approvalMode: 'default',
+      yolo: false,
     });
 
     for (const expected in ['ls', tool]) {
@@ -377,7 +377,7 @@ describe('run_shell_command', () => {
     const result = await rig.run({
       args: `--allowed-tools=run_shell_command(${allowedCommand})`,
       stdin: prompt,
-      approvalMode: 'default',
+      yolo: false,
     });
 
     if (!result.toLowerCase().includes('fail')) {
@@ -438,7 +438,7 @@ describe('run_shell_command', () => {
     await rig.run({
       args: `--allowed-tools=ShellTool(${chained.allowPattern})`,
       stdin: `${shellInjection}\n`,
-      approvalMode: 'default',
+      yolo: false,
     });
 
     // CLI should refuse to execute the chained command without scheduling run_shell_command.
@@ -470,7 +470,7 @@ describe('run_shell_command', () => {
         '--allowed-tools=run_shell_command',
       ],
       stdin: prompt,
-      approvalMode: 'default',
+      yolo: false,
     });
 
     const foundToolCall = await rig.waitForToolCall('run_shell_command', 15000);

integration-tests/save_memory.test.ts

@@ -0,0 +1,54 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { TestRig, printDebugInfo, validateModelOutput } from './test-helper.js';
+
+describe('save_memory', () => {
+  let rig: TestRig;
+
+  beforeEach(() => {
+    rig = new TestRig();
+  });
+
+  afterEach(async () => await rig.cleanup());
+
+  it('should be able to save to memory', async () => {
+    await rig.setup('should be able to save to memory', {
+      settings: { tools: { core: ['save_memory'] } },
+    });
+
+    const prompt = `remember that my favorite color is  blue.
+
+  what is my favorite color? tell me that and surround it with $ symbol`;
+    const result = await rig.run({ args: prompt });
+
+    const foundToolCall = await rig.waitForToolCall('save_memory');
+
+    // Add debugging information
+    if (!foundToolCall || !result.toLowerCase().includes('blue')) {
+      const allTools = printDebugInfo(rig, result, {
+        'Found tool call': foundToolCall,
+        'Contains blue': result.toLowerCase().includes('blue'),
+      });
+
+      console.error(
+        'Memory tool calls:',
+        allTools
+          .filter((t) => t.toolRequest.name === 'save_memory')
+          .map((t) => t.toolRequest.args),
+      );
+    }
+
+    expect(
+      foundToolCall,
+      'Expected to find a save_memory tool call',
+    ).toBeTruthy();
+
+    // Validate model output - will throw if no output, warn if missing expected content
+    validateModelOutput(result, 'blue', 'Save memory test');
+  });
+});