docs(triage): explicitly forbid skipping vagueness checks for complex bugs

.gemini/settings.json

@@ -2,8 +2,8 @@
   "experimental": {
     "extensionReloading": true,
     "modelSteering": true,
-    "autoMemory": true,
-    "gemma": true
+    "memoryManager": false,
+    "topicUpdateNarration": true
   },
   "general": {
     "devtools": true

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

@@ -162,7 +162,5 @@ instructions for the other section.
 
 ## Finalize
 
-- After making changes, if `npm run format` fails, it may be necessary to run
-  `npm install` first to ensure all formatting dependencies are available.
-  Then, run `npm run format` to ensure consistency.
+- After making changes, run `npm run format` ONLY to ensure consistency.
 - Delete any temporary files created during the process.

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

@@ -1,7 +1,7 @@
 ---
 name: docs-writer
 description:
-  Always use this skill when the task involves writing, reviewing, or editing
+  Always use this skill when the task involves writing, reviewing, or editing 
   files in the `/docs` directory or any `.md` files in the repository.
 ---
 
@@ -24,7 +24,7 @@ approach.
 
 - **Perspective and tense:** Address the reader as "you." Use active voice and
   present tense (e.g., "The API returns...").
-- **Tone:** Professional, friendly, and direct.
+- **Tone:** Professional, friendly, and direct. 
 - **Clarity:** Use simple vocabulary. Avoid jargon, slang, and marketing hype.
 - **Global Audience:** Write in standard US English. Avoid idioms and cultural
   references.
@@ -47,8 +47,8 @@ Write precisely to ensure your instructions are unambiguous.
   "foo" or "bar."
 - **Quota and limit terminology:** For any content involving resource capacity
   or using the word "quota" or "limit", strictly adhere to the guidelines in
-  the `quota-limit-style-guide.md` resource file. Generally, Use "quota" for
-  the administrative bucket and "limit" for the numerical ceiling.
+  the `quota-limit-style-guide.md` resource file. Generally, Use "quota" for the
+  administrative bucket and "limit" for the numerical ceiling.
 
 ### Formatting and syntax
 Apply consistent formatting to make documentation visually organized and
@@ -85,25 +85,17 @@ accessible.
 
 - **Callouts**: Use GitHub-flavored markdown alerts to highlight important
   information. To ensure the formatting is preserved by `npm run format`, place
-  an empty line, then a prettier ignore comment directly before the callout
-  block. Use `<!-- prettier-ignore -->` for standard Markdown files (`.md`) and
-  `{/* prettier-ignore */}` for MDX files (`.mdx`). The callout type (`[!TYPE]`)
-  should be on the first line, followed by a newline, and then the content, with
-  each subsequent line of content starting with `>`. Available types are `NOTE`,
-  `TIP`, `IMPORTANT`, `WARNING`, and `CAUTION`.
+  an empty line, then the `<!-- prettier-ignore -->` comment directly before
+  the callout block. The callout type (`[!TYPE]`) should be on the first line,
+  followed by a newline, and then the content, with each subsequent line of
+  content starting with `>`. Available types are `NOTE`, `TIP`, `IMPORTANT`,
+  `WARNING`, and `CAUTION`.
 
-  Example (.md):
+  Example:
 
 <!-- prettier-ignore -->
 > [!NOTE]
 > This is an example of a multi-line note that will be preserved
-> by Prettier.
-
-  Example (.mdx):
-
-{/* prettier-ignore */}
-> [!NOTE]
-> This is an example of a multi-line note that will be preserved
 > by Prettier.
 
 ### Links
@@ -126,10 +118,9 @@ accessible.
 <!-- prettier-ignore -->
 > [!NOTE]
 > This is an experimental feature currently under active development.
-(Note: Use `{/* prettier-ignore */}` if editing an `.mdx` file.)
 
 - **Headings:** Use hierarchical headings to support the user journey.
-- **Procedures:**
+- **Procedures:** 
   - Introduce lists of steps with a complete sentence.
   - Start each step with an imperative verb.
   - Number sequential steps; use bullets for non-sequential lists.
@@ -143,7 +134,7 @@ accessible.
 
 ## Phase 2: Preparation
 Before modifying any documentation, thoroughly investigate the request and the
-surrounding context.
+surrounding context. 
 
 1.  **Clarify:** Understand the core request. Differentiate between writing new
     content and editing existing content. If the request is ambiguous (e.g.,
@@ -154,8 +145,6 @@ surrounding context.
 4.  **Connect:** Identify all referencing pages if changing behavior. Check if
     `docs/sidebar.json` needs updates.
 5.  **Plan:** Create a step-by-step plan before making changes.
-6.  **Audit Docset:** If asked to audit the documentation, follow the procedural
-    guide in [docs-auditing.md](./references/docs-auditing.md).
 
 ## Phase 3: Execution
 Implement your plan by either updating existing files or creating new ones
@@ -168,7 +157,7 @@ documentation.
 
 - **Gaps:** Identify areas where the documentation is incomplete or no longer
   reflects existing code.
-- **Structure:** Apply "Structure (New Docs)" rules (BLUF, headings, etc.) when
+- **Structure:** Apply "Structure (New Docs)" rules (BLUF, headings, etc.) when 
   adding new sections to existing pages.
 - **Headers**: If you change a header, you must check for links that lead to
   that header and update them.
@@ -179,16 +168,15 @@ documentation.
   documents.
 
 ## Phase 4: Verification and finalization
-Perform a final quality check to ensure that all changes are correctly
-formatted and that all links are functional.
+Perform a final quality check to ensure that all changes are correctly formatted
+and that all links are functional.
 
 1.  **Accuracy:** Ensure content accurately reflects the implementation and
   technical behavior.
 2.  **Self-review:** Re-read changes for formatting, correctness, and flow.
-3.  **Link check:** Verify all new and existing links leading to or from
-    modified pages. If you changed a header, ensure that any links that lead to
-    it are updated.
-4.  **Format:** If `npm run format` fails, it may be necessary to run `npm
-    install` first to ensure all formatting dependencies are available. Once all
-    changes are complete, ask to execute `npm run format` to ensure consistent
-    formatting across the project. If the user confirms, execute the command.
+3.  **Link check:** Verify all new and existing links leading to or from modified
+    pages. If you changed a header, ensure that any links that lead to it are
+    updated.
+4.  **Format:** Once all changes are complete, ask to execute `npm run format`
+    to ensure consistent formatting across the project. If the user confirms,
+    execute the command.

.gemini/skills/docs-writer/references/docs-auditing.md

@@ -1,195 +0,0 @@
-# Procedural Guide: Auditing the Docset
-
-This guide outlines the process for auditing the Gemini CLI documentation for
-correctness and adherence to style guidelines. This process involves both an
-"Editor" and "Technical Writer" phase.
-
-## Objective
-
-To ensure all public-facing documentation is accurate, up-to-date, adheres to
-the Gemini CLI documentation style guide, and reflects the current state of the
-codebase.
-
-## Phase 1: Editor Audit
-
-**Role:** The editor is responsible for identifying potential issues based on
-style guide violations and technical inaccuracies.
-
-### Steps
-
-1.  **Identify Documentation Scope:**
-    - Read `docs/sidebar.json` to get a list of all viewable documentation
-      pages.
-    - For each entry with a `slug`, convert it into a file path (e.g., `docs` ->
-      `docs/index.md`, `docs/get-started` -> `docs/get-started.md`). Ignore
-      entries with `link` properties.
-
-2.  **Prepare Audit Results File:**
-    - Create a new Markdown file named `audit-results-[YYYY-MM-DD].md` (e.g.,
-      `audit-results-2026-03-13.md`). This file will contain all identified
-      violations and recommendations.
-
-3.  **Retrieve Style Guidelines:**
-    - Familiarize yourself with the `docs-writer` skill instructions and the
-      included style guidelines.
-
-4.  **Audit Each Document:**
-    - For each documentation file identified in Step 1, read its content.
-    - **Review against Style Guide:**
-      - **Voice and Tone Violations:**
-        - **Unprofessional Tone:** Identify phrasing that is overly casual,
-          defensive, or lacks a professional and friendly demeanor.
-        - **Indirectness or Vagueness:** Identify sentences that are
-          unnecessarily wordy or fail to be concise and direct.
-        - **Incorrect Pronoun:** Identify any use of third-person pronouns
-          (e.g., "we," "they," "the user") when referring to the reader, instead
-          of the second-person pronoun **"you"**.
-        - **Passive Voice:** Identify sentences written in the passive voice.
-        - **Incorrect Tense:** Identify the use of past or future tense verbs,
-          instead of the **present tense**.
-        - **Poor Vocabulary:** Identify the use of jargon, slang, or overly
-          informal language.
-      - **Language and Grammar Violations:**
-        - **Lack of Conciseness:** Identify unnecessarily long phrases or
-          sentences.
-        - **Punctuation Errors:** Identify incorrect or missing punctuation.
-        - **Ambiguous Dates:** Identify dates that could be misinterpreted
-          (e.g., "next Monday" instead of "April 15, 2026").
-        - **Abbreviation Usage:** Identify the use of abbreviations that should
-          be spelled out (e.g., "e.g." instead of "for example").
-        - **Terminology:** Check for incorrect or inconsistent use of
-          product-specific terms (e.g., "quota" vs. "limit").
-      - **Formatting and Syntax Violations:**
-        - **Missing Overview:** Check for the absence of a brief overview
-          paragraph at the start of the document.
-        - **Line Length:** Identify any lines of text that exceed **80
-          characters** (text wrap violation).
-        - **Casing:** Identify incorrect casing for headings, titles, or named
-          entities (e.g., product names like `Gemini CLI`).
-        - **List Formatting:** Identify incorrectly formatted lists (e.g.,
-          inconsistent indentation or numbering).
-        - **Incorrect Emphasis:** Identify incorrect use of bold text (should
-          only be used for UI elements) or code font (should be used for code,
-          file names, or command-line input).
-        - **Link Quality:** Identify links with non-descriptive anchor text
-          (e.g., "click here").
-        - **Image Alt Text:** Identify images with missing or poor-quality
-          (non-descriptive) alt text.
-      - **Structure Violations:**
-        - **Missing BLUF:** Check for the absence of a "Bottom Line Up Front"
-          summary at the start of complex sections or documents.
-        - **Experimental Feature Notes:** Identify experimental features that
-          are not clearly labeled with a standard note.
-        - **Heading Hierarchy:** Check for skipped heading levels (e.g., going
-          from `##` to `####`).
-        - **Procedure Clarity:** Check for procedural steps that do not start
-          with an imperative verb or where a condition is placed _after_ the
-          instruction.
-        - **Element Misuse:** Identify the incorrect or inappropriate use of
-          special elements (e.g., Notes, Warnings, Cautions).
-        - **Table of Contents:** Identify the presence of a dynamically
-          generated or manually included table of contents.
-        - **Missing Next Steps:** Check for procedural documents that lack a
-          "Next steps" section (if applicable).
-    - **Verify Code Accuracy (if applicable):**
-      - If the document contains code snippets (e.g., shell commands, API calls,
-        file paths, Docker image versions), use `grep_search` and `read_file`
-        within the `packages/` directory (or other relevant parts of the
-        codebase) to ensure the code is still accurate and up-to-date. Pay close
-        attention to version numbers, package names, and command syntax.
-    - **Record Findings:** For each **violation** or inaccuracy found:
-      - Note the file path.
-      - Describe the violation (e.g., "Violation (Language and Grammar): Uses
-        'e.g.'").
-      - Provide a clear and actionable recommendation to correct the issue.
-        (e.g., "Recommendation: Replace 'e.g.' with 'for example'." or
-        "Recommendation: Replace '...' with '...' in active voice.).
-      - Append these findings to `audit-results-[YYYY-MM-DD].md`.
-
-## Phase 2: Software Engineer Audit
-
-**Role:** The software engineer is responsible for finding undocumented features
-by auditing the codebase and recent changelogs, and passing these findings to
-the technical writer.
-
-### Steps
-
-1.  **Proactive Codebase Audit:**
-    - Audit high-signal areas of the codebase to identify undocumented features.
-      You MUST review:
-      - `packages/cli/src/commands/`
-      - `packages/core/src/tools/`
-      - `packages/cli/src/config/settings.ts`
-
-2.  **Review Recent Updates:**
-    - Check recent changelogs in stable and announcements within the
-      documentation to see if newly introduced features are documented properly.
-
-3.  **Evaluate and Record Findings:**
-    - Determine if these features are adequately covered in the docs. They do
-      not need to be documented word for word, but major features that customers
-      should care about probably should have an article.
-    - Append your findings to the `audit-results-[YYYY-MM-DD].md` file,
-      providing a brief description of the feature and where it should be
-      documented.
-
-## Phase 3: Technical Writer Implementation
-
-**Role:** The technical writer handles input from both the editor and the
-software engineer, makes appropriate decisions about what to change, and
-implements the approved changes.
-
-### Steps
-
-1.  **Review Audit Results:**
-    - Read `audit-results-[YYYY-MM-DD].md` to understand all identified issues,
-      undocumented features, and recommendations from both the Editor and
-      Software Engineer phases.
-
-2.  **Make Decisions and Log Reasoning:**
-    - Create or update an implementation log (e.g.,
-      `audit-implementation-log-[YYYY-MM-DD].md`).
-    - Make sure the logs are updated for all steps, documenting your reasoning
-      for each recommendation (why it was accepted, modified, or rejected). This
-      is required for a final check by a human in the PR.
-
-3.  **Implement Changes:**
-    - For each approved recommendation:
-      - Read the target documentation file.
-      - Apply the recommended change using the `replace` tool. Pay close
-        attention to `old_string` for exact matches, including whitespace and
-        newlines. For multiple occurrences of the same simple string (e.g.,
-        "e.g."), use `allow_multiple: true`.
-      - **String replacement safeguards:** When applying these fixes across the
-        docset, you must verify the following:
-        - **Preserve Code Blocks:** Explicitly verify that no code blocks,
-          inline code snippets, terminal commands, or file paths have been
-          erroneously capitalized or modified.
-        - **Preserve Literal Strings:** Never alter the wording of literal error
-          messages, UI quotes, or system logs. For example, if a style rule says
-          to remove the word "please", you must NOT remove it if it appears
-          inside a quoted error message (e.g.,
-          `Error: Please contact your administrator`).
-        - **Verify Sentence Casing:** When removing filler words (like "please")
-          from the beginning of a sentence or list item, always verify that the
-          new first word of the sentence is properly capitalized.
-      - For structural changes (e.g., adding an overview paragraph), use
-        `replace` or `write_file` as appropriate.
-      - For broken links, determine the correct new path or update the link
-        text.
-      - For creating new files (e.g., `docs/get-started.md` to fix a broken
-        link, or a new feature article), use `write_file`.
-
-4.  **Execute Auto-Generation Scripts:**
-    - Some documentation pages are auto-generated from the codebase and should
-      be updated using npm scripts rather than manual edits. After implementing
-      manual changes (especially if you edited settings or configurations based
-      on SWE recommendations), ensure you run:
-      - `npm run docs:settings` to generate/update the configuration reference.
-      - `npm run docs:keybindings` to generate/update the keybindings reference.
-
-5.  **Format Code:**
-    - **Dependencies:** If `npm run format` fails, it may be necessary to run
-      `npm install` first to ensure all formatting dependencies are available.
-    - After all changes have been implemented, run `npm run format` to ensure
-      consistent formatting across the project.

.gemini/skills/github-issue-triage/SKILL.md

@@ -0,0 +1,39 @@
+---
+name: github-issue-triage
+description: Analyzes and cleans up GitHub issues. DO NOT trigger this skill automatically. ONLY use when the user explicitly mentions "github-issue-triage", or explicitly asks to "triage issues", "clean up old issues", or "triage this issue".
+---
+
+# GitHub Issue Triage
+
+This skill provides workflows for finding, analyzing, and triaging GitHub issues to maintain a clean and actionable backlog.
+
+## Phase 1: Discovery (Optional)
+
+If the user asks you to "triage issues" or "clean up old issues" without providing a specific issue URL, you must first find candidate issues.
+
+Run the following script to get a list of issues:
+`node scripts/find_issues.cjs <owner/repo>` (e.g., `node scripts/find_issues.cjs google-gemini/gemini-cli`)
+
+You may optionally pass a custom search string and limit.
+`node scripts/find_issues.cjs <owner/repo> "<search_string>" <limit>`
+
+Pick the first issue from the list to triage and proceed to Phase 2. If the user provided a specific issue URL, start at Phase 2 directly.
+
+## Phase 2: Analysis
+
+For the target issue, you must run the analysis script to gather metadata and determine staleness/inactivity heuristics.
+
+Run:
+`node scripts/analyze_issue.cjs <issue_url> "<optional_comma_separated_maintainers>"`
+
+Read the JSON output carefully.
+- If `is_stale` is `true`, the issue has already been marked as stale and should be closed according to the rules in Phase 3.
+- Take note of `inactive_over_30_days`, `inactive_over_60_days`, `is_epic`, and other boolean flags.
+
+## Phase 3: Triage Execution
+
+After analyzing the issue and receiving the JSON output, you MUST consult the detailed triage rules to determine the next steps.
+
+Read the rules in [references/triage_rules.md](references/triage_rules.md) and execute the appropriate steps. You must follow the steps sequentially.
+
+If a step instructs you to **STOP EXECUTION**, you must conclude your work on this issue and not proceed to subsequent steps. If you are triaging a batch of issues, you may move on to the next issue in the list.

.gemini/skills/github-issue-triage/references/triage_rules.md

@@ -0,0 +1,162 @@
+# Issue Triage Rules
+
+**Important Note on CLI Commands**: When posting comments via the `gh` CLI that contain newlines (e.g. `\n`), you MUST use bash command substitution with `echo -e` so the newlines are rendered correctly. For example: `gh issue comment <issue_url> --body "$(echo -e "### Triage Summary\n\n<your summary>")"`.
+
+When executing triage on an issue, you must evaluate the following steps sequentially using the data provided from `scripts/analyze_issue.cjs` and the issue comments (`gh issue view <issue_url> --json comments`).
+
+## Categorization Guide: Help-wanted
+When categorizing an issue, determine if it is a good candidate for community contributions. Only use the **Help-wanted** label for these types of issues. Everything else remains unassigned to a specific whitelist label. Examples of **Help-wanted** issues include:
+    *   Small, well-defined features.
+    *   Easy-to-fix bugs (where the root cause might be identified but the fix isn't trivially "simple" enough to just patch immediately).
+    *   Tasks that are clearly scoped and ready for external help.
+    *   Issues that DO NOT require deep architectural knowledge, significant maintainer review time, modifications to core sensitive business logic (telemetry, security, billing), or sweeping UI/UX changes.
+
+Conversely, do **NOT** use the `help wanted` label for issues such as:
+    *   Easily reproducible bugs with a simple identified fix.
+    *   Epics or roadmap initiatives.
+    *   Changes to core architecture, sensitive security fixes, or internal tasks.
+    *   Issues requiring deep investigation.
+    *   Changes to key UI/UX that affect all users.
+    *   Modifications to core internal data structures and IPC mechanisms.
+    *   Changes to token/billing logic.
+    *   Changes to key model and diff/edit functionalities.
+    *   Features or changes that touch multiple parts of the codebase and would require significant reviewer time from maintainers.
+    *   Changes touching key workflows (like the core stream or execution workflows) that affect all users and require careful architectural consideration.
+    *   Changes touching sensitive business logic, telemetry, or API usage statistics/tracking.
+    *   Proposals affecting community guidelines, contributor frameworks, or project governance that require significant maintainer discretion and alignment.
+    *   Complex new subsystems, such as background LLM integration tasks, AI-driven automation, or new agentic behaviors that require significant design validation.
+
+## Step 1: Resolution Check
+**CRITICAL MISTAKE PREVENTION**: You MUST thoroughly read every single comment. Look explicitly for phrases like "appears to fix", "fixes this", "might be fixed", "resolved by", "no longer an issue", or links to other PRs/issues that suggest a resolution. Do not skim. If a user (even a non-maintainer) suggests a fix or PR exists, and the original reporter has not contradicted them, you MUST treat the issue as resolved.
+
+Read ALL the comments from the issue carefully, and review the JSON output for `cross_references`. 
+Check if ANY of the following conditions are met:
+1. Is there a cross-referenced PR in `cross_references` where `is_pr` is `true` and `is_merged` is `true`? If so, use `gh pr view <pr_url> --json title,body` to verify that the PR actually addresses and resolves the issue's request. If it does not, treat condition 1 as NOT met.
+2. Is it fixed, resolved, no longer reproducible, or functioning properly in the comments? (e.g., someone mentions it `might be fixed`, `should be fixed`, or `no longer an issue`) AND the reporter has not replied afterward to contradict this?
+3. Is there a workaround provided in the comments?
+4. Does someone state the issue is actually unrelated to this repository/project, or is an external problem (like a terminal emulator bug)?
+
+- If condition 1 is met: Execute `gh issue close <issue_url> --comment "Closing because this issue was referenced by a merged pull request. Feel free to reopen if the problem persists or if the PR did not fully resolve this." --reason "completed"` and **STOP EXECUTION**.
+- If condition 2 or 3 is met: Execute `gh issue close <issue_url> --comment "Closing because the comments indicate this issue might be fixed, has a workaround, is no longer an issue, or is resolved. Feel free to reopen if the problem persists." --reason "completed"` and **STOP EXECUTION**.
+- If condition 4 is met: Execute `gh issue close <issue_url> --comment "Closing because the comments indicate this issue is unrelated to this project or is an external problem." --reason "not planned"` and **STOP EXECUTION**.
+- If NONE of these conditions are met: Proceed to Step 1.1.
+
+## Step 1.1: Existing Feature Check
+**CRITICAL MISTAKE PREVENTION**: If the issue describes a feature request or enhancement (regardless of whether the JSON `is_feature_request` flag is true or false), you **MUST explicitly search the codebase** to verify if it is already implemented. You cannot skip this step for feature requests.
+1. Use the `grep_search` tool to look for relevant keywords related to the feature in files like `schemas/settings.schema.json`, `packages/cli/src/config/config.ts`, command definitions, or UI components.
+   - **Hotkeys & UI Actions**: If the user asks for a way to expand text, pause output, copy text, or perform a UI action, explicitly check `packages/cli/src/ui/key/keyBindings.ts` and the `Command` enum. Many interactive features (e.g., `Ctrl+O` for expanding truncated tool confirmations or output) already exist natively.
+2. If you verify that the requested functionality (e.g., a setting, flag, hotkey, or command) already exists natively:
+   - Execute `gh issue close <issue_url> --comment "This feature is actually already implemented! <Provide a brief explanation of how to use the feature, such as the command to run, the setting to change, or the hotkey to press>.\n\nI'm going to close this issue since the functionality already exists natively. Let us know if you run into any other issues!" --reason "completed"`
+   - **STOP EXECUTION**.
+3. If the feature does NOT exist, proceed to Step 1.2.
+
+## Step 1.2: Closed PR Re-evaluation
+If there is a cross-referenced PR in `cross_references` where `is_pr` is `true` and `is_merged` is `false` (and its state is `closed` or it has an automated closure comment):
+1. Use `gh pr view <pr_url> --json author,comments,state,title,body` to analyze the PR.
+2. Check the comments to see if it was closed by an automated bot (e.g., `gemini-cli` bot closing it automatically due to missing labels like 'help wanted' after 14 days).
+3. Analyze the PR's title, body, and comments to determine if it implements a valid and useful feature/fix and is worth resuming. 
+4. **Existing Feature Check**: Check if the requested feature is actually already implemented natively in the codebase (e.g., an existing hotkey, setting, or command). Search the codebase using `grep_search` if unsure.
+- If the feature is ALREADY IMPLEMENTED:
+  a. Do NOT reopen the PR.
+  b. Execute `gh issue close <issue_url> --comment "This feature is actually already implemented! <Provide a brief explanation of how to use the feature>.\n\nI'm going to close this issue since the functionality already exists natively. Let us know if you run into any other issues!" --reason "completed"`
+  c. Comment on the PR: `gh pr comment <pr_url> --body "@<author_username>, thank you for your contribution! We've reviewed this again and decided to keep it closed. The core feature requested in the parent issue is actually already implemented natively in the CLI. We appreciate the effort, but this specific PR is no longer needed!"`
+  d. **STOP EXECUTION**.
+5. Critically evaluate the PR's approach for correctness and safety. Ensure it does not introduce breaking changes, make false assumptions (e.g., making an optional configuration mandatory for all users), or negatively impact other workflows.
+- If the PR's approach is flawed or introduces breaking changes:
+  a. Do NOT reopen the PR.
+  b. Determine if the issue itself should be **Help-wanted** (using the Categorization Guide).
+  c. If **Help-wanted**, run `gh issue edit <issue_url> --remove-label "status/need-triage" --add-label "help wanted"`. If not, just remove `status/need-triage`.
+  d. Execute `gh issue comment <issue_url> --body "### Triage Summary\n\nWhile this issue is valid, the proposed fix in PR <pr_url> introduces potential breaking changes or relies on incorrect assumptions (e.g., <brief explanation of the flaw>). Therefore, we will not reopen that PR, but we still welcome a different approach to fix this issue!"`
+  e. Comment on the PR: `gh pr comment <pr_url> --body "@<author_username>, thank you for your contribution! We've reviewed the approach in this PR and decided to keep it closed because <brief explanation of the flaw>. We still welcome improvements here using a different approach! Feel free to open a new PR if you're interested."`
+  f. **STOP EXECUTION**.
+- If it is worth resuming AND was closed by a bot:
+  a. Determine if the issue should be **Help-wanted** (using the Categorization Guide).
+  b. If it should NOT be **Help-wanted**:
+     - Execute `gh issue edit <issue_url> --remove-label "status/need-triage"`
+     - Execute `gh issue comment <issue_url> --body "$(echo -e "### Triage Summary\n\n<brief explanation of why this issue requires maintainer attention and is not suitable for community contribution>")"`
+     - **STOP EXECUTION**. (Do not reopen the PR).
+  c. If it should be **Help-wanted**:
+     - Reopen the PR: `gh pr reopen <pr_url>`
+     - Assign the PR to the author: `gh pr edit <pr_url> --add-assignee <author_username>`
+     - Assign the issue to the author: `gh issue edit <issue_url> --add-assignee <author_username>`
+     - Add the help wanted label to the issue to prevent the bot from closing the PR again: `gh issue edit <issue_url> --add-label "help wanted"`
+     - Comment on the issue: `gh issue comment <issue_url> --body "### Triage Summary\n\n<brief explanation of why this is a help-wanted task>\n\n@<author_username>, apologies! It looks like your PR <pr_url> was incorrectly closed by our bot. I have reopened it and assigned this issue to you. Would you like to continue working on it?"`
+     - Comment on the PR: `gh pr comment <pr_url> --body "@<author_username>, apologies for the bot closing this PR! We have reopened it. Please sync your branch to the latest \`main\` and we will have someone review it shortly."`
+     - Execute `gh issue edit <issue_url> --remove-label "status/need-triage"`
+     - **STOP EXECUTION**.
+- If NOT met: Proceed to Step 1.5.
+
+## Step 1.5: Pending Response Check
+Read ALL the comments from the issue carefully.
+1. Check if the most recent comments include a request for more information, clarification, or reproduction steps directed at the reporter from any other user (maintainer or community member).
+2. Check if the reporter has NOT replied to that request.
+3. Check if that request was made over 14 days ago. (You can check the date of the comment vs today's date).
+4. **CRITICAL**: Before closing, verify if OTHER users have chimed in after the request to provide the necessary context, answer the question on behalf of the reporter, or confirm the bug's existence. If they have, the issue is NO LONGER pending response and you must proceed to Step 2.
+
+- If conditions 1, 2, and 3 are met AND condition 4 is false: Execute `gh issue close <issue_url> --comment "Closing because more information was requested over 2 weeks ago and we haven't received a response. Feel free to reopen if you can provide the requested details." --reason "not planned"` and **STOP EXECUTION**.
+- If NOT met: Proceed to Step 2.
+
+## Step 2: Assignee and Inactivity Handling
+Use the JSON output from `analyze_issue.cjs` to determine necessary actions.
+
+**CRITICAL VERIFICATION**: Before proceeding, explicitly verify the exact boolean values of `inactive_over_60_days`, `inactive_over_30_days`, and `is_feature_request` in the JSON output. Do not guess these values based on the date. Note that `is_feature_request` might be `false` even for feature requests if the title/labels lack specific keywords; if the body clearly asks for a new feature/enhancement, treat it as a feature request regardless of the JSON flag.
+
+1. **Assignee Check:** If an assignee is a contributor and hasn't made any updates on the issue for over 2 weeks, execute `gh issue edit <issue_url> --remove-assignee <username>` to remove them. (Do this before proceeding further).
+2. **Inactivity Check:** 
+   - If `inactive_over_60_days` is `true`: 
+     a. Formulate a comment to the reporter (@<reporter_username>). Evaluate the issue description and whether it is an Epic (`is_epic`):
+        - Always mention that the issue is being closed or pinged because it has been inactive for over 60 days.
+        - IF IT IS AN EPIC: Ask the reporter if it is still in progress or complete, and if it is complete, ask them to close it.
+        - IF IT IS NOT AN EPIC:
+          - If it's a feature/enhancement request and the description is relatively vague, ask: 1) if it is still needed and 2) if they can provide more details on the feature request.
+          - If the issue was mentioned by another issue that is closed as completed or by a pull request that is merged/closed (check `cross_references`), mention this cross-reference (e.g., "I see this issue was mentioned by #123 which is closed as completed...") and ask if this means it is resolved. Do NOT mention cross-references that are still open or closed as "not planned".
+          - If it's a feature/enhancement request but well-described, just ask if it's still needed.
+          - If it's a bug, ask if they can reproduce it with the latest build and provide detailed reproduction steps.
+          - If the issue has assignees, append a ping to the assignees to check in.
+          - If it is NOT an Epic AND `is_tracked_by_epic` is `false`, append "Feel free to reopen this issue." to the comment.
+     b. Execute `gh issue edit <issue_url> --remove-label "status/need-triage"`. If it is NOT an Epic, also append `--add-label "status/needs-info"`.
+     c. Execute `gh issue comment <issue_url> --body "<your formulated comment>"`
+     d. If it is NOT an Epic AND `is_tracked_by_epic` is `false`, execute `gh issue close <issue_url> --reason "not planned"`.
+     - After executing these actions, **STOP EXECUTION**.
+   - If `inactive_over_30_days` is `true` AND it is a bug report (`is_feature_request` is `false`) AND it is NOT an Epic (`is_epic` is `false`):
+     a. Execute `gh issue edit <issue_url> --remove-label "status/need-triage" --add-label "status/needs-info"`.
+     b. Execute `gh issue comment <issue_url> --body "@<reporter_username>, this issue has been inactive for over a month. Could you please try reproducing it with the latest nightly build and let us know if it still occurs? If we don't hear back, we will close this issue on <deadline_date>."`
+     - After executing these actions, **STOP EXECUTION**.
+   - If neither condition is met, proceed to Step 3.
+
+## Step 3: Vagueness Check
+**CRITICAL MISTAKE PREVENTION**: You MUST NOT skip this step just because you recognize the problem domain as complex or requiring maintainer attention. No matter how obvious the problem domain might seem, a bug report without explicit, step-by-step reproduction instructions must be halted and marked as vague first.
+
+Is the issue fundamentally missing context AND no one has asked for more information yet?
+- **For bugs**: Explicit reproduction steps are **REQUIRED**. Even if the user provides logs, error traces, or screenshots, if they do not provide clear, step-by-step instructions on how to reproduce the bug, it MUST be considered vague.
+- **For feature requests**: If it is just a vague statement without clear use cases or details, it is considered vague.
+- If YES (it is vague): Execute `gh issue edit <issue_url> --remove-label "status/need-triage" --add-label "status/needs-info"`. Ask the reporter: `gh issue comment <issue_url> --body "@<reporter_username>, thank you for the report! Could you please provide more specific details (e.g., detailed reproduction steps, expected behavior, logs, and environment details)? Closing this as vague if no response is received in a week."` and **STOP EXECUTION**.
+- If NO: Proceed to Step 4.
+
+## Step 4: Reproduction & Code Validity
+1. Review the issue comments. If a community member has already clearly identified the root cause of the bug or answered the feature request, DO NOT investigate the code. Proceed to Step 5.
+2. Clone the target repository to a temporary directory (`git clone <repo_url> target-repo`).
+3. Search the `target-repo/` codebase using `grep_search` and `read_file` ONLY. You are explicitly FORBIDDEN from writing new files, running tests, attempting to fix the code, OR attempting to reproduce the bug by executing code or shell commands. Your ONLY goal is to perform STATIC code analysis to determine if the logic for the bug still exists or if the reported behavior is actually intentional by design.
+- If definitively NO LONGER VALID: Close it: `gh issue close <issue_url> --comment "Closing because I have verified this works correctly in the latest codebase. <brief explanation>"` and **STOP EXECUTION**.
+- If INTENTIONAL BY DESIGN: Close it: `gh issue close <issue_url> --reason "not planned" --comment "Closing this issue as the reported behavior is intentional by design. <brief explanation of the design logic>"` and **STOP EXECUTION**.
+- If still valid: Proceed to Step 5.
+
+## Step 5: Duplicates
+Search for duplicates using `gh issue list --search "<keywords>" --repo <owner/repo> --state all`. 
+- **CRITICAL**: Pay special attention to newer issues that might already have active pull requests or more detailed context. If a duplicate exists that already has an active PR or more maintainer engagement, close the *current* issue you are triaging in favor of the active one.
+- If found: `gh issue close <issue_url> --reason "not planned" --comment "Closing as duplicate of #<duplicate_number>."` and **STOP EXECUTION**.
+- If no duplicates: Proceed to Step 6.
+
+## Step 6: Triage Summary
+Review the issue comments to see if a community member has already identified the root cause.
+- Determine if it should be **Help-wanted** (using the Categorization Guide) and explain why in your summary. 
+- If you categorized the issue as **Help-wanted**, run `gh issue edit <issue_url> --remove-label "status/need-triage" --add-label "help wanted"`. 
+- If it does not fit **Help-wanted**, you must still explain *why* it requires maintainer attention or why it's not a good fit for community contribution (e.g., "This issue touches core architecture and requires significant maintainer review time"). Simply run `gh issue edit <issue_url> --remove-label "status/need-triage"` to mark it triaged without a specific whitelist label.
+- Action: `gh issue comment <issue_url> --body "### Triage Summary\n\n<your summary>"`
+- **STOP EXECUTION**.
+
+## Mandatory Final Step
+Every issue that is triaged and remains OPEN MUST be assigned at least one of the following labels before you finish your triage process for that issue:
+- `status/needs-info` (for inactive, vague, or issues requiring more details)
+- `help wanted` (for well-defined, community-friendly issues)
+- NONE of the above (If the issue is triaged, valid, but too complex for a community contribution, it should simply remain open without `status/need-triage`). If an issue reaches the end of triage and remains open, you must remove `status/need-triage`.

.gemini/skills/github-issue-triage/scripts/analyze_issue.cjs

@@ -0,0 +1,161 @@
+const { execSync } = require('child_process');
+
+function runCommand(cmd) {
+  try {
+    return execSync(cmd, { encoding: 'utf-8' }).trim();
+  } catch (error) {
+    // Return empty or structured error so the agent can see it rather than failing the whole script
+    return JSON.stringify({ error: error.message });
+  }
+}
+
+async function analyzeIssue(issueLink, maintainersList) {
+  if (!issueLink) {
+    console.error(JSON.stringify({ error: "Issue link is required." }));
+    process.exit(1);
+  }
+
+  const parts = issueLink.split('/');
+  const issueNumberStr = parts[parts.length - 1];
+  const issueNumber = parseInt(issueNumberStr, 10);
+  const repoName = parts[parts.length - 3];
+  const repoOwner = parts[parts.length - 4];
+  const repo = `${repoOwner}/${repoName}`;
+
+  const maintainers = maintainersList ? maintainersList.split(',').map(m => m.trim()) : [];
+
+  const deadline = new Date();
+  deadline.setDate(deadline.getDate() + 14);
+
+  const result = {
+    issue_link: issueLink,
+    repo: repo,
+    issue_number: issueNumber,
+    is_tracked_by_epic: false,
+    is_stale: false,
+    inactive_over_30_days: false,
+    inactive_over_60_days: false,
+    has_assignees: false,
+    is_feature_request: false,
+    is_high_priority: false,
+    is_epic: false,
+    reporter: null,
+    assignees: [],
+    labels: [],
+    cross_references: [],
+    deadline_date: deadline.toISOString().split('T')[0]
+  };
+
+  try {
+    // 1. Fetch Issue Data
+    const issueDataRaw = runCommand(`gh issue view ${issueLink} --json title,body,author,comments,labels,assignees,updatedAt`);
+    if (issueDataRaw.startsWith('{"error"')) {
+       console.error(issueDataRaw);
+       process.exit(1);
+    }
+    const issue = JSON.parse(issueDataRaw);
+    
+    result.reporter = issue.author.login;
+    result.assignees = issue.assignees.map(a => a.login);
+    result.has_assignees = result.assignees.length > 0;
+    result.labels = issue.labels.map(l => l.name);
+    
+    result.is_feature_request = result.labels.some(l => {
+      const lower = l.toLowerCase();
+      return lower.includes('feature') || lower.includes('enhancement');
+    }) || issue.title.toLowerCase().includes('feature') || issue.title.toLowerCase().includes('proposal');
+    
+    result.is_high_priority = result.labels.some(l => {
+      const lower = l.toLowerCase();
+      return lower.includes('priority/p0') || lower.includes('priority/p1');
+    });
+
+    // 2. Fetch Timeline for cross references
+    const timelineCmd = `gh api repos/${repo}/issues/${issueNumber}/timeline --jq '[.[] | select(.event == "cross-referenced" and .source.issue)] | map({issue: .source.issue.number, state: .source.issue.state, state_reason: .source.issue.state_reason, is_pr: (.source.issue.pull_request != null), is_merged: (.source.issue.pull_request.merged_at != null)})'`;
+    const timelineRaw = runCommand(timelineCmd);
+    if (!timelineRaw.startsWith('{"error"')) {
+        result.cross_references = JSON.parse(timelineRaw);
+    }
+
+    // 3. Check if Epic (has sub issues or title starts with [Epic])
+    const epicCmd = `gh api repos/${repo}/issues/${issueNumber} --jq '{is_epic: (.sub_issues_summary.total > 0)}'`;
+    const epicRaw = runCommand(epicCmd);
+    if (!epicRaw.startsWith('{"error"')) {
+        result.is_epic = JSON.parse(epicRaw).is_epic || issue.title.toLowerCase().startsWith('[epic]');
+    } else {
+        result.is_epic = issue.title.toLowerCase().startsWith('[epic]');
+    }
+
+    // 4. Check for Parent Issue via GraphQL
+    const query = `query($owner: String!, $repo: String!, $issueNumber: Int!) { repository(owner: $owner, name: $repo) { issue(number: $issueNumber) { trackedInIssues(first: 1) { totalCount } } } }`;
+    const gqlCmd = `gh api graphql -F owner=${repoOwner} -F repo=${repoName} -F issueNumber=${issueNumber} -f query='${query}' --jq '.data.repository.issue.trackedInIssues.totalCount'`;
+    const parentCountRaw = runCommand(gqlCmd);
+    if (!parentCountRaw.startsWith('{"error"')) {
+        const count = parseInt(parentCountRaw, 10);
+        result.is_tracked_by_epic = !isNaN(count) && count > 0;
+    }
+
+    // Staleness Logic
+    if (result.is_tracked_by_epic) {
+      result.is_stale = true;
+    } else {
+      // Find last maintainer comment
+      const maintainerComments = issue.comments.filter(c => {
+        if (c.author.login === result.reporter) return false;
+        
+        const isMaintainer = maintainers.includes(c.author.login) || 
+                             ['OWNER', 'MEMBER', 'COLLABORATOR'].includes(c.authorAssociation);
+        
+        if (maintainers.length > 0) return isMaintainer;
+        // Basic bot exclusion if no maintainers defined
+        return !c.author.login.includes('github-actions') && c.author.login !== 'app/github-actions';
+      });
+
+      if (maintainerComments.length > 0) {
+        const lastMaintainerComment = maintainerComments[maintainerComments.length - 1];
+        
+        // Did reporter reply after maintainer?
+        const reporterReplied = issue.comments.some(c => {
+            return c.author.login === result.reporter && 
+                   new Date(c.updatedAt) > new Date(lastMaintainerComment.updatedAt);
+        });
+
+        if (!reporterReplied) {
+          const daysAgo = (new Date() - new Date(lastMaintainerComment.updatedAt)) / (1000 * 60 * 60 * 24);
+          if (daysAgo > 7) {
+             result.is_stale = true;
+          }
+        }
+      }
+    }
+
+    // Age / Inactivity check
+    if (!result.is_stale) {
+       const lastUpdateDaysAgo = (new Date() - new Date(issue.updatedAt)) / (1000 * 60 * 60 * 24);
+       if (lastUpdateDaysAgo > 60) {
+          result.inactive_over_60_days = true;
+          result.inactive_over_30_days = true;
+       } else if (lastUpdateDaysAgo > 30) {
+          result.inactive_over_30_days = true;
+       }
+    }
+
+    console.log(JSON.stringify(result, null, 2));
+
+  } catch (error) {
+    console.error(JSON.stringify({ error: error.message }));
+    process.exit(1);
+  }
+}
+
+const args = process.argv.slice(2);
+const issueLink = args[0];
+const maintainers = args[1] || ""; // Comma separated list of maintainers
+
+if (!issueLink) {
+  console.log("Usage: node analyze_issue.cjs <issue_link> [maintainers_csv]");
+  console.log("Example: node analyze_issue.cjs https://github.com/owner/repo/issues/123 'user1,user2'");
+  process.exit(1);
+}
+
+analyzeIssue(issueLink, maintainers);

.gemini/skills/github-issue-triage/scripts/find_issues.cjs

@@ -0,0 +1,34 @@
+const { execSync } = require('child_process');
+
+function findIssues(repo, searchString = "label:area/core,area/extensions,area/site,area/non-interactive sort:updated-asc", limit = 10) {
+  if (!repo) {
+    console.error(JSON.stringify({ error: "Repository is required (e.g., owner/repo)" }));
+    process.exit(1);
+  }
+
+  try {
+    const cmd = `gh issue list --repo ${repo} --state open --search "${searchString}" --json url --limit ${limit}`;
+    const output = execSync(cmd, { encoding: 'utf-8' });
+    const issues = JSON.parse(output);
+    const urls = issues.map(issue => issue.url);
+    
+    console.log(JSON.stringify({ issue_urls: urls }, null, 2));
+  } catch (error) {
+    console.error(JSON.stringify({ error: error.message }));
+    process.exit(1);
+  }
+}
+
+const args = process.argv.slice(2);
+const repo = args[0];
+const searchString = args[1];
+const limitStr = args[2];
+const limit = limitStr ? parseInt(limitStr, 10) : 10;
+
+if (!repo) {
+  console.log("Usage: node find_issues.cjs <owner/repo> [search_string] [limit]");
+  console.log("Example: node find_issues.cjs google-gemini/gemini-cli 'label:area/core sort:updated-asc' 10");
+  process.exit(1);
+}
+
+findIssues(repo, searchString, limit);

.github/actions/run-tests/action.yml

@@ -28,7 +28,6 @@ runs:
     - name: 'Run Tests'
       env:
         GEMINI_API_KEY: '${{ inputs.gemini_api_key }}'
-        GEMINI_CLI_TRUST_WORKSPACE: true
       working-directory: '${{ inputs.working-directory }}'
       run: |-
         echo "::group::Build"

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

@@ -98,7 +98,6 @@ runs:
       working-directory: '${{ inputs.working-directory }}'
       env:
         GEMINI_API_KEY: '${{ inputs.gemini_api_key }}'
-        GEMINI_CLI_TRUST_WORKSPACE: true
         INTEGRATION_TEST_USE_INSTALLED_GEMINI: 'true'
         # We must diable CI mode here because it interferes with interactive tests.
         # See https://github.com/google-gemini/gemini-cli/issues/10517

.github/workflows/agent-session-drift-check.yml

@@ -1,132 +0,0 @@
-# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
-
-name: 'Agent Session Drift Check'
-
-on:
-  pull_request:
-    branches:
-      - 'main'
-      - 'release/**'
-    paths:
-      - 'packages/cli/src/nonInteractiveCli.ts'
-      - 'packages/cli/src/nonInteractiveCliAgentSession.ts'
-
-concurrency:
-  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
-  cancel-in-progress: true
-
-jobs:
-  check-drift:
-    name: 'Check Agent Session Drift'
-    runs-on: 'ubuntu-latest'
-    if: "github.repository == 'google-gemini/gemini-cli'"
-    permissions:
-      contents: 'read'
-      pull-requests: 'write'
-    steps:
-      - name: 'Detect drift and comment'
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea' # ratchet:actions/github-script@v8
-        with:
-          script: |-
-            // === Pair configuration — append here to cover more pairs ===
-            const PAIRS = [
-              {
-                legacy: 'packages/cli/src/nonInteractiveCli.ts',
-                session: 'packages/cli/src/nonInteractiveCliAgentSession.ts',
-                label: 'non-interactive CLI',
-              },
-              // Future pairs can be added here. Remember to also add both
-              // paths to the `paths:` filter at the top of this workflow.
-              // Example:
-              // {
-              //   legacy: 'packages/core/src/agents/local-invocation.ts',
-              //   session: 'packages/core/src/agents/local-session-invocation.ts',
-              //   label: 'local subagent invocation',
-              // },
-            ];
-            // ============================================================
-
-            const prNumber = context.payload.pull_request.number;
-            const { owner, repo } = context.repo;
-
-            // Use the API to list changed files — no checkout/git diff needed.
-            const files = await github.paginate(github.rest.pulls.listFiles, {
-              owner,
-              repo,
-              pull_number: prNumber,
-              per_page: 100,
-            });
-            const changed = new Set(files.map((f) => f.filename));
-
-            const warnings = [];
-            for (const { legacy, session, label } of PAIRS) {
-              const legacyChanged = changed.has(legacy);
-              const sessionChanged = changed.has(session);
-              if (legacyChanged && !sessionChanged) {
-                warnings.push(
-                  `**${label}**: \`${legacy}\` was modified but \`${session}\` was not.`,
-                );
-              } else if (!legacyChanged && sessionChanged) {
-                warnings.push(
-                  `**${label}**: \`${session}\` was modified but \`${legacy}\` was not.`,
-                );
-              }
-            }
-
-            const MARKER = '<!-- agent-session-drift-check -->';
-
-            // Look up our existing drift comment (for upsert/cleanup).
-            const comments = await github.paginate(github.rest.issues.listComments, {
-              owner,
-              repo,
-              issue_number: prNumber,
-              per_page: 100,
-            });
-            const existing = comments.find(
-              (c) => c.user?.type === 'Bot' && c.body?.includes(MARKER),
-            );
-
-            if (warnings.length === 0) {
-              core.info('No drift detected.');
-              // If drift was previously flagged and is now resolved, remove the comment.
-              if (existing) {
-                await github.rest.issues.deleteComment({
-                  owner,
-                  repo,
-                  comment_id: existing.id,
-                });
-                core.info(`Deleted stale drift comment ${existing.id}.`);
-              }
-              return;
-            }
-
-            const body = [
-              MARKER,
-              '### ⚠️ Invocation Drift Warning',
-              '',
-              'The following file pairs should generally be kept in sync during the AgentSession migration:',
-              '',
-              ...warnings.map((w) => `- ${w}`),
-              '',
-              'If this is intentional (e.g., a bug fix specific to one implementation), you can ignore this comment.',
-              '',
-              '_This check will be removed once the legacy implementations are deleted._',
-            ].join('\n');
-
-            if (existing) {
-              core.info(`Updating existing drift comment ${existing.id}.`);
-              await github.rest.issues.updateComment({
-                owner,
-                repo,
-                comment_id: existing.id,
-                body,
-              });
-            } else {
-              core.info('Creating new drift comment.');
-              await github.rest.issues.createComment({
-                owner,
-                repo,
-                issue_number: prNumber,
-                body,
-              });
-            }

.github/workflows/chained_e2e.yml

@@ -167,7 +167,6 @@ jobs:
       - name: 'Run E2E tests'
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           VERBOSE: 'true'
           BUILD_SANDBOX_FLAGS: '--cache-from type=gha --cache-to type=gha,mode=max'
@@ -184,7 +183,7 @@ jobs:
     needs:
       - 'merge_queue_skipper'
       - 'parse_run_context'
-    runs-on: 'macos-latest-large'
+    runs-on: 'macos-latest'
     if: |
       github.repository == 'google-gemini/gemini-cli' && always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip != 'true')
     steps:
@@ -213,7 +212,6 @@ jobs:
         if: "${{runner.os != 'Windows'}}"
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           SANDBOX: 'sandbox:none'
           VERBOSE: 'true'
@@ -290,7 +288,6 @@ jobs:
       - name: 'Run E2E tests'
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           SANDBOX: 'sandbox:none'
           VERBOSE: 'true'
@@ -338,8 +335,6 @@ jobs:
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
           GEMINI_MODEL: 'gemini-3-pro-preview'
-          # Only run always passes behavioral tests.
-          EVAL_SUITE_TYPE: 'behavioral'
           # Disable Vitest internal retries to avoid double-retrying;
           # custom retry logic is handled in evals/test-helper.ts
           VITEST_RETRY: 0

.github/workflows/ci.yml

@@ -102,12 +102,6 @@ jobs:
       - name: 'Run yamllint'
         run: 'node scripts/lint.js --yamllint'
 
-      - name: 'Build project for typecheck'
-        run: 'npm run build'
-
-      - name: 'Run typecheck'
-        run: 'npm run typecheck'
-
       - name: 'Run Prettier'
         run: 'node scripts/lint.js --prettier'
 
@@ -179,7 +173,6 @@ jobs:
       - name: 'Run tests and generate reports'
         env:
           NO_COLOR: true
-          GEMINI_CLI_TRUST_WORKSPACE: true
         run: |
           if [[ "${{ matrix.shard }}" == "cli" ]]; then
             npm run test:ci --workspace "@google/gemini-cli"
@@ -231,7 +224,7 @@ jobs:
 
   test_mac:
     name: 'Test (Mac) - ${{ matrix.node-version }}, ${{ matrix.shard }}'
-    runs-on: 'macos-latest-large'
+    runs-on: 'macos-latest'
     needs:
       - 'merge_queue_skipper'
     if: "github.repository == 'google-gemini/gemini-cli' && needs.merge_queue_skipper.outputs.skip == 'false'"
@@ -268,7 +261,6 @@ jobs:
       - name: 'Run tests and generate reports'
         env:
           NO_COLOR: true
-          GEMINI_CLI_TRUST_WORKSPACE: true
         run: |
           if [[ "${{ matrix.shard }}" == "cli" ]]; then
             npm run test:ci --workspace "@google/gemini-cli" -- --coverage.enabled=false
@@ -432,7 +424,6 @@ jobs:
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
           NO_COLOR: true
-          GEMINI_CLI_TRUST_WORKSPACE: true
           NODE_OPTIONS: '--max-old-space-size=32768 --max-semi-space-size=256'
           UV_THREADPOOL_SIZE: '32'
           NODE_ENV: 'test'

.github/workflows/deflake.yml

@@ -62,7 +62,6 @@ jobs:
       - name: 'Run E2E tests'
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          GEMINI_CLI_TRUST_WORKSPACE: true
           IS_DOCKER: "${{ matrix.sandbox == 'sandbox:docker' }}"
           KEEP_OUTPUT: 'true'
           RUNS: '${{ github.event.inputs.runs }}'
@@ -78,7 +77,7 @@ jobs:
 
   deflake_e2e_mac:
     name: 'E2E Test (macOS)'
-    runs-on: 'macos-latest-large'
+    runs-on: 'macos-latest'
     if: "github.repository == 'google-gemini/gemini-cli'"
     steps:
       - name: 'Checkout'
@@ -106,7 +105,6 @@ jobs:
         if: "runner.os != 'Windows'"
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           RUNS: '${{ github.event.inputs.runs }}'
           SANDBOX: 'sandbox:none'
@@ -161,7 +159,6 @@ jobs:
       - name: 'Run E2E tests'
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           SANDBOX: 'sandbox:none'
           VERBOSE: 'true'

.github/workflows/docs-audit.yml

@@ -1,62 +0,0 @@
-name: 'Automated Documentation Audit'
-
-on:
-  schedule:
-    # Runs every Monday at 00:00 UTC
-    - cron: '0 0 * * MON'
-  workflow_dispatch:
-
-jobs:
-  audit-docs:
-    runs-on: 'ubuntu-latest'
-    permissions:
-      contents: 'write'
-      pull-requests: 'write'
-
-    steps:
-      - name: 'Checkout repository'
-        uses: 'actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5'
-        with:
-          fetch-depth: 0
-          ref: 'main'
-
-      - name: 'Set up Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020'
-        with:
-          node-version: '20'
-
-      - name: 'Run Docs Audit with Gemini'
-        id: 'run_gemini'
-        uses: 'google-github-actions/run-gemini-cli@a3bf79042542528e91937b3a3a6fbc4967ee3c31'
-        with:
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
-          prompt: |
-            Activate the 'docs-writer' skill.
-
-            **Task:** Execute the docs audit procedure, as defined in your 'docs-auditing.md' reference.
-            Provide a detailed summary of the changes you make.
-
-      - name: 'Get current date'
-        id: 'date'
-        run: |
-          echo "date=$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
-
-      - name: 'Create Pull Request with Audit Results'
-        uses: 'peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c'
-        with:
-          token: '${{ secrets.GEMINI_CLI_ROBOT_GITHUB_PAT }}'
-          commit-message: 'docs: weekly audit results for ${{ github.run_id }}'
-          title: 'Docs audit: ${{ steps.date.outputs.date }}'
-          body: |
-            This PR contains the auto-generated documentation audit for the week. It includes a new `audit-results-*.md` file with findings and any direct fixes applied by the agent.
-
-            ### Audit Summary:
-            ${{ steps.run_gemini.outputs.summary || 'No summary provided.' }}
-
-            Please review the suggestions and merge.
-
-            Related to #25152
-          branch: 'docs-audit-${{ github.run_id }}'
-          base: 'main'
-          team-reviewers: 'gemini-cli-docs, gemini-cli-maintainers'
-          delete-branch: true

.github/workflows/evals-nightly.yml

@@ -5,18 +5,10 @@ on:
     - cron: '0 1 * * *' # Runs at 1 AM every day
   workflow_dispatch:
     inputs:
-      suite_type:
-        description: 'Suite type to run'
-        type: 'choice'
-        options:
-          - 'behavioral'
-          - 'component-level'
-          - 'hero-scenario'
-        default: 'behavioral'
-      suite_name:
-        description: 'Specific suite name to run'
-        required: false
-        type: 'string'
+      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
@@ -67,9 +59,7 @@ jobs:
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
           GEMINI_MODEL: '${{ matrix.model }}'
-          RUN_EVALS: 'true'
-          EVAL_SUITE_TYPE: "${{ github.event.inputs.suite_type || 'behavioral' }}"
-          EVAL_SUITE_NAME: '${{ github.event.inputs.suite_name }}'
+          RUN_EVALS: "${{ github.event.inputs.run_all != 'false' }}"
           TEST_NAME_PATTERN: '${{ github.event.inputs.test_name_pattern }}'
           # Disable Vitest internal retries to avoid double-retrying;
           # custom retry logic is handled in evals/test-helper.ts

.github/workflows/gemini-cli-bot-brain.yml

@@ -1,45 +0,0 @@
-name: '🧠 Gemini CLI Bot: Brain'
-
-on:
-  schedule:
-    - cron: '0 0 * * *' # Every 24 hours
-  workflow_dispatch:
-
-concurrency:
-  group: '${{ github.workflow }}-${{ github.ref }}'
-  cancel-in-progress: true
-
-permissions:
-  contents: 'write'
-  issues: 'write'
-  pull-requests: 'write'
-
-jobs:
-  brain:
-    name: 'Brain (Reasoning Layer)'
-    runs-on: 'ubuntu-latest'
-    if: "github.repository == 'google-gemini/gemini-cli'"
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          fetch-depth: 0
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
-        with:
-          node-version: '20'
-          cache: 'npm'
-
-      - name: 'Install dependencies'
-        run: 'npm ci'
-
-      - name: 'Build Gemini CLI'
-        run: 'npm run bundle'
-
-      - name: 'Download Previous Metrics'
-        uses: 'actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093' # ratchet:actions/download-artifact@v4
-        with:
-          name: 'metrics-before'
-          path: 'tools/gemini-cli-bot/history/'
-        continue-on-error: true

.github/workflows/gemini-cli-bot-pulse.yml

@@ -1,59 +0,0 @@
-name: '🔄 Gemini CLI Bot: Pulse'
-
-on:
-  schedule:
-    - cron: '*/30 * * * *' # Every 30 minutes
-  workflow_dispatch:
-
-concurrency:
-  group: '${{ github.workflow }}-${{ github.ref }}'
-  cancel-in-progress: true
-
-permissions:
-  contents: 'write'
-  issues: 'write'
-  pull-requests: 'write'
-
-jobs:
-  pulse:
-    name: 'Pulse (Reflex Layer)'
-    runs-on: 'ubuntu-latest'
-    if: "github.repository == 'google-gemini/gemini-cli'"
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
-        with:
-          fetch-depth: 0
-
-      - name: 'Setup Node.js'
-        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
-        with:
-          node-version: '20'
-          cache: 'npm'
-
-      - name: 'Install dependencies'
-        run: 'npm ci'
-
-      - name: 'Collect Metrics'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        run: 'npm run metrics'
-
-      - name: 'Archive Metrics'
-        uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02' # ratchet:actions/upload-artifact@v4
-        with:
-          name: 'metrics-before'
-          path: 'metrics-before.csv'
-
-      - name: 'Run Reflex Processes'
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        run: |
-          if [ -d "tools/gemini-cli-bot/processes/scripts" ] && [ "$(ls -A tools/gemini-cli-bot/processes/scripts)" ]; then
-            for script in tools/gemini-cli-bot/processes/scripts/*.ts; do
-              echo "Running reflex script: $script"
-              npx tsx "$script"
-            done
-          else
-            echo "No reflex scripts found."
-          fi

.github/workflows/memory-nightly.yml

@@ -1,33 +0,0 @@
-name: 'Memory Tests: Nightly'
-
-on:
-  schedule:
-    - cron: '0 2 * * *' # Runs at 2 AM every day
-  workflow_dispatch: # Allow manual trigger
-
-permissions:
-  contents: 'read'
-
-jobs:
-  memory-test:
-    name: 'Run Memory Usage Tests'
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    if: "github.repository == 'google-gemini/gemini-cli'"
-    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: 'Run Memory Tests'
-        run: 'npm run test:memory'

.github/workflows/perf-nightly.yml

@@ -1,33 +0,0 @@
-name: 'Performance Tests: Nightly'
-
-on:
-  schedule:
-    - cron: '0 3 * * *' # Runs at 3 AM every day
-  workflow_dispatch: # Allow manual trigger
-
-permissions:
-  contents: 'read'
-
-jobs:
-  perf-test:
-    name: 'Run Performance Usage Tests'
-    runs-on: 'gemini-cli-ubuntu-16-core'
-    if: "github.repository == 'google-gemini/gemini-cli'"
-    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: 'Run Performance Tests'
-        run: 'npm run test:perf'

.github/workflows/test-build-binary.yml

@@ -141,7 +141,6 @@ jobs:
         if: "github.event_name != 'pull_request'"
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
-          GEMINI_CLI_TRUST_WORKSPACE: true
         run: |
           echo "Running integration tests with binary..."
           if [[ "${{ matrix.os }}" == 'windows-latest' ]]; then

.gitignore

@@ -48,7 +48,6 @@ packages/cli/src/generated/
 packages/core/src/generated/
 packages/devtools/src/_client-assets.ts
 .integration-tests/
-.perf-tests/
 packages/vscode-ide-companion/*.vsix
 packages/cli/download-ripgrep*/
 
@@ -65,6 +64,3 @@ gemini-debug.log
 evals/logs/
 
 temp_agents/
-
-# conductor extension and planning directories
-conductor/

.prettierignore

@@ -22,4 +22,3 @@ Thumbs.db
 .pytest_cache
 **/SKILL.md
 packages/sdk/test-data/*.json
-*.mdx

CONTRIBUTING.md

@@ -110,9 +110,7 @@ assign or unassign the issue as requested, provided the conditions are met
 (e.g., an issue must be unassigned to be assigned).
 
 Please note that you can have a maximum of 3 issues assigned to you at any given
-time and that only
-[issues labeled "help wanted"](https://github.com/google-gemini/gemini-cli/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22help%20wanted%22)
-may be self-assigned.
+time.
 
 ### Pull request guidelines
 

GEMINI.md

@@ -44,13 +44,6 @@ powerful tool for developers.
 - **Test Commands:**
   - **Unit (All):** `npm run test`
   - **Integration (E2E):** `npm run test:e2e`
-  - > **NOTE**: Please run the memory and perf tests locally **only if** you are
-    > implementing changes related to those test areas. Otherwise skip these
-    > tests locally and rely on CI to run them on nightly builds.
-  - **Memory (Nightly):** `npm run test:memory` (Runs memory regression tests
-    against baselines. Excluded from `preflight`, run nightly.)
-  - **Performance (Nightly):** `npm run test:perf` (Runs CPU performance
-    regression tests against baselines. Excluded from `preflight`, run nightly.)
   - **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`)

README.md

@@ -371,8 +371,6 @@ for planned features and priorities.
 
 ## 📖 Resources
 
-- **[Free Course](https://learn.deeplearning.ai/courses/gemini-cli-code-and-create-with-an-open-source-agent/information)** -
-  Learn the basics.
 - **[Official Roadmap](./ROADMAP.md)** - See what's coming next.
 - **[Changelog](https://www.geminicli.com/docs/changelogs)** - See recent
   notable updates.

docs/admin/enterprise-controls.md

@@ -72,7 +72,7 @@ organization.
 **Supported Fields:**
 
 - `url`: (Required) The full URL of the MCP server endpoint.
-- `type`: (Required) The connection type (for example, `sse` or `http`).
+- `type`: (Required) The connection type (e.g., `sse` or `http`).
 - `trust`: (Optional) If set to `true`, the server is trusted and tool execution
   will not require user approval.
 - `includeTools`: (Optional) An explicit list of tool names to allow. If

docs/changelogs/index.md

@@ -18,48 +18,6 @@ on GitHub.
 | [Preview](preview.md) | Experimental features ready for early feedback. |
 | [Stable](latest.md)   | Stable, recommended for general use.            |
 
-## Announcements: v0.38.0 - 2026-04-14
-
-- **Chapters Narrative Flow:** Group agent interactions into "Chapters" based on
-  intent and tool usage for better session structure
-  ([#23150](https://github.com/google-gemini/gemini-cli/pull/23150) by
-  @Abhijit-2592,
-  [#24079](https://github.com/google-gemini/gemini-cli/pull/24079) by
-  @gundermanc).
-- **Context Compression Service:** Advanced context management to efficiently
-  distill conversation history
-  ([#24483](https://github.com/google-gemini/gemini-cli/pull/24483) by
-  @joshualitt).
-- **UI Flicker & UX Enhancements:** Solved rendering flicker with "Terminal
-  Buffer" mode and introduced selective topic expansion
-  ([#24512](https://github.com/google-gemini/gemini-cli/pull/24512) by
-  @jacob314, [#24793](https://github.com/google-gemini/gemini-cli/pull/24793) by
-  @Abhijit-2592).
-- **Persistent Policy Approvals:** Implemented context-aware persistent
-  approvals for tool execution
-  ([#23257](https://github.com/google-gemini/gemini-cli/pull/23257) by @jerop).
-
-## Announcements: v0.37.0 - 2026-04-08
-
-- **Dynamic Sandbox Expansion:** Implemented dynamic sandbox expansion and
-  worktree support for Linux and Windows, improving developer workflows in
-  isolated environments
-  ([#23692](https://github.com/google-gemini/gemini-cli/pull/23692) by @galz10,
-  [#23691](https://github.com/google-gemini/gemini-cli/pull/23691) by
-  @scidomino).
-- **Chapters Narrative Flow:** Introduced tool-based topic grouping ("Chapters")
-  to provide better session structure and narrative continuity
-  ([#23150](https://github.com/google-gemini/gemini-cli/pull/23150) by
-  @Abhijit-2592,
-  [#24079](https://github.com/google-gemini/gemini-cli/pull/24079) by
-  @gundermanc).
-- **Advanced Browser Capabilities:** Enhanced the browser agent with persistent
-  sessions and dynamic tool discovery
-  ([#21306](https://github.com/google-gemini/gemini-cli/pull/21306) by
-  @kunal-10-cloud,
-  [#23805](https://github.com/google-gemini/gemini-cli/pull/23805) by
-  @cynthialong0-0).
-
 ## Announcements: v0.36.0 - 2026-04-01
 
 - **Multi-Registry Architecture and Sandboxing:** Introduced a multi-registry

docs/changelogs/latest.md

@@ -1,6 +1,6 @@
-# Latest stable release: v0.38.2
+# Latest stable release: v0.36.0
 
-Released: April 17, 2026
+Released: April 1, 2026
 
 For most users, our latest stable release is the recommended release. Install
 the latest stable version with:
@@ -11,264 +11,372 @@ npm install -g @google/gemini-cli
 
 ## Highlights
 
-- **Chapters Narrative Flow:** Introduced tool-based topic grouping ("Chapters")
-  to provide better session structure and narrative continuity in long-running
-  tasks.
-- **Context Compression Service:** Implemented a dedicated service for advanced
-  context management, efficiently distilling conversation history to preserve
-  focus and tokens.
-- **Enhanced UI Stability & UX:** Introduced a new "Terminal Buffer" mode to
-  solve rendering flicker, along with selective topic expansion and improved
-  tool confirmation layouts.
-- **Context-Aware Policy Approvals:** Users can now grant persistent,
-  context-aware approvals for tools, significantly reducing manual confirmation
-  overhead for trusted workflows.
-- **Background Process Monitoring:** New tools for monitoring and inspecting
-  background shell processes, providing better visibility into asynchronous
-  tasks.
+- **Multi-Registry Architecture and Tool Isolation:** Introduced a
+  multi-registry architecture for subagents and implemented strict sandboxing
+  for macOS (Seatbelt) and Windows to enhance security and isolation.
+- **Improved Subagent Coordination:** Enhanced subagents with local execution
+  capabilities, JIT context injection (upward traversal capped at git root), and
+  resilient tool rejection with contextual feedback.
+- **Enhanced UI and UX:** Implemented a refreshed UX for the Composer layout,
+  improved terminal fallback warnings, and resolved various UI flickering and
+  state persistence issues.
+- **Git Worktree Support:** Added support for Git worktrees to enable isolated
+  parallel sessions within the same repository.
+- **Plan Mode Improvements:** Plan mode now supports non-interactive execution
+  and includes hardened sandbox path resolution to prevent hallucinations.
 
 ## What's Changed
 
-- fix(patch): cherry-pick 14b2f35 to release/v0.38.1-pr-24974 to patch version
-  v0.38.1 and create version 0.38.2 by @gemini-cli-robot in
-  [#25585](https://github.com/google-gemini/gemini-cli/pull/25585)
-- fix(patch): cherry-pick 050c303 to release/v0.38.0-pr-25317 to patch version
-  v0.38.0 and create version 0.38.1 by @gemini-cli-robot in
-  [#25466](https://github.com/google-gemini/gemini-cli/pull/25466)
-- fix(cli): refresh slash command list after /skills reload by @NTaylorMullen in
-  [#24454](https://github.com/google-gemini/gemini-cli/pull/24454)
-- Update README.md for links. by @g-samroberts in
-  [#22759](https://github.com/google-gemini/gemini-cli/pull/22759)
-- fix(core): ensure complete_task tool calls are recorded in chat history by
-  @abhipatel12 in
-  [#24437](https://github.com/google-gemini/gemini-cli/pull/24437)
-- feat(policy): explicitly allow web_fetch in plan mode with ask_user by
-  @Adib234 in [#24456](https://github.com/google-gemini/gemini-cli/pull/24456)
-- fix(core): refactor linux sandbox to fix ARG_MAX crashes by @ehedlund in
-  [#24286](https://github.com/google-gemini/gemini-cli/pull/24286)
-- feat(config): add experimental.adk.agentSessionNoninteractiveEnabled setting
-  by @adamfweidman in
-  [#24439](https://github.com/google-gemini/gemini-cli/pull/24439)
-- Changelog for v0.36.0-preview.8 by @gemini-cli-robot in
-  [#24453](https://github.com/google-gemini/gemini-cli/pull/24453)
-- feat(cli): change default loadingPhrases to 'off' to hide tips by @keithguerin
-  in [#24342](https://github.com/google-gemini/gemini-cli/pull/24342)
-- fix(cli): ensure agent stops when all declinable tools are cancelled by
-  @NTaylorMullen in
-  [#24479](https://github.com/google-gemini/gemini-cli/pull/24479)
-- fix(core): enhance sandbox usability and fix build error by @galz10 in
-  [#24460](https://github.com/google-gemini/gemini-cli/pull/24460)
-- Terminal Serializer Optimization by @jacob314 in
-  [#24485](https://github.com/google-gemini/gemini-cli/pull/24485)
-- Auto configure memory. by @jacob314 in
-  [#24474](https://github.com/google-gemini/gemini-cli/pull/24474)
-- Unused error variables in catch block are not allowed by @alisa-alisa in
-  [#24487](https://github.com/google-gemini/gemini-cli/pull/24487)
-- feat(core): add background memory service for skill extraction by @SandyTao520
-  in [#24274](https://github.com/google-gemini/gemini-cli/pull/24274)
-- feat: implement high-signal PR regression check for evaluations by
-  @alisa-alisa in
-  [#23937](https://github.com/google-gemini/gemini-cli/pull/23937)
-- Fix shell output display by @jacob314 in
-  [#24490](https://github.com/google-gemini/gemini-cli/pull/24490)
-- fix(ui): resolve unwanted vertical spacing around various tool output
-  treatments by @jwhelangoog in
-  [#24449](https://github.com/google-gemini/gemini-cli/pull/24449)
-- revert(cli): bring back input box and footer visibility in copy mode by
-  @sehoon38 in [#24504](https://github.com/google-gemini/gemini-cli/pull/24504)
-- fix(cli): prevent crash in AnsiOutputText when handling non-array data by
-  @sehoon38 in [#24498](https://github.com/google-gemini/gemini-cli/pull/24498)
-- feat(cli): support default values for environment variables by @ruomengz in
-  [#24469](https://github.com/google-gemini/gemini-cli/pull/24469)
-- Implement background process monitoring and inspection tools by @cocosheng-g
-  in [#23799](https://github.com/google-gemini/gemini-cli/pull/23799)
-- docs(browser-agent): update stale browser agent documentation by @gsquared94
-  in [#24463](https://github.com/google-gemini/gemini-cli/pull/24463)
-- fix: enable browser_agent in integration tests and add localhost fixture tests
-  by @gsquared94 in
-  [#24523](https://github.com/google-gemini/gemini-cli/pull/24523)
-- fix(browser): handle computer-use model detection for analyze_screenshot by
-  @gsquared94 in
-  [#24502](https://github.com/google-gemini/gemini-cli/pull/24502)
-- feat(core): Land ContextCompressionService by @joshualitt in
-  [#24483](https://github.com/google-gemini/gemini-cli/pull/24483)
-- feat(core): scope subagent workspace directories via AsyncLocalStorage by
+- Changelog for v0.33.2 by @gemini-cli-robot in
+  [#22730](https://github.com/google-gemini/gemini-cli/pull/22730)
+- feat(core): multi-registry architecture and tool filtering for subagents by
+  @akh64bit in [#22712](https://github.com/google-gemini/gemini-cli/pull/22712)
+- Changelog for v0.34.0-preview.4 by @gemini-cli-robot in
+  [#22752](https://github.com/google-gemini/gemini-cli/pull/22752)
+- fix(devtools): use theme-aware text colors for console warnings and errors by
   @SandyTao520 in
-  [#24445](https://github.com/google-gemini/gemini-cli/pull/24445)
-- Update ink version to 6.6.7 by @jacob314 in
-  [#24514](https://github.com/google-gemini/gemini-cli/pull/24514)
-- fix(acp): handle all InvalidStreamError types gracefully in prompt by @sripasg
-  in [#24540](https://github.com/google-gemini/gemini-cli/pull/24540)
-- Fix crash when vim editor is not found in PATH on Windows by
-  @Nagajyothi-tammisetti in
-  [#22423](https://github.com/google-gemini/gemini-cli/pull/22423)
-- fix(core): move project memory dir under tmp directory by @SandyTao520 in
-  [#24542](https://github.com/google-gemini/gemini-cli/pull/24542)
-- Enable 'Other' option for yesno question type by @ruomengz in
-  [#24545](https://github.com/google-gemini/gemini-cli/pull/24545)
-- fix(cli): clear stale retry/loading state after cancellation (#21096) by
-  @Aaxhirrr in [#21960](https://github.com/google-gemini/gemini-cli/pull/21960)
-- Changelog for v0.37.0-preview.0 by @gemini-cli-robot in
-  [#24464](https://github.com/google-gemini/gemini-cli/pull/24464)
-- feat(core): implement context-aware persistent policy approvals by @jerop in
-  [#23257](https://github.com/google-gemini/gemini-cli/pull/23257)
-- docs: move agent disabling instructions and update remote agent status by
-  @jackwotherspoon in
-  [#24559](https://github.com/google-gemini/gemini-cli/pull/24559)
-- feat(cli): migrate nonInteractiveCli to LegacyAgentSession by @adamfweidman in
-  [#22987](https://github.com/google-gemini/gemini-cli/pull/22987)
-- fix(core): unsafe type assertions in Core File System #19712 by
-  @aniketsaurav18 in
-  [#19739](https://github.com/google-gemini/gemini-cli/pull/19739)
-- fix(ui): hide model quota in /stats and refactor quota display by @danzaharia1
-  in [#24206](https://github.com/google-gemini/gemini-cli/pull/24206)
-- Changelog for v0.36.0 by @gemini-cli-robot in
-  [#24558](https://github.com/google-gemini/gemini-cli/pull/24558)
-- Changelog for v0.37.0-preview.1 by @gemini-cli-robot in
-  [#24568](https://github.com/google-gemini/gemini-cli/pull/24568)
-- docs: add missing .md extensions to internal doc links by @ishaan-arora-1 in
-  [#24145](https://github.com/google-gemini/gemini-cli/pull/24145)
-- fix(ui): fixed table styling by @devr0306 in
-  [#24565](https://github.com/google-gemini/gemini-cli/pull/24565)
-- fix(core): pass includeDirectories to sandbox configuration by @galz10 in
-  [#24573](https://github.com/google-gemini/gemini-cli/pull/24573)
-- feat(ui): enable "TerminalBuffer" mode to solve flicker by @jacob314 in
-  [#24512](https://github.com/google-gemini/gemini-cli/pull/24512)
-- docs: clarify release coordination by @scidomino in
-  [#24575](https://github.com/google-gemini/gemini-cli/pull/24575)
-- fix(core): remove broken PowerShell translation and fix native \_\_write in
-  Windows sandbox by @scidomino in
-  [#24571](https://github.com/google-gemini/gemini-cli/pull/24571)
-- Add instructions for how to start react in prod and force react to prod mode
-  by @jacob314 in
-  [#24590](https://github.com/google-gemini/gemini-cli/pull/24590)
-- feat(cli): minimalist sandbox status labels by @galz10 in
-  [#24582](https://github.com/google-gemini/gemini-cli/pull/24582)
-- Feat/browser agent metrics by @kunal-10-cloud in
-  [#24210](https://github.com/google-gemini/gemini-cli/pull/24210)
-- test: fix Windows CI execution and resolve exposed platform failures by
-  @ehedlund in [#24476](https://github.com/google-gemini/gemini-cli/pull/24476)
-- feat(core,cli): prioritize summary for topics (#24608) by @Abhijit-2592 in
-  [#24609](https://github.com/google-gemini/gemini-cli/pull/24609)
-- show color by @jacob314 in
-  [#24613](https://github.com/google-gemini/gemini-cli/pull/24613)
-- feat(cli): enable compact tool output by default (#24509) by @jwhelangoog in
-  [#24510](https://github.com/google-gemini/gemini-cli/pull/24510)
-- fix(core): inject skill system instructions into subagent prompts if activated
-  by @abhipatel12 in
-  [#24620](https://github.com/google-gemini/gemini-cli/pull/24620)
-- fix(core): improve windows sandbox reliability and fix integration tests by
-  @ehedlund in [#24480](https://github.com/google-gemini/gemini-cli/pull/24480)
-- fix(core): ensure sandbox approvals are correctly persisted and matched for
-  proactive expansions by @galz10 in
-  [#24577](https://github.com/google-gemini/gemini-cli/pull/24577)
-- feat(cli) Scrollbar for input prompt by @jacob314 in
-  [#21992](https://github.com/google-gemini/gemini-cli/pull/21992)
-- Do not run pr-eval workflow when no steering changes detected by @alisa-alisa
-  in [#24621](https://github.com/google-gemini/gemini-cli/pull/24621)
-- Fix restoration of topic headers. by @gundermanc in
-  [#24650](https://github.com/google-gemini/gemini-cli/pull/24650)
-- feat(core): discourage update topic tool for simple tasks by @Samee24 in
-  [#24640](https://github.com/google-gemini/gemini-cli/pull/24640)
-- fix(core): ensure global temp directory is always in sandbox allowed paths by
-  @galz10 in [#24638](https://github.com/google-gemini/gemini-cli/pull/24638)
-- fix(core): detect uninitialized lines by @jacob314 in
-  [#24646](https://github.com/google-gemini/gemini-cli/pull/24646)
-- docs: update sandboxing documentation and toolSandboxing settings by @galz10
-  in [#24655](https://github.com/google-gemini/gemini-cli/pull/24655)
-- feat(cli): enhance tool confirmation UI and selection layout by @galz10 in
-  [#24376](https://github.com/google-gemini/gemini-cli/pull/24376)
-- feat(acp): add support for `/about` command by @sripasg in
-  [#24649](https://github.com/google-gemini/gemini-cli/pull/24649)
-- feat(cli): add role specific metrics to /stats by @cynthialong0-0 in
-  [#24659](https://github.com/google-gemini/gemini-cli/pull/24659)
-- split context by @jacob314 in
-  [#24623](https://github.com/google-gemini/gemini-cli/pull/24623)
-- fix(cli): remove -S from shebang to fix Windows and BSD execution by
-  @scidomino in [#24756](https://github.com/google-gemini/gemini-cli/pull/24756)
-- Fix issue where topic headers can be posted back to back by @gundermanc in
-  [#24759](https://github.com/google-gemini/gemini-cli/pull/24759)
-- fix(core): handle partial llm_request in BeforeModel hook override by
-  @krishdef7 in [#22326](https://github.com/google-gemini/gemini-cli/pull/22326)
-- fix(ui): improve narration suppression and reduce flicker by @gundermanc in
-  [#24635](https://github.com/google-gemini/gemini-cli/pull/24635)
-- fix(ui): fixed auth race condition causing logo to flicker by @devr0306 in
-  [#24652](https://github.com/google-gemini/gemini-cli/pull/24652)
-- fix(browser): remove premature browser cleanup after subagent invocation by
+  [#22181](https://github.com/google-gemini/gemini-cli/pull/22181)
+- Add support for dynamic model Resolution to ModelConfigService by @kevinjwang1
+  in [#22578](https://github.com/google-gemini/gemini-cli/pull/22578)
+- chore(release): bump version to 0.36.0-nightly.20260317.2f90b4653 by
+  @gemini-cli-robot in
+  [#22858](https://github.com/google-gemini/gemini-cli/pull/22858)
+- fix(cli): use active sessionId in useLogger and improve resume robustness by
+  @mattKorwel in
+  [#22606](https://github.com/google-gemini/gemini-cli/pull/22606)
+- fix(cli): expand tilde in policy paths from settings.json by @abhipatel12 in
+  [#22772](https://github.com/google-gemini/gemini-cli/pull/22772)
+- fix(core): add actionable warnings for terminal fallbacks (#14426) by
+  @spencer426 in
+  [#22211](https://github.com/google-gemini/gemini-cli/pull/22211)
+- feat(tracker): integrate task tracker protocol into core system prompt by
+  @anj-s in [#22442](https://github.com/google-gemini/gemini-cli/pull/22442)
+- chore: add posttest build hooks and fix missing dependencies by @NTaylorMullen
+  in [#22865](https://github.com/google-gemini/gemini-cli/pull/22865)
+- feat(a2a): add agent acknowledgment command and enhance registry discovery by
+  @alisa-alisa in
+  [#22389](https://github.com/google-gemini/gemini-cli/pull/22389)
+- fix(cli): automatically add all VSCode workspace folders to Gemini context by
+  @sakshisemalti in
+  [#21380](https://github.com/google-gemini/gemini-cli/pull/21380)
+- feat: add 'blocked' status to tasks and todos by @anj-s in
+  [#22735](https://github.com/google-gemini/gemini-cli/pull/22735)
+- refactor(cli): remove extra newlines in ShellToolMessage.tsx by @NTaylorMullen
+  in [#22868](https://github.com/google-gemini/gemini-cli/pull/22868)
+- fix(cli): lazily load settings in onModelChange to prevent stale closure data
+  loss by @KumarADITHYA123 in
+  [#20403](https://github.com/google-gemini/gemini-cli/pull/20403)
+- feat(core): subagent local execution and tool isolation by @akh64bit in
+  [#22718](https://github.com/google-gemini/gemini-cli/pull/22718)
+- fix(cli): resolve subagent grouping and UI state persistence by @abhipatel12
+  in [#22252](https://github.com/google-gemini/gemini-cli/pull/22252)
+- refactor(ui): extract SessionBrowser search and navigation components by
+  @abhipatel12 in
+  [#22377](https://github.com/google-gemini/gemini-cli/pull/22377)
+- fix: updates Docker image reference for GitHub MCP server by @jhhornn in
+  [#22938](https://github.com/google-gemini/gemini-cli/pull/22938)
+- refactor(cli): group subagent trajectory deletion and use native filesystem
+  testing by @abhipatel12 in
+  [#22890](https://github.com/google-gemini/gemini-cli/pull/22890)
+- refactor(cli): simplify keypress and mouse providers and update tests by
+  @scidomino in [#22853](https://github.com/google-gemini/gemini-cli/pull/22853)
+- Changelog for v0.34.0 by @gemini-cli-robot in
+  [#22860](https://github.com/google-gemini/gemini-cli/pull/22860)
+- test(cli): simplify createMockSettings calls by @scidomino in
+  [#22952](https://github.com/google-gemini/gemini-cli/pull/22952)
+- feat(ui): format multi-line banner warnings with a bold title by @keithguerin
+  in [#22955](https://github.com/google-gemini/gemini-cli/pull/22955)
+- Docs: Remove references to stale Gemini CLI file structure info by
+  @g-samroberts in
+  [#22976](https://github.com/google-gemini/gemini-cli/pull/22976)
+- feat(ui): remove write todo list tool from UI tips by @aniruddhaadak80 in
+  [#22281](https://github.com/google-gemini/gemini-cli/pull/22281)
+- Fix issue where subagent thoughts are appended. by @gundermanc in
+  [#22975](https://github.com/google-gemini/gemini-cli/pull/22975)
+- Feat/browser privacy consent by @kunal-10-cloud in
+  [#21119](https://github.com/google-gemini/gemini-cli/pull/21119)
+- fix(core): explicitly map execution context in LocalAgentExecutor by @akh64bit
+  in [#22949](https://github.com/google-gemini/gemini-cli/pull/22949)
+- feat(plan): support plan mode in non-interactive mode by @ruomengz in
+  [#22670](https://github.com/google-gemini/gemini-cli/pull/22670)
+- feat(core): implement strict macOS sandboxing using Seatbelt allowlist by
+  @ehedlund in [#22832](https://github.com/google-gemini/gemini-cli/pull/22832)
+- docs: add additional notes by @abhipatel12 in
+  [#23008](https://github.com/google-gemini/gemini-cli/pull/23008)
+- fix(cli): resolve duplicate footer on tool cancel via ESC (#21743) by
+  @ruomengz in [#21781](https://github.com/google-gemini/gemini-cli/pull/21781)
+- Changelog for v0.35.0-preview.1 by @gemini-cli-robot in
+  [#23012](https://github.com/google-gemini/gemini-cli/pull/23012)
+- fix(ui): fix flickering on small terminal heights by @devr0306 in
+  [#21416](https://github.com/google-gemini/gemini-cli/pull/21416)
+- fix(acp): provide more meta in tool_call_update by @Mervap in
+  [#22663](https://github.com/google-gemini/gemini-cli/pull/22663)
+- docs: add FAQ entry for checking Gemini CLI version by @surajsahani in
+  [#21271](https://github.com/google-gemini/gemini-cli/pull/21271)
+- feat(core): resilient subagent tool rejection with contextual feedback by
+  @abhipatel12 in
+  [#22951](https://github.com/google-gemini/gemini-cli/pull/22951)
+- fix(cli): correctly handle auto-update for standalone binaries by @bdmorgan in
+  [#23038](https://github.com/google-gemini/gemini-cli/pull/23038)
+- feat(core): add content-utils by @adamfweidman in
+  [#22984](https://github.com/google-gemini/gemini-cli/pull/22984)
+- fix: circumvent genai sdk requirement for api key when using gateway auth via
+  ACP by @sripasg in
+  [#23042](https://github.com/google-gemini/gemini-cli/pull/23042)
+- fix(core): don't persist browser consent sentinel in non-interactive mode by
+  @jasonmatthewsuhari in
+  [#23073](https://github.com/google-gemini/gemini-cli/pull/23073)
+- fix(core): narrow browser agent description to prevent stealing URL tasks from
+  web_fetch by @gsquared94 in
+  [#23086](https://github.com/google-gemini/gemini-cli/pull/23086)
+- feat(cli): Partial threading of AgentLoopContext. by @joshualitt in
+  [#22978](https://github.com/google-gemini/gemini-cli/pull/22978)
+- fix(browser-agent): enable "Allow all server tools" session policy by
+  @cynthialong0-0 in
+  [#22343](https://github.com/google-gemini/gemini-cli/pull/22343)
+- refactor(cli): integrate real config loading into async test utils by
+  @scidomino in [#23040](https://github.com/google-gemini/gemini-cli/pull/23040)
+- feat(core): inject memory and JIT context into subagents by @abhipatel12 in
+  [#23032](https://github.com/google-gemini/gemini-cli/pull/23032)
+- Fix logging and virtual list. by @jacob314 in
+  [#23080](https://github.com/google-gemini/gemini-cli/pull/23080)
+- feat(core): cap JIT context upward traversal at git root by @SandyTao520 in
+  [#23074](https://github.com/google-gemini/gemini-cli/pull/23074)
+- Docs: Minor style updates from initial docs audit. by @g-samroberts in
+  [#22872](https://github.com/google-gemini/gemini-cli/pull/22872)
+- feat(core): add experimental memory manager agent to replace save_memory tool
+  by @SandyTao520 in
+  [#22726](https://github.com/google-gemini/gemini-cli/pull/22726)
+- Changelog for v0.35.0-preview.2 by @gemini-cli-robot in
+  [#23142](https://github.com/google-gemini/gemini-cli/pull/23142)
+- Update website issue template for label and title by @g-samroberts in
+  [#23036](https://github.com/google-gemini/gemini-cli/pull/23036)
+- fix: upgrade ACP SDK from 0.12 to 0.16.1 by @sripasg in
+  [#23132](https://github.com/google-gemini/gemini-cli/pull/23132)
+- Update callouts to work on github. by @g-samroberts in
+  [#22245](https://github.com/google-gemini/gemini-cli/pull/22245)
+- feat: ACP: Add token usage metadata to the `send` method's return value by
+  @sripasg in [#23148](https://github.com/google-gemini/gemini-cli/pull/23148)
+- fix(plan): clarify that plan mode policies are combined with normal mode by
+  @ruomengz in [#23158](https://github.com/google-gemini/gemini-cli/pull/23158)
+- Add ModelChain support to ModelConfigService and make ModelDialog dynamic by
+  @kevinjwang1 in
+  [#22914](https://github.com/google-gemini/gemini-cli/pull/22914)
+- Ensure that copied extensions are writable in the user's local directory by
+  @kevinjwang1 in
+  [#23016](https://github.com/google-gemini/gemini-cli/pull/23016)
+- feat(core): implement native Windows sandboxing by @mattKorwel in
+  [#21807](https://github.com/google-gemini/gemini-cli/pull/21807)
+- feat(core): add support for admin-forced MCP server installations by
   @gsquared94 in
-  [#24753](https://github.com/google-gemini/gemini-cli/pull/24753)
-- Revert "feat(core,cli): prioritize summary for topics (#24608)" by
-  @Abhijit-2592 in
-  [#24777](https://github.com/google-gemini/gemini-cli/pull/24777)
-- relax tool sandboxing overrides for plan mode to match defaults. by
-  @DavidAPierce in
-  [#24762](https://github.com/google-gemini/gemini-cli/pull/24762)
-- fix(cli): respect global environment variable allowlist by @scidomino in
-  [#24767](https://github.com/google-gemini/gemini-cli/pull/24767)
-- fix(cli): ensure skills list outputs to stdout in non-interactive environments
-  by @spencer426 in
-  [#24566](https://github.com/google-gemini/gemini-cli/pull/24566)
-- Add an eval for and fix unsafe cloning behavior. by @gundermanc in
-  [#24457](https://github.com/google-gemini/gemini-cli/pull/24457)
-- fix(policy): allow complete_task in plan mode by @abhipatel12 in
-  [#24771](https://github.com/google-gemini/gemini-cli/pull/24771)
-- feat(telemetry): add browser agent clearcut metrics by @gsquared94 in
-  [#24688](https://github.com/google-gemini/gemini-cli/pull/24688)
-- feat(cli): support selective topic expansion and click-to-expand by
-  @Abhijit-2592 in
-  [#24793](https://github.com/google-gemini/gemini-cli/pull/24793)
-- temporarily disable sandbox integration test on windows by @ehedlund in
-  [#24786](https://github.com/google-gemini/gemini-cli/pull/24786)
-- Remove flakey test by @scidomino in
-  [#24837](https://github.com/google-gemini/gemini-cli/pull/24837)
-- Alisa/approve button by @alisa-alisa in
-  [#24645](https://github.com/google-gemini/gemini-cli/pull/24645)
-- feat(hooks): display hook system messages in UI by @mbleigh in
-  [#24616](https://github.com/google-gemini/gemini-cli/pull/24616)
-- fix(core): propagate BeforeModel hook model override end-to-end by @krishdef7
-  in [#24784](https://github.com/google-gemini/gemini-cli/pull/24784)
-- chore: fix formatting for behavioral eval skill reference file by @abhipatel12
-  in [#24846](https://github.com/google-gemini/gemini-cli/pull/24846)
-- fix: use directory junctions on Windows for skill linking by @enjoykumawat in
-  [#24823](https://github.com/google-gemini/gemini-cli/pull/24823)
-- fix(cli): prevent multiple banner increments on remount by @sehoon38 in
-  [#24843](https://github.com/google-gemini/gemini-cli/pull/24843)
-- feat(acp): add /help command by @sripasg in
-  [#24839](https://github.com/google-gemini/gemini-cli/pull/24839)
-- fix(core): remove tmux alternate buffer warning by @jackwotherspoon in
-  [#24852](https://github.com/google-gemini/gemini-cli/pull/24852)
-- Improve sandbox error matching and caching by @DavidAPierce in
-  [#24550](https://github.com/google-gemini/gemini-cli/pull/24550)
-- feat(core): add agent protocol UI types and experimental flag by @mbleigh in
-  [#24275](https://github.com/google-gemini/gemini-cli/pull/24275)
-- feat(core): use experiment flags for default fetch timeouts by @yunaseoul in
-  [#24261](https://github.com/google-gemini/gemini-cli/pull/24261)
-- Revert "fix(ui): improve narration suppression and reduce flicker (#2… by
-  @gundermanc in
-  [#24857](https://github.com/google-gemini/gemini-cli/pull/24857)
-- refactor(cli): remove duplication in interactive shell awaiting input hint by
-  @JayadityaGit in
-  [#24801](https://github.com/google-gemini/gemini-cli/pull/24801)
-- refactor(core): make LegacyAgentSession dependencies optional by @mbleigh in
-  [#24287](https://github.com/google-gemini/gemini-cli/pull/24287)
-- Changelog for v0.37.0-preview.2 by @gemini-cli-robot in
-  [#24848](https://github.com/google-gemini/gemini-cli/pull/24848)
-- fix(cli): always show shell command description or actual command by @jacob314
-  in [#24774](https://github.com/google-gemini/gemini-cli/pull/24774)
-- Added flag for ept size and increased default size by @devr0306 in
-  [#24859](https://github.com/google-gemini/gemini-cli/pull/24859)
-- fix(core): dispose Scheduler to prevent McpProgress listener leak by
-  @Anjaligarhwal in
-  [#24870](https://github.com/google-gemini/gemini-cli/pull/24870)
-- fix(cli): switch default back to terminalBuffer=false and fix regressions
-  introduced for that mode by @jacob314 in
-  [#24873](https://github.com/google-gemini/gemini-cli/pull/24873)
-- feat(cli): switch to ctrl+g from ctrl-x by @jacob314 in
-  [#24861](https://github.com/google-gemini/gemini-cli/pull/24861)
-- fix: isolate concurrent browser agent instances by @gsquared94 in
-  [#24794](https://github.com/google-gemini/gemini-cli/pull/24794)
-- docs: update MCP server OAuth redirect port documentation by @adamfweidman in
-  [#24844](https://github.com/google-gemini/gemini-cli/pull/24844)
+  [#23163](https://github.com/google-gemini/gemini-cli/pull/23163)
+- chore(lint): ignore .gemini directory and recursive node_modules by
+  @mattKorwel in
+  [#23211](https://github.com/google-gemini/gemini-cli/pull/23211)
+- feat(cli): conditionally exclude ask_user tool in ACP mode by @nmcnamara-eng
+  in [#23045](https://github.com/google-gemini/gemini-cli/pull/23045)
+- feat(core): introduce AgentSession and rename stream events to agent events by
+  @mbleigh in [#23159](https://github.com/google-gemini/gemini-cli/pull/23159)
+- feat(worktree): add Git worktree support for isolated parallel sessions by
+  @jerop in [#22973](https://github.com/google-gemini/gemini-cli/pull/22973)
+- Add support for linking in the extension registry by @kevinjwang1 in
+  [#23153](https://github.com/google-gemini/gemini-cli/pull/23153)
+- feat(extensions): add --skip-settings flag to install command by @Ratish1 in
+  [#17212](https://github.com/google-gemini/gemini-cli/pull/17212)
+- feat(telemetry): track if session is running in a Git worktree by @jerop in
+  [#23265](https://github.com/google-gemini/gemini-cli/pull/23265)
+- refactor(core): use absolute paths in GEMINI.md context markers by
+  @SandyTao520 in
+  [#23135](https://github.com/google-gemini/gemini-cli/pull/23135)
+- fix(core): add sanitization to sub agent thoughts and centralize utilities by
+  @devr0306 in [#22828](https://github.com/google-gemini/gemini-cli/pull/22828)
+- feat(core): refine User-Agent for VS Code traffic (unified format) by
+  @sehoon38 in [#23256](https://github.com/google-gemini/gemini-cli/pull/23256)
+- Fix schema for ModelChains by @kevinjwang1 in
+  [#23284](https://github.com/google-gemini/gemini-cli/pull/23284)
+- test(cli): refactor tests for async render utilities by @scidomino in
+  [#23252](https://github.com/google-gemini/gemini-cli/pull/23252)
+- feat(core): add security prompt for browser agent by @cynthialong0-0 in
+  [#23241](https://github.com/google-gemini/gemini-cli/pull/23241)
+- refactor(ide): replace dynamic undici import with static fetch import by
+  @cocosheng-g in
+  [#23268](https://github.com/google-gemini/gemini-cli/pull/23268)
+- test(cli): address unresolved feedback from PR #23252 by @scidomino in
+  [#23303](https://github.com/google-gemini/gemini-cli/pull/23303)
+- feat(browser): add sensitive action controls and read-only noise reduction by
+  @cynthialong0-0 in
+  [#22867](https://github.com/google-gemini/gemini-cli/pull/22867)
+- Disabling failing test while investigating by @alisa-alisa in
+  [#23311](https://github.com/google-gemini/gemini-cli/pull/23311)
+- fix broken extension link in hooks guide by @Indrapal-70 in
+  [#21728](https://github.com/google-gemini/gemini-cli/pull/21728)
+- fix(core): fix agent description indentation by @abhipatel12 in
+  [#23315](https://github.com/google-gemini/gemini-cli/pull/23315)
+- Wrap the text under TOML rule for easier readability in policy-engine.md… by
+  @CogitationOps in
+  [#23076](https://github.com/google-gemini/gemini-cli/pull/23076)
+- fix(extensions): revert broken extension removal behavior by @ehedlund in
+  [#23317](https://github.com/google-gemini/gemini-cli/pull/23317)
+- feat(core): set up onboarding telemetry by @yunaseoul in
+  [#23118](https://github.com/google-gemini/gemini-cli/pull/23118)
+- Retry evals on API error. by @gundermanc in
+  [#23322](https://github.com/google-gemini/gemini-cli/pull/23322)
+- fix(evals): remove tool restrictions and add compile-time guards by
+  @SandyTao520 in
+  [#23312](https://github.com/google-gemini/gemini-cli/pull/23312)
+- fix(hooks): support 'ask' decision for BeforeTool hooks by @gundermanc in
+  [#21146](https://github.com/google-gemini/gemini-cli/pull/21146)
+- feat(browser): add warning message for session mode 'existing' by
+  @cynthialong0-0 in
+  [#23288](https://github.com/google-gemini/gemini-cli/pull/23288)
+- chore(lint): enforce zero warnings and cleanup syntax restrictions by
+  @alisa-alisa in
+  [#22902](https://github.com/google-gemini/gemini-cli/pull/22902)
+- fix(cli): add Esc instruction to HooksDialog footer by @abhipatel12 in
+  [#23258](https://github.com/google-gemini/gemini-cli/pull/23258)
+- Disallow and suppress misused spread operator. by @gundermanc in
+  [#23294](https://github.com/google-gemini/gemini-cli/pull/23294)
+- fix(core): refine CliHelpAgent description for better delegation by
+  @abhipatel12 in
+  [#23310](https://github.com/google-gemini/gemini-cli/pull/23310)
+- fix(core): enable global session and persistent approval for web_fetch by
+  @NTaylorMullen in
+  [#23295](https://github.com/google-gemini/gemini-cli/pull/23295)
+- fix(plan): add state transition override to prevent plan mode freeze by
+  @Adib234 in [#23020](https://github.com/google-gemini/gemini-cli/pull/23020)
+- fix(cli): record skill activation tool calls in chat history by @NTaylorMullen
+  in [#23203](https://github.com/google-gemini/gemini-cli/pull/23203)
+- fix(core): ensure subagent tool updates apply configuration overrides
+  immediately by @abhipatel12 in
+  [#23161](https://github.com/google-gemini/gemini-cli/pull/23161)
+- fix(cli): resolve flicker at boundaries of list in BaseSelectionList by
+  @jackwotherspoon in
+  [#23298](https://github.com/google-gemini/gemini-cli/pull/23298)
+- test(cli): force generic terminal in tests to fix snapshot failures by
+  @abhipatel12 in
+  [#23499](https://github.com/google-gemini/gemini-cli/pull/23499)
+- Evals: PR Guidance adding workflow by @alisa-alisa in
+  [#23164](https://github.com/google-gemini/gemini-cli/pull/23164)
+- feat(core): refactor SandboxManager to a stateless architecture and introduce
+  explicit Deny interface by @ehedlund in
+  [#23141](https://github.com/google-gemini/gemini-cli/pull/23141)
+- feat(core): add event-translator and update agent types by @adamfweidman in
+  [#22985](https://github.com/google-gemini/gemini-cli/pull/22985)
+- perf(cli): parallelize and background startup cleanup tasks by @sehoon38 in
+  [#23545](https://github.com/google-gemini/gemini-cli/pull/23545)
+- fix: "allow always" for commands with paths by @scidomino in
+  [#23558](https://github.com/google-gemini/gemini-cli/pull/23558)
+- fix(cli): prevent terminal escape sequences from leaking on exit by
+  @mattKorwel in
+  [#22682](https://github.com/google-gemini/gemini-cli/pull/22682)
+- feat(cli): implement full "GEMINI CLI" logo for logged-out state by
+  @keithguerin in
+  [#22412](https://github.com/google-gemini/gemini-cli/pull/22412)
+- fix(plan): reserve minimum height for selection list in AskUserDialog by
+  @ruomengz in [#23280](https://github.com/google-gemini/gemini-cli/pull/23280)
+- fix(core): harden AgentSession replay semantics by @adamfweidman in
+  [#23548](https://github.com/google-gemini/gemini-cli/pull/23548)
+- test(core): migrate hook tests to scheduler by @abhipatel12 in
+  [#23496](https://github.com/google-gemini/gemini-cli/pull/23496)
+- chore(config): disable agents by default by @abhipatel12 in
+  [#23546](https://github.com/google-gemini/gemini-cli/pull/23546)
+- fix(ui): make tool confirmations take up entire terminal height by @devr0306
+  in [#22366](https://github.com/google-gemini/gemini-cli/pull/22366)
+- fix(core): prevent redundant remote agent loading on model switch by
+  @adamfweidman in
+  [#23576](https://github.com/google-gemini/gemini-cli/pull/23576)
+- refactor(core): update production type imports from coreToolScheduler by
+  @abhipatel12 in
+  [#23498](https://github.com/google-gemini/gemini-cli/pull/23498)
+- feat(cli): always prefix extension skills with colon separator by
+  @NTaylorMullen in
+  [#23566](https://github.com/google-gemini/gemini-cli/pull/23566)
+- fix(core): properly support allowRedirect in policy engine by @scidomino in
+  [#23579](https://github.com/google-gemini/gemini-cli/pull/23579)
+- fix(cli): prevent subcommand shadowing and skip auth for commands by
+  @mattKorwel in
+  [#23177](https://github.com/google-gemini/gemini-cli/pull/23177)
+- fix(test): move flaky tests to non-blocking suite by @mattKorwel in
+  [#23259](https://github.com/google-gemini/gemini-cli/pull/23259)
+- Changelog for v0.35.0-preview.3 by @gemini-cli-robot in
+  [#23574](https://github.com/google-gemini/gemini-cli/pull/23574)
+- feat(skills): add behavioral-evals skill with fixing and promoting guides by
+  @abhipatel12 in
+  [#23349](https://github.com/google-gemini/gemini-cli/pull/23349)
+- refactor(core): delete obsolete coreToolScheduler by @abhipatel12 in
+  [#23502](https://github.com/google-gemini/gemini-cli/pull/23502)
+- Changelog for v0.35.0-preview.4 by @gemini-cli-robot in
+  [#23581](https://github.com/google-gemini/gemini-cli/pull/23581)
+- feat(core): add LegacyAgentSession by @adamfweidman in
+  [#22986](https://github.com/google-gemini/gemini-cli/pull/22986)
+- feat(test-utils): add TestMcpServerBuilder and support in TestRig by
+  @abhipatel12 in
+  [#23491](https://github.com/google-gemini/gemini-cli/pull/23491)
+- fix(core)!: Force policy config to specify toolName by @kschaab in
+  [#23330](https://github.com/google-gemini/gemini-cli/pull/23330)
+- eval(save_memory): add multi-turn interactive evals for memoryManager by
+  @SandyTao520 in
+  [#23572](https://github.com/google-gemini/gemini-cli/pull/23572)
+- fix(telemetry): patch memory leak and enforce logPrompts privacy by
+  @spencer426 in
+  [#23281](https://github.com/google-gemini/gemini-cli/pull/23281)
+- perf(cli): background IDE client to speed up initialization by @sehoon38 in
+  [#23603](https://github.com/google-gemini/gemini-cli/pull/23603)
+- fix(cli): prevent Ctrl+D exit when input buffer is not empty by @wtanaka in
+  [#23306](https://github.com/google-gemini/gemini-cli/pull/23306)
+- fix: ACP: separate conversational text from execute tool command title by
+  @sripasg in [#23179](https://github.com/google-gemini/gemini-cli/pull/23179)
+- feat(evals): add behavioral evaluations for subagent routing by @Samee24 in
+  [#23272](https://github.com/google-gemini/gemini-cli/pull/23272)
+- refactor(cli,core): foundational layout, identity management, and type safety
+  by @jwhelangoog in
+  [#23286](https://github.com/google-gemini/gemini-cli/pull/23286)
+- fix(core): accurately reflect subagent tool failure in UI by @abhipatel12 in
+  [#23187](https://github.com/google-gemini/gemini-cli/pull/23187)
+- Changelog for v0.35.0-preview.5 by @gemini-cli-robot in
+  [#23606](https://github.com/google-gemini/gemini-cli/pull/23606)
+- feat(ui): implement refreshed UX for Composer layout by @jwhelangoog in
+  [#21212](https://github.com/google-gemini/gemini-cli/pull/21212)
+- fix: API key input dialog user interaction when selected Gemini API Key by
+  @kartikangiras in
+  [#21057](https://github.com/google-gemini/gemini-cli/pull/21057)
+- docs: update `/mcp refresh` to `/mcp reload` by @adamfweidman in
+  [#23631](https://github.com/google-gemini/gemini-cli/pull/23631)
+- Implementation of sandbox "Write-Protected" Governance Files by @DavidAPierce
+  in [#23139](https://github.com/google-gemini/gemini-cli/pull/23139)
+- feat(sandbox): dynamic macOS sandbox expansion and worktree support by @galz10
+  in [#23301](https://github.com/google-gemini/gemini-cli/pull/23301)
+- fix(acp): Pass the cwd to `AcpFileSystemService` to avoid looping failures in
+  asking for perms to write plan md file by @sripasg in
+  [#23612](https://github.com/google-gemini/gemini-cli/pull/23612)
+- fix(plan): sandbox path resolution in Plan Mode to prevent hallucinations by
+  @Adib234 in [#22737](https://github.com/google-gemini/gemini-cli/pull/22737)
+- feat(ui): allow immediate user input during startup by @sehoon38 in
+  [#23661](https://github.com/google-gemini/gemini-cli/pull/23661)
+- refactor(sandbox): reorganize Windows sandbox files by @galz10 in
+  [#23645](https://github.com/google-gemini/gemini-cli/pull/23645)
+- fix(core): improve remote agent streaming UI and UX by @adamfweidman in
+  [#23633](https://github.com/google-gemini/gemini-cli/pull/23633)
+- perf(cli): optimize --version startup time by @sehoon38 in
+  [#23671](https://github.com/google-gemini/gemini-cli/pull/23671)
+- refactor(core): stop gemini CLI from producing unsafe casts by @gundermanc in
+  [#23611](https://github.com/google-gemini/gemini-cli/pull/23611)
+- use enableAutoUpdate in test rig by @scidomino in
+  [#23681](https://github.com/google-gemini/gemini-cli/pull/23681)
+- feat(core): change user-facing auth type from oauth2 to oauth by @adamfweidman
+  in [#23639](https://github.com/google-gemini/gemini-cli/pull/23639)
+- chore(deps): fix npm audit vulnerabilities by @scidomino in
+  [#23679](https://github.com/google-gemini/gemini-cli/pull/23679)
+- test(evals): fix overlapping act() deadlock in app-test-helper by @Adib234 in
+  [#23666](https://github.com/google-gemini/gemini-cli/pull/23666)
+- fix(patch): cherry-pick 055ff92 to release/v0.36.0-preview.0-pr-23672 to patch
+  version v0.36.0-preview.0 and create version 0.36.0-preview.1 by
+  @gemini-cli-robot in
+  [#23723](https://github.com/google-gemini/gemini-cli/pull/23723)
+- fix(patch): cherry-pick 765fb67 to release/v0.36.0-preview.5-pr-24055 to patch
+  version v0.36.0-preview.5 and create version 0.36.0-preview.6 by
+  @gemini-cli-robot in
+  [#24061](https://github.com/google-gemini/gemini-cli/pull/24061)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.38.0...v0.38.2
+https://github.com/google-gemini/gemini-cli/compare/v0.35.3...v0.36.0

docs/changelogs/preview.md

@@ -1,6 +1,6 @@
-# Preview release: v0.39.0-preview.0
+# Preview release: v0.37.0-preview.2
 
-Released: April 14, 2026
+Released: April 07, 2026
 
 Our preview release includes the latest, new, and experimental features. This
 release may not be as stable as our [latest weekly release](latest.md).
@@ -13,245 +13,414 @@ npm install -g @google/gemini-cli@preview
 
 ## Highlights
 
-- **Refactored Subagents and Unified Tooling:** Consolidate subagent tools into
-  a single `invoke_subagent` tool, removed legacy wrapping tools, and improved
-  turn limits for codebase investigator.
-- **Advanced Memory and Skill Management:** Introduced `/memory` inbox for
-  reviewing extracted skills and added skill patching support, enhancing agent
-  learning and persistence.
-- **Expanded Test and Evaluation Infrastructure:** Added memory and CPU
-  performance integration test harnesses and generalized evaluation
-  infrastructure for better suite organization.
-- **Sandbox and Security Hardening:** Centralized sandbox paths for Linux and
-  macOS, enforced read-only security for async git worktree resolution, and
-  optimized Windows sandbox initialization.
-- **Enhanced CLI UX and UI Stability:** Improved scroll momentum, added a
-  `debugRainbow` setting, and resolved various memory leaks and PTY exhaustion
-  issues for a smoother terminal experience.
+- **Plan Mode Enhancements**: Plan now includes support for untrusted folders,
+  prioritized pre-approval discussions, and a resolve for sandbox-related
+  deadlocks during file creation.
+- **Browser Agent Evolved**: Significant updates to the browser agent, including
+  persistent session management, dynamic discovery of read-only tools,
+  sandbox-aware initialization, and automated reclamation of stale snapshots to
+  optimize context window usage.
+- **Advanced Sandbox Security**: Implementation of dynamic sandbox expansion for
+  both Linux and Windows, alongside secret visibility lockdown for environment
+  files and OS-specific forbidden path support.
+- **Unified Core Architecture**: Centralized context management and a new
+  `ModelConfigService` for unified model discovery, complemented by the
+  introduction of `AgentHistoryProvider` and tool-based topic grouping
+  (Chapters).
+- **UI/UX & Performance Improvements**: New Tokyo Night theme, "tab to queue"
+  message support, and compact tool output formatting, plus optimized build
+  scripts and improved layout stability for TUI components.
 
 ## What's Changed
 
-- refactor(plan): simplify policy priorities and consolidate read-only rules by
-  @ruomengz in [#24849](https://github.com/google-gemini/gemini-cli/pull/24849)
-- feat(test-utils): add memory usage integration test harness by @sripasg in
-  [#24876](https://github.com/google-gemini/gemini-cli/pull/24876)
-- feat(memory): add /memory inbox command for reviewing extracted skills by
-  @SandyTao520 in
-  [#24544](https://github.com/google-gemini/gemini-cli/pull/24544)
-- chore(release): bump version to 0.39.0-nightly.20260408.e77b22e63 by
+- fix(patch): cherry-pick cb7f7d6 to release/v0.37.0-preview.1-pr-24342 to patch
+  version v0.37.0-preview.1 and create version 0.37.0-preview.2 by
   @gemini-cli-robot in
-  [#24939](https://github.com/google-gemini/gemini-cli/pull/24939)
-- fix(core): ensure robust sandbox cleanup in all process execution paths by
-  @ehedlund in [#24763](https://github.com/google-gemini/gemini-cli/pull/24763)
-- chore: update ink version to 6.6.8 by @jacob314 in
-  [#24934](https://github.com/google-gemini/gemini-cli/pull/24934)
-- Changelog for v0.38.0-preview.0 by @gemini-cli-robot in
-  [#24938](https://github.com/google-gemini/gemini-cli/pull/24938)
-- chore: ignore conductor directory by @JayadityaGit in
-  [#22128](https://github.com/google-gemini/gemini-cli/pull/22128)
-- Changelog for v0.37.0 by @gemini-cli-robot in
-  [#24940](https://github.com/google-gemini/gemini-cli/pull/24940)
-- feat(plan): require user confirmation for activate_skill in Plan Mode by
-  @ruomengz in [#24946](https://github.com/google-gemini/gemini-cli/pull/24946)
-- feat(test-utils): add CPU performance integration test harness by @sripasg in
-  [#24951](https://github.com/google-gemini/gemini-cli/pull/24951)
-- fix(cli-ui): enable Ctrl+Backspace for word deletion in Windows Terminal by
-  @dogukanozen in
-  [#21447](https://github.com/google-gemini/gemini-cli/pull/21447)
-- test(sdk): add unit tests for GeminiCliSession by @AdamyaSingh7 in
-  [#21897](https://github.com/google-gemini/gemini-cli/pull/21897)
-- fix(core): resolve windows symlink bypass and stabilize sandbox integration
-  tests by @ehedlund in
-  [#24834](https://github.com/google-gemini/gemini-cli/pull/24834)
-- fix(cli): restore file path display in edit and write tool confirmations by
-  @jwhelangoog in
-  [#24974](https://github.com/google-gemini/gemini-cli/pull/24974)
-- feat(core): refine shell tool description display logic by @jwhelangoog in
-  [#24903](https://github.com/google-gemini/gemini-cli/pull/24903)
-- fix(core): dynamic session ID injection to resolve resume bugs by @scidomino
-  in [#24972](https://github.com/google-gemini/gemini-cli/pull/24972)
-- Update ink version to 6.6.9 by @jacob314 in
-  [#24980](https://github.com/google-gemini/gemini-cli/pull/24980)
-- Generalize evals infra to support more types of evals, organization and
-  queuing of named suites by @gundermanc in
-  [#24941](https://github.com/google-gemini/gemini-cli/pull/24941)
-- fix(cli): optimize startup with lightweight parent process by @sehoon38 in
-  [#24667](https://github.com/google-gemini/gemini-cli/pull/24667)
-- refactor(sandbox): use centralized sandbox paths in macOS Seatbelt
-  implementation by @ehedlund in
-  [#24984](https://github.com/google-gemini/gemini-cli/pull/24984)
-- feat(cli): refine tool output formatting for compact mode by @jwhelangoog in
-  [#24677](https://github.com/google-gemini/gemini-cli/pull/24677)
-- fix(sdk): skip broken sendStream tests to unblock nightly by @SandyTao520 in
-  [#25000](https://github.com/google-gemini/gemini-cli/pull/25000)
-- refactor(core): use centralized path resolution for Linux sandbox by @ehedlund
-  in [#24985](https://github.com/google-gemini/gemini-cli/pull/24985)
-- Support ctrl+shift+g by @jacob314 in
-  [#25035](https://github.com/google-gemini/gemini-cli/pull/25035)
-- feat(core): refactor subagent tool to unified invoke_subagent tool by
-  @abhipatel12 in
-  [#24489](https://github.com/google-gemini/gemini-cli/pull/24489)
-- fix(core): add explicit git identity env vars to prevent sandbox checkpointing
-  error by @mrpmohiburrahman in
-  [#19775](https://github.com/google-gemini/gemini-cli/pull/19775)
-- fix: respect hideContextPercentage when FooterConfigDialog is closed without
-  changes by @chernistry in
-  [#24773](https://github.com/google-gemini/gemini-cli/pull/24773)
-- fix(cli): suppress unhandled AbortError logs during request cancellation by
-  @euxaristia in
-  [#22621](https://github.com/google-gemini/gemini-cli/pull/22621)
-- Automated documentation audit by @g-samroberts in
-  [#24567](https://github.com/google-gemini/gemini-cli/pull/24567)
-- feat(cli): implement useAgentStream hook by @mbleigh in
-  [#24292](https://github.com/google-gemini/gemini-cli/pull/24292)
-- refactor(plan) Clean default plan toml by @ruomengz in
-  [#25037](https://github.com/google-gemini/gemini-cli/pull/25037)
-- refactor(core): remove legacy subagent wrapping tools by @abhipatel12 in
-  [#25053](https://github.com/google-gemini/gemini-cli/pull/25053)
-- fix(core): honor retryDelay in RetryInfo for 503 errors by @yunaseoul in
-  [#25057](https://github.com/google-gemini/gemini-cli/pull/25057)
-- fix(core): remediate subagent memory leaks using AbortSignal in MessageBus by
-  @abhipatel12 in
-  [#25048](https://github.com/google-gemini/gemini-cli/pull/25048)
-- feat(cli): wire up useAgentStream in AppContainer by @mbleigh in
-  [#24297](https://github.com/google-gemini/gemini-cli/pull/24297)
-- feat(core): migrate chat recording to JSONL streaming by @spencer426 in
-  [#23749](https://github.com/google-gemini/gemini-cli/pull/23749)
-- fix(core): clear 5-minute timeouts in oauth flow to prevent memory leaks by
-  @spencer426 in
-  [#24968](https://github.com/google-gemini/gemini-cli/pull/24968)
-- fix(sandbox): centralize async git worktree resolution and enforce read-only
-  security by @ehedlund in
-  [#25040](https://github.com/google-gemini/gemini-cli/pull/25040)
-- feat(test): add high-volume shell test and refine perf harness by @sripasg in
-  [#24983](https://github.com/google-gemini/gemini-cli/pull/24983)
-- fix(core): silently handle EPERM when listing dir structure by @scidomino in
-  [#25066](https://github.com/google-gemini/gemini-cli/pull/25066)
-- Changelog for v0.37.1 by @gemini-cli-robot in
-  [#25055](https://github.com/google-gemini/gemini-cli/pull/25055)
-- fix: decode Uint8Array and multi-byte UTF-8 in API error messages by
-  @kimjune01 in [#23341](https://github.com/google-gemini/gemini-cli/pull/23341)
-- Automated documentation audit results by @g-samroberts in
-  [#22755](https://github.com/google-gemini/gemini-cli/pull/22755)
-- debugging(ui): add optional debugRainbow setting by @jacob314 in
-  [#25088](https://github.com/google-gemini/gemini-cli/pull/25088)
-- fix: resolve lifecycle memory leaks by cleaning up listeners and root closures
-  by @spencer426 in
-  [#25049](https://github.com/google-gemini/gemini-cli/pull/25049)
-- docs(cli): updates f12 description to be more precise by @JayadityaGit in
-  [#15816](https://github.com/google-gemini/gemini-cli/pull/15816)
-- fix(cli): mark /settings as unsafe to run concurrently by @jacob314 in
-  [#25061](https://github.com/google-gemini/gemini-cli/pull/25061)
-- fix(core): remove buffer slice to prevent OOM on large output streams by
-  @spencer426 in
-  [#25094](https://github.com/google-gemini/gemini-cli/pull/25094)
-- feat(core): persist subagent agentId in tool call records by @abhipatel12 in
-  [#25092](https://github.com/google-gemini/gemini-cli/pull/25092)
-- chore(core): increase codebase investigator turn limits to 50 by @abhipatel12
-  in [#25125](https://github.com/google-gemini/gemini-cli/pull/25125)
-- refactor(core): consolidate execute() arguments into ExecuteOptions by
-  @mbleigh in [#25101](https://github.com/google-gemini/gemini-cli/pull/25101)
-- feat(core): add Strategic Re-evaluation guidance to system prompt by
-  @aishaneeshah in
-  [#25062](https://github.com/google-gemini/gemini-cli/pull/25062)
-- fix(core): preserve shell execution config fields on update by
-  @jasonmatthewsuhari in
-  [#25113](https://github.com/google-gemini/gemini-cli/pull/25113)
-- docs: add vi shortcuts and clarify MCP sandbox setup by @chrisjcthomas in
-  [#21679](https://github.com/google-gemini/gemini-cli/pull/21679)
-- fix(cli): pass session id to interactive shell executions by
-  @jasonmatthewsuhari in
-  [#25114](https://github.com/google-gemini/gemini-cli/pull/25114)
-- fix(cli): resolve text sanitization data loss due to C1 control characters by
-  @euxaristia in
-  [#22624](https://github.com/google-gemini/gemini-cli/pull/22624)
-- feat(core): add large memory regression test by @cynthialong0-0 in
-  [#25059](https://github.com/google-gemini/gemini-cli/pull/25059)
-- fix(core): resolve PTY exhaustion and orphan MCP subprocess leaks by
-  @spencer426 in
-  [#25079](https://github.com/google-gemini/gemini-cli/pull/25079)
-- chore(deps): update vulnerable dependencies via npm audit fix by @scidomino in
-  [#25140](https://github.com/google-gemini/gemini-cli/pull/25140)
-- perf(sandbox): optimize Windows sandbox initialization via native ACL
-  application by @ehedlund in
-  [#25077](https://github.com/google-gemini/gemini-cli/pull/25077)
-- chore: switch from keytar to @github/keytar by @cocosheng-g in
-  [#25143](https://github.com/google-gemini/gemini-cli/pull/25143)
-- fix: improve audio MIME normalization and validation in file reads by
-  @junaiddshaukat in
-  [#21636](https://github.com/google-gemini/gemini-cli/pull/21636)
-- docs: Update docs-audit to include changes in PR body by @g-samroberts in
-  [#25153](https://github.com/google-gemini/gemini-cli/pull/25153)
-- docs: correct documentation for enforced authentication type by @cocosheng-g
-  in [#25142](https://github.com/google-gemini/gemini-cli/pull/25142)
-- fix(cli): exclude update_topic from confirmation queue count by @Abhijit-2592
-  in [#24945](https://github.com/google-gemini/gemini-cli/pull/24945)
-- Memory fix for trace's streamWrapper. by @anthraxmilkshake in
-  [#25089](https://github.com/google-gemini/gemini-cli/pull/25089)
-- fix(core): fix quota footer for non-auto models and improve display by
-  @jackwotherspoon in
-  [#25121](https://github.com/google-gemini/gemini-cli/pull/25121)
-- docs(contributing): clarify self-assignment policy for issues by @jmr in
-  [#23087](https://github.com/google-gemini/gemini-cli/pull/23087)
-- feat(core): add skill patching support with /memory inbox integration by
-  @SandyTao520 in
-  [#25148](https://github.com/google-gemini/gemini-cli/pull/25148)
-- Stop suppressing thoughts and text in model response by @gundermanc in
-  [#25073](https://github.com/google-gemini/gemini-cli/pull/25073)
-- fix(release): prefix git hash in nightly versions to prevent semver
-  normalization by @SandyTao520 in
-  [#25304](https://github.com/google-gemini/gemini-cli/pull/25304)
-- feat(cli): extract QuotaContext and resolve infinite render loop by @Adib234
-  in [#24959](https://github.com/google-gemini/gemini-cli/pull/24959)
-- refactor(core): extract and centralize sandbox path utilities by @ehedlund in
-  [#25305](https://github.com/google-gemini/gemini-cli/pull/25305)
-- feat(ui): added enhancements to scroll momentum by @devr0306 in
-  [#24447](https://github.com/google-gemini/gemini-cli/pull/24447)
-- fix(core): replace custom binary detection with isbinaryfile to correctly
-  handle UTF-8 (U+FFFD) by @Anjaligarhwal in
-  [#25297](https://github.com/google-gemini/gemini-cli/pull/25297)
-- feat(agent): implement tool-controlled display protocol (Steps 2-3) by
-  @mbleigh in [#25134](https://github.com/google-gemini/gemini-cli/pull/25134)
-- Stop showing scrollbar unless we are in terminalBuffer mode by @jacob314 in
-  [#25320](https://github.com/google-gemini/gemini-cli/pull/25320)
-- feat: support auth block in MCP servers config in agents by @TanmayVartak in
-  [#24770](https://github.com/google-gemini/gemini-cli/pull/24770)
-- fix(core): expose GEMINI_PLANS_DIR to hook environment by @Adib234 in
-  [#25296](https://github.com/google-gemini/gemini-cli/pull/25296)
-- feat(core): implement silent fallback for Plan Mode model routing by @jerop in
-  [#25317](https://github.com/google-gemini/gemini-cli/pull/25317)
-- fix: correct redirect count increment in fetchJson by @KevinZhao in
-  [#24896](https://github.com/google-gemini/gemini-cli/pull/24896)
-- fix(core): prevent secondary crash in ModelRouterService finally block by
-  @gundermanc in
-  [#25333](https://github.com/google-gemini/gemini-cli/pull/25333)
-- feat(core): introduce decoupled ContextManager and Sidecar architecture by
+  [#24842](https://github.com/google-gemini/gemini-cli/pull/24842)
+- fix(patch): cherry-pick 64c928f to release/v0.37.0-preview.0-pr-23257 to patch
+  version v0.37.0-preview.0 and create version 0.37.0-preview.1 by
+  @gemini-cli-robot in
+  [#24561](https://github.com/google-gemini/gemini-cli/pull/24561)
+- feat(evals): centralize test agents into test-utils for reuse by @Samee24 in
+  [#23616](https://github.com/google-gemini/gemini-cli/pull/23616)
+- revert: chore(config): disable agents by default by @abhipatel12 in
+  [#23672](https://github.com/google-gemini/gemini-cli/pull/23672)
+- fix(plan): update telemetry attribute keys and add timestamp by @Adib234 in
+  [#23685](https://github.com/google-gemini/gemini-cli/pull/23685)
+- fix(core): prevent premature MCP discovery completion by @jackwotherspoon in
+  [#23637](https://github.com/google-gemini/gemini-cli/pull/23637)
+- feat(browser): add maxActionsPerTask for browser agent setting by
+  @cynthialong0-0 in
+  [#23216](https://github.com/google-gemini/gemini-cli/pull/23216)
+- fix(core): improve agent loader error formatting for empty paths by
+  @adamfweidman in
+  [#23690](https://github.com/google-gemini/gemini-cli/pull/23690)
+- fix(cli): only show updating spinner when auto-update is in progress by
+  @scidomino in [#23709](https://github.com/google-gemini/gemini-cli/pull/23709)
+- Refine onboarding metrics to log the duration explicitly and use the tier
+  name. by @yunaseoul in
+  [#23678](https://github.com/google-gemini/gemini-cli/pull/23678)
+- chore(tools): add toJSON to tools and invocations to reduce logging verbosity
+  by @alisa-alisa in
+  [#22899](https://github.com/google-gemini/gemini-cli/pull/22899)
+- fix(cli): stabilize copy mode to prevent flickering and cursor resets by
+  @mattKorwel in
+  [#22584](https://github.com/google-gemini/gemini-cli/pull/22584)
+- fix(test): move flaky ctrl-c-exit test to non-blocking suite by @mattKorwel in
+  [#23732](https://github.com/google-gemini/gemini-cli/pull/23732)
+- feat(skills): add ci skill for automated failure replication by @mattKorwel in
+  [#23720](https://github.com/google-gemini/gemini-cli/pull/23720)
+- feat(sandbox): implement forbiddenPaths for OS-specific sandbox managers by
+  @ehedlund in [#23282](https://github.com/google-gemini/gemini-cli/pull/23282)
+- fix(core): conditionally expose additional_permissions in shell tool by
+  @galz10 in [#23729](https://github.com/google-gemini/gemini-cli/pull/23729)
+- refactor(core): standardize OS-specific sandbox tests and extract linux helper
+  methods by @ehedlund in
+  [#23715](https://github.com/google-gemini/gemini-cli/pull/23715)
+- format recently added script by @scidomino in
+  [#23739](https://github.com/google-gemini/gemini-cli/pull/23739)
+- fix(ui): prevent over-eager slash subcommand completion by @keithguerin in
+  [#20136](https://github.com/google-gemini/gemini-cli/pull/20136)
+- Fix dynamic model routing for gemini 3.1 pro to customtools model by
+  @kevinjwang1 in
+  [#23641](https://github.com/google-gemini/gemini-cli/pull/23641)
+- feat(core): support inline agentCardJson for remote agents by @adamfweidman in
+  [#23743](https://github.com/google-gemini/gemini-cli/pull/23743)
+- fix(cli): skip console log/info in headless mode by @cynthialong0-0 in
+  [#22739](https://github.com/google-gemini/gemini-cli/pull/22739)
+- test(core): install bubblewrap on Linux CI for sandbox integration tests by
+  @ehedlund in [#23583](https://github.com/google-gemini/gemini-cli/pull/23583)
+- docs(reference): split tools table into category sections by @sheikhlimon in
+  [#21516](https://github.com/google-gemini/gemini-cli/pull/21516)
+- fix(browser): detect embedded URLs in query params to prevent allowedDomains
+  bypass by @tony-shi in
+  [#23225](https://github.com/google-gemini/gemini-cli/pull/23225)
+- fix(browser): add proxy bypass constraint to domain restriction system prompt
+  by @tony-shi in
+  [#23229](https://github.com/google-gemini/gemini-cli/pull/23229)
+- fix(policy): relax write_file argsPattern in plan mode to allow paths without
+  session ID by @Adib234 in
+  [#23695](https://github.com/google-gemini/gemini-cli/pull/23695)
+- docs: fix grammar in CONTRIBUTING and numbering in sandbox docs by
+  @splint-disk-8i in
+  [#23448](https://github.com/google-gemini/gemini-cli/pull/23448)
+- fix(acp): allow attachments by adding a permission prompt by @sripasg in
+  [#23680](https://github.com/google-gemini/gemini-cli/pull/23680)
+- fix(core): thread AbortSignal to chat compression requests (#20405) by
+  @SH20RAJ in [#20778](https://github.com/google-gemini/gemini-cli/pull/20778)
+- feat(core): implement Windows sandbox dynamic expansion Phase 1 and 2.1 by
+  @scidomino in [#23691](https://github.com/google-gemini/gemini-cli/pull/23691)
+- Add note about root privileges in sandbox docs by @diodesign in
+  [#23314](https://github.com/google-gemini/gemini-cli/pull/23314)
+- docs(core): document agent_card_json string literal options for remote agents
+  by @adamfweidman in
+  [#23797](https://github.com/google-gemini/gemini-cli/pull/23797)
+- fix(cli): resolve TTY hang on headless environments by unconditionally
+  resuming process.stdin before React Ink launch by @cocosheng-g in
+  [#23673](https://github.com/google-gemini/gemini-cli/pull/23673)
+- fix(ui): cleanup estimated string length hacks in composer by @keithguerin in
+  [#23694](https://github.com/google-gemini/gemini-cli/pull/23694)
+- feat(browser): dynamically discover read-only tools by @cynthialong0-0 in
+  [#23805](https://github.com/google-gemini/gemini-cli/pull/23805)
+- docs: clarify policy requirement for `general.plan.directory` in settings
+  schema by @jerop in
+  [#23784](https://github.com/google-gemini/gemini-cli/pull/23784)
+- Revert "perf(cli): optimize --version startup time (#23671)" by @scidomino in
+  [#23812](https://github.com/google-gemini/gemini-cli/pull/23812)
+- don't silence errors from wombat by @scidomino in
+  [#23822](https://github.com/google-gemini/gemini-cli/pull/23822)
+- fix(ui): prevent escape key from cancelling requests in shell mode by
+  @PrasannaPal21 in
+  [#21245](https://github.com/google-gemini/gemini-cli/pull/21245)
+- Changelog for v0.36.0-preview.0 by @gemini-cli-robot in
+  [#23702](https://github.com/google-gemini/gemini-cli/pull/23702)
+- feat(core,ui): Add experiment-gated support for gemini flash 3.1 lite by
+  @chrstnb in [#23794](https://github.com/google-gemini/gemini-cli/pull/23794)
+- Changelog for v0.36.0-preview.3 by @gemini-cli-robot in
+  [#23827](https://github.com/google-gemini/gemini-cli/pull/23827)
+- new linting check: github-actions-pinning by @alisa-alisa in
+  [#23808](https://github.com/google-gemini/gemini-cli/pull/23808)
+- fix(cli): show helpful guidance when no skills are available by @Niralisj in
+  [#23785](https://github.com/google-gemini/gemini-cli/pull/23785)
+- fix: Chat logs and errors handle tail tool calls correctly by @googlestrobe in
+  [#22460](https://github.com/google-gemini/gemini-cli/pull/22460)
+- Don't try removing a tag from a non-existent release. by @scidomino in
+  [#23830](https://github.com/google-gemini/gemini-cli/pull/23830)
+- fix(cli): allow ask question dialog to take full window height by @jacob314 in
+  [#23693](https://github.com/google-gemini/gemini-cli/pull/23693)
+- fix(core): strip leading underscores from error types in telemetry by
+  @yunaseoul in [#23824](https://github.com/google-gemini/gemini-cli/pull/23824)
+- Changelog for v0.35.0 by @gemini-cli-robot in
+  [#23819](https://github.com/google-gemini/gemini-cli/pull/23819)
+- feat(evals): add reliability harvester and 500/503 retry support by
+  @alisa-alisa in
+  [#23626](https://github.com/google-gemini/gemini-cli/pull/23626)
+- feat(sandbox): dynamic Linux sandbox expansion and worktree support by @galz10
+  in [#23692](https://github.com/google-gemini/gemini-cli/pull/23692)
+- Merge examples of use into quickstart documentation by @diodesign in
+  [#23319](https://github.com/google-gemini/gemini-cli/pull/23319)
+- fix(cli): prioritize primary name matches in slash command search by @sehoon38
+  in [#23850](https://github.com/google-gemini/gemini-cli/pull/23850)
+- Changelog for v0.35.1 by @gemini-cli-robot in
+  [#23840](https://github.com/google-gemini/gemini-cli/pull/23840)
+- fix(browser): keep input blocker active across navigations by @kunal-10-cloud
+  in [#22562](https://github.com/google-gemini/gemini-cli/pull/22562)
+- feat(core): new skill to look for duplicated code while reviewing PRs by
+  @devr0306 in [#23704](https://github.com/google-gemini/gemini-cli/pull/23704)
+- fix(core): replace hardcoded non-interactive ASK_USER denial with explicit
+  policy rules by @ruomengz in
+  [#23668](https://github.com/google-gemini/gemini-cli/pull/23668)
+- fix(plan): after exiting plan mode switches model to a flash model by @Adib234
+  in [#23885](https://github.com/google-gemini/gemini-cli/pull/23885)
+- feat(gcp): add development worker infrastructure by @mattKorwel in
+  [#23814](https://github.com/google-gemini/gemini-cli/pull/23814)
+- fix(a2a-server): A2A server should execute ask policies in interactive mode by
+  @kschaab in [#23831](https://github.com/google-gemini/gemini-cli/pull/23831)
+- feat(core): define TrajectoryProvider interface by @sehoon38 in
+  [#23050](https://github.com/google-gemini/gemini-cli/pull/23050)
+- Docs: Update quotas and pricing by @jkcinouye in
+  [#23835](https://github.com/google-gemini/gemini-cli/pull/23835)
+- fix(core): allow disabling environment variable redaction by @galz10 in
+  [#23927](https://github.com/google-gemini/gemini-cli/pull/23927)
+- feat(cli): enable notifications cross-platform via terminal bell fallback by
+  @genneth in [#21618](https://github.com/google-gemini/gemini-cli/pull/21618)
+- feat(sandbox): implement secret visibility lockdown for env files by
+  @DavidAPierce in
+  [#23712](https://github.com/google-gemini/gemini-cli/pull/23712)
+- fix(core): remove shell outputChunks buffer caching to prevent memory bloat
+  and sanitize prompt input by @spencer426 in
+  [#23751](https://github.com/google-gemini/gemini-cli/pull/23751)
+- feat(core): implement persistent browser session management by @kunal-10-cloud
+  in [#21306](https://github.com/google-gemini/gemini-cli/pull/21306)
+- refactor(core): delegate sandbox denial parsing to SandboxManager by
+  @scidomino in [#23928](https://github.com/google-gemini/gemini-cli/pull/23928)
+- dep(update) Update Ink version to 6.5.0 by @jacob314 in
+  [#23843](https://github.com/google-gemini/gemini-cli/pull/23843)
+- Docs: Update 'docs-writer' skill for relative links by @jkcinouye in
+  [#21463](https://github.com/google-gemini/gemini-cli/pull/21463)
+- Changelog for v0.36.0-preview.4 by @gemini-cli-robot in
+  [#23935](https://github.com/google-gemini/gemini-cli/pull/23935)
+- fix(acp): Update allow approval policy flow for ACP clients to fix config
+  persistence and compatible with TUI by @sripasg in
+  [#23818](https://github.com/google-gemini/gemini-cli/pull/23818)
+- Changelog for v0.35.2 by @gemini-cli-robot in
+  [#23960](https://github.com/google-gemini/gemini-cli/pull/23960)
+- ACP integration documents by @g-samroberts in
+  [#22254](https://github.com/google-gemini/gemini-cli/pull/22254)
+- fix(core): explicitly set error names to avoid bundling renaming issues by
+  @yunaseoul in [#23913](https://github.com/google-gemini/gemini-cli/pull/23913)
+- feat(core): subagent isolation and cleanup hardening by @abhipatel12 in
+  [#23903](https://github.com/google-gemini/gemini-cli/pull/23903)
+- disable extension-reload test by @scidomino in
+  [#24018](https://github.com/google-gemini/gemini-cli/pull/24018)
+- feat(core): add forbiddenPaths to GlobalSandboxOptions and refactor
+  createSandboxManager by @ehedlund in
+  [#23936](https://github.com/google-gemini/gemini-cli/pull/23936)
+- refactor(core): improve ignore resolution and fix directory-matching bug by
+  @ehedlund in [#23816](https://github.com/google-gemini/gemini-cli/pull/23816)
+- revert(core): support custom base URL via env vars by @spencer426 in
+  [#23976](https://github.com/google-gemini/gemini-cli/pull/23976)
+- Increase memory limited for eslint. by @jacob314 in
+  [#24022](https://github.com/google-gemini/gemini-cli/pull/24022)
+- fix(acp): prevent crash on empty response in ACP mode by @sripasg in
+  [#23952](https://github.com/google-gemini/gemini-cli/pull/23952)
+- feat(core): Land `AgentHistoryProvider`. by @joshualitt in
+  [#23978](https://github.com/google-gemini/gemini-cli/pull/23978)
+- fix(core): switch to subshells for shell tool wrapping to fix heredocs and
+  edge cases by @abhipatel12 in
+  [#24024](https://github.com/google-gemini/gemini-cli/pull/24024)
+- Debug command. by @jacob314 in
+  [#23851](https://github.com/google-gemini/gemini-cli/pull/23851)
+- Changelog for v0.36.0-preview.5 by @gemini-cli-robot in
+  [#24046](https://github.com/google-gemini/gemini-cli/pull/24046)
+- Fix test flakes by globally mocking ink-spinner by @jacob314 in
+  [#24044](https://github.com/google-gemini/gemini-cli/pull/24044)
+- Enable network access in sandbox configuration by @galz10 in
+  [#24055](https://github.com/google-gemini/gemini-cli/pull/24055)
+- feat(context): add configurable memoryBoundaryMarkers setting by @SandyTao520
+  in [#24020](https://github.com/google-gemini/gemini-cli/pull/24020)
+- feat(core): implement windows sandbox expansion and denial detection by
+  @scidomino in [#24027](https://github.com/google-gemini/gemini-cli/pull/24027)
+- fix(core): resolve ACP Operation Aborted Errors in grep_search by @ivanporty
+  in [#23821](https://github.com/google-gemini/gemini-cli/pull/23821)
+- fix(hooks): prevent SessionEnd from firing twice in non-interactive mode by
+  @krishdef7 in [#22139](https://github.com/google-gemini/gemini-cli/pull/22139)
+- Re-word intro to Gemini 3 page. by @g-samroberts in
+  [#24069](https://github.com/google-gemini/gemini-cli/pull/24069)
+- fix(cli): resolve layout contention and flashing loop in StatusRow by
+  @keithguerin in
+  [#24065](https://github.com/google-gemini/gemini-cli/pull/24065)
+- fix(sandbox): implement Windows Mandatory Integrity Control for GeminiSandbox
+  by @galz10 in [#24057](https://github.com/google-gemini/gemini-cli/pull/24057)
+- feat(core): implement tool-based topic grouping (Chapters) by @Abhijit-2592 in
+  [#23150](https://github.com/google-gemini/gemini-cli/pull/23150)
+- feat(cli): support 'tab to queue' for messages while generating by @gundermanc
+  in [#24052](https://github.com/google-gemini/gemini-cli/pull/24052)
+- feat(core): agnostic background task UI with CompletionBehavior by
+  @adamfweidman in
+  [#22740](https://github.com/google-gemini/gemini-cli/pull/22740)
+- UX for topic narration tool by @gundermanc in
+  [#24079](https://github.com/google-gemini/gemini-cli/pull/24079)
+- fix: shellcheck warnings in scripts by @scidomino in
+  [#24035](https://github.com/google-gemini/gemini-cli/pull/24035)
+- test(evals): add comprehensive subagent delegation evaluations by @abhipatel12
+  in [#24132](https://github.com/google-gemini/gemini-cli/pull/24132)
+- fix(a2a-server): prioritize ADC before evaluating headless constraints for
+  auth initialization by @spencer426 in
+  [#23614](https://github.com/google-gemini/gemini-cli/pull/23614)
+- Text can be added after /plan command by @rambleraptor in
+  [#22833](https://github.com/google-gemini/gemini-cli/pull/22833)
+- fix(cli): resolve missing F12 logs via global console store by @scidomino in
+  [#24235](https://github.com/google-gemini/gemini-cli/pull/24235)
+- fix broken tests by @scidomino in
+  [#24279](https://github.com/google-gemini/gemini-cli/pull/24279)
+- fix(evals): add update_topic behavioral eval by @gundermanc in
+  [#24223](https://github.com/google-gemini/gemini-cli/pull/24223)
+- feat(core): Unified Context Management and Tool Distillation. by @joshualitt
+  in [#24157](https://github.com/google-gemini/gemini-cli/pull/24157)
+- Default enable narration for the team. by @gundermanc in
+  [#24224](https://github.com/google-gemini/gemini-cli/pull/24224)
+- fix(core): ensure default agents provide tools and use model-specific schemas
+  by @abhipatel12 in
+  [#24268](https://github.com/google-gemini/gemini-cli/pull/24268)
+- feat(cli): show Flash Lite Preview model regardless of user tier by @sehoon38
+  in [#23904](https://github.com/google-gemini/gemini-cli/pull/23904)
+- feat(cli): implement compact tool output by @jwhelangoog in
+  [#20974](https://github.com/google-gemini/gemini-cli/pull/20974)
+- Add security settings for tool sandboxing by @galz10 in
+  [#23923](https://github.com/google-gemini/gemini-cli/pull/23923)
+- chore(test-utils): switch integration tests to use PREVIEW_GEMINI_MODEL by
+  @sehoon38 in [#24276](https://github.com/google-gemini/gemini-cli/pull/24276)
+- feat(core): enable topic update narration for legacy models by @Abhijit-2592
+  in [#24241](https://github.com/google-gemini/gemini-cli/pull/24241)
+- feat(core): add project-level memory scope to save_memory tool by @SandyTao520
+  in [#24161](https://github.com/google-gemini/gemini-cli/pull/24161)
+- test(integration): fix plan mode write denial test false positive by @sehoon38
+  in [#24299](https://github.com/google-gemini/gemini-cli/pull/24299)
+- feat(plan): support `Plan` mode in untrusted folders by @Adib234 in
+  [#17586](https://github.com/google-gemini/gemini-cli/pull/17586)
+- fix(core): enable mid-stream retries for all models and re-enable compression
+  test by @sehoon38 in
+  [#24302](https://github.com/google-gemini/gemini-cli/pull/24302)
+- Changelog for v0.36.0-preview.6 by @gemini-cli-robot in
+  [#24082](https://github.com/google-gemini/gemini-cli/pull/24082)
+- Changelog for v0.35.3 by @gemini-cli-robot in
+  [#24083](https://github.com/google-gemini/gemini-cli/pull/24083)
+- feat(cli): add auth info to footer by @sehoon38 in
+  [#24042](https://github.com/google-gemini/gemini-cli/pull/24042)
+- fix(browser): reset action counter for each agent session and let it ignore
+  internal actions by @cynthialong0-0 in
+  [#24228](https://github.com/google-gemini/gemini-cli/pull/24228)
+- feat(plan): promote planning feature to stable by @ruomengz in
+  [#24282](https://github.com/google-gemini/gemini-cli/pull/24282)
+- fix(browser): terminate subagent immediately on domain restriction violations
+  by @gsquared94 in
+  [#24313](https://github.com/google-gemini/gemini-cli/pull/24313)
+- feat(cli): add UI to update extensions by @ruomengz in
+  [#23682](https://github.com/google-gemini/gemini-cli/pull/23682)
+- Fix(browser): terminate immediately for "browser is already running" error by
+  @cynthialong0-0 in
+  [#24233](https://github.com/google-gemini/gemini-cli/pull/24233)
+- docs: Add 'plan' option to approval mode in CLI reference by @YifanRuan in
+  [#24134](https://github.com/google-gemini/gemini-cli/pull/24134)
+- fix(core): batch macOS seatbelt rules into a profile file to prevent ARG_MAX
+  errors by @ehedlund in
+  [#24255](https://github.com/google-gemini/gemini-cli/pull/24255)
+- fix(core): fix race condition between browser agent and main closing process
+  by @cynthialong0-0 in
+  [#24340](https://github.com/google-gemini/gemini-cli/pull/24340)
+- perf(build): optimize build scripts for parallel execution and remove
+  redundant checks by @sehoon38 in
+  [#24307](https://github.com/google-gemini/gemini-cli/pull/24307)
+- ci: install bubblewrap on Linux for release workflows by @ehedlund in
+  [#24347](https://github.com/google-gemini/gemini-cli/pull/24347)
+- chore(release): allow bundling for all builds, including stable by @sehoon38
+  in [#24305](https://github.com/google-gemini/gemini-cli/pull/24305)
+- Revert "Add security settings for tool sandboxing" by @jerop in
+  [#24357](https://github.com/google-gemini/gemini-cli/pull/24357)
+- docs: update subagents docs to not be experimental by @abhipatel12 in
+  [#24343](https://github.com/google-gemini/gemini-cli/pull/24343)
+- fix(core): implement **read and **write commands in sandbox managers by
+  @galz10 in [#24283](https://github.com/google-gemini/gemini-cli/pull/24283)
+- don't try to remove tags in dry run by @scidomino in
+  [#24356](https://github.com/google-gemini/gemini-cli/pull/24356)
+- fix(config): disable JIT context loading by default by @SandyTao520 in
+  [#24364](https://github.com/google-gemini/gemini-cli/pull/24364)
+- test(sandbox): add integration test for dynamic permission expansion by
+  @galz10 in [#24359](https://github.com/google-gemini/gemini-cli/pull/24359)
+- docs(policy): remove unsupported mcpName wildcard edge case by @abhipatel12 in
+  [#24133](https://github.com/google-gemini/gemini-cli/pull/24133)
+- docs: fix broken GEMINI.md link in CONTRIBUTING.md by @Panchal-Tirth in
+  [#24182](https://github.com/google-gemini/gemini-cli/pull/24182)
+- feat(core): infrastructure for event-driven subagent history by @abhipatel12
+  in [#23914](https://github.com/google-gemini/gemini-cli/pull/23914)
+- fix(core): resolve Plan Mode deadlock during plan file creation due to sandbox
+  restrictions by @DavidAPierce in
+  [#24047](https://github.com/google-gemini/gemini-cli/pull/24047)
+- fix(core): fix browser agent UX issues and improve E2E test reliability by
+  @gsquared94 in
+  [#24312](https://github.com/google-gemini/gemini-cli/pull/24312)
+- fix(ui): wrap topic and intent fields in TopicMessage by @jwhelangoog in
+  [#24386](https://github.com/google-gemini/gemini-cli/pull/24386)
+- refactor(core): Centralize context management logic into src/context by
   @joshualitt in
-  [#24752](https://github.com/google-gemini/gemini-cli/pull/24752)
-- docs(core): update generalist agent documentation by @abhipatel12 in
-  [#25325](https://github.com/google-gemini/gemini-cli/pull/25325)
-- chore(mcp): check MCP error code over brittle string match by @jackwotherspoon
-  in [#25381](https://github.com/google-gemini/gemini-cli/pull/25381)
-- feat(plan): update plan mode prompt to allow showing plan content by @ruomengz
-  in [#25058](https://github.com/google-gemini/gemini-cli/pull/25058)
-- test(core): improve sandbox integration test coverage and fix OS-specific
-  failures by @ehedlund in
-  [#25307](https://github.com/google-gemini/gemini-cli/pull/25307)
-- fix(core): use debug level for keychain fallback logging by @ehedlund in
-  [#25398](https://github.com/google-gemini/gemini-cli/pull/25398)
-- feat(test): add a performance test in asian language by @cynthialong0-0 in
-  [#25392](https://github.com/google-gemini/gemini-cli/pull/25392)
-- feat(cli): enable mouse clicking for cursor positioning in AskUser multi-line
-  answers by @Adib234 in
-  [#24630](https://github.com/google-gemini/gemini-cli/pull/24630)
-- fix(core): detect kmscon terminal as supporting true color by @claygeo in
-  [#25282](https://github.com/google-gemini/gemini-cli/pull/25282)
-- ci: add agent session drift check workflow by @adamfweidman in
-  [#25389](https://github.com/google-gemini/gemini-cli/pull/25389)
-- use macos-latest-large runner where applicable. by @scidomino in
-  [#25413](https://github.com/google-gemini/gemini-cli/pull/25413)
-- Changelog for v0.37.2 by @gemini-cli-robot in
-  [#25336](https://github.com/google-gemini/gemini-cli/pull/25336)
+  [#24380](https://github.com/google-gemini/gemini-cli/pull/24380)
+- fix(core): pin AuthType.GATEWAY to use Gemini 3.1 Pro/Flash Lite by default by
+  @sripasg in [#24375](https://github.com/google-gemini/gemini-cli/pull/24375)
+- feat(ui): add Tokyo Night theme by @danrneal in
+  [#24054](https://github.com/google-gemini/gemini-cli/pull/24054)
+- fix(cli): refactor test config loading and mock debugLogger in test-setup by
+  @mattKorwel in
+  [#24389](https://github.com/google-gemini/gemini-cli/pull/24389)
+- Set memoryManager to false in settings.json by @mattKorwel in
+  [#24393](https://github.com/google-gemini/gemini-cli/pull/24393)
+- ink 6.6.3 by @jacob314 in
+  [#24372](https://github.com/google-gemini/gemini-cli/pull/24372)
+- fix(core): resolve subagent chat recording gaps and directory inheritance by
+  @abhipatel12 in
+  [#24368](https://github.com/google-gemini/gemini-cli/pull/24368)
+- fix(cli): cap shell output at 10 MB to prevent RangeError crash by @ProthamD
+  in [#24168](https://github.com/google-gemini/gemini-cli/pull/24168)
+- feat(plan): conditionally add enter/exit plan mode tools based on current mode
+  by @ruomengz in
+  [#24378](https://github.com/google-gemini/gemini-cli/pull/24378)
+- feat(core): prioritize discussion before formal plan approval by @jerop in
+  [#24423](https://github.com/google-gemini/gemini-cli/pull/24423)
+- fix(ui): add accelerated scrolling on alternate buffer mode by @devr0306 in
+  [#23940](https://github.com/google-gemini/gemini-cli/pull/23940)
+- feat(core): populate sandbox forbidden paths with project ignore file contents
+  by @ehedlund in
+  [#24038](https://github.com/google-gemini/gemini-cli/pull/24038)
+- fix(core): ensure blue border overlay and input blocker to act correctly
+  depending on browser agent activities by @cynthialong0-0 in
+  [#24385](https://github.com/google-gemini/gemini-cli/pull/24385)
+- fix(ui): removed additional vertical padding for tables by @devr0306 in
+  [#24381](https://github.com/google-gemini/gemini-cli/pull/24381)
+- fix(build): upload full bundle directory archive to GitHub releases by
+  @sehoon38 in [#24403](https://github.com/google-gemini/gemini-cli/pull/24403)
+- fix(build): wire bundle:browser-mcp into bundle pipeline by @gsquared94 in
+  [#24424](https://github.com/google-gemini/gemini-cli/pull/24424)
+- feat(browser): add sandbox-aware browser agent initialization by @gsquared94
+  in [#24419](https://github.com/google-gemini/gemini-cli/pull/24419)
+- feat(core): enhance tracker task schemas for detailed titles and descriptions
+  by @anj-s in [#23902](https://github.com/google-gemini/gemini-cli/pull/23902)
+- refactor(core): Unified context management settings schema by @joshualitt in
+  [#24391](https://github.com/google-gemini/gemini-cli/pull/24391)
+- feat(core): update browser agent prompt to check open pages first when
+  bringing up by @cynthialong0-0 in
+  [#24431](https://github.com/google-gemini/gemini-cli/pull/24431)
+- fix(acp) refactor(core,cli): centralize model discovery logic in
+  ModelConfigService by @sripasg in
+  [#24392](https://github.com/google-gemini/gemini-cli/pull/24392)
+- Changelog for v0.36.0-preview.7 by @gemini-cli-robot in
+  [#24346](https://github.com/google-gemini/gemini-cli/pull/24346)
+- fix: update task tracker storage location in system prompt by @anj-s in
+  [#24034](https://github.com/google-gemini/gemini-cli/pull/24034)
+- feat(browser): supersede stale snapshots to reclaim context-window tokens by
+  @gsquared94 in
+  [#24440](https://github.com/google-gemini/gemini-cli/pull/24440)
+- docs(core): add subagent tool isolation draft doc by @akh64bit in
+  [#23275](https://github.com/google-gemini/gemini-cli/pull/23275)
 
 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.38.0-preview.0...v0.39.0-preview.0
+https://github.com/google-gemini/gemini-cli/compare/v0.36.0-preview.8...v0.37.0-preview.2

docs/cli/acp-mode.md

@@ -44,8 +44,8 @@ and Gemini CLI (the server).
 
 - **Communication:** The entire communication happens over standard input/output
   (stdio) using the JSON-RPC 2.0 protocol.
-- **Client's role:** The client is responsible for sending requests (for
-  example, prompts) and handling responses and notifications from Gemini CLI.
+- **Client's role:** The client is responsible for sending requests (e.g.,
+  prompts) and handling responses and notifications from Gemini CLI.
 - **Gemini CLI's role:** In ACP mode, Gemini CLI listens for incoming JSON-RPC
   requests, processes them, and sends back responses.
 
@@ -72,8 +72,8 @@ leverage the IDE's capabilities to perform tasks. The MCP client logic is in
 
 ## Capabilities and supported methods
 
-The ACP protocol exposes a number of methods for ACP clients (for example IDEs)
-to control Gemini CLI.
+The ACP protocol exposes a number of methods for ACP clients (e.g. IDEs) to
+control Gemini CLI.
 
 ### Core methods
 
@@ -87,8 +87,8 @@ to control Gemini CLI.
 
 ### Session control
 
-- `setSessionMode`: Allows changing the approval level for tool calls (for
-  example, to `auto-approve`).
+- `setSessionMode`: Allows changing the approval level for tool calls (e.g., to
+  `auto-approve`).
 - `unstable_setSessionModel`: Changes the model for the current session.
 
 ### File system proxy

docs/cli/auto-memory.md

@@ -1,143 +0,0 @@
-# Auto Memory
-
-Auto Memory is an experimental feature that mines your past Gemini CLI sessions
-in the background and turns recurring workflows into reusable
-[Agent Skills](./skills.md). You review, accept, or discard each extracted skill
-before it becomes available to future sessions.
-
-<!-- prettier-ignore -->
-> [!NOTE]
-> This is an experimental feature currently under active development.
-
-## Overview
-
-Every session you run with Gemini CLI is recorded locally as a transcript. Auto
-Memory scans those transcripts for procedural patterns that recur across
-sessions, then drafts each pattern as a `SKILL.md` file in a project-local
-inbox. You inspect the draft, decide whether it captures real expertise, and
-promote it to your global or workspace skills directory if you want it.
-
-You'll use Auto Memory when you want to:
-
-- **Capture team workflows** that you find yourself walking the agent through
-  more than once.
-- **Codify hard-won fixes** for project-specific landmines so future sessions
-  avoid them.
-- **Bootstrap a skills library** without writing every `SKILL.md` by hand.
-
-Auto Memory complements—but does not replace—the
-[`save_memory` tool](../tools/memory.md), which captures single facts into
-`GEMINI.md`. Auto Memory captures multi-step procedures into skills.
-
-## Prerequisites
-
-- Gemini CLI installed and authenticated.
-- At least 10 user messages across recent, idle sessions in the project. Auto
-  Memory ignores active or trivial sessions.
-
-## How to enable Auto Memory
-
-Auto Memory is off by default. Enable it in your settings file:
-
-1.  Open your global settings file at `~/.gemini/settings.json`. If you only
-    want Auto Memory in one project, edit `.gemini/settings.json` in that
-    project instead.
-
-2.  Add the experimental flag:
-
-    ```json
-    {
-      "experimental": {
-        "autoMemory": true
-      }
-    }
-    ```
-
-3.  Restart Gemini CLI. The flag requires a restart because the extraction
-    service starts during session boot.
-
-## How Auto Memory works
-
-Auto Memory runs as a background task on session startup. It does not block the
-UI, consume your interactive turns, or surface tool prompts.
-
-1.  **Eligibility scan.** The service indexes recent sessions from
-    `~/.gemini/tmp/<project>/chats/`. Sessions are eligible only if they have
-    been idle for at least three hours and contain at least 10 user messages.
-2.  **Lock acquisition.** A lock file in the project's memory directory
-    coordinates across multiple CLI instances so extraction runs at most once at
-    a time.
-3.  **Sub-agent extraction.** A specialized sub-agent (named `confucius`)
-    reviews the session index, reads any sessions that look like they contain
-    repeated procedural workflows, and drafts new `SKILL.md` files. Its
-    instructions tell it to default to creating zero skills unless the evidence
-    is strong, so most runs produce no inbox items.
-4.  **Patch validation.** If the sub-agent proposes edits to skills outside the
-    inbox (for example, an existing global skill), it writes a unified diff
-    `.patch` file. Auto Memory dry-runs each patch and discards any that do not
-    apply cleanly.
-5.  **Notification.** When a run produces new skills or patches, Gemini CLI
-    surfaces an inline message telling you how many items are waiting.
-
-## How to review extracted skills
-
-Use the `/memory inbox` slash command to open the inbox dialog at any time:
-
-**Command:** `/memory inbox`
-
-The dialog lists each draft skill with its name, description, and source
-sessions. From there you can:
-
-- **Read** the full `SKILL.md` body before deciding.
-- **Promote** a skill to your user (`~/.gemini/skills/`) or workspace
-  (`.gemini/skills/`) directory.
-- **Discard** a skill you do not want.
-- **Apply** or reject a `.patch` proposal against an existing skill.
-
-Promoted skills become discoverable in the next session and follow the standard
-[skill discovery precedence](./skills.md#skill-discovery-tiers).
-
-## How to disable Auto Memory
-
-To turn off background extraction, set the flag back to `false` in your settings
-file and restart Gemini CLI:
-
-```json
-{
-  "experimental": {
-    "autoMemory": false
-  }
-}
-```
-
-Disabling the flag stops the background service immediately on the next session
-start. Existing inbox items remain on disk; you can either drain them with
-`/memory inbox` first or remove the project memory directory manually.
-
-## Data and privacy
-
-- Auto Memory only reads session files that already exist locally on your
-  machine. Nothing is uploaded to Gemini outside the normal API calls the
-  extraction sub-agent makes during its run.
-- The sub-agent is instructed to redact secrets, tokens, and credentials it
-  encounters and to never copy large tool outputs verbatim.
-- Drafted skills live in your project's memory directory until you promote or
-  discard them. They are not automatically loaded into any session.
-
-## Limitations
-
-- The sub-agent runs on a preview Gemini Flash model. Extraction quality depends
-  on the model's ability to recognize durable patterns versus one-off incidents.
-- Auto Memory does not extract skills from the current session. It only
-  considers sessions that have been idle for three hours or more.
-- Inbox items are stored per project. Skills extracted in one workspace are not
-  visible from another until you promote them to the user-scope skills
-  directory.
-
-## Next steps
-
-- Learn how skills are discovered and activated in [Agent Skills](./skills.md).
-- Explore the [memory management tutorial](./tutorials/memory-management.md) for
-  the complementary `save_memory` and `GEMINI.md` workflows.
-- Review the experimental settings catalog in
-  [Settings](./settings.md#experimental).

docs/cli/checkpointing.md

@@ -1,9 +1,9 @@
 # Checkpointing
 
-Gemini CLI includes a Checkpointing feature that automatically saves a snapshot
-of your project's state before any file modifications are made by AI-powered
-tools. This lets you safely experiment with and apply code changes, knowing you
-can instantly revert back to the state before the tool was run.
+The Gemini CLI includes a Checkpointing feature that automatically saves a
+snapshot of your project's state before any file modifications are made by
+AI-powered tools. This lets you safely experiment with and apply code changes,
+knowing you can instantly revert back to the state before the tool was run.
 
 ## How it works
 
@@ -72,7 +72,7 @@ To see a list of all saved checkpoints for the current project, simply run:
 
 The CLI will display a list of available checkpoint files. These file names are
 typically composed of a timestamp, the name of the file being modified, and the
-name of the tool that was about to be run (for example,
+name of the tool that was about to be run (e.g.,
 `2025-06-22T10-00-00_000Z-my-file.txt-write_file`).
 
 ### Restore a specific checkpoint

docs/cli/cli-reference.md

@@ -29,16 +29,16 @@ and parameters.
 
 These commands are available within the interactive REPL.
 
-| Command              | Description                                     |
-| -------------------- | ----------------------------------------------- |
-| `/skills reload`     | Reload discovered skills from disk              |
-| `/agents reload`     | Reload the agent registry                       |
-| `/commands reload`   | Reload custom slash commands                    |
-| `/memory reload`     | Reload context files (for example, `GEMINI.md`) |
-| `/mcp reload`        | Restart and reload MCP servers                  |
-| `/extensions reload` | Reload all active extensions                    |
-| `/help`              | Show help for all commands                      |
-| `/quit`              | Exit the interactive session                    |
+| Command              | Description                              |
+| -------------------- | ---------------------------------------- |
+| `/skills reload`     | Reload discovered skills from disk       |
+| `/agents reload`     | Reload the agent registry                |
+| `/commands reload`   | Reload custom slash commands             |
+| `/memory reload`     | Reload context files (e.g., `GEMINI.md`) |
+| `/mcp reload`        | Restart and reload MCP servers           |
+| `/extensions reload` | Reload all active extensions             |
+| `/help`              | Show help for all commands               |
+| `/quit`              | Exit the interactive session             |
 
 ## CLI Options
 
@@ -52,7 +52,6 @@ These commands are available within the interactive REPL.
 | `--prompt-interactive`           | `-i`  | string  | -         | Execute prompt and continue in interactive mode                                                                                                                        |
 | `--worktree`                     | `-w`  | string  | -         | Start Gemini in a new git worktree. If no name is provided, one is generated automatically. Requires `experimental.worktrees: true` in settings.                       |
 | `--sandbox`                      | `-s`  | boolean | `false`   | Run in a sandboxed environment for safer execution                                                                                                                     |
-| `--skip-trust`                   | -     | boolean | `false`   | Trust the current workspace for this session, skipping the folder trust check.                                                                                         |
 | `--approval-mode`                | -     | string  | `default` | Approval mode for tool execution. Choices: `default`, `auto_edit`, `yolo`, `plan`                                                                                      |
 | `--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.**                                                                                                        |
@@ -61,7 +60,7 @@ These commands are available within the interactive REPL.
 | `--allowed-tools`                | -     | array   | -         | **Deprecated.** Use the [Policy Engine](../reference/policy-engine.md) instead. Tools that are allowed to run without confirmation (comma-separated or multiple flags) |
 | `--extensions`                   | `-e`  | array   | -         | List of extensions to use. If not provided, all extensions are enabled (comma-separated or multiple flags)                                                             |
 | `--list-extensions`              | `-l`  | boolean | -         | List all available extensions and exit                                                                                                                                 |
-| `--resume`                       | `-r`  | string  | -         | Resume a previous session. Use `"latest"` for most recent or index number (for example `--resume 5`)                                                                   |
+| `--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)                                                                                 |

docs/cli/creating-skills.md

@@ -14,7 +14,7 @@ skill. To use it, ask Gemini CLI to create a new skill for you.
 
 Gemini CLI will then use the `skill-creator` to generate the skill:
 
-1.  Generate a new directory for your skill (for example, `my-new-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
@@ -24,7 +24,7 @@ Gemini CLI will then use the `skill-creator` to generate the skill:
 
 If you prefer to create skills manually:
 
-1.  **Create a directory** for your skill (for example, `my-new-skill/`).
+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

docs/cli/custom-commands.md

@@ -85,8 +85,8 @@ The model receives:
 **B. Using arguments in shell commands (inside `!{...}` blocks)**
 
 When you use `{{args}}` inside a shell injection block (`!{...}`), the arguments
-are automatically **shell-escaped** before replacement. This lets you safely
-pass arguments to shell commands, ensuring the resulting command is
+are automatically **shell-escaped** before replacement. This allows you to
+safely pass arguments to shell commands, ensuring the resulting command is
 syntactically correct and secure while preventing command injection
 vulnerabilities.
 
@@ -105,8 +105,8 @@ 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`.
-3. Inside: The second `{{args}}` is replaced with the escaped version (for
-   example, on Linux: `"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" .`.
 5. The CLI prompts you to confirm this exact, secure command before execution.
 6. The final prompt is sent.
@@ -116,13 +116,13 @@ When you run `/grep-code It's complicated`:
 If your `prompt` does **not** contain the special placeholder `{{args}}`, the
 CLI uses a default behavior for handling arguments.
 
-If you provide arguments to the command (for example, `/mycommand arg1`), the
-CLI will append the full command you typed to the end of the prompt, separated
-by two newlines. This allows the model to see both the original instructions and
-the specific arguments you just provided.
+If you provide arguments to the command (e.g., `/mycommand arg1`), the CLI will
+append the full command you typed to the end of the prompt, separated by two
+newlines. This allows the model to see both the original instructions and the
+specific arguments you just provided.
 
-If you do **not** provide any arguments (for example, `/mycommand`), the prompt
-is sent to the model exactly as it is, with nothing appended.
+If you do **not** provide any arguments (e.g., `/mycommand`), the prompt is sent
+to the model exactly as it is, with nothing appended.
 
 **Example (`changelog.toml`):**
 
@@ -188,7 +188,7 @@ ensure that only intended commands can be run.
     dialog will appear showing the exact command(s) to be executed.
 5.  **Execution and error reporting:** The command is executed. If the command
     fails, the output injected into the prompt will include the error messages
-    (stderr) followed by a status line, for example,
+    (stderr) followed by a status line, e.g.,
     `[Shell command exited with code 1]`. This helps the model understand the
     context of the failure.
 
@@ -229,10 +229,9 @@ operate on specific files.
 
 - **File injection**: `@{path/to/file.txt}` is replaced by the content of
   `file.txt`.
-- **Multimodal support**: If the path points to a supported image (for example,
-  PNG, JPEG), PDF, audio, or video file, it will be correctly encoded and
-  injected as multimodal input. Other binary files are handled gracefully and
-  skipped.
+- **Multimodal support**: If the path points to a supported image (e.g., PNG,
+  JPEG), PDF, audio, or video file, it will be correctly encoded and injected as
+  multimodal input. Other binary files are handled gracefully and skipped.
 - **Directory listing**: `@{path/to/dir}` is traversed and each file present
   within the directory and all subdirectories is inserted into the prompt. This
   respects `.gitignore` and `.geminiignore` if enabled.

docs/cli/enterprise.md

@@ -175,8 +175,8 @@ the enterprise settings are always loaded with the highest precedence.
 **Example wrapper script:**
 
 Administrators can create a script named `gemini` and place it in a directory
-that appears earlier in the user's `PATH` than the actual Gemini CLI binary (for
-example, `/usr/local/bin/gemini`).
+that appears earlier in the user's `PATH` than the actual Gemini CLI binary
+(e.g., `/usr/local/bin/gemini`).
 
 ```bash
 #!/bin/bash
@@ -325,9 +325,9 @@ User. When it comes to the `mcpServers` object, these configurations are
 1.  **Merging:** The lists of servers from all three levels are combined into a
     single list.
 2.  **Precedence:** If a server with the **same name** is defined at multiple
-    levels (for example, a server named `corp-api` exists in both system and
-    user settings), the definition from the highest-precedence level is used.
-    The order of precedence is: **System > Workspace > User**.
+    levels (e.g., a server named `corp-api` exists in both system and user
+    settings), the definition from the highest-precedence level is used. The
+    order of precedence is: **System > Workspace > User**.
 
 This means a user **cannot** override the definition of a server that is already
 defined in the system-level settings. However, they **can** add new servers with
@@ -343,8 +343,8 @@ canonical servers and adding their names to an allowlist.
 For even greater security, especially when dealing with third-party MCP servers,
 you can restrict which specific tools from a server are exposed to the model.
 This is done using the `includeTools` and `excludeTools` properties within a
-server's definition. This lets you use a subset of tools from a server without
-allowing potentially dangerous ones.
+server's definition. This allows you to use a subset of tools from a server
+without allowing potentially dangerous ones.
 
 Following the principle of least privilege, it is highly recommended to use
 `includeTools` to create an allowlist of only the necessary tools.
@@ -481,8 +481,9 @@ an environment variable, but it can also be enforced for custom tools via the
 ## Telemetry and auditing
 
 For auditing and monitoring purposes, you can configure Gemini CLI to send
-telemetry data to a central location. This lets you track tool usage and other
-events. For more information, see the [telemetry documentation](./telemetry.md).
+telemetry data to a central location. This allows you to track tool usage and
+other events. For more information, see the
+[telemetry documentation](./telemetry.md).
 
 **Example:** Enable telemetry and send it to a local OTLP collector. If
 `otlpEndpoint` is not specified, it defaults to `http://localhost:4317`.
@@ -505,19 +506,15 @@ events. For more information, see the [telemetry documentation](./telemetry.md).
 ## Authentication
 
 You can enforce a specific authentication method for all users by setting the
-`security.auth.enforcedType` in the system-level `settings.json` file. This
-prevents users from choosing a different authentication method. See the
-[Authentication docs](../get-started/authentication.mdx) for more details.
+`enforcedAuthType` in the system-level `settings.json` file. This prevents users
+from choosing a different authentication method. See the
+[Authentication docs](../get-started/authentication.md) for more details.
 
 **Example:** Enforce the use of Google login for all users.
 
 ```json
 {
-  "security": {
-    "auth": {
-      "enforcedType": "oauth-personal"
-    }
-  }
+  "enforcedAuthType": "oauth-personal"
 }
 ```
 

docs/cli/gemini-ignore.md

@@ -1,9 +1,9 @@
 # Ignoring files
 
 This document provides an overview of the Gemini Ignore (`.geminiignore`)
-feature of Gemini CLI.
+feature of the Gemini CLI.
 
-Gemini CLI includes the ability to automatically ignore files, similar to
+The Gemini CLI includes the ability to automatically ignore files, similar to
 `.gitignore` (used by Git) and `.aiexclude` (used by Gemini Code Assist). Adding
 paths to your `.geminiignore` file will exclude them from tools that support
 this feature, although they will still be visible to other services (such as

docs/cli/generation-settings.md

@@ -1,28 +1,26 @@
 # Advanced Model Configuration
 
-This guide details the Model Configuration system within Gemini CLI. Designed
-for researchers, AI quality engineers, and advanced users, this system provides
-a rigorous framework for managing generative model hyperparameters and
+This guide details the Model Configuration system within the Gemini CLI.
+Designed for researchers, AI quality engineers, and advanced users, this system
+provides a rigorous framework for managing generative model hyperparameters and
 behaviors.
 
-<!-- prettier-ignore -->
-> [!WARNING]
-> This is a power-user feature. Configuration values are passed
+> **Warning**: This is a power-user feature. Configuration values are passed
 > directly to the model provider with minimal validation. Incorrect settings
-> (for example, incompatible parameter combinations) may result in runtime
-> errors from the API.
+> (e.g., incompatible parameter combinations) may result in runtime errors from
+> the API.
 
 ## 1. System Overview
 
 The Model Configuration system (`ModelConfigService`) enables deterministic
-control over model generation. It decouples the requested model identifier (for
-example, a CLI flag or agent request) from the underlying API configuration.
-This allows for:
+control over model generation. It decouples the requested model identifier
+(e.g., a CLI flag or agent request) from the underlying API configuration. This
+allows for:
 
 - **Precise Hyperparameter Tuning**: Direct control over `temperature`, `topP`,
   `thinkingBudget`, and other SDK-level parameters.
 - **Environment-Specific Behavior**: Distinct configurations for different
-  operating contexts (for example, testing vs. production).
+  operating contexts (e.g., testing vs. production).
 - **Agent-Scoped Customization**: Applying specific settings only when a
   particular agent is active.
 
@@ -73,7 +71,7 @@ context. They are evaluated dynamically for each model request.
   specified `match` properties.
   - `model`: Matches the requested model name or alias.
   - `overrideScope`: Matches the distinct scope of the request (typically the
-    agent name, for example, `codebaseInvestigator`).
+    agent name, e.g., `codebaseInvestigator`).
 
 **Example Override**:
 
@@ -115,8 +113,8 @@ and `overrideScope`).
 1.  **Filtering**: All matching overrides are identified.
 2.  **Sorting**: Matches are prioritized by **specificity** (the number of
     matched keys in the `match` object).
-    - Specific matches (for example, `model` + `overrideScope`) override broad
-      matches (for example, `model` only).
+    - Specific matches (e.g., `model` + `overrideScope`) override broad matches
+      (e.g., `model` only).
     - Tie-breaking: If specificity is equal, the order of definition in the
       `overrides` array is preserved (last one wins).
 3.  **Merging**: The configurations from the sorted overrides are merged
@@ -130,10 +128,10 @@ The configuration follows the `ModelConfigServiceConfig` interface.
 
 Defines the actual parameters for the model.
 
-| Property                | Type     | Description                                                               |
-| :---------------------- | :------- | :------------------------------------------------------------------------ |
-| `model`                 | `string` | The identifier of the model to be called (for example, `gemini-2.5-pro`). |
-| `generateContentConfig` | `object` | The configuration object passed to the `@google/genai` SDK.               |
+| Property                | Type     | Description                                                        |
+| :---------------------- | :------- | :----------------------------------------------------------------- |
+| `model`                 | `string` | The identifier of the model to be called (e.g., `gemini-2.5-pro`). |
+| `generateContentConfig` | `object` | The configuration object passed to the `@google/genai` SDK.        |
 
 ### `GenerateContentConfig` (Common Parameters)
 
@@ -144,7 +142,7 @@ Directly maps to the SDK's `GenerateContentConfig`. Common parameters include:
 - **`topP`**: (`number`) Nucleus sampling probability.
 - **`maxOutputTokens`**: (`number`) Limit on generated response length.
 - **`thinkingConfig`**: (`object`) Configuration for models with reasoning
-  capabilities (for example, `thinkingBudget`, `includeThoughts`).
+  capabilities (e.g., `thinkingBudget`, `includeThoughts`).
 
 ## 5. Practical Examples
 
@@ -172,7 +170,7 @@ configuration but enforcing zero temperature.
 ### Agent-Specific Parameter Injection
 
 Enforce extended thinking budgets for a specific agent without altering the
-global default, for example for the `codebaseInvestigator`.
+global default, e.g. for the `codebaseInvestigator`.
 
 ```json
 "modelConfigs": {

docs/cli/model-routing.md

@@ -10,8 +10,8 @@ Model routing is managed by the `ModelAvailabilityService`, which monitors model
 health and automatically routes requests to available models based on defined
 policies.
 
-1.  **Model failure:** If the currently selected model fails (for example, due
-    to quota or server errors), the CLI will initiate the fallback process.
+1.  **Model failure:** If the currently selected model fails (e.g., due to quota
+    or server errors), the CLI will initiate 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

docs/cli/model-steering.md

@@ -19,7 +19,7 @@ Model steering is an experimental feature and is disabled by default. You can
 enable it using the `/settings` command or by updating your `settings.json`
 file.
 
-1.  Type `/settings` in Gemini CLI.
+1.  Type `/settings` in the Gemini CLI.
 2.  Search for **Model Steering**.
 3.  Set the value to **true**.
 

docs/cli/plan-mode.md

@@ -130,9 +130,7 @@ These are the only allowed tools:
   [`cli_help`](../core/subagents.md#cli-help-agent)
 - **Interaction:** [`ask_user`](../tools/ask-user.md)
 - **MCP tools (Read):** Read-only [MCP tools](../tools/mcp-server.md) (for
-  example, `github_read_issue`, `postgres_read_schema`) and core
-  [MCP resource tools](../tools/mcp-resources.md) (`list_mcp_resources`,
-  `read_mcp_resource`) are allowed.
+  example, `github_read_issue`, `postgres_read_schema`) are allowed.
 - **Planning (Write):**
   [`write_file`](../tools/file-system.md#3-write_file-writefile) and
   [`replace`](../tools/file-system.md#6-replace-edit) only allowed for `.md`
@@ -316,8 +314,8 @@ Hooks such as `BeforeTool` or `AfterTool` can be configured to intercept the
 > [!WARNING] When hooks are triggered by **tool executions**, they do **not**
 > run when you manually toggle Plan Mode using the `/plan` command or the
 > `Shift+Tab` keyboard shortcut. If you need hooks to execute on mode changes,
-> ensure the transition is initiated by the agent (for example, by asking "start
-> a plan for...").
+> ensure the transition is initiated by the agent (e.g., by asking "start a plan
+> for...").
 
 #### Example: Archive approved plans to GCS (`AfterTool`)
 
@@ -329,11 +327,8 @@ Storage whenever Gemini CLI exits Plan Mode to start the implementation.
 
 ```bash
 #!/usr/bin/env bash
-# Extract the plan filename from the tool input JSON
-plan_filename=$(jq -r '.tool_input.plan_filename // empty')
-
-# Construct the absolute path using the GEMINI_PLANS_DIR environment variable
-plan_path="$GEMINI_PLANS_DIR/$plan_filename"
+# Extract the plan path from the tool input JSON
+plan_path=$(jq -r '.tool_input.plan_path // empty')
 
 if [ -f "$plan_path" ]; then
   # Generate a unique filename using a timestamp
@@ -359,7 +354,7 @@ To register this `AfterTool` hook, add it to your `settings.json`:
           {
             "name": "archive-plan",
             "type": "command",
-            "command": "~/.gemini/hooks/archive-plan.sh"
+            "command": "./.gemini/hooks/archive-plan.sh"
           }
         ]
       }
@@ -446,10 +441,6 @@ on the current phase of your task:
     switches to a high-speed **Flash** model. This provides a faster, more
     responsive experience during the implementation of the plan.
 
-If the high-reasoning model is unavailable or you don't have access to it,
-Gemini CLI automatically and silently falls back to a faster model to ensure
-your workflow isn't interrupted.
-
 This behavior is enabled by default to provide the best balance of quality and
 performance. You can disable this automatic switching in your settings:
 

docs/cli/sandbox.md

@@ -1,11 +1,11 @@
-# Sandboxing in Gemini CLI
+# Sandboxing in the Gemini CLI
 
-This document provides a guide to sandboxing in Gemini CLI, including
+This document provides a guide to sandboxing in the Gemini CLI, including
 prerequisites, quickstart, and configuration.
 
 ## Prerequisites
 
-Before using sandboxing, you need to install and set up Gemini CLI:
+Before using sandboxing, you need to install and set up the Gemini CLI:
 
 ```bash
 npm install -g @google/gemini-cli
@@ -229,7 +229,7 @@ gemini -p "run the test suite"
 2. **Environment variable**:
    `GEMINI_SANDBOX=true|docker|podman|sandbox-exec|runsc|lxc`
 3. **Settings file**: `"sandbox": true` in the `tools` object of your
-   `settings.json` file (for example, `{"tools": {"sandbox": true}}`).
+   `settings.json` file (e.g., `{"tools": {"sandbox": true}}`).
 
 ### macOS Seatbelt profiles
 
@@ -309,9 +309,7 @@ $env:SANDBOX_SET_UID_GID="false"  # Disable UID/GID mapping
 
 **Missing commands**
 
-- Add to a custom Dockerfile. Automatic `BUILD_SANDBOX` builds are only
-  available when running Gemini CLI from source; npm installs need a prebuilt
-  image instead.
+- Add to custom Dockerfile.
 - Install via `sandbox.bashrc`.
 
 **Network issues**

docs/cli/settings.md

@@ -24,22 +24,20 @@ they appear in the UI.
 
 ### General
 
-| UI Label                      | Setting                            | Description                                                                                                                                                                                                                                                   | Default     |
-| ----------------------------- | ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
-| Vim Mode                      | `general.vimMode`                  | Enable Vim keybindings                                                                                                                                                                                                                                        | `false`     |
-| Default Approval Mode         | `general.defaultApprovalMode`      | The default approval mode for tool execution. 'default' prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is read-only mode. YOLO mode (auto-approve all actions) can only be enabled via command line (--yolo or --approval-mode=yolo). | `"default"` |
-| Enable Auto Update            | `general.enableAutoUpdate`         | Enable automatic updates.                                                                                                                                                                                                                                     | `true`      |
-| Enable Terminal Notifications | `general.enableNotifications`      | Enable terminal run-event notifications for action-required prompts and session completion.                                                                                                                                                                   | `false`     |
-| Terminal Notification Method  | `general.notificationMethod`       | How to send terminal notifications.                                                                                                                                                                                                                           | `"auto"`    |
-| Enable Plan Mode              | `general.plan.enabled`             | Enable Plan Mode for read-only safety during planning.                                                                                                                                                                                                        | `true`      |
-| Plan Directory                | `general.plan.directory`           | The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory. A custom directory requires a policy to allow write access in Plan Mode.                                                                     | `undefined` |
-| Plan Model Routing            | `general.plan.modelRouting`        | Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro for the planning phase and Flash for the implementation phase.                                                                                                          | `true`      |
-| Retry Fetch Errors            | `general.retryFetchErrors`         | Retry on "exception TypeError: fetch failed sending request" errors.                                                                                                                                                                                          | `true`      |
-| Max Chat Model Attempts       | `general.maxAttempts`              | Maximum number of attempts for requests to the main chat model. Cannot exceed 10.                                                                                                                                                                             | `10`        |
-| Debug Keystroke Logging       | `general.debugKeystrokeLogging`    | Enable debug logging of keystrokes to the console.                                                                                                                                                                                                            | `false`     |
-| Enable Session Cleanup        | `general.sessionRetention.enabled` | Enable automatic session cleanup                                                                                                                                                                                                                              | `true`      |
-| Keep chat history             | `general.sessionRetention.maxAge`  | Automatically delete chats older than this time period (e.g., "30d", "7d", "24h", "1w")                                                                                                                                                                       | `"30d"`     |
-| Topic & Update Narration      | `general.topicUpdateNarration`     | Enable the Topic & Update communication model for reduced chattiness and structured progress reporting.                                                                                                                                                       | `true`      |
+| UI Label                | Setting                            | Description                                                                                                                                                                                                                                                   | Default     |
+| ----------------------- | ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
+| Vim Mode                | `general.vimMode`                  | Enable Vim keybindings                                                                                                                                                                                                                                        | `false`     |
+| Default Approval Mode   | `general.defaultApprovalMode`      | The default approval mode for tool execution. 'default' prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is read-only mode. YOLO mode (auto-approve all actions) can only be enabled via command line (--yolo or --approval-mode=yolo). | `"default"` |
+| Enable Auto Update      | `general.enableAutoUpdate`         | Enable automatic updates.                                                                                                                                                                                                                                     | `true`      |
+| Enable Notifications    | `general.enableNotifications`      | Enable run-event notifications for action-required prompts and session completion.                                                                                                                                                                            | `false`     |
+| Enable Plan Mode        | `general.plan.enabled`             | Enable Plan Mode for read-only safety during planning.                                                                                                                                                                                                        | `true`      |
+| Plan Directory          | `general.plan.directory`           | The directory where planning artifacts are stored. If not specified, defaults to the system temporary directory. A custom directory requires a policy to allow write access in Plan Mode.                                                                     | `undefined` |
+| Plan Model Routing      | `general.plan.modelRouting`        | Automatically switch between Pro and Flash models based on Plan Mode status. Uses Pro for the planning phase and Flash for the implementation phase.                                                                                                          | `true`      |
+| Retry Fetch Errors      | `general.retryFetchErrors`         | Retry on "exception TypeError: fetch failed sending request" errors.                                                                                                                                                                                          | `true`      |
+| Max Chat Model Attempts | `general.maxAttempts`              | Maximum number of attempts for requests to the main chat model. Cannot exceed 10.                                                                                                                                                                             | `10`        |
+| Debug Keystroke Logging | `general.debugKeystrokeLogging`    | Enable debug logging of keystrokes to the console.                                                                                                                                                                                                            | `false`     |
+| Enable Session Cleanup  | `general.sessionRetention.enabled` | Enable automatic session cleanup                                                                                                                                                                                                                              | `true`      |
+| Keep chat history       | `general.sessionRetention.maxAge`  | Automatically delete chats older than this time period (e.g., "30d", "7d", "24h", "1w")                                                                                                                                                                       | `"30d"`     |
 
 ### Output
 
@@ -155,26 +153,23 @@ they appear in the UI.
 
 ### Advanced
 
-| UI Label                          | Setting                        | Description                                                                                                                                                                                                           | Default |
-| --------------------------------- | ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Auto Configure Max Old Space Size | `advanced.autoConfigureMemory` | Automatically configure Node.js memory limits. Note: Because memory is allocated during the initial process boot, this setting is only read from the global user settings file and ignores workspace-level overrides. | `true`  |
+| UI Label                          | Setting                        | Description                                   | Default |
+| --------------------------------- | ------------------------------ | --------------------------------------------- | ------- |
+| Auto Configure Max Old Space Size | `advanced.autoConfigureMemory` | Automatically configure Node.js memory limits | `true`  |
 
 ### Experimental
 
-| UI Label                                             | Setting                                         | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | Default |
-| ---------------------------------------------------- | ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Gemma Models                                         | `experimental.gemma`                            | Enable access to Gemma 4 models (experimental).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `false` |
-| Enable Git Worktrees                                 | `experimental.worktrees`                        | Enable automated Git worktree management for parallel work.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `false` |
-| Use OSC 52 Paste                                     | `experimental.useOSC52Paste`                    | Use OSC 52 for pasting. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it).                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `false` |
-| Use OSC 52 Copy                                      | `experimental.useOSC52Copy`                     | Use OSC 52 for copying. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it).                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `false` |
-| Model Steering                                       | `experimental.modelSteering`                    | Enable model steering (user hints) to guide the model during tool execution.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false` |
-| Direct Web Fetch                                     | `experimental.directWebFetch`                   | Enable web fetch behavior that bypasses LLM summarization.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `false` |
-| Enable Gemma Model Router                            | `experimental.gemmaModelRouter.enabled`         | Enable the Gemma Model Router (experimental). Requires a local endpoint serving Gemma via the Gemini API using LiteRT-LM shim.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `false` |
-| Auto-start LiteRT Server                             | `experimental.gemmaModelRouter.autoStartServer` | Automatically start the LiteRT-LM server when Gemini CLI starts and the Gemma router is enabled.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `false` |
-| Memory v2                                            | `experimental.memoryV2`                         | Disable the built-in save_memory tool and let the main agent persist project context by editing markdown files directly with edit/write_file. Route facts across four tiers: team-shared conventions go to project GEMINI.md files, project-specific personal notes go to the per-project private memory folder (MEMORY.md as index + sibling .md files for detail), and cross-project personal preferences go to the global ~/.gemini/GEMINI.md (the only file under ~/.gemini/ that the agent can edit — settings, credentials, etc. remain off-limits). Set to false to fall back to the legacy save_memory tool. | `true`  |
-| Auto Memory                                          | `experimental.autoMemory`                       | Automatically extract reusable skills from past sessions in the background. Review results with /memory inbox.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `false` |
-| Use the generalist profile to manage agent contexts. | `experimental.generalistProfile`                | Suitable for general coding and software development tasks.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `false` |
-| Enable Context Management                            | `experimental.contextManagement`                | Enable logic for context management.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `false` |
+| UI Label                                             | Setting                             | Description                                                                                                                                               | Default |
+| ---------------------------------------------------- | ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| Enable Git Worktrees                                 | `experimental.worktrees`            | Enable automated Git worktree management for parallel work.                                                                                               | `false` |
+| Use OSC 52 Paste                                     | `experimental.useOSC52Paste`        | Use OSC 52 for pasting. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
+| Use OSC 52 Copy                                      | `experimental.useOSC52Copy`         | Use OSC 52 for copying. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
+| Model Steering                                       | `experimental.modelSteering`        | Enable model steering (user hints) to guide the model during tool execution.                                                                              | `false` |
+| Direct Web Fetch                                     | `experimental.directWebFetch`       | Enable web fetch behavior that bypasses LLM summarization.                                                                                                | `false` |
+| Memory Manager Agent                                 | `experimental.memoryManager`        | Replace the built-in save_memory tool with a memory manager subagent that supports adding, removing, de-duplicating, and organizing memories.             | `false` |
+| Use the generalist profile to manage agent contexts. | `experimental.generalistProfile`    | Suitable for general coding and software development tasks.                                                                                               | `false` |
+| Enable Context Management                            | `experimental.contextManagement`    | Enable logic for context management.                                                                                                                      | `false` |
+| Topic & Update Narration                             | `experimental.topicUpdateNarration` | Enable the experimental Topic & Update communication model for reduced chattiness and structured progress reporting.                                      | `false` |
 
 ### Skills
 

docs/cli/system-prompt.md

@@ -24,7 +24,7 @@ project-specific behavior or create a customized persona.
 
 You can set the environment variable temporarily in your shell, or persist it
 via a `.gemini/.env` file. See
-[Persisting Environment Variables](../get-started/authentication.mdx#persisting-environment-variables).
+[Persisting Environment Variables](../get-started/authentication.md#persisting-environment-variables).
 
 - Use the project default path (`.gemini/system.md`):
   - `GEMINI_SYSTEM_MD=true` or `GEMINI_SYSTEM_MD=1`
@@ -35,7 +35,7 @@ via a `.gemini/.env` file. See
   - `GEMINI_SYSTEM_MD=/absolute/path/to/my-system.md`
   - Relative paths are supported and resolved from the current working
     directory.
-  - Tilde expansion is supported (for example, `~/my-system.md`).
+  - Tilde expansion is supported (e.g., `~/my-system.md`).
 
 - Disable the override (use built‑in prompt):
   - `GEMINI_SYSTEM_MD=false` or `GEMINI_SYSTEM_MD=0` or unset the variable.
@@ -51,7 +51,7 @@ error with: `missing system prompt file '<path>'`.
   - Create `.gemini/system.md`, then add to `.gemini/.env`:
     - `GEMINI_SYSTEM_MD=1`
 - Use a custom file under your home directory:
-  - `GEMINI_SYSTEM_MD=~/prompts/system.md gemini`
+  - `GEMINI_SYSTEM_MD=~/prompts/SYSTEM.md gemini`
 
 ## UI indicator
 
@@ -70,7 +70,7 @@ dynamically include built-in content:
 - `${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` (for example, `${write_file_ToolName}`,
+  `${toolName}_ToolName` (e.g., `${write_file_ToolName}`,
   `${run_shell_command_ToolName}`).
 
   This pattern is generated dynamically for all available tools.
@@ -102,17 +102,17 @@ safety and workflow rules.
 
 This creates the file and writes the current built‑in system prompt to it.
 
-## Best practices: system.md vs GEMINI.md
+## Best practices: SYSTEM.md vs GEMINI.md
 
-- system.md (firmware):
+- SYSTEM.md (firmware):
   - Non‑negotiable operational rules: safety, tool‑use protocols, approvals, and
     mechanics that keep the CLI reliable.
   - Stable across tasks and projects (or per project when needed).
 - GEMINI.md (strategy):
   - Persona, goals, methodologies, and project/domain context.
-  - Evolves per task; relies on system.md for safe execution.
+  - Evolves per task; relies on SYSTEM.md for safe execution.
 
-Keep system.md minimal but complete for safety and tool operation. Keep
+Keep SYSTEM.md minimal but complete for safety and tool operation. Keep
 GEMINI.md focused on high‑level guidance and project specifics.
 
 ## Troubleshooting

docs/cli/telemetry.md

@@ -35,18 +35,17 @@ The observability system provides:
 You control telemetry behavior through the `.gemini/settings.json` file.
 Environment variables can override these settings.
 
-| Setting        | Environment Variable              | Description                                         | Values            | Default                 |
-| -------------- | --------------------------------- | --------------------------------------------------- | ----------------- | ----------------------- |
-| `enabled`      | `GEMINI_TELEMETRY_ENABLED`        | Enable or disable telemetry                         | `true`/`false`    | `false`                 |
-| `traces`       | `GEMINI_TELEMETRY_TRACES_ENABLED` | Enable detailed attribute tracing                   | `true`/`false`    | `false`                 |
-| `target`       | `GEMINI_TELEMETRY_TARGET`         | Where to send telemetry data                        | `"gcp"`/`"local"` | `"local"`               |
-| `otlpEndpoint` | `GEMINI_TELEMETRY_OTLP_ENDPOINT`  | OTLP collector endpoint                             | URL string        | `http://localhost:4317` |
-| `otlpProtocol` | `GEMINI_TELEMETRY_OTLP_PROTOCOL`  | OTLP transport protocol                             | `"grpc"`/`"http"` | `"grpc"`                |
-| `outfile`      | `GEMINI_TELEMETRY_OUTFILE`        | Save telemetry to file (overrides `otlpEndpoint`)   | file path         | -                       |
-| `logPrompts`   | `GEMINI_TELEMETRY_LOG_PROMPTS`    | Include prompts in telemetry logs                   | `true`/`false`    | `true`                  |
-| `useCollector` | `GEMINI_TELEMETRY_USE_COLLECTOR`  | Use external OTLP collector (advanced)              | `true`/`false`    | `false`                 |
-| `useCliAuth`   | `GEMINI_TELEMETRY_USE_CLI_AUTH`   | Use CLI credentials for telemetry (GCP target only) | `true`/`false`    | `false`                 |
-| -              | `GEMINI_CLI_SURFACE`              | Optional custom label for traffic reporting         | string            | -                       |
+| Setting        | Environment Variable             | Description                                         | Values            | Default                 |
+| -------------- | -------------------------------- | --------------------------------------------------- | ----------------- | ----------------------- |
+| `enabled`      | `GEMINI_TELEMETRY_ENABLED`       | Enable or disable telemetry                         | `true`/`false`    | `false`                 |
+| `target`       | `GEMINI_TELEMETRY_TARGET`        | Where to send telemetry data                        | `"gcp"`/`"local"` | `"local"`               |
+| `otlpEndpoint` | `GEMINI_TELEMETRY_OTLP_ENDPOINT` | OTLP collector endpoint                             | URL string        | `http://localhost:4317` |
+| `otlpProtocol` | `GEMINI_TELEMETRY_OTLP_PROTOCOL` | OTLP transport protocol                             | `"grpc"`/`"http"` | `"grpc"`                |
+| `outfile`      | `GEMINI_TELEMETRY_OUTFILE`       | Save telemetry to file (overrides `otlpEndpoint`)   | file path         | -                       |
+| `logPrompts`   | `GEMINI_TELEMETRY_LOG_PROMPTS`   | Include prompts in telemetry logs                   | `true`/`false`    | `true`                  |
+| `useCollector` | `GEMINI_TELEMETRY_USE_COLLECTOR` | Use external OTLP collector (advanced)              | `true`/`false`    | `false`                 |
+| `useCliAuth`   | `GEMINI_TELEMETRY_USE_CLI_AUTH`  | Use CLI credentials for telemetry (GCP target only) | `true`/`false`    | `false`                 |
+| -              | `GEMINI_CLI_SURFACE`             | Optional custom label for traffic reporting         | string            | -                       |
 
 **Note on boolean environment variables:** For boolean settings like `enabled`,
 setting the environment variable to `true` or `1` enables the feature.
@@ -1236,12 +1235,6 @@ These metrics follow standard [OpenTelemetry GenAI semantic conventions].
 Traces provide an "under-the-hood" view of agent and backend operations. Use
 traces to debug tool interactions and optimize performance.
 
-<!-- prettier-ignore -->
-> [!NOTE]
-> Detailed trace attributes (like full prompts and tool outputs) are disabled by default
-> to minimize overhead. You must explicitly set `telemetry.traces` to `true` (or set
-> `GEMINI_TELEMETRY_TRACES_ENABLED=true`) to capture them.
-
 Every trace captures rich metadata via standard span attributes.
 
 <details open>

docs/cli/themes.md

@@ -117,8 +117,8 @@ least `background.primary`, `text.primary`, `text.secondary`, and the various
 accent colors via `text.link`, `text.accent`, and `status` to ensure a cohesive
 UI.
 
-You can use either hex codes (for example, `#FF0000`) **or** standard CSS color
-names (for example, `coral`, `teal`, `blue`) for any color value. See
+You can use either hex codes (e.g., `#FF0000`) **or** standard CSS color names
+(e.g., `coral`, `teal`, `blue`) for any color value. See
 [CSS color names](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value#color_keywords)
 for a full list of supported names.
 

docs/cli/trusted-folders.md

@@ -1,7 +1,7 @@
 # Trusted Folders
 
 The Trusted Folders feature is a security setting that gives you control over
-which projects can use the full capabilities of Gemini CLI. It prevents
+which projects can use the full capabilities of the Gemini CLI. It prevents
 potentially malicious code from running by asking you to approve a folder before
 the CLI loads any project-specific configurations from it.
 
@@ -24,12 +24,12 @@ Add the following to your user `settings.json` file:
 
 ## How it works: The trust dialog
 
-Once the feature is enabled, the first time you run Gemini CLI from a folder, a
-dialog will automatically appear, prompting you to make a choice:
+Once the feature is enabled, the first time you run the Gemini CLI from a
+folder, a dialog will automatically appear, prompting you to make a choice:
 
-- **Trust folder**: Grants full trust to the current folder (for example,
+- **Trust folder**: Grants full trust to the current folder (e.g.,
   `my-project`).
-- **Trust parent folder**: Grants trust to the parent directory (for example,
+- **Trust parent folder**: Grants trust to the parent directory (e.g.,
   `safe-projects`), which automatically trusts all of its subdirectories as
   well. This is useful if you keep all your safe projects in one place.
 - **Don't trust**: Marks the folder as untrusted. The CLI will operate in a
@@ -40,9 +40,9 @@ will only be asked once per folder.
 
 ## Understanding folder contents: The discovery phase
 
-Before you make a choice, Gemini CLI performs a **discovery phase** to scan the
-folder for potential configurations. This information is displayed in the trust
-dialog to help you make an informed decision.
+Before you make a choice, the Gemini CLI performs a **discovery phase** to scan
+the folder for potential configurations. This information is displayed in the
+trust dialog to help you make an informed decision.
 
 The discovery UI lists the following categories of items found in the project:
 
@@ -63,16 +63,16 @@ attention:
   settings, such as auto-approving certain tools or disabling the security
   sandbox.
 - **Discovery Errors**: If the CLI encounters issues while scanning the folder
-  (for example, a malformed `settings.json` file), these errors will be
-  displayed prominently.
+  (e.g., a malformed `settings.json` file), these errors will be displayed
+  prominently.
 
 By reviewing these details, you can ensure that you only grant trust to projects
 that you know are safe.
 
 ## Why trust matters: The impact of an untrusted workspace
 
-When a folder is **untrusted**, Gemini CLI runs in a restricted "safe mode" to
-protect you. In this mode, the following features are disabled:
+When a folder is **untrusted**, the Gemini CLI runs in a restricted "safe mode"
+to protect you. In this mode, the following features are disabled:
 
 1.  **Workspace settings are ignored**: The CLI will **not** load the
     `.gemini/settings.json` file from the project. This prevents the loading of
@@ -97,36 +97,8 @@ protect you. In this mode, the following features are disabled:
     commands from .toml files, including both project-specific and global user
     commands.
 
-Granting trust to a folder unlocks the full functionality of Gemini CLI for that
-workspace.
-
-## Headless and automated environments
-
-When running Gemini CLI in a headless environment (for example, a CI/CD
-pipeline) where interactive prompts are not possible, the trust dialog cannot be
-displayed. If the folder is untrusted and the Folder Trust feature is enabled,
-the CLI will throw a `FatalUntrustedWorkspaceError` and exit.
-
-To proceed in these environments, you can bypass the trust check using one of
-the following methods:
-
-- **Command-line flag:** Run the CLI with the `--skip-trust` flag.
-- **Environment variable:** Set the `GEMINI_CLI_TRUST_WORKSPACE=true`
-  environment variable.
-
-These methods will trust the current workspace for the duration of the session
-without prompting.
-
-For detailed instructions on managing folder trust within CI/CD workflows,
-review the
-[Gemini CLI trust guidance for GitHub Actions](https://github.com/google-github-actions/run-gemini-cli/blob/main/docs/trust-guidance.md).
-
-## Overriding the trust file location
-
-By default, trust settings are saved to `~/.gemini/trustedFolders.json`. If you
-need to store this file in a different location, you can set the
-`GEMINI_CLI_TRUSTED_FOLDERS_PATH` environment variable to the desired absolute
-file path.
+Granting trust to a folder unlocks the full functionality of the Gemini CLI for
+that workspace.
 
 ## Managing your trust settings
 

docs/cli/tutorials/mcp-setup.md

@@ -102,7 +102,7 @@ The agent will:
 ## Troubleshooting
 
 - **Server won't start?** Try running the docker command manually in your
-  terminal to see if it prints an error (for example, "image not found").
+  terminal to see if it prints an error (e.g., "image not found").
 - **Tools not found?** Run `/mcp reload` to force the CLI to re-query the server
   for its capabilities.
 

docs/cli/tutorials/memory-management.md

@@ -50,7 +50,7 @@ loaded into every conversation.
 
 ### Scenario: Using the hierarchy
 
-Context is loaded hierarchically. This lets you have general rules for
+Context is loaded hierarchically. This allows you to have general rules for
 everything and specific rules for sub-projects.
 
 1.  **Global:** `~/.gemini/GEMINI.md` (Rules for _every_ project you work on).
@@ -124,5 +124,3 @@ immediately. Force a reload with:
 - Explore the [Command reference](../../reference/commands.md) for more
   `/memory` options.
 - Read the technical spec for [Project context](../../cli/gemini-md.md).
-- Try the experimental [Auto Memory](../auto-memory.md) feature to extract
-  reusable skills from your past sessions automatically.

docs/cli/tutorials/plan-mode-steering.md

@@ -79,8 +79,8 @@ each step with higher confidence and fewer errors.
 - **Steer early:** Providing feedback during the research phase is more
   efficient than waiting for the final plan to be drafted.
 - **Use for context:** Steering is a great way to provide knowledge that might
-  not be obvious from reading the code (for example, "We are planning to
-  deprecate this module next month").
+  not be obvious from reading the code (e.g., "We are planning to deprecate this
+  module next month").
 
 ## Next steps
 

docs/cli/tutorials/session-management.md

@@ -35,7 +35,7 @@ browser.
 
 This opens a searchable list of all your past sessions. You'll see:
 
-- A timestamp (for example, "2 hours ago").
+- A timestamp (e.g., "2 hours ago").
 - The first user message (helping you identify the topic).
 - The number of turns in the conversation.
 

docs/cli/tutorials/shell-commands.md

@@ -58,7 +58,7 @@ watchers.
 
 **Prompt:** `Start the React dev server in the background.`
 
-Gemini will run the command (for example, `npm run dev`) and detach it.
+Gemini will run the command (e.g., `npm run dev`) and detach it.
 
 ### Scenario: Viewing active shells
 

docs/cli/tutorials/task-planning.md

@@ -7,7 +7,7 @@ progress with the todo list.
 ## Prerequisites
 
 - Gemini CLI installed and authenticated.
-- A complex task in mind (for example, a multi-file refactor or new feature).
+- A complex task in mind (e.g., a multi-file refactor or new feature).
 
 ## Why use task planning?
 
@@ -58,7 +58,7 @@ Tell the agent to proceed.
 As the agent works, you'll see the todo list update in real-time above the input
 box.
 
-- **Current focus:** The active task is highlighted (for example,
+- **Current focus:** The active task is highlighted (e.g.,
   `[IN_PROGRESS] Create tsconfig.json`).
 - **Progress:** Completed tasks are marked as done.
 
@@ -90,4 +90,4 @@ living document, not a static text block.
 - See the [Todo tool reference](../../tools/todos.md) for technical schema
   details.
 - Learn about [Memory management](memory-management.md) to persist planning
-  preferences (for example, "Always create a test plan first").
+  preferences (e.g., "Always create a test plan first").

docs/core/index.md

@@ -29,7 +29,7 @@ While the `packages/cli` portion of Gemini CLI provides the user interface,
   potentially incorporating conversation history, tool definitions, and
   instructional context from `GEMINI.md` files.
 - **Tool management & orchestration:**
-  - Registering available tools (for example, file system tools, shell command
+  - Registering available tools (e.g., file system tools, shell command
     execution).
   - Interpreting tool use requests from the Gemini model.
   - Executing the requested tools with the provided arguments.
@@ -45,7 +45,7 @@ The core plays a vital role in security:
 
 - **API key management:** It handles the `GEMINI_API_KEY` and ensures it's used
   securely when communicating with the Gemini API.
-- **Tool execution:** When tools interact with the local system (for example,
+- **Tool execution:** When tools interact with the local system (e.g.,
   `run_shell_command`), the core (and its underlying tool implementations) must
   do so with appropriate caution, often involving sandboxing mechanisms to
   prevent unintended modifications.
@@ -70,7 +70,7 @@ to use the CLI even if the default "pro" model is rate-limited.
 
 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 lets you continue working without interruption.
+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
@@ -90,8 +90,9 @@ in a hierarchical manner, starting from the current working directory and moving
 up to the project root and the user's home directory. It also searches in
 subdirectories.
 
-This lets you have global, project-level, and component-level context files,
-which are all combined to provide the model with the most relevant information.
+This allows you to have global, project-level, and component-level context
+files, which are all combined to provide the model with the most relevant
+information.
 
 You can use the [`/memory` command](../reference/commands.md) to `show`, `add`,
 and `refresh` the content of loaded `GEMINI.md` files.

docs/core/local-model-routing.md

@@ -108,7 +108,7 @@ Download complete.
 $ ./lit.lit.macos_arm64 pull gemma3-1b-gpu-custom
 
 [Legal] The model you are about to download is governed by
-the Gemma Terms of Use and Prohibited Use Policy. Review these terms and ensure you agree before continuing.
+the Gemma Terms of Use and Prohibited Use Policy. Please review these terms and ensure you agree before continuing.
 
 Full Terms: https://ai.google.dev/gemma/terms
 Prohibited Use Policy: https://ai.google.dev/gemma/prohibited_use_policy

docs/core/remote-agents.md

@@ -430,7 +430,7 @@ both behind auth.
 
 ## Managing Subagents
 
-Users can manage subagents using the following commands within Gemini CLI:
+Users can manage subagents using the following commands within the Gemini CLI:
 
 - `/agents list`: Displays all available local and remote subagents.
 - `/agents reload`: Reloads the agent registry. Use this after adding or

docs/core/subagents.md

@@ -87,23 +87,11 @@ Gemini CLI comes with the following built-in subagents:
 
 ### Generalist Agent
 
-- **Name:** `generalist`
-- **Purpose:** A general, all-purpose subagent that uses the inherited tool
-  access and configurations from the main agent. Useful for executing broad,
-  resource-heavy subtasks in an isolated conversation, optimizing your main
-  agent's context by returning only the final result of that given task.
-- **When to use:** Use this agent when a task requires many steps, handles large
-  volumes of information, or requires the same full capabilities as the main
-  agent. It is ideal for:
-  - **Multi-file modifications:** Applying refactors or fixing errors across
-    several files at once.
-  - **High-volume execution:** Running commands or tests that produce extensive
-    terminal output.
-  - **Action-oriented research:** Investigations where the agent needs to both
-    search code and run commands or make edits to find a solution. By delegating
-    these tasks, you prevent your main conversation from becoming cluttered or
-    slow. You can invoke it explicitly using `@generalist`.
-- **Configuration:** Enabled by default.
+- **Name:** `generalist_agent`
+- **Purpose:** Route tasks to the appropriate specialized subagent.
+- **When to use:** Implicitly used by the main agent for routing. Not directly
+  invoked by the user.
+- **Configuration:** Enabled by default. No specific configuration options.
 
 ### Browser Agent (experimental)
 
@@ -370,7 +358,7 @@ it yourself; just report it.
 | `kind`         | string | No       | `local` (default) or `remote`.                                                                                                                                                                                |
 | `tools`        | array  | No       | List of tool names this agent can use. Supports wildcards: `*` (all tools), `mcp_*` (all MCP tools), `mcp_server_*` (all tools from a server). **If omitted, it inherits all tools from the parent session.** |
 | `mcpServers`   | object | No       | Configuration for inline Model Context Protocol (MCP) servers isolated to this specific agent.                                                                                                                |
-| `model`        | string | No       | Specific model to use (for example, `gemini-3-preview`). Defaults to `inherit` (uses the main session model).                                                                                                 |
+| `model`        | string | No       | Specific model to use (e.g., `gemini-3-preview`). Defaults to `inherit` (uses the main session model).                                                                                                        |
 | `temperature`  | number | No       | Model temperature (0.0 - 2.0). Defaults to `1`.                                                                                                                                                               |
 | `max_turns`    | number | No       | Maximum number of conversation turns allowed for this agent before it must return. Defaults to `30`.                                                                                                          |
 | `timeout_mins` | number | No       | Maximum execution time in minutes. Defaults to `10`.                                                                                                                                                          |
@@ -422,8 +410,8 @@ With this feature, you can:
 ### Configuring isolated tools and servers
 
 You can configure tool isolation for a subagent by updating its markdown
-frontmatter. This lets you explicitly state which tools the subagent can use,
-rather than relying on the global registry.
+frontmatter. This allows you to explicitly state which tools the subagent can
+use, rather than relying on the global registry.
 
 Add an `mcpServers` object to define inline MCP servers that are unique to the
 agent.
@@ -533,24 +521,6 @@ field.
 }
 ```
 
-#### Safety policies (TOML)
-
-You can restrict access to specific subagents using the CLI's **Policy Engine**.
-Subagents are treated as virtual tool names for policy matching purposes.
-
-To govern access to a subagent, create a `.toml` file in your policy directory
-(e.g., `~/.gemini/policies/`):
-
-```toml
-[[rule]]
-toolName = "codebase_investigator"
-decision = "deny"
-deny_message = "Deep codebase analysis is restricted for this session."
-```
-
-For more information on setting up fine-grained safety guardrails, see the
-[Policy Engine reference](../reference/policy-engine.md#special-syntax-for-subagents).
-
 ### Optimizing your subagent
 
 The main agent's system prompt encourages it to use an expert subagent when one

docs/extensions/best-practices.md

@@ -117,9 +117,8 @@ for your users.
 Follow [Semantic Versioning (SemVer)](https://semver.org/) to communicate
 changes clearly.
 
-- **Major:** Breaking changes (for example, renaming tools or changing
-  arguments).
-- **Minor:** New features (for example, adding new tools or commands).
+- **Major:** Breaking changes (e.g., renaming tools or changing arguments).
+- **Minor:** New features (e.g., adding new tools or commands).
 - **Patch:** Bug fixes and performance improvements.
 
 ### Release channels
@@ -183,7 +182,7 @@ If your tools aren't working as expected:
 If a custom command isn't responding:
 
 - **Check precedence:** Remember that user and project commands take precedence
-  over extension commands. Use the prefixed name (for example,
-  `/extension.command`) to verify the extension's version.
+  over extension commands. Use the prefixed name (e.g., `/extension.command`) to
+  verify the extension's version.
 - **Help command:** Run `/help` to see a list of all available commands and
   their sources.

docs/extensions/reference.md

@@ -88,12 +88,12 @@ gemini extensions new <path> [template]
 ```
 
 - `<path>`: The directory to create.
-- `[template]`: The template to use (for example, `mcp-server`, `context`,
+- `[template]`: The template to use (e.g., `mcp-server`, `context`,
   `custom-commands`).
 
 ### Link a local extension
 
-Create a symbolic link between your development directory and Gemini CLI
+Create a symbolic link between your development directory and the Gemini CLI
 extensions directory. This lets you test changes immediately without
 reinstalling.
 
@@ -244,7 +244,7 @@ agent definition files (`.md`) to an `agents/` directory in your extension root.
 
 ### <a id="policy-engine"></a>Policy Engine
 
-Extensions can contribute policy rules and safety checkers to Gemini CLI
+Extensions can contribute policy rules and safety checkers to the Gemini CLI
 [Policy Engine](../reference/policy-engine.md). These rules are defined in
 `.toml` files and take effect when the extension is activated.
 
@@ -324,14 +324,13 @@ defined in the `themes` array in `gemini-extension.json`.
 Custom themes provided by extensions can be selected using the `/theme` command
 or by setting the `ui.theme` property in your `settings.json` file. Note that
 when referring to a theme from an extension, the extension name is appended to
-the theme name in parentheses, for example,
-`shades-of-green (my-green-extension)`.
+the theme name in parentheses, e.g., `shades-of-green (my-green-extension)`.
 
 ### Conflict resolution
 
 Extension commands have the lowest precedence. If an extension command name
 conflicts with a user or project command, the extension command is prefixed with
-the extension name (for example, `/gcp.deploy`) using a dot separator.
+the extension name (e.g., `/gcp.deploy`) using a dot separator.
 
 ## Variables
 

docs/extensions/releasing.md

@@ -98,7 +98,7 @@ Use these values for the placeholders:
 **Examples:**
 
 - `darwin.arm64.my-tool.tar.gz` (specific to Apple Silicon Macs)
-- `darwin.my-tool.tar.gz` (fallback for all Macs, for example Intel)
+- `darwin.my-tool.tar.gz` (fallback for all Macs, e.g. Intel)
 - `linux.x64.my-tool.tar.gz`
 - `win32.my-tool.zip`
 
@@ -155,10 +155,9 @@ jobs:
 
 ## Migrating an Extension Repository
 
-If you need to move your extension to a new repository (for example, from a
-personal account to an organization) or rename it, you can use the `migratedTo`
-property in your `gemini-extension.json` file to seamlessly transition your
-users.
+If you need to move your extension to a new repository (e.g., from a personal
+account to an organization) or rename it, you can use the `migratedTo` property
+in your `gemini-extension.json` file to seamlessly transition your users.
 
 1. **Create the new repository**: Setup your extension in its new location.
 2. **Update the old repository**: In your original repository, update the
@@ -174,7 +173,7 @@ users.
    ```
 3. **Release the update**: Publish this new version in your old repository.
 
-When users check for updates, Gemini CLI will detect the `migratedTo` field,
+When users check for updates, the Gemini CLI will detect the `migratedTo` field,
 verify that the new repository contains a valid extension update, and
 automatically update their local installation to track the new source and name
 moving forward. All extension settings will automatically migrate to the new

docs/extensions/writing-extensions.md

@@ -7,22 +7,22 @@ linking it for local development.
 
 ## Prerequisites
 
-Before you start, ensure you have Gemini CLI installed and a basic understanding
-of Node.js.
+Before you start, ensure you have the Gemini CLI installed and a basic
+understanding of Node.js.
 
 ## Extension features
 
 Extensions offer several ways to customize Gemini CLI. Use this table to decide
 which features your extension needs.
 
-| Feature                                                        | What it is                                                                                                                | When to use it                                                                                                                                                                                                                                                                                 | Invoked by            |
-| :------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------ | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :-------------------- |
-| **[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 (for example, before/after a tool call). | Use this when you want to automate actions based on what the model is doing, like validating tool arguments, logging activity, or modifying the model's input/output.                                                                                                                          | CLI                   |
-| **[Custom themes](reference.md#themes)**                       | A set of color definitions to personalize the CLI UI.                                                                     | Use this to provide a unique visual identity for your extension or to offer specialized high-contrast or thematic color schemes.                                                                                                                                                               | User (via /theme)     |
+| 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                   |
+| **[Custom themes](reference.md#themes)**                       | A set of color definitions to personalize the CLI UI.                                                              | Use this to provide a unique visual identity for your extension or to offer specialized high-contrast or thematic color schemes.                                                                                                                                                               | User (via /theme)     |
 
 ## Step 1: Create a new extension
 
@@ -172,7 +172,7 @@ Link your extension to your Gemini CLI installation for local development.
 
 2.  **Link the extension:**
 
-    The `link` command creates a symbolic link from Gemini CLI extensions
+    The `link` command creates a symbolic link from the Gemini CLI extensions
     directory to your development directory. Changes you make are reflected
     immediately.
 

docs/get-started/authentication.md

@@ -1,11 +1,10 @@
-import { Tabs, TabItem } from '@astrojs/starlight/components';
-
 # Gemini CLI authentication setup
 
 To use Gemini CLI, you'll need to authenticate with Google. This guide helps you
 quickly find the best way to sign in based on your account type and how you're
 using the CLI.
 
+<!-- prettier-ignore -->
 > [!TIP]
 > Looking for a high-level comparison of all available subscriptions?
 > To compare features and find the right quota for your needs, see our
@@ -24,7 +23,7 @@ Select the authentication method that matches your situation in the table below:
 | Organization users with a company, school, or Google Workspace account | [Sign in with Google](#login-google)                             | [Yes](#set-gcp)                                             |
 | AI Studio user with a Gemini API key                                   | [Use Gemini API Key](#gemini-api)                                | No                                                          |
 | Google Cloud Vertex AI user                                            | [Vertex AI](#vertex-ai)                                          | [Yes](#set-gcp)                                             |
-| [Headless mode](#headless)                                             | [Use Gemini API Key](#gemini-api) or<br /> [Vertex AI](#vertex-ai) | No (for Gemini API Key)<br /> [Yes](#set-gcp) (for Vertex AI) |
+| [Headless mode](#headless)                                             | [Use Gemini API Key](#gemini-api) or<br> [Vertex AI](#vertex-ai) | No (for Gemini API Key)<br> [Yes](#set-gcp) (for Vertex AI) |
 
 ### What is my Google account type?
 
@@ -85,24 +84,19 @@ To authenticate and use Gemini CLI with a Gemini API key:
 
 2. Set the `GEMINI_API_KEY` environment variable to your key. For example:
 
-   <Tabs>
-     <TabItem label="macOS/Linux">
+   **macOS/Linux**
 
-     ```bash
-      # Replace YOUR_GEMINI_API_KEY with the key from AI Studio
-      export GEMINI_API_KEY="YOUR_GEMINI_API_KEY"
-     ```
+   ```bash
+   # Replace YOUR_GEMINI_API_KEY with the key from AI Studio
+   export GEMINI_API_KEY="YOUR_GEMINI_API_KEY"
+   ```
 
-     </TabItem>
-     <TabItem label="Windows (PowerShell)">
+   **Windows (PowerShell)**
 
-     ```powershell
-      # Replace YOUR_GEMINI_API_KEY with the key from AI Studio
-      $env:GEMINI_API_KEY="YOUR_GEMINI_API_KEY"
-     ```
-
-     </TabItem>
-   </Tabs>
+   ```powershell
+   # Replace YOUR_GEMINI_API_KEY with the key from AI Studio
+   $env:GEMINI_API_KEY="YOUR_GEMINI_API_KEY"
+   ```
 
    To make this setting persistent, see
    [Persisting Environment Variables](#persisting-vars).
@@ -115,6 +109,7 @@ To authenticate and use Gemini CLI with a Gemini API key:
 
 4. Select **Use Gemini API key**.
 
+<!-- prettier-ignore -->
 > [!WARNING]
 > Treat API keys, especially for services like Gemini, as sensitive
 > credentials. Protect them to prevent unauthorized access and potential misuse
@@ -136,26 +131,21 @@ or the location where you want to run your jobs.
 
 For example:
 
-<Tabs>
-  <TabItem label="macOS/Linux">
+**macOS/Linux**
 
-  ```bash
+```bash
 # Replace with your project ID and desired location (for example, us-central1)
 export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
 export GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"
-  ```
+```
 
-  </TabItem>
-  <TabItem label="Windows (PowerShell)">
+**Windows (PowerShell)**
 
-  ```powershell
+```powershell
 # Replace with your project ID and desired location (for example, us-central1)
 $env:GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
 $env:GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"
-  ```
-
-  </TabItem>
-</Tabs>
+```
 
 To make any Vertex AI environment variable settings persistent, see
 [Persisting Environment Variables](#persisting-vars).
@@ -167,22 +157,17 @@ Consider this authentication method if you have Google Cloud CLI installed.
 If you have previously set `GOOGLE_API_KEY` or `GEMINI_API_KEY`, you must unset
 them to use ADC.
 
-<Tabs>
-  <TabItem label="macOS/Linux">
+**macOS/Linux**
 
-  ```bash
+```bash
 unset GOOGLE_API_KEY GEMINI_API_KEY
-  ```
+```
 
-  </TabItem>
-  <TabItem label="Windows (PowerShell)">
+**Windows (PowerShell)**
 
-  ```powershell
+```powershell
 Remove-Item Env:\GOOGLE_API_KEY, Env:\GEMINI_API_KEY -ErrorAction Ignore
-  ```
-
-  </TabItem>
-</Tabs>
+```
 
 1. Verify you have a Google Cloud project and Vertex AI API is enabled.
 
@@ -210,22 +195,17 @@ pipelines, or if your organization restricts user-based ADC or API key creation.
 If you have previously set `GOOGLE_API_KEY` or `GEMINI_API_KEY`, you must unset
 them:
 
-<Tabs>
-  <TabItem label="macOS/Linux">
+**macOS/Linux**
 
-  ```bash
+```bash
 unset GOOGLE_API_KEY GEMINI_API_KEY
-  ```
+```
 
-  </TabItem>
-  <TabItem label="Windows (PowerShell)">
+**Windows (PowerShell)**
 
-  ```powershell
+```powershell
 Remove-Item Env:\GOOGLE_API_KEY, Env:\GEMINI_API_KEY -ErrorAction Ignore
-  ```
-
-  </TabItem>
-</Tabs>
+```
 
 1.  [Create a service account and key](https://cloud.google.com/iam/docs/keys-create-delete)
     and download the provided JSON file. Assign the "Vertex AI User" role to the
@@ -234,24 +214,19 @@ Remove-Item Env:\GOOGLE_API_KEY, Env:\GEMINI_API_KEY -ErrorAction Ignore
 2.  Set the `GOOGLE_APPLICATION_CREDENTIALS` environment variable to the JSON
     file's absolute path. For example:
 
-    <Tabs>
-      <TabItem label="macOS/Linux">
+    **macOS/Linux**
 
-      ```bash
-        # Replace /path/to/your/keyfile.json with the actual path
-        export GOOGLE_APPLICATION_CREDENTIALS="/path/to/your/keyfile.json"
-      ```
+    ```bash
+    # Replace /path/to/your/keyfile.json with the actual path
+    export GOOGLE_APPLICATION_CREDENTIALS="/path/to/your/keyfile.json"
+    ```
 
-      </TabItem>
-      <TabItem label="Windows (PowerShell)">
+    **Windows (PowerShell)**
 
-      ```powershell
-        # Replace C:\path\to\your\keyfile.json with the actual path
-        $env:GOOGLE_APPLICATION_CREDENTIALS="C:\path\to\your\keyfile.json"
-      ```
-
-      </TabItem>
-    </Tabs>
+    ```powershell
+    # Replace C:\path\to\your\keyfile.json with the actual path
+    $env:GOOGLE_APPLICATION_CREDENTIALS="C:\path\to\your\keyfile.json"
+    ```
 
 3.  [Configure your Google Cloud Project](#set-gcp).
 
@@ -263,6 +238,7 @@ Remove-Item Env:\GOOGLE_API_KEY, Env:\GEMINI_API_KEY -ErrorAction Ignore
 
 5.  Select **Vertex AI**.
 
+<!-- prettier-ignore -->
 > [!WARNING]
 > Protect your service account key file as it gives access to
 > your resources.
@@ -274,24 +250,19 @@ Remove-Item Env:\GOOGLE_API_KEY, Env:\GEMINI_API_KEY -ErrorAction Ignore
 
 2.  Set the `GOOGLE_API_KEY` environment variable:
 
-    <Tabs>
-      <TabItem label="macOS/Linux">
+    **macOS/Linux**
 
-      ```bash
-        # Replace YOUR_GOOGLE_API_KEY with your Vertex AI API key
-        export GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"
-      ```
+    ```bash
+    # Replace YOUR_GOOGLE_API_KEY with your Vertex AI API key
+    export GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"
+    ```
 
-      </TabItem>
-      <TabItem label="Windows (PowerShell)">
+    **Windows (PowerShell)**
 
-      ```powershell
-        # Replace YOUR_GOOGLE_API_KEY with your Vertex AI API key
-        $env:GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"
-      ```
-
-      </TabItem>
-    </Tabs>
+    ```powershell
+    # Replace YOUR_GOOGLE_API_KEY with your Vertex AI API key
+    $env:GOOGLE_API_KEY="YOUR_GOOGLE_API_KEY"
+    ```
 
     If you see errors like `"API keys are not supported by this API..."`, your
     organization might restrict API key usage for this service. Try the other
@@ -309,6 +280,7 @@ Remove-Item Env:\GOOGLE_API_KEY, Env:\GEMINI_API_KEY -ErrorAction Ignore
 
 ## Set your Google Cloud project <a id="set-gcp"></a>
 
+<!-- prettier-ignore -->
 > [!IMPORTANT]
 > Most individual Google accounts (free and paid) don't require a
 > Google Cloud project for authentication.
@@ -336,24 +308,19 @@ To configure Gemini CLI to use a Google Cloud project, do the following:
 
     For example, to set the `GOOGLE_CLOUD_PROJECT_ID` variable:
 
-    <Tabs>
-      <TabItem label="macOS/Linux">
+    **macOS/Linux**
 
-      ```bash
-        # Replace YOUR_PROJECT_ID with your actual Google Cloud project ID
-        export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
-      ```
+    ```bash
+    # Replace YOUR_PROJECT_ID with your actual Google Cloud project ID
+    export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
+    ```
 
-      </TabItem>
-      <TabItem label="Windows (PowerShell)">
+    **Windows (PowerShell)**
 
-      ```powershell
-        # Replace YOUR_PROJECT_ID with your actual Google Cloud project ID
-        $env:GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
-      ```
-
-      </TabItem>
-    </Tabs>
+    ```powershell
+    # Replace YOUR_PROJECT_ID with your actual Google Cloud project ID
+    $env:GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"
+    ```
 
     To make this setting persistent, see
     [Persisting Environment Variables](#persisting-vars).
@@ -366,29 +333,21 @@ persist them with the following methods:
 1.  **Add your environment variables to your shell configuration file:** Append
     the environment variable commands to your shell's startup file.
 
-    <Tabs>
-      <TabItem label="macOS/Linux">
+    **macOS/Linux** (for example, `~/.bashrc`, `~/.zshrc`, or `~/.profile`):
 
-      (for example, `~/.bashrc`, `~/.zshrc`, or `~/.profile`):
+    ```bash
+    echo 'export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"' >> ~/.bashrc
+    source ~/.bashrc
+    ```
 
-      ```bash
-        echo 'export GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"' >> ~/.bashrc
-        source ~/.bashrc
-      ```
+    **Windows (PowerShell)** (for example, `$PROFILE`):
 
-      </TabItem>
-      <TabItem label="Windows (PowerShell)">
-
-      (for example, `$PROFILE`):
-
-      ```powershell
-        Add-Content -Path $PROFILE -Value '$env:GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"'
-        . $PROFILE
-      ```
-
-      </TabItem>
-    </Tabs>
+    ```powershell
+    Add-Content -Path $PROFILE -Value '$env:GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"'
+    . $PROFILE
+    ```
 
+<!-- prettier-ignore -->
 > [!WARNING]
 > Be aware that when you export API keys or service account
 > paths in your shell configuration file, any process launched from that
@@ -402,30 +361,25 @@ persist them with the following methods:
 
     Example for user-wide settings:
 
-    <Tabs>
-      <TabItem label="macOS/Linux">
+    **macOS/Linux**
 
-      ```bash
-        mkdir -p ~/.gemini
-        cat >> ~/.gemini/.env <<'EOF'
-        GOOGLE_CLOUD_PROJECT="your-project-id"
-        # Add other variables like GEMINI_API_KEY as needed
-        EOF
-      ```
+    ```bash
+    mkdir -p ~/.gemini
+    cat >> ~/.gemini/.env <<'EOF'
+    GOOGLE_CLOUD_PROJECT="your-project-id"
+    # Add other variables like GEMINI_API_KEY as needed
+    EOF
+    ```
 
-      </TabItem>
-      <TabItem label="Windows (PowerShell)">
+    **Windows (PowerShell)**
 
-      ```powershell
-        New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.gemini"
-        @"
-        GOOGLE_CLOUD_PROJECT="your-project-id"
-        # Add other variables like GEMINI_API_KEY as needed
-        "@ | Out-File -FilePath "$env:USERPROFILE\.gemini\.env" -Encoding utf8 -Append
-      ```
-
-      </TabItem>
-    </Tabs>
+    ```powershell
+    New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.gemini"
+    @"
+    GOOGLE_CLOUD_PROJECT="your-project-id"
+    # Add other variables like GEMINI_API_KEY as needed
+    "@ | Out-File -FilePath "$env:USERPROFILE\.gemini\.env" -Encoding utf8 -Append
+    ```
 
 Variables are loaded from the first file found, not merged.
 

docs/get-started/gemini-3.md

@@ -60,7 +60,7 @@ or fallback to Gemini 2.5 Pro.
 > [!NOTE]
 > The **Keep trying** option uses exponential backoff, in which Gemini
 > CLI waits longer between each retry, when the system is busy. If the retry
-> doesn't happen immediately, wait a few minutes for the request to
+> doesn't happen immediately, please wait a few minutes for the request to
 > process.
 
 ### Model selection and routing types

docs/get-started/index.md

@@ -1,7 +1,7 @@
 # Get started with Gemini CLI
 
 Welcome to Gemini CLI! This guide will help you install, configure, and start
-using Gemini CLI to enhance your workflow right from your terminal.
+using the Gemini CLI to enhance your workflow right from your terminal.
 
 ## Quickstart: Install, authenticate, configure, and use Gemini CLI
 
@@ -24,8 +24,7 @@ Once Gemini CLI is installed, run Gemini CLI from your command line:
 gemini
 ```
 
-For more installation options, see
-[Gemini CLI Installation](./installation.mdx).
+For more installation options, see [Gemini CLI Installation](./installation.md).
 
 ## Authenticate
 
@@ -47,7 +46,7 @@ cases, you can log in with your existing Google account:
 
 Certain account types may require you to configure a Google Cloud project. For
 more information, including other authentication methods, see
-[Gemini CLI Authentication Setup](./authentication.mdx).
+[Gemini CLI Authentication Setup](./authentication.md).
 
 ## Configure
 
@@ -133,7 +132,7 @@ colors. After analyzing the source code, here's how it works:
   getters. The `red` getter adds the red color code, and the `bold` getter adds
   the bold code.
 
-- **Output generation:** When the chain is treated as a string (for example, in
+- **Output generation:** When the chain is treated as a string (e.g., in
   `console.log`), a final `toString()` method is called. This method joins all
   the stored ANSI codes, wraps them around the input string ('Hello'), and adds
   a reset code at the end. This produces the final, styled string that the

docs/get-started/installation.md

@@ -0,0 +1,181 @@
+# Gemini CLI installation, execution, and releases
+
+This document provides an overview of Gemini CLI's system requirements,
+installation methods, and release types.
+
+## Recommended system specifications
+
+- **Operating System:**
+  - macOS 15+
+  - Windows 11 24H2+
+  - Ubuntu 20.04+
+- **Hardware:**
+  - "Casual" usage: 4GB+ RAM (short sessions, common tasks and edits)
+  - "Power" usage: 16GB+ RAM (long sessions, large codebases, deep context)
+- **Runtime:** Node.js 20.0.0+
+- **Shell:** Bash, Zsh, or PowerShell
+- **Location:**
+  [Gemini Code Assist supported locations](https://developers.google.com/gemini-code-assist/resources/available-locations#americas)
+- **Internet connection required**
+
+## Install Gemini CLI
+
+We recommend most users install Gemini CLI using one of the following
+installation methods:
+
+- npm
+- Homebrew
+- MacPorts
+- Anaconda
+
+Note that Gemini CLI comes pre-installed on
+[**Cloud Shell**](https://docs.cloud.google.com/shell/docs) and
+[**Cloud Workstations**](https://cloud.google.com/workstations).
+
+### Install globally with npm
+
+```bash
+npm install -g @google/gemini-cli
+```
+
+### Install globally with Homebrew (macOS/Linux)
+
+```bash
+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
+```
+
+## Run Gemini CLI
+
+For most users, we recommend running Gemini CLI with the `gemini` command:
+
+```bash
+gemini
+```
+
+For a list of options and additional commands, see the
+[CLI cheatsheet](../cli/cli-reference.md).
+
+You can also run Gemini CLI using one of the following advanced methods:
+
+- Run instantly with npx. You can run Gemini CLI without permanent installation.
+- In a sandbox. This method offers increased security and isolation.
+- From the source. This is recommended for contributors to the project.
+
+### Run instantly with npx
+
+```bash
+# Using npx (no installation required)
+npx @google/gemini-cli
+```
+
+You can also execute the CLI directly from the main branch on GitHub, which is
+helpful for testing features still in development:
+
+```bash
+npx https://github.com/google-gemini/gemini-cli
+```
+
+### Run in a sandbox (Docker/Podman)
+
+For security and isolation, Gemini CLI can be run inside a container. This is
+the default way that the CLI executes tools that might have side effects.
+
+- **Directly from the registry:** You can run the published sandbox image
+  directly. This is useful for environments where you only have Docker and want
+  to run the CLI.
+  ```bash
+  # Run the published sandbox image
+  docker run --rm -it us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.1.1
+  ```
+- **Using the `--sandbox` flag:** If you have Gemini CLI installed locally
+  (using the standard installation described above), you can instruct it to run
+  inside the sandbox container.
+  ```bash
+  gemini --sandbox -y -p "your prompt here"
+  ```
+
+### Run from source (recommended for Gemini CLI contributors)
+
+Contributors to the project will want to run the CLI directly from the source
+code.
+
+- **Development mode:** This method provides hot-reloading and is useful for
+  active development.
+  ```bash
+  # From the root of the repository
+  npm run start
+  ```
+- **Production mode (React optimizations):** This method runs the CLI with React
+  production mode enabled, which is useful for testing performance without
+  development overhead.
+  ```bash
+  # From the root of the repository
+  npm run start:prod
+  ```
+- **Production-like mode (linked package):** This method simulates a global
+  installation by linking your local package. It's useful for testing a local
+  build in a production workflow.
+
+  ```bash
+  # Link the local cli package to your global node_modules
+  npm link packages/cli
+
+  # Now you can run your local version using the `gemini` command
+  gemini
+  ```
+
+## Releases
+
+Gemini CLI has three release channels: nightly, preview, and stable. For most
+users, we recommend the stable release, which is the default installation.
+
+### Stable
+
+New stable releases are published each week. The stable release is the promotion
+of last week's `preview` release along with any bug fixes. The stable release
+uses `latest` tag, but omitting the tag also installs the latest stable release
+by default:
+
+```bash
+# Both commands install the latest stable release.
+npm install -g @google/gemini-cli
+npm install -g @google/gemini-cli@latest
+```
+
+### Preview
+
+New preview releases will be published each week. These releases are not fully
+vetted and may contain regressions or other outstanding issues. Try out the
+preview release by using the `preview` tag:
+
+```bash
+npm install -g @google/gemini-cli@preview
+```
+
+### Nightly
+
+Nightly releases are published every day. The nightly release includes all
+changes from the main branch at time of release. It should be assumed there are
+pending validations and issues. You can help test the latest changes by
+installing with the `nightly` tag:
+
+```bash
+npm install -g @google/gemini-cli@nightly
+```

docs/get-started/installation.mdx

@@ -1,201 +0,0 @@
-import { Tabs, TabItem } from '@astrojs/starlight/components';
-
-# Gemini CLI installation, execution, and releases
-
-This document provides an overview of Gemini CLI's system requirements,
-installation methods, and release types.
-
-## Recommended system specifications
-
-- **Operating System:**
-  - macOS 15+
-  - Windows 11 24H2+
-  - Ubuntu 20.04+
-- **Hardware:**
-  - "Casual" usage: 4GB+ RAM (short sessions, common tasks and edits)
-  - "Power" usage: 16GB+ RAM (long sessions, large codebases, deep context)
-- **Runtime:** Node.js 20.0.0+
-- **Shell:** Bash, Zsh, or PowerShell
-- **Location:**
-  [Gemini Code Assist supported locations](https://developers.google.com/gemini-code-assist/resources/available-locations#americas)
-- **Internet connection required**
-
-## Install Gemini CLI
-
-We recommend most users install Gemini CLI using one of the following
-installation methods. Note that Gemini CLI comes pre-installed on
-[**Cloud Shell**](https://docs.cloud.google.com/shell/docs) and
-[**Cloud Workstations**](https://cloud.google.com/workstations).
-
-<Tabs>
-  <TabItem label="npm">
-
-  Install globally with npm:
-
-  ```bash
-  npm install -g @google/gemini-cli
-  ```
-
-  </TabItem>
-  <TabItem label="Homebrew (macOS/Linux)">
-
-  Install globally with Homebrew:
-
-  ```bash
-  brew install gemini-cli
-  ```
-
-  </TabItem>
-  <TabItem label="MacPorts (macOS)">
-
-  Install globally with MacPorts:
-
-  ```bash
-  sudo port install gemini-cli
-  ```
-
-  </TabItem>
-  <TabItem label="Anaconda">
-
-  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
-  ```
-
-  </TabItem>
-</Tabs>
-
-## Run Gemini CLI
-
-For most users, we recommend running Gemini CLI with the `gemini` command:
-
-```bash
-gemini
-```
-
-For a list of options and additional commands, see the
-[CLI cheatsheet](../cli/cli-reference.md).
-
-You can also run Gemini CLI using one of the following advanced methods:
-
-<Tabs>
-  <TabItem label="npx">
-
-  Run instantly with npx. You can run Gemini CLI without permanent installation.
-
-  ```bash
-  # Using npx (no installation required)
-  npx @google/gemini-cli
-  ```
-
-  You can also execute the CLI directly from the main branch on GitHub, which is
-  helpful for testing features still in development:
-
-  ```bash
-  npx https://github.com/google-gemini/gemini-cli
-  ```
-
-  </TabItem>
-  <TabItem label="Docker/Podman Sandbox">
-
-  For security and isolation, Gemini CLI can be run inside a container. This is
-  the default way that the CLI executes tools that might have side effects.
-
-  - **Directly from the registry:** You can run the published sandbox image
-    directly. This is useful for environments where you only have Docker and want
-    to run the CLI.
-    ```bash
-    # Run the published sandbox image
-    docker run --rm -it us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.1.1
-    ```
-  - **Using the `--sandbox` flag:** If you have Gemini CLI installed locally
-    (using the standard installation described above), you can instruct it to run
-    inside the sandbox container.
-    ```bash
-    gemini --sandbox -y -p "your prompt here"
-    ```
-
-  </TabItem>
-  <TabItem label="From source">
-
-  Contributors to the project will want to run the CLI directly from the source
-  code.
-
-  - **Development mode:** This method provides hot-reloading and is useful for
-    active development.
-    ```bash
-    # From the root of the repository
-    npm run start
-    ```
-  - **Production mode (React optimizations):** This method runs the CLI with React
-    production mode enabled, which is useful for testing performance without
-    development overhead.
-    ```bash
-    # From the root of the repository
-    npm run start:prod
-    ```
-  - **Production-like mode (linked package):** This method simulates a global
-    installation by linking your local package. It's useful for testing a local
-    build in a production workflow.
-
-    ```bash
-    # Link the local cli package to your global node_modules
-    npm link packages/cli
-
-    # Now you can run your local version using the `gemini` command
-    gemini
-    ```
-
-  </TabItem>
-</Tabs>
-
-## Releases
-
-Gemini CLI has three release channels: stable, preview, and nightly. For most
-users, we recommend the stable release, which is the default installation.
-
-<Tabs>
-  <TabItem label="Stable">
-
-  Stable releases are published each week. A stable release is created from the
-  previous week's preview release along with any bug fixes. The stable release
-  uses the `latest` tag. Omitting the tag also installs the latest stable
-  release by default.
-
-  ```bash
-  # Both commands install the latest stable release.
-  npm install -g @google/gemini-cli
-  npm install -g @google/gemini-cli@latest
-  ```
-
-  </TabItem>
-  <TabItem label="Preview">
-
-  New preview releases will be published each week. These releases are not fully
-  vetted and may contain regressions or other outstanding issues. Try out the
-  preview release by using the `preview` tag:
-
-  ```bash
-  npm install -g @google/gemini-cli@preview
-  ```
-
-  </TabItem>
-  <TabItem label="Nightly">
-
-  Nightly releases are published every day. The nightly release includes all
-  changes from the main branch at time of release. It should be assumed there are
-  pending validations and issues. You can help test the latest changes by
-  installing with the `nightly` tag:
-
-  ```bash
-  npm install -g @google/gemini-cli@nightly
-  ```
-
-  </TabItem>
-</Tabs>

docs/hooks/best-practices.md

@@ -367,7 +367,7 @@ chmod +x .gemini/hooks/*.js
 ```
 
 **Windows Note**: On Windows, PowerShell scripts (`.ps1`) don't use `chmod`, but
-you may need to ensure your execution policy allows them to run (for example,
+you may need to ensure your execution policy allows them to run (e.g.,
 `Set-ExecutionPolicy RemoteSigned -Scope CurrentUser`).
 
 ### Version control
@@ -401,12 +401,12 @@ git add .gemini/settings.json
 Understanding where hooks come from and what they can do is critical for secure
 usage.
 
-| Hook Source                   | Description                                                                                                                       |
-| :---------------------------- | :-------------------------------------------------------------------------------------------------------------------------------- |
-| **System**                    | Configured by system administrators (for example, `/etc/gemini-cli/settings.json`, `/Library/...`). Assumed to be the **safest**. |
-| **User** (`~/.gemini/...`)    | Configured by you. You are responsible for ensuring they are safe.                                                                |
-| **Extensions**                | You explicitly approve and install these. Security depends on the extension source (integrity).                                   |
-| **Project** (`./.gemini/...`) | **Untrusted by default.** Safest in trusted internal repos; higher risk in third-party/public repos.                              |
+| Hook Source                   | Description                                                                                                                |
+| :---------------------------- | :------------------------------------------------------------------------------------------------------------------------- |
+| **System**                    | Configured by system administrators (e.g., `/etc/gemini-cli/settings.json`, `/Library/...`). Assumed to be the **safest**. |
+| **User** (`~/.gemini/...`)    | Configured by you. You are responsible for ensuring they are safe.                                                         |
+| **Extensions**                | You explicitly approve and install these. Security depends on the extension source (integrity).                            |
+| **Project** (`./.gemini/...`) | **Untrusted by default.** Safest in trusted internal repos; higher risk in third-party/public repos.                       |
 
 #### Project Hook Security
 
@@ -422,10 +422,9 @@ When you open a project with hooks defined in `.gemini/settings.json`:
 5. **Trust**: The hook is marked as "trusted" for this project.
 
 > **Modification detection**: If the `command` string of a project hook is
-> changed (for example, 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.
+> 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
 
@@ -442,17 +441,17 @@ When you open a project with hooks defined in `.gemini/settings.json`:
 **Verify the source** of any project hooks or extensions before enabling them.
 
 - For open-source projects, a quick review of the hook scripts is recommended.
-- For extensions, ensure you trust the author or publisher (for example,
-  verified publishers, well-known community members).
+- For extensions, ensure you trust the author or publisher (e.g., verified
+  publishers, well-known community members).
 - Be cautious with obfuscated scripts or compiled binaries from unknown sources.
 
 #### Sanitize environment
 
-Hooks inherit the environment of Gemini CLI process, which may include sensitive
-API keys. Gemini CLI provides a
+Hooks inherit the environment of the Gemini CLI process, which may include
+sensitive API keys. Gemini CLI provides a
 [redaction system](../reference/configuration.md#environment-variable-redaction)
-that automatically filters variables matching sensitive patterns (for example,
-`KEY`, `TOKEN`).
+that automatically filters variables matching sensitive patterns (e.g., `KEY`,
+`TOKEN`).
 
 > **Disabled by Default**: Environment redaction is currently **OFF by
 > default**. We strongly recommend enabling it if you are running third-party
@@ -512,7 +511,7 @@ chmod +x .gemini/hooks/my-hook.sh
 ```
 
 **Windows Note**: On Windows, ensure your execution policy allows running
-scripts (for example, `Get-ExecutionPolicy`).
+scripts (e.g., `Get-ExecutionPolicy`).
 
 **Verify script path:** Ensure the path in `settings.json` resolves correctly.
 

docs/hooks/index.md

@@ -63,9 +63,9 @@ Hooks communicate via `stdin` (Input) and `stdout` (Output).
 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 (for
-   example, `echo "debug" >&2`). Gemini CLI captures `stderr` but never attempts
-   to parse it as JSON.
+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.
 
 #### Exit codes
 
@@ -74,7 +74,7 @@ execution:
 
 | Exit Code | Label            | Behavioral Impact                                                                                                                                                            |
 | --------- | ---------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **0**     | **Success**      | The `stdout` is parsed as JSON. **Preferred code** for all logic, including intentional blocks (for example, `{"decision": "deny"}`).                                        |
+| **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.                                                                               |
 
@@ -84,9 +84,8 @@ You can filter which specific tools or triggers fire your hook using the
 `matcher` field.
 
 - **Tool events** (`BeforeTool`, `AfterTool`): Matchers are **Regular
-  Expressions**. (for example, `"write_.*"`).
-- **Lifecycle events**: Matchers are **Exact Strings**. (for example,
-  `"startup"`).
+  Expressions**. (e.g., `"write_.*"`).
+- **Lifecycle events**: Matchers are **Exact Strings**. (e.g., `"startup"`).
 - **Wildcards**: `"*"` or `""` (empty string) matches all occurrences.
 
 ## Configuration
@@ -138,7 +137,6 @@ multiple layers in the following order of precedence (highest to lowest):
 Hooks are executed with a sanitized environment.
 
 - `GEMINI_PROJECT_DIR`: The absolute path to the project root.
-- `GEMINI_PLANS_DIR`: The absolute path to the plans directory.
 - `GEMINI_SESSION_ID`: The unique ID for the current session.
 - `GEMINI_CWD`: The current working directory.
 - `CLAUDE_PROJECT_DIR`: (Alias) Provided for compatibility.
@@ -153,8 +151,8 @@ Hooks are executed with a sanitized environment.
 
 **Project-level hooks** are particularly risky when opening untrusted projects.
 Gemini CLI **fingerprints** project hooks. If a hook's name or command changes
-(for example, via `git pull`), it is treated as a **new, untrusted hook** and
-you will be warned before it executes.
+(e.g., via `git pull`), it is treated as a **new, untrusted hook** and you will
+be warned before it executes.
 
 See [Security Considerations](../hooks/best-practices.md#using-hooks-securely)
 for a detailed threat model.

docs/hooks/reference.md

@@ -20,8 +20,8 @@ including JSON schemas and API details.
 
 ## Configuration schema
 
-Hooks are defined in `settings.json` within the `hooks` object. Each event (for
-example, `BeforeTool`) contains an array of **hook definitions**.
+Hooks are defined in `settings.json` within the `hooks` object. Each event
+(e.g., `BeforeTool`) contains an array of **hook definitions**.
 
 ### Hook definition
 
@@ -52,7 +52,7 @@ All hooks receive these common fields via `stdin`:
   "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 (for example "BeforeTool")
+  "hook_event_name": string, // The firing event (e.g. "BeforeTool")
   "timestamp": string        // ISO 8601 execution time
 }
 ```
@@ -81,12 +81,12 @@ Most hooks support these fields in their `stdout` JSON:
 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 (for example, `read_file`,
+- **Built-in Tools**: You can match any built-in tool (e.g., `read_file`,
   `run_shell_command`). See the [Tools Reference](../reference/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 (for example,
+- **Regex Support**: Matchers support regular expressions (e.g.,
   `matcher: "read_.*"` matches all file reading tools).
 
 ### `BeforeTool`
@@ -194,7 +194,7 @@ request format.
     (generation params).
 - **Relevant Output Fields**:
   - `hookSpecificOutput.llm_request`: An object that **overrides** parts of the
-    outgoing request (for example, changing models or temperature).
+    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.
@@ -271,14 +271,14 @@ telemetry.
 
 ### `Notification`
 
-Fires when the CLI emits a system alert (for example, Tool Permissions). Used
-for external logging or cross-platform alerts.
+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 (for example, tool name,
-    file path).
+  - `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

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

@@ -20,9 +20,9 @@ Protocol (MCP)**.
 
 - **Protocol:** The server must be a valid MCP server. We recommend using an
   existing MCP SDK for your language of choice if available.
-- **Endpoint:** The server should expose a single endpoint (for example, `/mcp`)
-  for all MCP communication.
-- **Port:** The server **MUST** listen on a dynamically assigned port (that is,
+- **Endpoint:** The server should expose a single endpoint (e.g., `/mcp`) for
+  all MCP communication.
+- **Port:** The server **MUST** listen on a dynamically assigned port (i.e.,
   listen on port `0`).
 
 ### 2. Discovery mechanism: The port file
@@ -68,15 +68,15 @@ creating a "discovery file."
     The CLI will include this token in an `Authorization: Bearer <token>` header
     on all requests.
   - `ideInfo` (object, required): Information about the IDE.
-    - `name` (string, required): A short, lowercase identifier for the IDE (for
-      example, `vscode`, `jetbrains`).
-    - `displayName` (string, required): A user-friendly name for the IDE (for
-      example, `VS Code`, `JetBrains IDE`).
+    - `name` (string, required): A short, lowercase identifier for the IDE
+      (e.g., `vscode`, `jetbrains`).
+    - `displayName` (string, required): A user-friendly name for the IDE (e.g.,
+      `VS Code`, `JetBrains IDE`).
 
 - **Authentication:** To secure the connection, the plugin **MUST** generate a
   unique, secret token and include it in the discovery file. The CLI will then
   include this token in the `Authorization` header for all requests to the MCP
-  server (for example, `Authorization: Bearer a-very-secret-token`). Your server
+  server (e.g., `Authorization: Bearer a-very-secret-token`). Your server
   **MUST** validate this token on every request and reject any that are
   unauthorized.
 - **Tie-breaking with environment variables (recommended):** For the most
@@ -135,7 +135,7 @@ to the CLI whenever the user's context changes.
 <!-- prettier-ignore -->
 > [!NOTE]
 > The `openFiles` list should only include files that exist on disk.
-> Virtual files (for example, unsaved files without a path, editor settings pages)
+> Virtual files (e.g., unsaved files without a path, editor settings pages)
 > **MUST** be excluded.
 
 ### How the CLI uses this context
@@ -188,7 +188,7 @@ The plugin **MUST** register an `openDiff` tool on its MCP server.
   `CallToolResult` to acknowledge the request and report whether the diff view
   was successfully opened.
   - On Success: If the diff view was opened successfully, the response **MUST**
-    contain empty content (that is, `content: []`).
+    contain empty content (i.e., `content: []`).
   - On Failure: If an error prevented the diff view from opening, the response
     **MUST** have `isError: true` and include a `TextContent` block in the
     `content` array describing the error.
@@ -223,9 +223,9 @@ The plugin **MUST** register a `closeDiff` tool on its MCP server.
 
 ### `ide/diffAccepted` notification
 
-When the user accepts the changes in a diff view (for example, by clicking an
-"Apply" or "Save" button), the plugin **MUST** send an `ide/diffAccepted`
-notification to the CLI.
+When the user accepts the changes in a diff view (e.g., by clicking an "Apply"
+or "Save" button), the plugin **MUST** send an `ide/diffAccepted` notification
+to the CLI.
 
 - **Payload:** The notification parameters **MUST** include the file path and
   the final content of the file. The content may differ from the original
@@ -242,7 +242,7 @@ notification to the CLI.
 
 ### `ide/diffRejected` notification
 
-When the user rejects the changes (for example, by closing the diff view without
+When the user rejects the changes (e.g., by closing the diff view without
 accepting), the plugin **MUST** send an `ide/diffRejected` notification to the
 CLI.
 

docs/ide-integration/index.md

@@ -132,7 +132,7 @@ editor.
 **To accept a diff**, you can perform any of the following actions:
 
 - Click the **checkmark icon** in the diff editor's title bar.
-- Save the file (for example, with `Cmd+S` or `Ctrl+S`).
+- Save the file (e.g., with `Cmd+S` or `Ctrl+S`).
 - Open the Command Palette and run **Gemini CLI: Accept Diff**.
 - Respond with `yes` in the CLI when prompted.
 
@@ -208,7 +208,7 @@ directly through their in-built registry features.
 
 ## Using with sandboxing
 
-If you are using Gemini CLI within a sandbox, be aware of the following:
+If you are using Gemini CLI within a sandbox, please be aware of the following:
 
 - **On macOS:** The IDE integration requires network access to communicate with
   the IDE companion extension. You must use a Seatbelt profile that allows
@@ -299,5 +299,5 @@ to connect using the provided PID.
 
 ### ACP integration errors
 
-For issues related to ACP integration, refer to the debugging and telemetry
-section in the [ACP Mode](../cli/acp-mode.md) documentation.
+For issues related to ACP integration, please refer to the debugging and
+telemetry section in the [ACP Mode](../cli/acp-mode.md) documentation.

docs/index.md

@@ -15,9 +15,9 @@ npm install -g @google/gemini-cli
 Jump in to Gemini CLI.
 
 - **[Quickstart](./get-started/index.md):** Your first session with Gemini CLI.
-- **[Installation](./get-started/installation.mdx):** How to install Gemini CLI
+- **[Installation](./get-started/installation.md):** How to install Gemini CLI
   on your system.
-- **[Authentication](./get-started/authentication.mdx):** Setup instructions for
+- **[Authentication](./get-started/authentication.md):** Setup instructions for
   personal and enterprise accounts.
 - **[CLI cheatsheet](./cli/cli-reference.md):** A quick reference for common
   commands and options.

docs/integration-tests.md

@@ -6,8 +6,8 @@ in this project.
 ## Overview
 
 The integration tests are designed to validate the end-to-end functionality of
-Gemini CLI. They execute the built binary in a controlled environment and verify
-that it behaves as expected when interacting with the file system.
+the Gemini CLI. They execute the built binary in a controlled environment and
+verify that it behaves as expected when interacting with the file system.
 
 These tests are located in the `integration-tests` directory and are run using a
 custom test runner.
@@ -117,88 +117,6 @@ npm run test:integration:sandbox:docker
 npm run test:integration:sandbox:podman
 ```
 
-## Memory regression tests
-
-Memory regression tests are designed to detect heap growth and leaks across key
-CLI scenarios. They are located in the `memory-tests` directory.
-
-These tests are distinct from standard integration tests because they measure
-memory usage and compare it against committed baselines.
-
-### Running memory tests
-
-Memory tests are not run as part of the default `npm run test` or
-`npm run test:e2e` commands. They are run nightly in CI but can be run manually:
-
-```bash
-npm run test:memory
-```
-
-### Updating baselines
-
-If you intentionally change behavior that affects memory usage, you may need to
-update the baselines. Set the `UPDATE_MEMORY_BASELINES` environment variable to
-`true`:
-
-```bash
-UPDATE_MEMORY_BASELINES=true npm run test:memory
-```
-
-This will run the tests, take median snapshots, and overwrite
-`memory-tests/baselines.json`. You should review the changes and commit the
-updated baseline file.
-
-### How it works
-
-The harness (`MemoryTestHarness` in `packages/test-utils`):
-
-- Forces garbage collection multiple times to reduce noise.
-- Takes median snapshots to filter spikes.
-- Compares against baselines with a 10% tolerance.
-- Can analyze sustained leaks across 3 snapshots using `analyzeSnapshots()`.
-
-## Performance regression tests
-
-Performance regression tests are designed to detect wall-clock time, CPU usage,
-and event loop delay regressions across key CLI scenarios. They are located in
-the `perf-tests` directory.
-
-These tests are distinct from standard integration tests because they measure
-performance metrics and compare it against committed baselines.
-
-### Running performance tests
-
-Performance tests are not run as part of the default `npm run test` or
-`npm run test:e2e` commands. They are run nightly in CI but can be run manually:
-
-```bash
-npm run test:perf
-```
-
-### Updating baselines
-
-If you intentionally change behavior that affects performance, you may need to
-update the baselines. Set the `UPDATE_PERF_BASELINES` environment variable to
-`true`:
-
-```bash
-UPDATE_PERF_BASELINES=true npm run test:perf
-```
-
-This will run the tests multiple times (with warmup), apply IQR outlier
-filtering, and overwrite `perf-tests/baselines.json`. You should review the
-changes and commit the updated baseline file.
-
-### How it works
-
-The harness (`PerfTestHarness` in `packages/test-utils`):
-
-- Measures wall-clock time using `performance.now()`.
-- Measures CPU usage using `process.cpuUsage()`.
-- Monitors event loop delay using `perf_hooks.monitorEventLoopDelay()`.
-- Applies IQR (Interquartile Range) filtering to remove outlier samples.
-- Compares against baselines with a 15% tolerance.
-
 ## Diagnostics
 
 The integration test runner provides several options for diagnostics to help

docs/issue-and-pr-automation.md

@@ -37,8 +37,8 @@ is to perform an initial analysis and apply the correct labels.
   - It uses a Gemini model to analyze the issue's title and body against a
     detailed set of guidelines.
   - **Applies one `area/*` label**: Categorizes the issue into a functional area
-    of the project (for example, `area/ux`, `area/models`, `area/platform`).
-  - **Applies one `kind/*` label**: Identifies the type of issue (for example,
+    of the project (e.g., `area/ux`, `area/models`, `area/platform`).
+  - **Applies one `kind/*` label**: Identifies the type of issue (e.g.,
     `kind/bug`, `kind/enhancement`, `kind/question`).
   - **Applies one `priority/*` label**: Assigns a priority from P0 (critical) to
     P3 (low) based on the described impact.
@@ -50,8 +50,8 @@ is to perform an initial analysis and apply the correct labels.
 - **What you should do**:
   - Fill out the issue template as completely as possible. The more detail you
     provide, the more accurate the triage will be.
-  - If the `status/need-information` label is added, provide the requested
-    details in a comment.
+  - If the `status/need-information` label is added, please provide the
+    requested details in a comment.
 
 ### 2. When you open a pull request: `Continuous Integration (CI)`
 
@@ -84,8 +84,7 @@ issues and have consistent labels.
 - **When it runs**: Every 15 minutes on all open pull requests.
 - **What it does**:
   - **Checks for a linked issue**: The bot scans your PR description for a
-    keyword that links it to an issue (for example, `Fixes #123`,
-    `Closes #456`).
+    keyword that links it to an issue (e.g., `Fixes #123`, `Closes #456`).
   - **Adds `status/need-issue`**: If no linked issue is found, the bot will add
     the `status/need-issue` label to your PR. This is a clear signal that an
     issue needs to be created and linked.
@@ -157,7 +156,7 @@ and will never be auto-unassigned.
 ### 6. Release automation
 
 This workflow handles the process of packaging and publishing new versions of
-Gemini CLI.
+the Gemini CLI.
 
 - **Workflow File**: `.github/workflows/release-manual.yml`
 - **When it runs**: On a daily schedule for "nightly" releases, and manually for
@@ -172,4 +171,4 @@ Gemini CLI.
     will be included in the very next nightly release.
 
 We hope this detailed overview is helpful. If you have any questions about our
-automation or processes, don't hesitate to ask!
+automation or processes, please don't hesitate to ask!

docs/npm.md

@@ -5,7 +5,7 @@ This monorepo contains two main packages: `@google/gemini-cli` and
 
 ## `@google/gemini-cli`
 
-This is the main package for Gemini CLI. It is responsible for the user
+This is the main package for the Gemini CLI. It is responsible for the user
 interface, command parsing, and all other user-facing functionality.
 
 When this package is published, it is bundled into a single executable file.

docs/reference/commands.md

@@ -156,7 +156,7 @@ Slash commands provide meta-level control over the CLI itself.
 
 ### `/docs`
 
-- **Description:** Open Gemini CLI documentation in your browser.
+- **Description:** Open the Gemini CLI documentation in your browser.
 
 ### `/editor`
 
@@ -400,8 +400,8 @@ Slash commands provide meta-level control over the CLI itself.
 
 ### `/shells` (or `/bashes`)
 
-- **Description:** Toggle the background shells view. This lets you view and
-  manage long-running processes that you've sent to the background.
+- **Description:** Toggle the background shells view. This allows you to view
+  and manage long-running processes that you've sent to the background.
 
 ### `/setup-github`
 
@@ -474,8 +474,7 @@ Slash commands provide meta-level control over the CLI itself.
   input area supports vim-style navigation and editing commands in both NORMAL
   and INSERT modes.
 - **Features:**
-  - **Count support:** Prefix commands with numbers (for example, `3h`, `5w`,
-    `10G`)
+  - **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
@@ -491,8 +490,9 @@ Slash commands provide meta-level control over the CLI itself.
 ### Custom commands
 
 Custom commands allow you to create personalized shortcuts for your most-used
-prompts. For detailed instructions on how to create, manage, and use them, see
-the dedicated [Custom Commands documentation](../cli/custom-commands.md).
+prompts. For detailed instructions on how to create, manage, and use them,
+please see the dedicated
+[Custom Commands documentation](../cli/custom-commands.md).
 
 ## Input prompt shortcuts
 
@@ -523,7 +523,7 @@ your prompt to Gemini. These commands include git-aware filtering.
     - If a path to a single file is provided, the content of that file is read.
     - If a path to a directory is provided, the command attempts to read the
       content of files within that directory and any subdirectories.
-    - Spaces in paths should be escaped with a backslash (for example,
+    - Spaces in paths should be escaped with a backslash (e.g.,
       `@My\ Documents/file.txt`).
     - The command uses the `read_many_files` tool internally. The content is
       fetched and then inserted into your query before being sent to the Gemini
@@ -549,8 +549,8 @@ your prompt to Gemini. These commands include git-aware filtering.
 - If the path specified after `@` is not found or is invalid, an error message
   will be displayed, and the query might not be sent to the Gemini model, or it
   will be sent without the file content.
-- If the `read_many_files` tool encounters an error (for example, permission
-  issues), this will also be reported.
+- If the `read_many_files` tool encounters an error (e.g., permission issues),
+  this will also be reported.
 
 ## Shell mode and passthrough commands (`!`)
 
@@ -583,4 +583,4 @@ Gemini CLI.
 - **Environment variable:** When a command is executed via `!` or in shell mode,
   the `GEMINI_CLI=1` environment variable is set in the subprocess's
   environment. This allows scripts or tools to detect if they are being run from
-  within Gemini CLI.
+  within the Gemini CLI.

docs/reference/configuration.md

@@ -71,7 +71,7 @@ Additionally, each extension can have its own `.env` file in its directory,
 which will be loaded automatically.
 
 **Note for Enterprise Users:** For guidance on deploying and managing Gemini CLI
-in a corporate environment, see the
+in a corporate environment, please see the
 [Enterprise Configuration](../cli/enterprise.md) documentation.
 
 ### The `.gemini` directory in your project
@@ -79,7 +79,7 @@ in a corporate environment, see the
 In addition to a project settings file, a project's `.gemini` directory can
 contain other project-specific files related to Gemini CLI's operation, such as:
 
-- [Custom sandbox profiles](#sandboxing) (for example,
+- [Custom sandbox profiles](#sandboxing) (e.g.,
   `.gemini/sandbox-macos-custom.sb`, `.gemini/sandbox.Dockerfile`).
 
 ### Available settings in `settings.json`
@@ -134,15 +134,10 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `true`
 
 - **`general.enableNotifications`** (boolean):
-  - **Description:** Enable terminal run-event notifications for action-required
-    prompts and session completion.
+  - **Description:** Enable run-event notifications for action-required prompts
+    and session completion.
   - **Default:** `false`
 
-- **`general.notificationMethod`** (enum):
-  - **Description:** How to send terminal notifications.
-  - **Default:** `"auto"`
-  - **Values:** `"auto"`, `"osc9"`, `"osc777"`, `"bell"`
-
 - **`general.checkpointing.enabled`** (boolean):
   - **Description:** Enable session checkpointing for recovery
   - **Default:** `false`
@@ -198,11 +193,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Minimum retention period (safety limit, defaults to "1d")
   - **Default:** `"1d"`
 
-- **`general.topicUpdateNarration`** (boolean):
-  - **Description:** Enable the Topic & Update communication model for reduced
-    chattiness and structured progress reporting.
-  - **Default:** `true`
-
 #### `output`
 
 - **`output.format`** (enum):
@@ -212,12 +202,6 @@ their corresponding top-level category object in your `settings.json` file.
 
 #### `ui`
 
-- **`ui.debugRainbow`** (boolean):
-  - **Description:** Enable debug rainbow rendering. Only useful for debugging
-    rendering bugs and performance issues.
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
 - **`ui.theme`** (string):
   - **Description:** The color theme for the UI. See the CLI themes guide for
     available options.
@@ -436,20 +420,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `"ask"`
   - **Values:** `"ask"`, `"always"`, `"never"`
 
-- **`billing.vertexAi.requestType`** (enum):
-  - **Description:** Sets the X-Vertex-AI-LLM-Request-Type header for Vertex AI
-    requests.
-  - **Default:** `undefined`
-  - **Values:** `"dedicated"`, `"shared"`
-  - **Requires restart:** Yes
-
-- **`billing.vertexAi.sharedRequestType`** (enum):
-  - **Description:** Sets the X-Vertex-AI-LLM-Shared-Request-Type header for
-    Vertex AI requests.
-  - **Default:** `undefined`
-  - **Values:** `"priority"`, `"flex"`
-  - **Requires restart:** Yes
-
 #### `model`
 
 - **`model.name`** (string):
@@ -563,18 +533,6 @@ their corresponding top-level category object in your `settings.json` file.
           "model": "gemini-2.5-flash-lite"
         }
       },
-      "gemma-4-31b-it": {
-        "extends": "chat-base-3",
-        "modelConfig": {
-          "model": "gemma-4-31b-it"
-        }
-      },
-      "gemma-4-26b-a4b-it": {
-        "extends": "chat-base-3",
-        "modelConfig": {
-          "model": "gemma-4-26b-a4b-it"
-        }
-      },
       "gemini-2.5-flash-base": {
         "extends": "base",
         "modelConfig": {
@@ -846,28 +804,6 @@ their corresponding top-level category object in your `settings.json` file.
           "multimodalToolUse": false
         }
       },
-      "gemma-4-31b-it": {
-        "displayName": "gemma-4-31b-it",
-        "tier": "custom",
-        "family": "gemma-4",
-        "isPreview": false,
-        "isVisible": true,
-        "features": {
-          "thinking": true,
-          "multimodalToolUse": false
-        }
-      },
-      "gemma-4-26b-a4b-it": {
-        "displayName": "gemma-4-26b-a4b-it",
-        "tier": "custom",
-        "family": "gemma-4",
-        "isPreview": false,
-        "isVisible": true,
-        "features": {
-          "thinking": true,
-          "multimodalToolUse": false
-        }
-      },
       "auto": {
         "tier": "auto",
         "isPreview": true,
@@ -938,12 +874,6 @@ their corresponding top-level category object in your `settings.json` file.
 
     ```json
     {
-      "gemma-4-31b-it": {
-        "default": "gemma-4-31b-it"
-      },
-      "gemma-4-26b-a4b-it": {
-        "default": "gemma-4-26b-a4b-it"
-      },
       "gemini-3.1-pro-preview": {
         "default": "gemini-3.1-pro-preview",
         "contexts": [
@@ -1413,12 +1343,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `true`
   - **Requires restart:** Yes
 
-- **`context.fileFiltering.enableFileWatcher`** (boolean):
-  - **Description:** Enable file watcher updates for @ file suggestions
-    (experimental).
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
 - **`context.fileFiltering.enableRecursiveFileSearch`** (boolean):
   - **Description:** Enable recursive file search functionality when completing
     @ references in the prompt.
@@ -1507,12 +1431,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `undefined`
   - **Requires restart:** Yes
 
-- **`tools.confirmationRequired`** (array):
-  - **Description:** Tool names that always require user confirmation. Takes
-    precedence over allowed tools and core tool allowlists.
-  - **Default:** `undefined`
-  - **Requires restart:** Yes
-
 - **`tools.exclude`** (array):
   - **Description:** Tool names to exclude from discovery.
   - **Default:** `undefined`
@@ -1660,10 +1578,7 @@ their corresponding top-level category object in your `settings.json` file.
 #### `advanced`
 
 - **`advanced.autoConfigureMemory`** (boolean):
-  - **Description:** Automatically configure Node.js memory limits. Note:
-    Because memory is allocated during the initial process boot, this setting is
-    only read from the global user settings file and ignores workspace-level
-    overrides.
+  - **Description:** Automatically configure Node.js memory limits
   - **Default:** `true`
   - **Requires restart:** Yes
 
@@ -1686,11 +1601,6 @@ their corresponding top-level category object in your `settings.json` file.
 
 #### `experimental`
 
-- **`experimental.gemma`** (boolean):
-  - **Description:** Enable access to Gemma 4 models (experimental).
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
 - **`experimental.adk.agentSessionNoninteractiveEnabled`** (boolean):
   - **Description:** Enable non-interactive agent sessions.
   - **Default:** `false`
@@ -1739,10 +1649,8 @@ their corresponding top-level category object in your `settings.json` file.
   - **Requires restart:** Yes
 
 - **`experimental.jitContext`** (boolean):
-  - **Description:** Enable Just-In-Time (JIT) context loading. Defaults to
-    true; set to false to opt out and load all GEMINI.md files into the system
-    instruction up-front.
-  - **Default:** `true`
+  - **Description:** Enable Just-In-Time (JIT) context loading.
+  - **Default:** `false`
   - **Requires restart:** Yes
 
 - **`experimental.useOSC52Paste`** (boolean):
@@ -1784,18 +1692,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
   - **Requires restart:** Yes
 
-- **`experimental.gemmaModelRouter.autoStartServer`** (boolean):
-  - **Description:** Automatically start the LiteRT-LM server when Gemini CLI
-    starts and the Gemma router is enabled.
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
-- **`experimental.gemmaModelRouter.binaryPath`** (string):
-  - **Description:** Custom path to the LiteRT-LM binary. Leave empty to use the
-    default location (~/.gemini/bin/litert/).
-  - **Default:** `""`
-  - **Requires restart:** Yes
-
 - **`experimental.gemmaModelRouter.classifier.host`** (string):
   - **Description:** The host of the classifier.
   - **Default:** `"http://localhost:9379"`
@@ -1807,22 +1703,10 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `"gemma3-1b-gpu-custom"`
   - **Requires restart:** Yes
 
-- **`experimental.memoryV2`** (boolean):
-  - **Description:** Disable the built-in save_memory tool and let the main
-    agent persist project context by editing markdown files directly with
-    edit/write_file. Route facts across four tiers: team-shared conventions go
-    to project GEMINI.md files, project-specific personal notes go to the
-    per-project private memory folder (MEMORY.md as index + sibling .md files
-    for detail), and cross-project personal preferences go to the global
-    ~/.gemini/GEMINI.md (the only file under ~/.gemini/ that the agent can edit
-    — settings, credentials, etc. remain off-limits). Set to false to fall back
-    to the legacy save_memory tool.
-  - **Default:** `true`
-  - **Requires restart:** Yes
-
-- **`experimental.autoMemory`** (boolean):
-  - **Description:** Automatically extract reusable skills from past sessions in
-    the background. Review results with /memory inbox.
+- **`experimental.memoryManager`** (boolean):
+  - **Description:** Replace the built-in save_memory tool with a memory manager
+    subagent that supports adding, removing, de-duplicating, and organizing
+    memories.
   - **Default:** `false`
   - **Requires restart:** Yes
 
@@ -1837,7 +1721,8 @@ their corresponding top-level category object in your `settings.json` file.
   - **Requires restart:** Yes
 
 - **`experimental.topicUpdateNarration`** (boolean):
-  - **Description:** Deprecated: Use general.topicUpdateNarration instead.
+  - **Description:** Enable the experimental Topic & Update communication model
+    for reduced chattiness and structured progress reporting.
   - **Default:** `false`
 
 #### `skills`
@@ -2024,15 +1909,15 @@ Configures connections to one or more Model-Context Protocol (MCP) servers for
 discovering and using custom tools. Gemini CLI attempts to connect to each
 configured MCP server to discover available tools. Every discovered tool is
 prepended with the `mcp_` prefix and its server alias to form a fully qualified
-name (FQN) (for example, `mcp_serverAlias_actualToolName`) to avoid conflicts.
-Note that the system might strip certain schema properties from MCP tool
-definitions for compatibility. At least one of `command`, `url`, or `httpUrl`
-must be provided. If multiple are specified, the order of precedence is
-`httpUrl`, then `url`, then `command`.
+name (FQN) (e.g., `mcp_serverAlias_actualToolName`) to avoid conflicts. Note
+that the system might strip certain schema properties from MCP tool definitions
+for compatibility. At least one of `command`, `url`, or `httpUrl` must be
+provided. If multiple are specified, the order of precedence is `httpUrl`, then
+`url`, then `command`.
 
 <!-- prettier-ignore -->
 > [!WARNING]
-> Avoid using underscores (`_`) in your server aliases (for example, use
+> Avoid using underscores (`_`) in your server aliases (e.g., use
 > `my-server` instead of `my_server`). The underlying policy engine parses Fully
 > Qualified Names (`mcp_server_tool`) using the first underscore after the
 > `mcp_` prefix. An underscore in your server alias will cause the parser to
@@ -2077,8 +1962,6 @@ see [Telemetry](../cli/telemetry.md).
 
 - **Properties:**
   - **`enabled`** (boolean): Whether or not telemetry is enabled.
-  - **`traces`** (boolean): Whether detailed traces with large attributes (like
-    tool outputs and file reads) are captured. Defaults to `false`.
   - **`target`** (string): The destination for collected telemetry. Supported
     values are `local` and `gcp`.
   - **`otlpEndpoint`** (string): The endpoint for the OTLP Exporter.
@@ -2178,7 +2061,7 @@ within your user's home folder.
 Environment variables are a common way to configure applications, especially for
 sensitive information like API keys or for settings that might change between
 environments. For authentication setup, see the
-[Authentication documentation](../get-started/authentication.mdx) which covers
+[Authentication documentation](../get-started/authentication.md) which covers
 all available authentication methods.
 
 The CLI automatically loads environment variables from an `.env` file. The
@@ -2199,22 +2082,14 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
 - **`GEMINI_API_KEY`**:
   - Your API key for the Gemini API.
   - One of several available
-    [authentication methods](../get-started/authentication.mdx).
-  - Set this in your shell profile (for example, `~/.bashrc`, `~/.zshrc`) or an
-    `.env` file.
+    [authentication methods](../get-started/authentication.md).
+  - Set this in your shell profile (e.g., `~/.bashrc`, `~/.zshrc`) or an `.env`
+    file.
 - **`GEMINI_MODEL`**:
   - Specifies the default Gemini model to use.
   - Overrides the hardcoded default
   - Example: `export GEMINI_MODEL="gemini-3-flash-preview"` (Windows PowerShell:
     `$env:GEMINI_MODEL="gemini-3-flash-preview"`)
-- **`GEMINI_CLI_TRUST_WORKSPACE`**:
-  - If set to `"true"`, trusts the current workspace for the duration of the
-    session, bypassing the folder trust check.
-  - Useful for headless environments (for example, CI/CD pipelines).
-- **`GEMINI_CLI_TRUSTED_FOLDERS_PATH`**:
-  - Overrides the default location for the `trustedFolders.json` file.
-  - Useful if you want to store this configuration in a custom location instead
-    of the default `~/.gemini/`.
 - **`GEMINI_CLI_IDE_PID`**:
   - Manually specifies the PID of the IDE process to use for integration. This
     is useful when running Gemini CLI in a standalone terminal while still
@@ -2264,21 +2139,6 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
   - When set, overrides the default API version used by the SDK.
   - Example: `export GOOGLE_GENAI_API_VERSION="v1"` (Windows PowerShell:
     `$env:GOOGLE_GENAI_API_VERSION="v1"`)
-- **`GOOGLE_GEMINI_BASE_URL`**:
-  - Overrides the default base URL for Gemini API requests (when using
-    `gemini-api-key` authentication).
-  - Must be a valid URL. For security, it must use HTTPS unless pointing to
-    `localhost` (or `127.0.0.1` / `[::1]`).
-  - Example: `export GOOGLE_GEMINI_BASE_URL="https://my-proxy.com"` (Windows
-    PowerShell: `$env:GOOGLE_GEMINI_BASE_URL="https://my-proxy.com"`)
-- **`GOOGLE_VERTEX_BASE_URL`**:
-  - Overrides the default base URL for Vertex AI API requests (when using
-    `vertex-ai` authentication).
-  - Must be a valid URL. For security, it must use HTTPS unless pointing to
-    `localhost` (or `127.0.0.1` / `[::1]`).
-  - Example: `export GOOGLE_VERTEX_BASE_URL="https://my-vertex-proxy.com"`
-    (Windows PowerShell:
-    `$env:GOOGLE_VERTEX_BASE_URL="https://my-vertex-proxy.com"`)
 - **`OTLP_GOOGLE_CLOUD_PROJECT`**:
   - Your Google Cloud Project ID for Telemetry in Google Cloud
   - Example: `export OTLP_GOOGLE_CLOUD_PROJECT="YOUR_PROJECT_ID"` (Windows
@@ -2287,10 +2147,6 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
   - Set to `true` or `1` to enable telemetry. Any other value is treated as
     disabling it.
   - Overrides the `telemetry.enabled` setting.
-- **`GEMINI_TELEMETRY_TRACES_ENABLED`**:
-  - Set to `true` or `1` to enable detailed tracing with large attributes. Any
-    other value is treated as disabling it.
-  - Overrides the `telemetry.traces` setting.
 - **`GEMINI_TELEMETRY_TARGET`**:
   - Sets the telemetry target (`local` or `gcp`).
   - Overrides the `telemetry.target` setting.
@@ -2312,7 +2168,7 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
     Any other value is treated as disabling it.
   - Overrides the `telemetry.useCollector` setting.
 - **`GOOGLE_CLOUD_LOCATION`**:
-  - Your Google Cloud Project Location (for example, us-central1).
+  - Your Google Cloud Project Location (e.g., us-central1).
   - Required for using Vertex AI in non-express mode.
   - Example: `export GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"` (Windows
     PowerShell: `$env:GOOGLE_CLOUD_LOCATION="YOUR_PROJECT_LOCATION"`).
@@ -2343,7 +2199,7 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
   - `strict-proxied`: Same as `strict-open` but routes network through proxy.
   - `<profile_name>`: Uses a custom profile. To define a custom profile, create
     a file named `sandbox-macos-<profile_name>.sb` in your project's `.gemini/`
-    directory (for example, `my-project/.gemini/sandbox-macos-custom.sb`).
+    directory (e.g., `my-project/.gemini/sandbox-macos-custom.sb`).
 - **`DEBUG` or `DEBUG_MODE`** (often used by underlying libraries or the CLI
   itself):
   - Set to `true` or `1` to enable verbose debug logging, which can be helpful
@@ -2382,7 +2238,7 @@ from the system or loaded from `.env` files.
 
 **Allowlist (Never Redacted):**
 
-- Common system variables (for example, `PATH`, `HOME`, `USER`, `SHELL`, `TERM`,
+- Common system variables (e.g., `PATH`, `HOME`, `USER`, `SHELL`, `TERM`,
   `LANG`).
 - Variables starting with `GEMINI_CLI_`.
 - GitHub Action specific variables.
@@ -2508,7 +2364,7 @@ for that specific session.
 While not strictly configuration for the CLI's _behavior_, context files
 (defaulting to `GEMINI.md` but configurable via the `context.fileName` setting)
 are crucial for configuring the _instructional context_ (also referred to as
-"memory") provided to the Gemini model. This powerful feature lets you give
+"memory") provided to the Gemini model. This powerful feature allows you to give
 project-specific instructions, coding style guides, or any relevant background
 information to the AI, making its responses more tailored and accurate to your
 needs. The CLI includes UI elements, such as an indicator in the footer showing
@@ -2519,7 +2375,7 @@ context.
   that you want the Gemini model to be aware of during your interactions. The
   system is designed to manage this instructional context hierarchically.
 
-### Example context file content (for example, `GEMINI.md`)
+### Example context file content (e.g., `GEMINI.md`)
 
 Here's a conceptual example of what a context file at the root of a TypeScript
 project might contain:
@@ -2529,7 +2385,7 @@ project might contain:
 
 ## General Instructions:
 
-- When generating new TypeScript code, follow the existing coding style.
+- When generating new TypeScript code, please follow the existing coding style.
 - Ensure all new functions and classes have JSDoc comments.
 - Prefer functional programming paradigms where appropriate.
 - All code should be compatible with TypeScript 5.0 and Node.js 20+.
@@ -2537,7 +2393,7 @@ project might contain:
 ## Coding Style:
 
 - Use 2 spaces for indentation.
-- Interface names should be prefixed with `I` (for example, `IUserService`).
+- Interface names should be prefixed with `I` (e.g., `IUserService`).
 - Private class members should be prefixed with an underscore (`_`).
 - Always use strict equality (`===` and `!==`).
 
@@ -2551,7 +2407,7 @@ project might contain:
 ## Regarding Dependencies:
 
 - Avoid introducing new external dependencies unless absolutely necessary.
-- If a new dependency is required, state the reason.
+- If a new dependency is required, please state the reason.
 ```
 
 This example demonstrates how you can provide general project context, specific
@@ -2561,13 +2417,13 @@ you. Project-specific context files are highly encouraged to establish
 conventions and context.
 
 - **Hierarchical loading and precedence:** The CLI implements a sophisticated
-  hierarchical memory system by loading context files (for example, `GEMINI.md`)
-  from several locations. Content from files lower in this list (more specific)
+  hierarchical memory system by loading context files (e.g., `GEMINI.md`) from
+  several locations. Content from files lower in this list (more specific)
   typically overrides or supplements content from files higher up (more
   general). The exact concatenation order and final context can be inspected
   using the `/memory show` command. The typical loading order is:
   1.  **Global context file:**
-      - Location: `~/.gemini/<configured-context-filename>` (for example,
+      - Location: `~/.gemini/<configured-context-filename>` (e.g.,
         `~/.gemini/GEMINI.md` in your user home directory).
       - Scope: Provides default instructions for all your projects.
   2.  **Project root and ancestors context files:**
@@ -2604,12 +2460,12 @@ conventions and context.
 
 By understanding and utilizing these configuration layers and the hierarchical
 nature of context files, you can effectively manage the AI's memory and tailor
-Gemini CLI's responses to your specific needs and projects.
+the Gemini CLI's responses to your specific needs and projects.
 
 ## Sandboxing
 
-Gemini CLI can execute potentially unsafe operations (like shell commands and
-file modifications) within a sandboxed environment to protect your system.
+The Gemini CLI can execute potentially unsafe operations (like shell commands
+and file modifications) within a sandboxed environment to protect your system.
 
 Sandboxing is disabled by default, but you can enable it in a few ways:
 
@@ -2644,15 +2500,11 @@ sandbox image:
 BUILD_SANDBOX=1 gemini -s
 ```
 
-Building a custom sandbox with `BUILD_SANDBOX` is only supported when running
-Gemini CLI from source. If you installed the CLI with npm, build the Docker
-image separately and reference that image in your sandbox configuration.
-
 ## Usage statistics
 
-To help us improve Gemini CLI, we collect anonymized usage statistics. This data
-helps us understand how the CLI is used, identify common issues, and prioritize
-new features.
+To help us improve the Gemini CLI, we collect anonymized usage statistics. This
+data helps us understand how the CLI is used, identify common issues, and
+prioritize new features.
 
 **What we collect:**
 

docs/reference/keyboard-shortcuts.md

@@ -91,7 +91,7 @@ available combinations.
 | `input.submit`                       | Submit the current prompt.                                                | `Enter`                                                                             |
 | `input.queueMessage`                 | Queue the current prompt to be processed after the current task finishes. | `Tab`                                                                               |
 | `input.newline`                      | Insert a newline without submitting.                                      | `Ctrl+Enter`<br />`Cmd/Win+Enter`<br />`Alt+Enter`<br />`Shift+Enter`<br />`Ctrl+J` |
-| `input.openExternalEditor`           | Open the current prompt or the plan in an external editor.                | `Ctrl+G`<br />`Ctrl+Shift+G`                                                        |
+| `input.openExternalEditor`           | Open the current prompt or the plan in an external editor.                | `Ctrl+G`                                                                            |
 | `input.deprecatedOpenExternalEditor` | Deprecated command to open external editor.                               | `Ctrl+X`                                                                            |
 | `input.paste`                        | Paste from the clipboard.                                                 | `Ctrl+V`<br />`Cmd/Win+V`<br />`Alt+V`                                              |
 
@@ -99,7 +99,7 @@ available combinations.
 
 | Command                       | Action                                                                                                                                             | Keys               |
 | ----------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
-| `app.showErrorDetails`        | Toggle the debug console for detailed error information.                                                                                           | `F12`              |
+| `app.showErrorDetails`        | Toggle detailed error information.                                                                                                                 | `F12`              |
 | `app.showFullTodos`           | Toggle the full TODO list.                                                                                                                         | `Ctrl+T`           |
 | `app.showIdeContextDetail`    | Show IDE context details.                                                                                                                          | `F4`               |
 | `app.toggleMarkdown`          | Toggle Markdown rendering.                                                                                                                         | `Alt+M`            |
@@ -248,83 +248,6 @@ a `key` combination.
 - `Double-click` on a paste placeholder (alternate buffer mode only): Expand to
   view full content inline. Double-click again to collapse.
 
-## Vi mode shortcuts
-
-When vim mode is enabled with `/vim` or `general.vimMode: true`, Gemini CLI
-supports NORMAL and INSERT modes.
-
-### Mode switching
-
-| Action                                       | Keys      |
-| -------------------------------------------- | --------- |
-| Enter NORMAL mode from INSERT mode           | `Esc`     |
-| Enter INSERT mode at the cursor              | `i`       |
-| Enter INSERT mode after the cursor           | `a`       |
-| Enter INSERT mode at the start of the line   | `I`       |
-| Enter INSERT mode at the end of the line     | `A`       |
-| Insert a new line below and switch to INSERT | `o`       |
-| Insert a new line above and switch to INSERT | `O`       |
-| Clear input in NORMAL mode                   | `Esc Esc` |
-
-### Navigation in NORMAL mode
-
-| Action                            | Keys            |
-| --------------------------------- | --------------- |
-| Move left                         | `h`             |
-| Move down                         | `j`             |
-| Move up                           | `k`             |
-| Move right                        | `l`             |
-| Move to start of line             | `0`             |
-| Move to first non-whitespace char | `^`             |
-| Move to end of line               | `$`             |
-| Move forward by word              | `w`             |
-| Move backward by word             | `b`             |
-| Move to end of word               | `e`             |
-| Move forward by WORD              | `W`             |
-| Move backward by WORD             | `B`             |
-| Move to end of WORD               | `E`             |
-| Go to first line                  | `gg`            |
-| Go to last line                   | `G`             |
-| Go to line N                      | `N G` or `N gg` |
-
-Counts are supported for navigation commands. For example, `5j` moves down five
-lines and `3w` moves forward three words.
-
-### Editing in NORMAL mode
-
-| Action                         | Keys  |
-| ------------------------------ | ----- |
-| Delete character under cursor  | `x`   |
-| Delete to end of line          | `D`   |
-| Delete line                    | `dd`  |
-| Change to end of line          | `C`   |
-| Change line                    | `cc`  |
-| Delete forward word            | `dw`  |
-| Delete backward word           | `db`  |
-| Delete to end of word          | `de`  |
-| Delete forward WORD            | `dW`  |
-| Delete backward WORD           | `dB`  |
-| Delete to end of WORD          | `dE`  |
-| Change forward word            | `cw`  |
-| Change backward word           | `cb`  |
-| Change to end of word          | `ce`  |
-| Change forward WORD            | `cW`  |
-| Change backward WORD           | `cB`  |
-| Change to end of WORD          | `cE`  |
-| Delete to start of line        | `d0`  |
-| Delete to first non-whitespace | `d^`  |
-| Change to start of line        | `c0`  |
-| Change to first non-whitespace | `c^`  |
-| Delete from first line to here | `dgg` |
-| Delete from here to last line  | `dG`  |
-| Change from first line to here | `cgg` |
-| Change from here to last line  | `cG`  |
-| Undo last change               | `u`   |
-| Repeat last command            | `.`   |
-
-Counts are also supported for editing commands. For example, `3dd` deletes three
-lines and `2cw` changes two words.
-
 ## Limitations
 
 - On [Windows Terminal](https://en.wikipedia.org/wiki/Windows_Terminal):

docs/reference/memport.md

@@ -1,7 +1,8 @@
 # Memory Import Processor
 
-The Memory Import Processor is a feature that lets you modularize your GEMINI.md
-files by importing content from other files using the `@file.md` syntax.
+The Memory Import Processor is a feature that allows you to modularize your
+GEMINI.md files by importing content from other files using the `@file.md`
+syntax.
 
 ## Overview
 

docs/reference/policy-engine.md

@@ -1,8 +1,8 @@
 # Policy engine
 
-Gemini CLI includes a powerful policy engine that provides fine-grained control
-over tool execution. It allows users and administrators to define rules that
-determine whether a tool call should be allowed, denied, or require user
+The Gemini CLI includes a powerful policy engine that provides fine-grained
+control over tool execution. It allows users and administrators to define rules
+that determine whether a tool call should be allowed, denied, or require user
 confirmation.
 
 ## Quick start
@@ -23,9 +23,9 @@ To create your first policy:
     New-Item -ItemType Directory -Force -Path "$env:USERPROFILE\.gemini\policies"
     ```
 
-2.  **Create a new policy file** (for example,
-    `~/.gemini/policies/my-rules.toml`). You can use any filename ending in
-    `.toml`; all such files in this directory will be loaded and combined:
+2.  **Create a new policy file** (e.g., `~/.gemini/policies/my-rules.toml`). You
+    can use any filename ending in `.toml`; all such files in this directory
+    will be loaded and combined:
     ```toml
     [[rule]]
     toolName = "run_shell_command"
@@ -33,7 +33,7 @@ To create your first policy:
     decision = "deny"
     priority = 100
     ```
-3.  **Run a command** that triggers the policy (for example, ask Gemini CLI to
+3.  **Run a command** that triggers the policy (e.g., ask Gemini CLI to
     `rm -rf /`). The tool will now be blocked automatically.
 
 ## Core concepts
@@ -120,12 +120,6 @@ There are three possible decisions a rule can enforce:
 
 ### Priority system and tiers
 
-> [!WARNING] The **Workspace** tier (project-level policies) is currently
-> non-functional. Defining policies in a workspace's `.gemini/policies`
-> directory will not have any effect. See
-> [issue #18186](https://github.com/google-gemini/gemini-cli/issues/18186). Use
-> User or Admin policies instead.
-
 The policy engine uses a sophisticated priority system to resolve conflicts when
 multiple rules match a single tool call. The core principle is simple: **the
 rule with the highest priority wins**.
@@ -133,13 +127,13 @@ rule with the highest priority wins**.
 To provide a clear hierarchy, policies are organized into three tiers. Each tier
 has a designated number that forms the base of the final priority calculation.
 
-| Tier      | Base | Description                                                                                   |
-| :-------- | :--- | :-------------------------------------------------------------------------------------------- |
-| Default   | 1    | Built-in policies that ship with Gemini CLI.                                                  |
-| Extension | 2    | Policies defined in extensions.                                                               |
-| Workspace | 3    | **(Currently disabled)** Policies defined in the current workspace's configuration directory. |
-| User      | 4    | Custom policies defined by the user.                                                          |
-| Admin     | 5    | Policies managed by an administrator (for example, in an enterprise environment).             |
+| Tier      | Base | Description                                                                |
+| :-------- | :--- | :------------------------------------------------------------------------- |
+| Default   | 1    | Built-in policies that ship with the Gemini CLI.                           |
+| Extension | 2    | Policies defined in extensions.                                            |
+| Workspace | 3    | Policies defined in the current workspace's configuration directory.       |
+| User      | 4    | Custom policies defined by the user.                                       |
+| Admin     | 5    | Policies managed by an administrator (e.g., in an enterprise environment). |
 
 Within a TOML policy file, you assign a priority value from **0 to 999**. The
 engine transforms this into a final priority using the following formula:
@@ -165,8 +159,8 @@ For example:
 
 Approval modes allow the policy engine to apply different sets of rules based on
 the CLI's operational mode. A rule in a TOML policy file can be associated with
-one or more modes (for example, `yolo`, `autoEdit`, `plan`). The rule will only
-be active if the CLI is running in one of its specified modes. If a rule has no
+one or more modes (e.g., `yolo`, `autoEdit`, `plan`). The rule will only be
+active if the CLI is running in one of its specified modes. If a rule has no
 modes specified, it is always active.
 
 - `default`: The standard interactive mode where most write tools require
@@ -220,11 +214,11 @@ User, and (if configured) Admin directories.
 
 ### Policy locations
 
-| Tier          | Type   | Location                                                 |
-| :------------ | :----- | :------------------------------------------------------- |
-| **User**      | Custom | `~/.gemini/policies/*.toml`                              |
-| **Workspace** | Custom | **(Disabled)** `$WORKSPACE_ROOT/.gemini/policies/*.toml` |
-| **Admin**     | System | _See below (OS specific)_                                |
+| Tier          | Type   | Location                                  |
+| :------------ | :----- | :---------------------------------------- |
+| **User**      | Custom | `~/.gemini/policies/*.toml`               |
+| **Workspace** | Custom | `$WORKSPACE_ROOT/.gemini/policies/*.toml` |
+| **Admin**     | System | _See below (OS specific)_                 |
 
 #### System-wide policies (Admin)
 
@@ -263,7 +257,7 @@ To prevent privilege escalation, the CLI enforces strict security checks on the
 directory are **ignored**.
 
 - **Linux / macOS:** Must be owned by `root` (UID 0) and NOT writable by group
-  or others (for example, `chmod 755`).
+  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. If you see a
   security warning, use the folder properties to remove write permissions for
@@ -392,7 +386,7 @@ policies, as it is much more robust than manually writing Fully Qualified Names
 
 <!-- prettier-ignore -->
 > [!WARNING]
-> Do not use underscores (`_`) in your MCP server names (for example, use
+> Do not use underscores (`_`) in your MCP server names (e.g., use
 > `my-server` rather than `my_server`). The policy parser splits Fully Qualified
 > Names (`mcp_server_tool`) on the _first_ underscore following the `mcp_`
 > prefix. If your server name contains an underscore, the parser will
@@ -403,8 +397,7 @@ policies, as it is much more robust than manually writing Fully Qualified Names
 
 Combine `mcpName` and `toolName` to target a single operation. When using
 `mcpName`, the `toolName` field should strictly be the simple name of the tool
-(for example, `search`), **not** the Fully Qualified Name (for example,
-`mcp_server_search`).
+(e.g., `search`), **not** the Fully Qualified Name (e.g., `mcp_server_search`).
 
 ```toml
 # Allows the `search` tool on the `my-jira-server` MCP
@@ -445,37 +438,10 @@ decision = "ask_user"
 priority = 10
 ```
 
-### Special syntax for subagents
-
-You can secure and govern subagents using standard policy rules by treating the
-subagent's name as the `toolName`.
-
-When the main agent invokes a subagent (e.g., using the unified `invoke_agent`
-tool), the Policy Engine automatically treats the target `agent_name` as a
-virtual tool alias for rule matching.
-
-**Example:**
-
-This rule denies access to the `codebase_investigator` subagent.
-
-```toml
-[[rule]]
-toolName = "codebase_investigator"
-decision = "deny"
-priority = 500
-deny_message = "Deep codebase analysis is restricted for this session."
-```
-
-- **Backward Compatibility**: Any rules written targeting historical 1:1
-  subagent tool names will continue to match transparently.
-- **Context differentiation**: To create rules based on **who** is calling a
-  tool, use the `subagent` field instead. See
-  [TOML rule schema](#toml-rule-schema).
-
 ## Default policies
 
-Gemini CLI ships with a set of default policies to provide a safe out-of-the-box
-experience.
+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

docs/reference/tools.md

@@ -92,28 +92,6 @@ each tool.
 | [`ask_user`](../tools/ask-user.md) | `Communicate` | Requests clarification or missing information via an interactive dialog.               |
 | [`write_todos`](../tools/todos.md) | `Other`       | Maintains an internal list of subtasks. The model uses this to track its own progress. |
 
-### Task Tracker (Experimental)
-
-<!-- prettier-ignore -->
-> [!NOTE]
-> This is an experimental feature currently under active development. Enable via `experimental.taskTracker`.
-
-| Tool                                            | Kind    | Description                                                                 |
-| :---------------------------------------------- | :------ | :-------------------------------------------------------------------------- |
-| [`tracker_create_task`](../tools/tracker.md)    | `Other` | Creates a new task in the experimental tracker.                             |
-| [`tracker_update_task`](../tools/tracker.md)    | `Other` | Updates an existing task's status, description, or dependencies.            |
-| [`tracker_get_task`](../tools/tracker.md)       | `Other` | Retrieves the full details of a specific task.                              |
-| [`tracker_list_tasks`](../tools/tracker.md)     | `Other` | Lists tasks in the tracker, optionally filtered by status, type, or parent. |
-| [`tracker_add_dependency`](../tools/tracker.md) | `Other` | Adds a dependency between two tasks, ensuring topological execution.        |
-| [`tracker_visualize`](../tools/tracker.md)      | `Other` | Renders an ASCII tree visualization of the current task graph.              |
-
-### MCP
-
-| Tool                                              | Kind     | Description                                                            |
-| :------------------------------------------------ | :------- | :--------------------------------------------------------------------- |
-| [`list_mcp_resources`](../tools/mcp-resources.md) | `Search` | Lists all available resources exposed by connected MCP servers.        |
-| [`read_mcp_resource`](../tools/mcp-resources.md)  | `Read`   | Reads the content of a specific Model Context Protocol (MCP) resource. |
-
 ### Memory
 
 | Tool                                             | Kind    | Description                                                                          |
@@ -135,24 +113,12 @@ each tool.
 | :-------------- | :------ | :----------------------------------------------------------------------------------------------------------------- |
 | `complete_task` | `Other` | Finalizes a subagent's mission and returns the result to the parent agent. This tool is not available to the user. |
 
-### Task Tracking
-
-| Tool                     | Kind    | Description                                                                 |
-| :----------------------- | :------ | :-------------------------------------------------------------------------- |
-| `tracker_add_dependency` | `Think` | Adds a dependency between two existing tasks in the tracker.                |
-| `tracker_create_task`    | `Think` | Creates a new task in the internal tracker to monitor progress.             |
-| `tracker_get_task`       | `Think` | Retrieves the details and current status of a specific tracked task.        |
-| `tracker_list_tasks`     | `Think` | Lists all tasks currently being tracked.                                    |
-| `tracker_update_task`    | `Think` | Updates the status or details of an existing task.                          |
-| `tracker_visualize`      | `Think` | Generates a visual representation of the current task dependency graph.     |
-| `update_topic`           | `Think` | Updates the current topic and status to keep the user informed of progress. |
-
 ### Web
 
-| Tool                                          | Kind     | Description                                                                                                                                                                                                                                                                     |
-| :-------------------------------------------- | :------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| [`google_web_search`](../tools/web-search.md) | `Search` | Performs a Google Search to find up-to-date information.                                                                                                                                                                                                                        |
-| [`web_fetch`](../tools/web-fetch.md)          | `Fetch`  | Retrieves and processes content from specific URLs. **Warning:** This tool can access local and private network addresses (for example, localhost), which may pose a security risk if used with untrusted prompts. In Plan Mode, this tool requires explicit user confirmation. |
+| Tool                                          | Kind     | Description                                                                                                                                                                                                                                                              |
+| :-------------------------------------------- | :------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [`google_web_search`](../tools/web-search.md) | `Search` | Performs a Google Search to find up-to-date information.                                                                                                                                                                                                                 |
+| [`web_fetch`](../tools/web-fetch.md)          | `Fetch`  | Retrieves and processes content from specific URLs. **Warning:** This tool can access local and private network addresses (e.g., localhost), which may pose a security risk if used with untrusted prompts. In Plan Mode, this tool requires explicit user confirmation. |
 
 ## Under the hood
 

docs/release-confidence.md

@@ -1,7 +1,7 @@
 # Release confidence strategy
 
 This document outlines the strategy for gaining confidence in every release of
-Gemini CLI. It serves as a checklist and quality gate for release manager to
+the Gemini CLI. It serves as a checklist and quality gate for release manager to
 ensure we are shipping a high-quality product.
 
 ## The goal

docs/releases.md

@@ -45,7 +45,7 @@ promotion flow is:
 ### Preview
 
 These releases will not have been fully vetted and may contain regressions or
-other outstanding issues. Help us test and install with `preview` tag.
+other outstanding issues. Please help us test and install with `preview` tag.
 
 ```bash
 npm install -g @google/gemini-cli@preview
@@ -126,8 +126,8 @@ specific version from any branch, tag, or commit SHA.
 2.  Select the **Release: Manual** workflow from the list.
 3.  Click the **Run workflow** dropdown button.
 4.  Fill in the required inputs:
-    - **Version**: The exact version to release (for example, `v0.6.1`). This
-      must be a valid semantic version with a `v` prefix.
+    - **Version**: The exact version to release (e.g., `v0.6.1`). This must be a
+      valid semantic version with a `v` prefix.
     - **Ref**: The branch, tag, or full commit SHA to release from.
     - **NPM Channel**: The npm channel to publish to. The options are `preview`,
       `nightly`, `latest` (for stable releases), and `dev`. The default is
@@ -165,10 +165,9 @@ require a full release cycle.
 3.  Click the **Run workflow** dropdown button.
 4.  Fill in the required inputs:
     - **Version**: The existing package version that you want to point the tag
-      to (for example, `0.5.0-preview-2`). This version **must** already be
-      published to the npm registry.
-    - **Channel**: The npm `dist-tag` to apply (for example, `preview`,
-      `stable`).
+      to (e.g., `0.5.0-preview-2`). This version **must** already be published
+      to the npm registry.
+    - **Channel**: The npm `dist-tag` to apply (e.g., `preview`, `stable`).
     - **Dry Run**: Leave as `true` to log the action without making changes, or
       set to `false` to perform the live tag change.
     - **Environment**: Select the appropriate environment. The `dev` environment
@@ -228,7 +227,7 @@ workflow.
 This workflow will automatically:
 
 1.  Find the latest release tag for the channel.
-2.  Create a release branch from that tag if one doesn't exist (for example,
+2.  Create a release branch from that tag if one doesn't exist (e.g.,
     `release/v0.5.1-pr-12345`).
 3.  Create a new hotfix branch from the release branch.
 4.  Cherry-pick your specified commit into the hotfix branch.
@@ -283,8 +282,9 @@ created:
 6. **Update the PR description**: Consider updating the PR title and description
    to reflect that it includes multiple fixes.
 
-This approach lets you group related fixes into a single patch release while
-maintaining full control over what gets included and how conflicts are resolved.
+This approach allows you to group related fixes into a single patch release
+while maintaining full control over what gets included and how conflicts are
+resolved.
 
 #### 3. Automatic release
 
@@ -302,9 +302,9 @@ consistently and reliably.
 #### Troubleshooting: Older branch workflows
 
 **Issue**: If the patch trigger workflow fails with errors like "Resource not
-accessible by integration" or references to non-existent workflow files (for
-example, `patch-release.yml`), this indicates the hotfix branch contains an
-outdated version of the workflow files.
+accessible by integration" or references to non-existent workflow files (e.g.,
+`patch-release.yml`), this indicates the hotfix branch contains an outdated
+version of the workflow files.
 
 **Root cause**: When a PR is merged, GitHub Actions runs the workflow definition
 from the **source branch** (the hotfix branch), not from the target branch (the
@@ -428,7 +428,7 @@ This command will do the following:
 
 You can then inspect the generated tarballs to ensure that they contain the
 correct files and that the `package.json` files have been updated correctly. The
-tarballs will be created in the root of each package's directory (for example,
+tarballs will be created in the root of each package's directory (e.g.,
 `packages/cli/google-gemini-cli-0.1.6.tgz`).
 
 By performing a dry run, you can be confident that your changes to the packaging
@@ -477,9 +477,9 @@ executable that enables `npx` usage directly from the GitHub repository.
 1.  **The JavaScript bundle is created:**
     - **What happens:** The built JavaScript from both `packages/core/dist` and
       `packages/cli/dist`, along with all third-party JavaScript dependencies,
-      are bundled by `esbuild` into a single, executable JavaScript file (for
-      example, `gemini.js`). The `node-pty` library is excluded from this bundle
-      as it contains native binaries.
+      are bundled by `esbuild` into a single, executable JavaScript file (e.g.,
+      `gemini.js`). The `node-pty` library is excluded from this bundle as it
+      contains native binaries.
     - **Why:** This creates a single, optimized file that contains all the
       necessary application code. It simplifies execution for users who want to
       run the CLI without a full `npm install`, as all dependencies (including
@@ -540,9 +540,9 @@ The list of available labels is not currently populated correctly. If you want
 to add a label that does not appear alphabetically in the first 30 labels in the
 repo, you must use your browser's developer tools to manually modify the UI:
 
-1. Open your browser's developer tools (for example, Chrome DevTools).
+1. Open your browser's developer tools (e.g., Chrome DevTools).
 2. In the `/github-settings` dialog, inspect the list of labels.
 3. Locate one of the `<li>` elements representing a label.
 4. In the HTML, modify the `data-option-value` attribute of that `<li>` element
-   to the desired label name (for example, `release-failure`).
+   to the desired label name (e.g., `release-failure`).
 5. Click on your modified label in the UI to select it, then save your settings.

docs/resources/faq.md

@@ -8,7 +8,7 @@ problems encountered while using Gemini CLI.
 This section addresses common questions about Gemini CLI usage, security, and
 troubleshooting general errors.
 
-### Why can't I use third-party software like Claude Code, OpenClaw, or OpenCode with Gemini CLI?
+### Why can't I use third-party software (e.g. Claude Code, OpenClaw, OpenCode) with Gemini CLI?
 
 Using third-party software, tools, or services to harvest or piggyback on Gemini
 CLI's OAuth authentication to access our backend services is a direct violation
@@ -113,8 +113,8 @@ export GOOGLE_CLOUD_PROJECT="your-project-id"
 $env:GOOGLE_CLOUD_PROJECT="your-project-id"
 ```
 
-To make this setting permanent, add this line to your shell's startup file (for
-example, `~/.bashrc`, `~/.zshrc`).
+To make this setting permanent, add this line to your shell's startup file
+(e.g., `~/.bashrc`, `~/.zshrc`).
 
 ### What is the best way to store my API keys securely?
 
@@ -131,9 +131,9 @@ To store your API keys securely, you can:
   Manager, or a secret manager on Linux). You can then have your scripts or
   environment load the key from the secure storage at runtime.
 
-### Where are Gemini CLI configuration and settings files stored?
+### Where are the Gemini CLI configuration and settings files stored?
 
-Gemini CLI configuration is stored in two `settings.json` files:
+The Gemini CLI configuration is stored in two `settings.json` files:
 
 1.  In your home directory: `~/.gemini/settings.json`.
 2.  In your project's root directory: `./.gemini/settings.json`.

docs/resources/tos-privacy.md

@@ -1,17 +1,17 @@
 # Gemini CLI: License, Terms of Service, and Privacy Notices
 
 Gemini CLI is an open-source tool that lets you interact with Google's powerful
-AI services directly from your command-line interface. Gemini CLI software is
-licensed under the
+AI services directly from your command-line interface. The Gemini CLI software
+is licensed under the
 [Apache 2.0 license](https://github.com/google-gemini/gemini-cli/blob/main/LICENSE).
 When you use Gemini CLI to access or use Google’s services, the Terms of Service
 and Privacy Notices applicable to those services apply to such access and use.
 
-Directly accessing the services powering Gemini CLI (for example, the Gemini
-Code Assist service) using third-party software, tools, or services (for
-example, using OpenClaw with Gemini CLI OAuth) is a violation of applicable
-terms and policies. Such actions may be grounds for suspension or termination of
-your account.
+Directly accessing the services powering Gemini CLI (e.g., the Gemini Code
+Assist service) using third-party software, tools, or services (for example,
+using OpenClaw with Gemini CLI OAuth) is a violation of applicable terms and
+policies. Such actions may be grounds for suspension or termination of your
+account.
 
 Your Gemini CLI Usage Statistics are handled in accordance with Google's Privacy
 Policy.
@@ -19,7 +19,7 @@ Policy.
 <!-- prettier-ignore -->
 > [!NOTE]
 > See [quotas and pricing](quota-and-pricing.md) for the quota and
-> pricing details that apply to your usage of Gemini CLI.
+> pricing details that apply to your usage of the Gemini CLI.
 
 ## Supported authentication methods
 
@@ -37,7 +37,7 @@ If you log in with your Google account and you do not already have a Gemini Code
 Assist account associated with your Google account, you will be directed to the
 sign up flow for Gemini Code Assist for individuals. If your Google account is
 managed by your organization, your administrator may not permit access to Gemini
-Code Assist for individuals. See the
+Code Assist for individuals. Please see the
 [Gemini Code Assist for individuals FAQs](https://developers.google.com/gemini-code-assist/resources/faqs)
 for further information.
 
@@ -76,7 +76,7 @@ If you are using a Gemini API key for authentication with the
 [Gemini Developer API](https://ai.google.dev/gemini-api/docs), these Terms of
 Service and Privacy Notice documents apply:
 
-- Terms of Service: Your use of Gemini CLI is governed by the
+- Terms of Service: Your use of the Gemini CLI is governed by the
   [Gemini API Terms of Service](https://ai.google.dev/gemini-api/terms). These
   terms may differ depending on whether you are using an unpaid or paid service:
   - For unpaid services, refer to the
@@ -92,7 +92,7 @@ If you are using a Gemini API key for authentication with a
 [Vertex AI GenAI API](https://cloud.google.com/vertex-ai/generative-ai/docs/reference/rest)
 backend, these Terms of Service and Privacy Notice documents apply:
 
-- Terms of Service: Your use of Gemini CLI is governed by the
+- Terms of Service: Your use of the Gemini CLI is governed by the
   [Google Cloud Platform Service Terms](https://cloud.google.com/terms/service-terms/).
 - Privacy Notice: The collection and use of your data is described in the
   [Google Cloud Privacy Notice](https://cloud.google.com/terms/cloud-privacy-notice).

docs/resources/troubleshooting.md

@@ -80,9 +80,9 @@ topics on:
       directory is in your `PATH`. You can update Gemini CLI using the command
       `npm install -g @google/gemini-cli@latest`.
     - If you are running `gemini` from source, ensure you are using the correct
-      command to invoke it (for example, `node packages/cli/dist/index.js ...`).
-      To update Gemini CLI, pull the latest changes from the repository, and
-      then rebuild using the command `npm run build`.
+      command to invoke it (e.g., `node packages/cli/dist/index.js ...`). To
+      update Gemini CLI, pull the latest changes from the repository, and then
+      rebuild using the command `npm run build`.
 
 - **Error: `MODULE_NOT_FOUND` or import errors.**
   - **Cause:** Dependencies are not installed correctly, or the project hasn't
@@ -101,18 +101,18 @@ topics on:
     configuration.
 
 - **Gemini CLI is not running in interactive mode in "CI" environments**
-  - **Issue:** Gemini CLI does not enter interactive mode (no prompt appears) if
-    an environment variable starting with `CI_` (for example, `CI_TOKEN`) is
-    set. This is because the `is-in-ci` package, used by the underlying UI
+  - **Issue:** The Gemini CLI does not enter interactive mode (no prompt
+    appears) if an environment variable starting with `CI_` (e.g., `CI_TOKEN`)
+    is set. This is because the `is-in-ci` package, used by the underlying UI
     framework, detects these variables and assumes a non-interactive CI
     environment.
   - **Cause:** The `is-in-ci` package checks for the presence of `CI`,
     `CONTINUOUS_INTEGRATION`, or any environment variable with a `CI_` prefix.
     When any of these are found, it signals that the environment is
-    non-interactive, which prevents Gemini CLI from starting in its interactive
-    mode.
+    non-interactive, which prevents the Gemini CLI from starting in its
+    interactive mode.
   - **Solution:** If the `CI_` prefixed variable is not needed for the CLI to
-    function, you can temporarily unset it for the command. For example,
+    function, you can temporarily unset it for the command. e.g.,
     `env -u CI_TOKEN gemini`
 
 - **DEBUG mode not working from project .env file**
@@ -126,7 +126,7 @@ topics on:
 
 - **Warning: `npm WARN deprecated node-domexception@1.0.0` or
   `npm WARN deprecated glob` during install/update**
-  - **Issue:** When installing or updating Gemini CLI globally via
+  - **Issue:** When installing or updating the Gemini CLI globally via
     `npm install -g @google/gemini-cli` or `npm update -g @google/gemini-cli`,
     you might see deprecation warnings regarding `node-domexception` or old
     versions of `glob`.
@@ -141,14 +141,14 @@ topics on:
 
 ## Exit codes
 
-Gemini CLI uses specific exit codes to indicate the reason for termination. This
-is especially useful for scripting and automation.
+The Gemini CLI uses specific exit codes to indicate the reason for termination.
+This is especially useful for scripting and automation.
 
 | Exit Code | Error Type                 | Description                                                                                         |
 | --------- | -------------------------- | --------------------------------------------------------------------------------------------------- |
 | 41        | `FatalAuthenticationError` | An error occurred during the authentication process.                                                |
 | 42        | `FatalInputError`          | Invalid or missing input was provided to the CLI. (non-interactive mode only)                       |
-| 44        | `FatalSandboxError`        | An error occurred with the sandboxing environment (for example, Docker, Podman, or Seatbelt).       |
+| 44        | `FatalSandboxError`        | An error occurred with the sandboxing environment (e.g., Docker, Podman, or Seatbelt).              |
 | 52        | `FatalConfigError`         | A configuration file (`settings.json`) is invalid or contains errors.                               |
 | 53        | `FatalTurnLimitedError`    | The maximum number of conversational turns for the session was reached. (non-interactive mode only) |
 
@@ -164,8 +164,8 @@ is especially useful for scripting and automation.
   - 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`.
-  - Use Node.js debugging tools (for example, `node --inspect`) if you need to
-    step through server-side code.
+  - Use Node.js debugging tools (e.g., `node --inspect`) if you need to step
+    through server-side code.
 
 - **Tool issues:**
   - If a specific tool is failing, try to isolate the issue by running the
@@ -182,7 +182,7 @@ is especially useful for scripting and automation.
 ## Existing GitHub issues similar to yours or creating new issues
 
 If you encounter an issue that was not covered here in this _Troubleshooting
-guide_, consider searching Gemini CLI
+guide_, consider searching the Gemini CLI
 [Issue tracker on GitHub](https://github.com/google-gemini/gemini-cli/issues).
 If you can't find an issue similar to yours, consider creating a new GitHub
 Issue with a detailed description. Pull requests are also welcome!

docs/resources/uninstall.md

@@ -28,9 +28,8 @@ Remove-Item -Path (Join-Path $env:LocalAppData "npm-cache\_npx") -Recurse -Force
 
 ## Method 2: Using npm (global install)
 
-If you installed the CLI globally (for example,
-`npm install -g @google/gemini-cli`), use the `npm uninstall` command with the
-`-g` flag to remove it.
+If you installed the CLI globally (e.g., `npm install -g @google/gemini-cli`),
+use the `npm uninstall` command with the `-g` flag to remove it.
 
 ```bash
 npm uninstall -g @google/gemini-cli
@@ -40,7 +39,7 @@ This command completely removes the package from your system.
 
 ## Method 3: Homebrew
 
-If you installed the CLI globally using Homebrew (for example,
+If you installed the CLI globally using Homebrew (e.g.,
 `brew install gemini-cli`), use the `brew uninstall` command to remove it.
 
 ```bash
@@ -49,7 +48,7 @@ brew uninstall gemini-cli
 
 ## Method 4: MacPorts
 
-If you installed the CLI globally using MacPorts (for example,
+If you installed the CLI globally using MacPorts (e.g.,
 `sudo port install gemini-cli`), use the `port uninstall` command to remove it.
 
 ```bash

docs/sidebar.json

@@ -96,11 +96,6 @@
             ]
           },
           { "label": "Agent Skills", "slug": "docs/cli/skills" },
-          {
-            "label": "Auto Memory",
-            "badge": "🔬",
-            "slug": "docs/cli/auto-memory"
-          },
           { "label": "Checkpointing", "slug": "docs/cli/checkpointing" },
           { "label": "Headless mode", "slug": "docs/cli/headless" },
           {
@@ -127,14 +122,7 @@
               }
             ]
           },
-          {
-            "label": "MCP servers",
-            "collapsed": true,
-            "items": [
-              { "label": "Overview", "slug": "docs/tools/mcp-server" },
-              { "label": "Resource tools", "slug": "docs/tools/mcp-resources" }
-            ]
-          },
+          { "label": "MCP servers", "slug": "docs/tools/mcp-server" },
           { "label": "Model routing", "slug": "docs/cli/model-routing" },
           { "label": "Model selection", "slug": "docs/cli/model" },
           {

docs/tools/ask-user.md

@@ -15,7 +15,7 @@ confirmation.
     Each question object has the following properties:
     - `question` (string, required): The complete question text.
     - `header` (string, required): A short label (max 16 chars) displayed as a
-      chip/tag (for example, "Auth", "Database").
+      chip/tag (e.g., "Auth", "Database").
     - `type` (string, optional): The type of question. Defaults to `'choice'`.
       - `'choice'`: Multiple-choice with options (supports multi-select).
       - `'text'`: Free-form text input.
@@ -35,7 +35,7 @@ confirmation.
   - Returns the user's answers to the model.
 
 - **Output (`llmContent`):** A JSON string containing the user's answers,
-  indexed by question position (for example,
+  indexed by question position (e.g.,
   `{"answers":{"0": "Option A", "1": "Some text"}}`).
 
 - **Confirmation:** Yes. The tool inherently involves user interaction.
@@ -75,7 +75,7 @@ confirmation.
       "header": "Project Name",
       "question": "What is the name of your new project?",
       "type": "text",
-      "placeholder": "for example, my-awesome-app"
+      "placeholder": "e.g., my-awesome-app"
     }
   ]
 }

docs/tools/file-system.md

@@ -1,7 +1,7 @@
 # File system tools reference
 
-Gemini CLI core provides a suite of tools for interacting with the local file
-system. These tools allow the model to explore and modify your codebase.
+The Gemini CLI core provides a suite of tools for interacting with the local
+file system. These tools allow the model to explore and modify your codebase.
 
 ## Technical reference
 
@@ -49,8 +49,8 @@ Finds files matching specific glob patterns across the workspace.
 - **Display name:** FindFiles
 - **File:** `glob.ts`
 - **Parameters:**
-  - `pattern` (string, required): The glob pattern to match against (for
-    example, `"*.py"`, `"src/**/*.js"`).
+  - `pattern` (string, required): The glob pattern to match against (e.g.,
+    `"*.py"`, `"src/**/*.js"`).
   - `path` (string, optional): The absolute path to the directory to search
     within. If omitted, searches the tool's root directory.
   - `case_sensitive` (boolean, optional): Whether the search should be
@@ -78,18 +78,18 @@ lines containing matches, along with their file paths and line numbers.
 - **File:** `grep.ts`
 - **Parameters:**
   - `pattern` (string, required): The regular expression (regex) to search for
-    (for example, `"function\s+myFunction"`).
+    (e.g., `"function\s+myFunction"`).
   - `path` (string, optional): The absolute path to the directory to search
     within. Defaults to the current working directory.
   - `include` (string, optional): A glob pattern to filter which files are
-    searched (for example, `"*.js"`, `"src/**/*.{ts,tsx}"`). If omitted,
-    searches most files (respecting common ignores).
+    searched (e.g., `"*.js"`, `"src/**/*.{ts,tsx}"`). If omitted, searches most
+    files (respecting common ignores).
 - **Behavior:**
   - Uses `git grep` if available in a Git repository for speed; otherwise, falls
     back to system `grep` or a JavaScript-based search.
   - Returns a list of matching lines, each prefixed with its file path (relative
     to the search directory) and line number.
-- **Output (`llmContent`):** A formatted string of matches, for example:
+- **Output (`llmContent`):** A formatted string of matches, e.g.:
   ```
   Found 3 matches for pattern "myFunction" in path "." (filter: "*.ts"):
   ---

docs/tools/mcp-resources.md

@@ -1,44 +0,0 @@
-# MCP resource tools
-
-MCP resource tools let Gemini CLI discover and retrieve data from contextual
-resources exposed by Model Context Protocol (MCP) servers.
-
-## 1. `list_mcp_resources` (ListMcpResources)
-
-`list_mcp_resources` retrieves a list of all available resources from connected
-MCP servers. This is primarily a discovery tool that helps the model understand
-what external data sources are available for reference.
-
-- **Tool name:** `list_mcp_resources`
-- **Display name:** List MCP Resources
-- **Kind:** `Search`
-- **File:** `list-mcp-resources.ts`
-- **Parameters:**
-  - `serverName` (string, optional): An optional filter to list resources from a
-    specific server.
-- **Behavior:**
-  - Iterates through all connected MCP servers.
-  - Fetches the list of resources each server exposes.
-  - Formats the results into a plain-text list of URIs and descriptions.
-- **Output (`llmContent`):** A formatted list of available resources, including
-  their URI, server name, and optional description.
-- **Confirmation:** No. This is a read-only discovery tool.
-
-## 2. `read_mcp_resource` (ReadMcpResource)
-
-`read_mcp_resource` retrieves the content of a specific resource identified by
-its URI.
-
-- **Tool name:** `read_mcp_resource`
-- **Display name:** Read MCP Resource
-- **Kind:** `Read`
-- **File:** `read-mcp-resource.ts`
-- **Parameters:**
-  - `uri` (string, required): The URI of the MCP resource to read.
-- **Behavior:**
-  - Locates the resource and its associated server by URI.
-  - Calls the server's `resources/read` method.
-  - Processes the response, extracting text or binary data.
-- **Output (`llmContent`):** The content of the resource. For binary data, it
-  returns a placeholder indicating the data type.
-- **Confirmation:** No. This is a read-only retrieval tool.

docs/tools/mcp-server.md

@@ -1,7 +1,7 @@
-# MCP servers with Gemini CLI
+# MCP servers with the Gemini CLI
 
 This document provides a guide to configuring and using Model Context Protocol
-(MCP) servers with Gemini CLI.
+(MCP) servers with the Gemini CLI.
 
 ## What is an MCP server?
 
@@ -10,7 +10,7 @@ CLI through the Model Context Protocol, allowing it to interact with external
 systems and data sources. MCP servers act as a bridge between the Gemini model
 and your local environment or other services like APIs.
 
-An MCP server enables Gemini CLI to:
+An MCP server enables the Gemini CLI to:
 
 - **Discover tools:** List available tools, their descriptions, and parameters
   through standardized schema definitions.
@@ -19,13 +19,13 @@ An MCP server enables Gemini CLI to:
 - **Access resources:** Read data from specific resources that the server
   exposes (files, API payloads, reports, etc.).
 
-With an MCP server, you can extend Gemini CLI's capabilities to perform actions
-beyond its built-in features, such as interacting with databases, APIs, custom
-scripts, or specialized workflows.
+With an MCP server, you can extend the Gemini CLI's capabilities to perform
+actions beyond its built-in features, such as interacting with databases, APIs,
+custom scripts, or specialized workflows.
 
 ## Core integration architecture
 
-Gemini CLI integrates with MCP servers through a sophisticated discovery and
+The Gemini CLI integrates with MCP servers through a sophisticated discovery and
 execution system built into the core package (`packages/core/src/tools/`):
 
 ### Discovery Layer (`mcp-client.ts`)
@@ -54,7 +54,7 @@ Each discovered MCP tool is wrapped in a `DiscoveredMCPTool` instance that:
 
 ### Transport mechanisms
 
-Gemini CLI supports three MCP transport types:
+The Gemini CLI supports three MCP transport types:
 
 - **Stdio Transport:** Spawns a subprocess and communicates via stdin/stdout
 - **SSE Transport:** Connects to Server-Sent Events endpoints
@@ -64,8 +64,7 @@ Gemini CLI supports three MCP transport types:
 
 Some MCP servers expose contextual “resources” in addition to the tools and
 prompts. Gemini CLI discovers these automatically and gives you the possibility
-to reference them in the chat. For more information on the tools used to
-interact with these resources, see [MCP resource tools](mcp-resources.md).
+to reference them in the chat.
 
 ### Discovery and listing
 
@@ -89,9 +88,9 @@ in the conversation.
 
 ## How to set up your MCP server
 
-Gemini CLI uses the `mcpServers` configuration in your `settings.json` file to
-locate and connect to MCP servers. This configuration supports multiple servers
-with different transport mechanisms.
+The Gemini CLI uses the `mcpServers` configuration in your `settings.json` file
+to locate and connect to MCP servers. This configuration supports multiple
+servers with different transport mechanisms.
 
 ### Configure the MCP server in settings.json
 
@@ -156,8 +155,7 @@ Each server configuration supports the following properties:
 #### Required (one of the following)
 
 - **`command`** (string): Path to the executable for Stdio transport
-- **`url`** (string): SSE endpoint URL (for example,
-  `"http://localhost:8080/sse"`)
+- **`url`** (string): SSE endpoint URL (e.g., `"http://localhost:8080/sse"`)
 - **`httpUrl`** (string): HTTP streaming endpoint URL
 
 #### Optional
@@ -190,7 +188,7 @@ Each server configuration supports the following properties:
 ### Environment variable expansion
 
 Gemini CLI automatically expands environment variables in the `env` block of
-your MCP server configuration. This lets you securely reference variables
+your MCP server configuration. This allows you to securely reference variables
 defined in your shell or environment without hardcoding sensitive information
 directly in your `settings.json` file.
 
@@ -243,14 +241,13 @@ specific data with that server.
 <!-- prettier-ignore -->
 > [!NOTE]
 > Even when explicitly defined, you should avoid hardcoding secrets.
-> Instead, use environment variable expansion
-> (for example, `"MY_KEY": "$MY_KEY"`) to securely pull the value from your host
-> environment at runtime.
+> Instead, use environment variable expansion (e.g., `"MY_KEY": "$MY_KEY"`) to
+> securely pull the value from your host environment at runtime.
 
 ### OAuth support for remote MCP servers
 
-Gemini CLI supports OAuth 2.0 authentication for remote MCP servers using SSE or
-HTTP transports. This enables secure access to MCP servers that require
+The Gemini CLI supports OAuth 2.0 authentication for remote MCP servers using
+SSE or HTTP transports. This enables secure access to MCP servers that require
 authentication.
 
 #### Automatic OAuth discovery
@@ -406,7 +403,7 @@ then be used to authenticate with the MCP server.
 5. **Grant all users and groups** who will access the MCP Server the necessary
    permissions to
    [impersonate the service account](https://cloud.google.com/docs/authentication/use-service-account-impersonation)
-   (for example, `roles/iam.serviceAccountTokenCreator`).
+   (i.e., `roles/iam.serviceAccountTokenCreator`).
 6. **[Enable](https://console.cloud.google.com/apis/library/iamcredentials.googleapis.com)
    the IAM Credentials API** for your project.
 
@@ -535,8 +532,8 @@ then be used to authenticate with the MCP server.
 
 ## Discovery process deep dive
 
-When Gemini CLI starts, it performs MCP server discovery through the following
-detailed process:
+When the Gemini CLI starts, it performs MCP server discovery through the
+following detailed process:
 
 ### 1. Server iteration and connection
 
@@ -586,7 +583,7 @@ every discovered MCP tool is assigned a strict namespace.
 
 <!-- prettier-ignore -->
 > [!WARNING]
-> Do not use underscores (`_`) in your MCP server names (for example, use
+> Do not use underscores (`_`) in your MCP server names (e.g., use
 > `my-server` rather than `my_server`). The policy parser splits Fully Qualified
 > Names (`mcp_server_tool`) on the _first_ underscore following the `mcp_`
 > prefix. If your server name contains an underscore, the parser will
@@ -891,7 +888,7 @@ use.
 
 MCP tools are not limited to returning simple text. You can return rich,
 multi-part content, including text, images, audio, and other binary data in a
-single tool response. This lets you build powerful tools that can provide
+single tool response. This allows you to build powerful tools that can provide
 diverse information to the model in a single turn.
 
 All data returned from the tool is processed and sent to the model as context
@@ -904,8 +901,8 @@ To return rich content, your tool's response must adhere to the MCP
 specification for a
 [`CallToolResult`](https://modelcontextprotocol.io/specification/2025-06-18/server/tools#tool-result).
 The `content` field of the result should be an array of `ContentBlock` objects.
-Gemini CLI will correctly process this array, separating text from binary data
-and packaging it for the model.
+The Gemini CLI will correctly process this array, separating text from binary
+data and packaging it for the model.
 
 You can mix and match different content block types in the `content` array. The
 supported block types include:
@@ -941,7 +938,7 @@ text description and an image:
 }
 ```
 
-When Gemini CLI receives this response, it will:
+When the Gemini CLI receives this response, it will:
 
 1.  Extract all the text and combine it into a single `functionResponse` part
     for the model.
@@ -955,8 +952,8 @@ context to the Gemini model.
 ## MCP prompts as slash commands
 
 In addition to tools, MCP servers can expose predefined prompts that can be
-executed as slash commands within Gemini CLI. This lets you create shortcuts for
-common or complex queries that can be easily invoked by name.
+executed as slash commands within the Gemini CLI. This allows you to create
+shortcuts for common or complex queries that can be easily invoked by name.
 
 ### Defining prompts on the server
 
@@ -1024,8 +1021,8 @@ or, using positional arguments:
 /poem-writer "Gemini CLI" reverent
 ```
 
-When you run this command, Gemini CLI executes the `prompts/get` method on the
-MCP server with the provided arguments. The server is responsible for
+When you run this command, the Gemini CLI executes the `prompts/get` method on
+the MCP server with the provided arguments. The server is responsible for
 substituting the arguments into the prompt template and returning the final
 prompt text. The CLI then sends this prompt to the model for execution. This
 provides a convenient way to automate and share common workflows.
@@ -1033,10 +1030,10 @@ provides a convenient way to automate and share common workflows.
 ## Managing MCP servers with `gemini mcp`
 
 While you can always configure MCP servers by manually editing your
-`settings.json` file, Gemini CLI provides a convenient set of commands to manage
-your server configurations programmatically. These commands streamline the
-process of adding, listing, and removing MCP servers without needing to directly
-edit JSON files.
+`settings.json` file, the Gemini CLI provides a convenient set of commands to
+manage your server configurations programmatically. These commands streamline
+the process of adding, listing, and removing MCP servers without needing to
+directly edit JSON files.
 
 ### Adding a server (`gemini mcp add`)
 
@@ -1059,9 +1056,9 @@ gemini mcp add [options] <name> <commandOrUrl> [args...]
 
 - `-s, --scope`: Configuration scope (user or project). [default: "project"]
 - `-t, --transport`: Transport type (stdio, sse, http). [default: "stdio"]
-- `-e, --env`: Set environment variables (for example, `-e KEY=value`).
-- `-H, --header`: Set HTTP headers for SSE and HTTP transports (for example,
-  `-H "X-Api-Key: abc123" -H "Authorization: Bearer abc123"`).
+- `-e, --env`: Set environment variables (e.g. -e KEY=value).
+- `-H, --header`: Set HTTP headers for SSE and HTTP transports (e.g. -H
+  "X-Api-Key: abc123" -H "Authorization: Bearer abc123").
 - `--timeout`: Set connection timeout in milliseconds.
 - `--trust`: Trust the server (bypass all tool call confirmation prompts).
 - `--description`: Set the description for the server.

docs/tools/shell.md

@@ -32,7 +32,7 @@ The tool returns a JSON object containing:
 ## Configuration
 
 You can configure the behavior of the `run_shell_command` tool by modifying your
-`settings.json` file or by using the `/settings` command in Gemini CLI.
+`settings.json` file or by using the `/settings` command in the Gemini CLI.
 
 ### Enabling interactive commands
 
@@ -93,9 +93,9 @@ applies when `tools.shell.enableInteractiveShell` is enabled.
 ## Interactive commands
 
 The `run_shell_command` tool now supports interactive commands by integrating a
-pseudo-terminal (pty). This lets you run commands that require real-time user
-input, such as text editors (`vim`, `nano`), terminal-based UIs (`htop`), and
-interactive version control operations (`git rebase -i`).
+pseudo-terminal (pty). This allows you to run commands that require real-time
+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,
@@ -116,7 +116,7 @@ including complex TUIs, will be rendered correctly.
 
 When `run_shell_command` executes a command, it sets the `GEMINI_CLI=1`
 environment variable in the subprocess's environment. This allows scripts or
-tools to detect if they are being run from within Gemini CLI.
+tools to detect if they are being run from within the Gemini CLI.
 
 ## Command restrictions
 

docs/tools/tracker.md

@@ -1,61 +0,0 @@
-# Tracker tools (`tracker_*`)
-
-<!-- prettier-ignore -->
-> [!NOTE]
-> This is an experimental feature currently under active development.
-
-The `tracker_*` tools allow the Gemini agent to maintain an internal, persistent
-graph of tasks and dependencies for multi-step requests. This suite of tools
-provides a more robust and granular way to manage execution plans than the
-legacy `write_todos` tool.
-
-## Technical reference
-
-The agent uses these tools to manage its execution plan, decompose complex goals
-into actionable sub-tasks, and provide real-time progress updates to the CLI
-interface. The task state is stored in the `.gemini/tmp/tracker/<session-id>`
-directory, allowing the agent to manage its plan for the current session.
-
-### Available Tools
-
-- `tracker_create_task`: Creates a new task in the tracker. You can specify a
-  title, description, and task type (`epic`, `task`, `bug`).
-- `tracker_update_task`: Updates an existing task's status (`open`,
-  `in_progress`, `blocked`, `closed`), description, or dependencies.
-- `tracker_get_task`: Retrieves the full details of a specific task by its
-  6-character hex ID.
-- `tracker_list_tasks`: Lists tasks in the tracker, optionally filtered by
-  status, type, or parent ID.
-- `tracker_add_dependency`: Adds a dependency between two tasks, ensuring
-  topological execution.
-- `tracker_visualize`: Renders an ASCII tree visualization of the current task
-  graph.
-
-## Technical behavior
-
-- **Interface:** Updates the progress indicator and task tree above the CLI
-  input prompt.
-- **Persistence:** Task state is saved automatically to the
-  `.gemini/tmp/tracker/<session-id>` directory. Task states are session-specific
-  and do not persist across different sessions.
-- **Dependencies:** Tasks can depend on other tasks, forming a directed acyclic
-  graph (DAG). The agent must resolve dependencies before starting blocked
-  tasks.
-- **Interaction:** Users can view the current state of the tracker by asking the
-  agent to visualize it, or by running `gemini-cli` commands if implemented.
-
-## Use cases
-
-- Coordinating multi-file refactoring projects.
-- Breaking down a mission into a hierarchy of epics and tasks for better
-  visibility.
-- Tracking bugs and feature requests directly within the context of an active
-  codebase.
-- Providing visibility into the agent's current focus and remaining work.
-
-## Next steps
-
-- Follow the [Task planning tutorial](../cli/tutorials/task-planning.md) for
-  usage details and migration from the legacy todo list.
-- Learn about [Session management](../cli/session-management.md) for context on
-  persistent state.

esbuild.config.js

@@ -62,7 +62,7 @@ const external = [
   '@lydell/node-pty-linux-x64',
   '@lydell/node-pty-win32-arm64',
   '@lydell/node-pty-win32-x64',
-  '@github/keytar',
+  'keytar',
   '@google/gemini-cli-devtools',
 ];
 

evals/answer-vs-act.eval.ts

@@ -19,8 +19,6 @@ describe('Answer vs. ask eval', () => {
    * automatically modify the file, but instead asks for permission.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should not edit files when asked to inspect for bugs',
     prompt: 'Inspect app.ts for bugs',
     files: FILES,
@@ -44,8 +42,6 @@ describe('Answer vs. ask eval', () => {
    * does modify the file.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should edit files when asked to fix bug',
     prompt: 'Fix the bug in app.ts - it should add numbers not subtract',
     files: FILES,
@@ -70,8 +66,6 @@ describe('Answer vs. ask eval', () => {
    * automatically modify the file, but instead asks for permission.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should not edit when asking "any bugs"',
     prompt: 'Any bugs in app.ts?',
     files: FILES,
@@ -95,8 +89,6 @@ describe('Answer vs. ask eval', () => {
    * automatically modify the file.
    */
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should not edit files when asked a general question',
     prompt: 'How does app.ts work?',
     files: FILES,
@@ -120,8 +112,6 @@ describe('Answer vs. ask eval', () => {
    * automatically modify the file.
    */
   evalTest('ALWAYS_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should not edit files when asked about style',
     prompt: 'Is app.ts following good style?',
     files: FILES,
@@ -145,8 +135,6 @@ describe('Answer vs. ask eval', () => {
    * the agent does NOT automatically modify the file.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should not edit files when user notes an issue',
     prompt: 'The add function subtracts numbers.',
     files: FILES,

evals/app-test-helper.ts

@@ -10,13 +10,10 @@ import {
   runEval,
   prepareLogDir,
   symlinkNodeModules,
-  withEvalRetries,
-  prepareWorkspace,
-  type BaseEvalCase,
-  EVAL_MODEL,
 } from './test-helper.js';
 import fs from 'node:fs';
 import path from 'node:path';
+import { DEFAULT_GEMINI_MODEL } from '@google/gemini-cli-core';
 
 /**
  * Config overrides for evals, with tool-restriction fields explicitly
@@ -32,13 +29,15 @@ interface EvalConfigOverrides {
   allowedTools?: never;
   /** Restricting tools via mainAgentTools in evals is forbidden. */
   mainAgentTools?: never;
-
   [key: string]: unknown;
 }
 
-export interface AppEvalCase extends BaseEvalCase {
+export interface AppEvalCase {
+  name: string;
   configOverrides?: EvalConfigOverrides;
   prompt: string;
+  timeout?: number;
+  files?: Record<string, string>;
   setup?: (rig: AppRig) => Promise<void>;
   assert: (rig: AppRig, output: string) => Promise<void>;
 }
@@ -49,55 +48,56 @@ export interface AppEvalCase extends BaseEvalCase {
  */
 export function appEvalTest(policy: EvalPolicy, evalCase: AppEvalCase) {
   const fn = async () => {
-    await withEvalRetries(evalCase.name, async () => {
-      const rig = new AppRig({
-        configOverrides: {
-          model: EVAL_MODEL,
-          ...evalCase.configOverrides,
-        },
-      });
-
-      const { logDir, sanitizedName } = await prepareLogDir(evalCase.name);
-      const logFile = path.join(logDir, `${sanitizedName}.log`);
-
-      try {
-        await rig.initialize();
-
-        const testDir = rig.getTestDir();
-        symlinkNodeModules(testDir);
-
-        // Setup initial files
-        if (evalCase.files) {
-          // Note: AppRig does not use a separate homeDir, so we use testDir twice
-          await prepareWorkspace(testDir, testDir, evalCase.files);
-        }
-
-        // Run custom setup if provided (e.g. for breakpoints)
-        if (evalCase.setup) {
-          await evalCase.setup(rig);
-        }
-
-        // Render the app!
-        await rig.render();
-
-        // Wait for initial ready state
-        await rig.waitForIdle();
-
-        // Send the initial prompt
-        await rig.sendMessage(evalCase.prompt);
-
-        // Run assertion. Interaction-heavy tests can do their own waiting/steering here.
-        const output = rig.getStaticOutput();
-        await evalCase.assert(rig, output);
-      } finally {
-        const output = rig.getStaticOutput();
-        if (output) {
-          await fs.promises.writeFile(logFile, output);
-        }
-        await rig.unmount();
-      }
+    const rig = new AppRig({
+      configOverrides: {
+        model: DEFAULT_GEMINI_MODEL,
+        ...evalCase.configOverrides,
+      },
     });
+
+    const { logDir, sanitizedName } = await prepareLogDir(evalCase.name);
+    const logFile = path.join(logDir, `${sanitizedName}.log`);
+
+    try {
+      await rig.initialize();
+
+      const testDir = rig.getTestDir();
+      symlinkNodeModules(testDir);
+
+      // Setup initial files
+      if (evalCase.files) {
+        for (const [filePath, content] of Object.entries(evalCase.files)) {
+          const fullPath = path.join(testDir, filePath);
+          fs.mkdirSync(path.dirname(fullPath), { recursive: true });
+          fs.writeFileSync(fullPath, content);
+        }
+      }
+
+      // Run custom setup if provided (e.g. for breakpoints)
+      if (evalCase.setup) {
+        await evalCase.setup(rig);
+      }
+
+      // Render the app!
+      await rig.render();
+
+      // Wait for initial ready state
+      await rig.waitForIdle();
+
+      // Send the initial prompt
+      await rig.sendMessage(evalCase.prompt);
+
+      // Run assertion. Interaction-heavy tests can do their own waiting/steering here.
+      const output = rig.getStaticOutput();
+      await evalCase.assert(rig, output);
+    } finally {
+      const output = rig.getStaticOutput();
+      if (output) {
+        await fs.promises.writeFile(logFile, output);
+      }
+      await rig.unmount();
+    }
   };
 
-  runEval(policy, evalCase, fn, (evalCase.timeout ?? 60000) + 10000);
+  runEval(policy, evalCase.name, fn, (evalCase.timeout ?? 60000) + 10000);
 }

evals/ask_user.eval.ts

@@ -5,21 +5,17 @@
  */
 
 import { describe, expect } from 'vitest';
-import { ApprovalMode, isRecord } from '@google/gemini-cli-core';
-import { appEvalTest, type AppEvalCase } from './app-test-helper.js';
-import { type EvalPolicy } from './test-helper.js';
+import { appEvalTest, AppEvalCase } from './app-test-helper.js';
+import { EvalPolicy } from './test-helper.js';
 
 function askUserEvalTest(policy: EvalPolicy, evalCase: AppEvalCase) {
-  const existingGeneral = evalCase.configOverrides?.['general'];
-  const generalBase = isRecord(existingGeneral) ? existingGeneral : {};
-
   return appEvalTest(policy, {
     ...evalCase,
     configOverrides: {
       ...evalCase.configOverrides,
-      approvalMode: ApprovalMode.DEFAULT,
       general: {
-        ...generalBase,
+        ...evalCase.configOverrides?.general,
+        approvalMode: 'default',
         enableAutoUpdate: false,
         enableAutoUpdateNotification: false,
       },
@@ -32,8 +28,6 @@ function askUserEvalTest(policy: EvalPolicy, evalCase: AppEvalCase) {
 
 describe('ask_user', () => {
   askUserEvalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'Agent uses AskUser tool to present multiple choice options',
     prompt: `Use the ask_user tool to ask me what my favorite color is. Provide 3 options: red, green, or blue.`,
     setup: async (rig) => {
@@ -49,8 +43,6 @@ describe('ask_user', () => {
   });
 
   askUserEvalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'Agent uses AskUser tool to clarify ambiguous requirements',
     files: {
       'package.json': JSON.stringify({ name: 'my-app', version: '1.0.0' }),
@@ -69,8 +61,6 @@ describe('ask_user', () => {
   });
 
   askUserEvalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'Agent uses AskUser tool before performing significant ambiguous rework',
     files: {
       'packages/core/src/index.ts': '// index\nexport const version = "1.0.0";',
@@ -92,8 +82,8 @@ describe('ask_user', () => {
       ]);
       expect(confirmation, 'Expected a tool call confirmation').toBeDefined();
 
-      if (confirmation?.toolName === 'enter_plan_mode') {
-        await rig.resolveTool('enter_plan_mode');
+      if (confirmation?.name === 'enter_plan_mode') {
+        rig.acceptConfirmation('enter_plan_mode');
         confirmation = await rig.waitForPendingConfirmation('ask_user');
       }
 
@@ -111,8 +101,6 @@ describe('ask_user', () => {
   // updates to clarify that shell command confirmation is handled by the UI.
   // See fix: https://github.com/google-gemini/gemini-cli/pull/20504
   askUserEvalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'Agent does NOT use AskUser to confirm shell commands',
     files: {
       'package.json': JSON.stringify({

evals/automated-tool-use.eval.ts

@@ -14,8 +14,6 @@ describe('Automated tool use', () => {
    * a repro by guiding the agent into using the existing deficient script.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should use automated tools (eslint --fix) to fix code style issues',
     files: {
       'package.json': JSON.stringify(
@@ -104,8 +102,6 @@ describe('Automated tool use', () => {
    * instead of trying to edit the files itself.
    */
   evalTest('USUALLY_PASSES', {
-    suiteName: 'default',
-    suiteType: 'behavioral',
     name: 'should use automated tools (prettier --write) to fix formatting issues',
     files: {
       'package.json': JSON.stringify(