Fix hang at interactive prompt creating with vite.

2026-07-26 09:40:58 -07:00 · 2026-03-09 10:34:14 -07:00
438 changed files with 4919 additions and 17290 deletions
@@ -107,7 +107,7 @@ Gemini CLI project.
  set.
 - **Logging**: Use `debugLogger` for rethrown errors to avoid duplicate logging.
 - **Keyboard Shortcuts**: Define all new keyboard shortcuts in
-  `packages/cli/src/ui/key/keyBindings.ts` and document them in
+  `packages/cli/src/config/keyBindings.ts` and document them in
  `docs/cli/keyboard-shortcuts.md`. Be careful of keybindings that require the
  `Meta` key, as only certain meta key shortcuts are supported on Mac. Avoid
  function keys and shortcuts commonly bound in VSCode.
@@ -193,7 +193,7 @@ runs:
        INPUTS_A2A_PACKAGE_NAME: '${{ inputs.a2a-package-name }}'

    - name: '📦 Prepare bundled CLI for npm release'
-      if: "inputs.npm-registry-url != 'https://npm.pkg.github.com/' && inputs.npm-tag != 'latest'"
+      if: "inputs.npm-registry-url != 'https://npm.pkg.github.com/'"
      working-directory: '${{ inputs.working-directory }}'
      shell: 'bash'
      run: |
@@ -120,9 +120,6 @@ jobs:
            if (recentRuns.length > 0) {
              core.setOutput('dispatched_run_urls', recentRuns.map(r => r.html_url).join(','));
              core.setOutput('dispatched_run_ids', recentRuns.map(r => r.id).join(','));
-
-              const markdownLinks = recentRuns.map(r => `- [View dispatched workflow run](${r.html_url})`).join('\n');
-              core.setOutput('dispatched_run_links', markdownLinks);
            }

      - name: 'Comment on Failure'
@@ -141,19 +138,16 @@ jobs:
          token: '${{ secrets.GITHUB_TOKEN }}'
          issue-number: '${{ github.event.issue.number }}'
          body: |
-            🚀 **[Step 1/4] Patch workflow(s) waiting for approval!**
+            ✅ **Patch workflow(s) dispatched successfully!**

            **📋 Details:**
            - **Channels**: `${{ steps.dispatch_patch.outputs.dispatched_channels }}`
            - **Commit**: `${{ steps.pr_status.outputs.MERGE_COMMIT_SHA }}`
            - **Workflows Created**: ${{ steps.dispatch_patch.outputs.dispatched_run_count }}

-            **⏳ Status:** The patch creation workflow has been triggered and is waiting for deployment approval. Please visit the specific workflow links below and approve the runs.
-
            **🔗 Track Progress:**
-            ${{ steps.dispatch_patch.outputs.dispatched_run_links }}
-            - [View patch workflow history](https://github.com/${{ github.repository }}/actions/workflows/release-patch-1-create-pr.yml)
-            - [This trigger workflow run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
+            - [View patch workflows](https://github.com/${{ github.repository }}/actions/workflows/release-patch-1-create-pr.yml)
+            - [This workflow run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})

      - name: 'Final Status Comment - Dispatch Success (No URL)'
        if: "always() && startsWith(github.event.comment.body, '/patch') && steps.dispatch_patch.outcome == 'success' && !steps.dispatch_patch.outputs.dispatched_run_urls"
@@ -162,18 +156,16 @@ jobs:
          token: '${{ secrets.GITHUB_TOKEN }}'
          issue-number: '${{ github.event.issue.number }}'
          body: |
-            🚀 **[Step 1/4] Patch workflow(s) waiting for approval!**
+            ✅ **Patch workflow(s) dispatched successfully!**

            **📋 Details:**
            - **Channels**: `${{ steps.dispatch_patch.outputs.dispatched_channels }}`
            - **Commit**: `${{ steps.pr_status.outputs.MERGE_COMMIT_SHA }}`
            - **Workflows Created**: ${{ steps.dispatch_patch.outputs.dispatched_run_count }}

-            **⏳ Status:** The patch creation workflow has been triggered and is waiting for deployment approval. Please visit the workflow history link below and approve the runs.
-
            **🔗 Track Progress:**
-            - [View patch workflow history](https://github.com/${{ github.repository }}/actions/workflows/release-patch-1-create-pr.yml)
-            - [This trigger workflow run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
+            - [View patch workflows](https://github.com/${{ github.repository }}/actions/workflows/release-patch-1-create-pr.yml)
+            - [This workflow run](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})

      - name: 'Final Status Comment - Failure'
        if: "always() && startsWith(github.event.comment.body, '/patch') && (steps.dispatch_patch.outcome == 'failure' || steps.dispatch_patch.outcome == 'cancelled')"
@@ -182,7 +174,7 @@ jobs:
          token: '${{ secrets.GITHUB_TOKEN }}'
          issue-number: '${{ github.event.issue.number }}'
          body: |
-            ❌ **[Step 1/4] Patch workflow dispatch failed!**
+            ❌ **Patch workflow dispatch failed!**

            There was an error dispatching the patch creation workflow.

@@ -62,5 +62,3 @@ gemini-debug.log
 .gemini-clipboard/
 .eslintcache
 evals/logs/
-
-temp_agents/
@@ -60,45 +60,20 @@ All submissions, including submissions by project members, require review. We
 use [GitHub pull requests](https://docs.github.com/articles/about-pull-requests)
 for this purpose.

-To assist with the review process, we provide an automated review tool that
-helps detect common anti-patterns, testing issues, and other best practices that
-are easy to miss.
+If your pull request involves changes to `packages/cli` (the frontend), we
+recommend running our automated frontend review tool. **Note: This tool is
+currently experimental.** It helps detect common React anti-patterns, testing
+issues, and other frontend-specific best practices that are easy to miss.

-#### Using the automated review tool
+To run the review tool, enter the following command from within Gemini CLI:

-You can run the review tool in two ways:
+```text
+/review-frontend <PR_NUMBER>
+```

-1.  **Using the helper script (Recommended):** We provide a script that
-    automatically handles checking out the PR into a separate worktree,
-    installing dependencies, building the project, and launching the review
-    tool.
-
-    ```bash
-    ./scripts/review.sh <PR_NUMBER> [model]
-    ```
-
-    **Warning:** If you run `scripts/review.sh`, you must have first verified
-    that the code for the PR being reviewed is safe to run and does not contain
-    data exfiltration attacks.
-
-    **Authors are strongly encouraged to run this script on their own PRs**
-    immediately after creation. This allows you to catch and fix simple issues
-    locally before a maintainer performs a full review.
-
-    **Note on Models:** By default, the script uses the latest Pro model
-    (`gemini-3.1-pro-preview`). If you do not have enough Pro quota, you can run
-    it with the latest Flash model instead:
-    `./scripts/review.sh <PR_NUMBER> gemini-3-flash-preview`.
-
-2.  **Manually from within Gemini CLI:** If you already have the PR checked out
-    and built, you can run the tool directly from the CLI prompt:
-
-    ```text
-    /review-frontend <PR_NUMBER>
-    ```
-
-Replace `<PR_NUMBER>` with your pull request number. Reviewers should use this
-tool to augment, not replace, their manual review process.
+Replace `<PR_NUMBER>` with your pull request number. Authors are encouraged to
+run this on their own PRs for self-review, and reviewers should use it to
+augment their manual review process.

 ### Self-assigning and unassigning issues

@@ -292,8 +267,7 @@ npm run test:e2e
 ```

 For more detailed information on the integration testing framework, please see
-the
-[Integration Tests documentation](https://geminicli.com/docs/integration-tests).
+the [Integration Tests documentation](/docs/integration-tests.md).

 ### Linting and preflight checks

@@ -572,7 +546,7 @@ Before submitting your documentation pull request, please:

 If you have questions about contributing documentation:

- Check our [FAQ](https://geminicli.com/docs/resources/faq).
+- Check our [FAQ](/docs/resources/faq.md).
 - Review existing documentation for examples.
 - Open [an issue](https://github.com/google-gemini/gemini-cli/issues) to discuss
  your proposed changes.
@@ -6,7 +6,7 @@
 [![License](https://img.shields.io/github/license/google-gemini/gemini-cli)](https://github.com/google-gemini/gemini-cli/blob/main/LICENSE)
 [![View Code Wiki](https://assets.codewiki.google/readme-badge/static.svg)](https://codewiki.google/github.com/google-gemini/gemini-cli?utm_source=badge&utm_medium=github&utm_campaign=github.com/google-gemini/gemini-cli)

-![Gemini CLI Screenshot](/docs/assets/gemini-screenshot.png)
+![Gemini CLI Screenshot](./docs/assets/gemini-screenshot.png)

 Gemini CLI is an open-source AI agent that brings the power of Gemini directly
 into your terminal. It provides lightweight access to Gemini, giving you the
@@ -147,7 +147,7 @@ Integrate Gemini CLI directly into your GitHub workflows with

 Choose the authentication method that best fits your needs:

-### Option 1: Sign in with Google (OAuth login using your Google Account)
+### Option 1: Login with Google (OAuth login using your Google Account)

 **✨ Best for:** Individual developers as well as anyone who has a Gemini Code
 Assist License. (see
@@ -161,7 +161,7 @@ for details)
 - **No API key management** - just sign in with your Google account
 - **Automatic updates** to latest models

-#### Start Gemini CLI, then choose _Sign in with Google_ and follow the browser authentication flow when prompted
+#### Start Gemini CLI, then choose _Login with Google_ and follow the browser authentication flow when prompted

 ```bash
 gemini
@@ -1,6 +1,6 @@
-# Preview release: v0.33.0-preview.13
+# Preview release: v0.33.0-preview.4

-Released: March 10, 2026
+Released: March 06, 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).
@@ -29,10 +29,6 @@ npm install -g @google/gemini-cli@preview

 ## What's Changed

- fix(patch): cherry-pick e5615f4 to release/v0.33.0-preview.12-pr-21037 to
-  patch version v0.33.0-preview.12 and create version 0.33.0-preview.13 by
-  @gemini-cli-robot in
-  [#21922](https://github.com/google-gemini/gemini-cli/pull/21922)
 - fix(patch): cherry-pick 7ec477d to release/v0.33.0-preview.3-pr-21305 to patch
  version v0.33.0-preview.3 and create version 0.33.0-preview.4 by
  @gemini-cli-robot in
@@ -202,4 +198,4 @@ npm install -g @google/gemini-cli@preview
  [#20991](https://github.com/google-gemini/gemini-cli/pull/20991)

 **Full Changelog**:
-https://github.com/google-gemini/gemini-cli/compare/v0.32.0-preview.0...v0.33.0-preview.13
+https://github.com/google-gemini/gemini-cli/compare/v0.32.0-preview.0...v0.33.0-preview.4
@@ -8,8 +8,7 @@ and parameters.
 | Command                            | Description                        | Example                                                      |
 | ---------------------------------- | ---------------------------------- | ------------------------------------------------------------ |
 | `gemini`                           | Start interactive REPL             | `gemini`                                                     |
-| `gemini -p "query"`                | Query non-interactively            | `gemini -p "summarize README.md"`                            |
-| `gemini "query"`                   | Query and continue interactively   | `gemini "explain this project"`                              |
+| `gemini "query"`                   | Query non-interactively, then exit | `gemini "explain this project"`                              |
 | `cat file \| gemini`               | Process piped content              | `cat logs.txt \| gemini`<br>`Get-Content logs.txt \| gemini` |
 | `gemini -i "query"`                | Execute and continue interactively | `gemini -i "What is the purpose of this project?"`           |
 | `gemini -r "latest"`               | Continue most recent session       | `gemini -r "latest"`                                         |
@@ -21,9 +20,9 @@ and parameters.

 ### Positional arguments

-| Argument | Type              | Description                                                                                                |
-| -------- | ----------------- | ---------------------------------------------------------------------------------------------------------- |
-| `query`  | string (variadic) | Positional prompt. Defaults to interactive mode in a TTY. Use `-p/--prompt` for non-interactive execution. |
+| Argument | Type              | Description                                                                                                        |
+| -------- | ----------------- | ------------------------------------------------------------------------------------------------------------------ |
+| `query`  | string (variadic) | Positional prompt. Defaults to one-shot mode. Use `-i/--prompt-interactive` to execute and continue interactively. |

 ## Interactive commands

@@ -48,7 +47,7 @@ These commands are available within the interactive REPL.
 | `--version`                      | `-v`  | -       | -         | Show CLI version number and exit                                                                                                                                       |
 | `--help`                         | `-h`  | -       | -         | Show help information                                                                                                                                                  |
 | `--model`                        | `-m`  | string  | `auto`    | Model to use. See [Model Selection](#model-selection) for available values.                                                                                            |
-| `--prompt`                       | `-p`  | string  | -         | Prompt text. Appended to stdin input if provided. Forces non-interactive mode.                                                                                         |
+| `--prompt`                       | `-p`  | string  | -         | Prompt text. Appended to stdin input if provided. **Deprecated:** Use positional arguments instead.                                                                    |
 | `--prompt-interactive`           | `-i`  | string  | -         | Execute prompt and continue in interactive mode                                                                                                                        |
 | `--sandbox`                      | `-s`  | boolean | `false`   | Run in a sandboxed environment for safer execution                                                                                                                     |
 | `--approval-mode`                | -     | string  | `default` | Approval mode for tool execution. Choices: `default`, `auto_edit`, `yolo`                                                                                              |
@@ -6,7 +6,7 @@ structured text or JSON output without an interactive terminal UI.
 ## Technical reference

 Headless mode is triggered when the CLI is run in a non-TTY environment or when
-providing a query with the `-p` (or `--prompt`) flag.
+providing a query as a positional argument without the interactive flag.

 ### Output formats

@@ -31,8 +31,7 @@ Returns a stream of newline-delimited JSON (JSONL) events.
  - `tool_use`: Tool call requests with arguments.
  - `tool_result`: Output from executed tools.
  - `error`: Non-fatal warnings and system errors.
-  - `result`: Final outcome with aggregated statistics and per-model token usage
-    breakdowns.
+  - `result`: Final outcome with aggregated statistics.

 ## Exit codes

@@ -1,4 +1,4 @@
-# Plan Mode
+# Plan Mode (experimental)

 Plan Mode is a read-only environment for architecting robust solutions before
 implementation. With Plan Mode, you can:
@@ -8,8 +8,27 @@ implementation. With Plan Mode, you can:
 - **Design:** Understand problems, evaluate trade-offs, and choose a solution.
 - **Plan:** Align on an execution strategy before any code is modified.

-Plan Mode is enabled by default. You can manage this setting using the
-`/settings` command.
+> **Note:** This is a preview feature currently under active development. Your
+> feedback is invaluable as we refine this feature. If you have ideas,
+> suggestions, or encounter issues:
+>
+> - [Open an issue] on GitHub.
+> - Use the **/bug** command within Gemini CLI to file an issue.
+
+## How to enable Plan Mode
+
+Enable Plan Mode in **Settings** or by editing your configuration file.
+
+- **Settings:** Use the `/settings` command and set **Plan** to `true`.
+- **Configuration:** Add the following to your `settings.json`:
+
+  ```json
+  {
+    "experimental": {
+      "plan": true
+    }
+  }
+  ```

 ## How to enter Plan Mode

@@ -43,11 +62,8 @@ To start Plan Mode while using Gemini CLI:
 - **Command:** Type `/plan` in the input box.

 - **Natural Language:** Ask Gemini CLI to "start a plan for...". Gemini CLI
-  calls the
-  [`enter_plan_mode`](../tools/planning.md#1-enter_plan_mode-enterplanmode) tool
-  to switch modes.
-  > **Note:** This tool is not available when Gemini CLI is in
-  > [YOLO mode](../reference/configuration.md#command-line-arguments).
+  calls the [`enter_plan_mode`] tool to switch modes.
+  > **Note:** This tool is not available when Gemini CLI is in [YOLO mode].

 ## How to use Plan Mode

@@ -58,8 +74,7 @@ Gemini CLI takes action.
    will then enter Plan Mode (if it's not already) to research the task.
 2.  **Review research and provide input:** As Gemini CLI analyzes your codebase,
    it may ask you questions or present different implementation options using
-    [`ask_user`](../tools/ask-user.md). Provide your preferences to help guide
-    the design.
+    [`ask_user`]. Provide your preferences to help guide the design.
 3.  **Review the plan:** Once Gemini CLI has a proposed strategy, it creates a
    detailed implementation plan as a Markdown file in your plans directory. You
    can open and read this file to understand the proposed changes.
@@ -101,33 +116,25 @@ Plan Mode enforces strict safety policies to prevent accidental changes.

 These are the only allowed tools:

- **FileSystem (Read):**
-  [`read_file`](../tools/file-system.md#2-read_file-readfile),
-  [`list_directory`](../tools/file-system.md#1-list_directory-readfolder),
-  [`glob`](../tools/file-system.md#4-glob-findfiles)
- **Search:** [`grep_search`](../tools/file-system.md#5-grep_search-searchtext),
-  [`google_web_search`](../tools/web-search.md)
- **Research Subagents:**
-  [`codebase_investigator`](../core/subagents.md#codebase-investigator),
-  [`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`) 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`
+- **FileSystem (Read):** [`read_file`], [`list_directory`], [`glob`]
+- **Search:** [`grep_search`], [`google_web_search`]
+- **Research Subagents:** [`codebase_investigator`], [`cli_help`]
+- **Interaction:** [`ask_user`]
+- **MCP tools (Read):** Read-only [MCP tools] (for example, `github_read_issue`,
+  `postgres_read_schema`) are allowed.
+- **Planning (Write):** [`write_file`] and [`replace`] only allowed for `.md`
  files in the `~/.gemini/tmp/<project>/<session-id>/plans/` directory or your
  [custom plans directory](#custom-plan-directory-and-policies).
- **Memory:** [`save_memory`](../tools/memory.md)
- **Skills:** [`activate_skill`](../cli/skills.md) (allows loading specialized
-  instructions and resources in a read-only manner)
+- **Memory:** [`save_memory`]
+- **Skills:** [`activate_skill`] (allows loading specialized instructions and
+  resources in a read-only manner)

 ### Custom planning with skills

-You can use [Agent Skills](../cli/skills.md) to customize how Gemini CLI
-approaches planning for specific types of tasks. When a skill is activated
-during Plan Mode, its specialized instructions and procedural workflows will
-guide the research, design, and planning phases.
+You can use [Agent Skills] to customize how Gemini CLI approaches planning for
+specific types of tasks. When a skill is activated during Plan Mode, its
+specialized instructions and procedural workflows will guide the research,
+design, and planning phases.

 For example:

@@ -144,32 +151,10 @@ based on the task description.

 ### Custom policies

-Plan Mode's default tool restrictions are managed by the
-[policy engine](../reference/policy-engine.md) and defined in the built-in
-[`plan.toml`] file. The built-in policy (Tier 1) enforces the read-only state,
-but you can customize these rules by creating your own policies in your
-`~/.gemini/policies/` directory (Tier 2).
-
-#### Global vs. mode-specific rules
-
-As described in the
-[policy engine documentation](../reference/policy-engine.md#approval-modes), any
-rule that does not explicitly specify `modes` is considered "always active" and
-will apply to Plan Mode as well.
-
-If you want a rule to apply to other modes but _not_ to Plan Mode, you must
-explicitly specify the target modes. For example, to allow `npm test` in default
-and Auto-Edit modes but not in Plan Mode:
-
-```toml
-[[rule]]
-toolName = "run_shell_command"
-commandPrefix = "npm test"
-decision = "allow"
-priority = 100
-# By omitting "plan", this rule will not be active in Plan Mode.
-modes = ["default", "autoEdit"]
-```
+Plan Mode's default tool restrictions are managed by the [policy engine] and
+defined in the built-in [`plan.toml`] file. The built-in policy (Tier 1)
+enforces the read-only state, but you can customize these rules by creating your
+own policies in your `~/.gemini/policies/` directory (Tier 2).

 #### Example: Automatically approve read-only MCP tools

@@ -188,8 +173,8 @@ priority = 100
 modes = ["plan"]
 ```

-For more information on how the policy engine works, see the
-[policy engine](../reference/policy-engine.md) docs.
+For more information on how the policy engine works, see the [policy engine]
+docs.

 #### Example: Allow git commands in Plan Mode

@@ -209,12 +194,9 @@ modes = ["plan"]

 #### Example: Enable custom subagents in Plan Mode

-Built-in research [subagents](../core/subagents.md) like
-[`codebase_investigator`](../core/subagents.md#codebase-investigator) and
-[`cli_help`](../core/subagents.md#cli-help-agent) are enabled by default in Plan
-Mode. You can enable additional
-[custom subagents](../core/subagents.md#creating-custom-subagents) by adding a
-rule to your policy.
+Built-in research [subagents] like [`codebase_investigator`] and [`cli_help`]
+are enabled by default in Plan Mode. You can enable additional [custom
+subagents] by adding a rule to your policy.

 `~/.gemini/policies/research-subagents.toml`

@@ -253,11 +235,10 @@ locations defined within a project's workspace cannot be used to escape and
 overwrite sensitive files elsewhere. Any user-configured directory must reside
 within the project boundary.

-Using a custom directory requires updating your
-[policy engine](../reference/policy-engine.md) configurations to allow
-`write_file` and `replace` in that specific location. For example, to allow
-writing to the `.gemini/plans` directory within your project, create a policy
-file at `~/.gemini/policies/plan-custom-directory.toml`:
+Using a custom directory requires updating your [policy engine] configurations
+to allow `write_file` and `replace` in that specific location. For example, to
+allow writing to the `.gemini/plans` directory within your project, create a
+policy file at `~/.gemini/policies/plan-custom-directory.toml`:

 ```toml
 [[rule]]
@@ -273,16 +254,13 @@ argsPattern = "\"file_path\":\"[^\"]+[\\\\/]+\\.gemini[\\\\/]+plans[\\\\/]+[\\w-
 ## Planning workflows

 Plan Mode provides building blocks for structured research and design. These are
-implemented as [extensions](../extensions/index.md) using core planning tools
-like [`enter_plan_mode`](../tools/planning.md#1-enter_plan_mode-enterplanmode),
-[`exit_plan_mode`](../tools/planning.md#2-exit_plan_mode-exitplanmode), and
-[`ask_user`](../tools/ask-user.md).
+implemented as [extensions] using core planning tools like [`enter_plan_mode`],
+[`exit_plan_mode`], and [`ask_user`].

 ### Built-in planning workflow

 The built-in planner uses an adaptive workflow to analyze your project, consult
-you on trade-offs via [`ask_user`](../tools/ask-user.md), and draft a plan for
-your approval.
+you on trade-offs via [`ask_user`], and draft a plan for your approval.

 ### Custom planning workflows

@@ -294,29 +272,23 @@ You can install or create specialized planners to suit your workflow.
 "tracks" and stores persistent artifacts in your project's `conductor/`
 directory:

- **Automate transitions:** Switches to read-only mode via
-  [`enter_plan_mode`](../tools/planning.md#1-enter_plan_mode-enterplanmode).
- **Streamline decisions:** Uses [`ask_user`](../tools/ask-user.md) for
-  architectural choices.
+- **Automate transitions:** Switches to read-only mode via [`enter_plan_mode`].
+- **Streamline decisions:** Uses [`ask_user`] for architectural choices.
 - **Maintain project context:** Stores artifacts in the project directory using
  [custom plan directory and policies](#custom-plan-directory-and-policies).
- **Handoff execution:** Transitions to implementation via
-  [`exit_plan_mode`](../tools/planning.md#2-exit_plan_mode-exitplanmode).
+- **Handoff execution:** Transitions to implementation via [`exit_plan_mode`].

 #### Build your own

 Since Plan Mode is built on modular building blocks, you can develop your own
-custom planning workflow as an [extensions](../extensions/index.md). By
-leveraging core tools and [custom policies](#custom-policies), you can define
-how Gemini CLI researches and stores plans for your specific domain.
+custom planning workflow as an [extensions]. By leveraging core tools and
+[custom policies](#custom-policies), you can define how Gemini CLI researches
+and stores plans for your specific domain.

 To build a custom planning workflow, you can use:

- **Tool usage:** Use core tools like
-  [`enter_plan_mode`](../tools/planning.md#1-enter_plan_mode-enterplanmode),
-  [`ask_user`](../tools/ask-user.md), and
-  [`exit_plan_mode`](../tools/planning.md#2-exit_plan_mode-exitplanmode) to
-  manage the research and design process.
+- **Tool usage:** Use core tools like [`enter_plan_mode`], [`ask_user`], and
+  [`exit_plan_mode`] to manage the research and design process.
 - **Customization:** Set your own storage locations and policy rules using
  [custom plan directories](#custom-plan-directory-and-policies) and
  [custom policies](#custom-policies).
@@ -330,9 +302,8 @@ high-reasoning model routing.

 ## Automatic Model Routing

-When using an [auto model](../reference/configuration.md#model), Gemini CLI
-automatically optimizes [model routing](../cli/telemetry.md#model-routing) based
-on the current phase of your task:
+When using an [auto model], Gemini CLI automatically optimizes [model routing]
+based on the current phase of your task:

 1.  **Planning Phase:** While in Plan Mode, the CLI routes requests to a
    high-reasoning **Pro** model to ensure robust architectural decisions and
@@ -363,8 +334,7 @@ associated plan files and task trackers.
 - **Default behavior:** Sessions (and their plans) are retained for **30 days**.
 - **Configuration:** You can customize this behavior via the `/settings` command
  (search for **Session Retention**) or in your `settings.json` file. See
-  [session retention](../cli/session-management.md#session-retention) for more
-  details.
+  [session retention] for more details.

 Manual deletion also removes all associated artifacts:

@@ -374,7 +344,32 @@ Manual deletion also removes all associated artifacts:
 If you use a [custom plans directory](#custom-plan-directory-and-policies),
 those files are not automatically deleted and must be managed manually.

+[`list_directory`]: /docs/tools/file-system.md#1-list_directory-readfolder
+[`read_file`]: /docs/tools/file-system.md#2-read_file-readfile
+[`grep_search`]: /docs/tools/file-system.md#5-grep_search-searchtext
+[`write_file`]: /docs/tools/file-system.md#3-write_file-writefile
+[`glob`]: /docs/tools/file-system.md#4-glob-findfiles
+[`google_web_search`]: /docs/tools/web-search.md
+[`replace`]: /docs/tools/file-system.md#6-replace-edit
+[MCP tools]: /docs/tools/mcp-server.md
+[`save_memory`]: /docs/tools/memory.md
+[`activate_skill`]: /docs/cli/skills.md
+[`codebase_investigator`]: /docs/core/subagents.md#codebase-investigator
+[`cli_help`]: /docs/core/subagents.md#cli-help-agent
+[subagents]: /docs/core/subagents.md
+[custom subagents]: /docs/core/subagents.md#creating-custom-subagents
+[policy engine]: /docs/reference/policy-engine.md
+[`enter_plan_mode`]: /docs/tools/planning.md#1-enter_plan_mode-enterplanmode
+[`exit_plan_mode`]: /docs/tools/planning.md#2-exit_plan_mode-exitplanmode
+[`ask_user`]: /docs/tools/ask-user.md
+[YOLO mode]: /docs/reference/configuration.md#command-line-arguments
 [`plan.toml`]:
  https://github.com/google-gemini/gemini-cli/blob/main/packages/core/src/policy/policies/plan.toml
+[auto model]: /docs/reference/configuration.md#model
+[model routing]: /docs/cli/telemetry.md#model-routing
+[preferred external editor]: /docs/reference/configuration.md#general
+[session retention]: /docs/cli/session-management.md#session-retention
+[extensions]: /docs/extensions/
 [Conductor]: https://github.com/gemini-cli-extensions/conductor
 [open an issue]: https://github.com/google-gemini/gemini-cli/issues
+[Agent Skills]: /docs/cli/skills.md
@@ -61,15 +61,6 @@ Browser**:
 /resume
 ```

-When typing `/resume` (or `/chat`) in slash completion, commands are grouped
-under titled separators:
-
- `-- auto --` (session browser)
-  - `list` is selectable and opens the session browser
- `-- checkpoints --` (manual tagged checkpoint commands)
-
-Unique prefixes such as `/resum` and `/cha` resolve to the same grouped menu.
-
 The Session Browser provides an interactive interface where you can perform the
 following actions:

@@ -81,21 +72,6 @@ following actions:
 - **Select:** Press **Enter** to resume the selected session.
 - **Esc:** Press **Esc** to exit the Session Browser.

-### Manual chat checkpoints
-
-For named branch points inside a session, use chat checkpoints:
-
-```text
-/resume save decision-point
-/resume list
-/resume resume decision-point
-```
-
-Compatibility aliases:
-
- `/chat ...` works for the same commands.
- `/resume checkpoints ...` also remains supported during migration.
-
 ## Managing sessions

 You can list and delete sessions to keep your history organized and manage disk
@@ -57,7 +57,7 @@ they appear in the UI.
 | Show Shortcuts Hint                  | `ui.showShortcutsHint`                 | Show the "? for shortcuts" hint above the input.                                                                                                                  | `true`   |
 | Hide Banner                          | `ui.hideBanner`                        | Hide the application banner                                                                                                                                       | `false`  |
 | Hide Context Summary                 | `ui.hideContextSummary`                | Hide the context summary (GEMINI.md, MCP servers) above the input.                                                                                                | `false`  |
-| Hide Workspace Path                  | `ui.footer.hideCWD`                    | Hide the workspace path in the footer.                                                                                                                            | `false`  |
+| Hide CWD                             | `ui.footer.hideCWD`                    | Hide the current working directory in the footer.                                                                                                                 | `false`  |
 | Hide Sandbox Status                  | `ui.footer.hideSandboxStatus`          | Hide the sandbox status indicator in the footer.                                                                                                                  | `false`  |
 | Hide Model Info                      | `ui.footer.hideModelInfo`              | Hide the model name and context usage in the footer.                                                                                                              | `false`  |
 | Hide Context Window Percentage       | `ui.footer.hideContextPercentage`      | Hides the context window usage percentage.                                                                                                                        | `true`   |
@@ -66,7 +66,7 @@ they appear in the UI.
 | Show Line Numbers                    | `ui.showLineNumbers`                   | Show line numbers in the chat.                                                                                                                                    | `true`   |
 | Show Citations                       | `ui.showCitations`                     | Show citations for generated text in the chat.                                                                                                                    | `false`  |
 | Show Model Info In Chat              | `ui.showModelInfoInChat`               | Show the model name in the chat for each model turn.                                                                                                              | `false`  |
-| Show User Identity                   | `ui.showUserIdentity`                  | Show the signed-in user's identity (e.g. email) in the UI.                                                                                                        | `true`   |
+| Show User Identity                   | `ui.showUserIdentity`                  | Show the logged-in user's identity (e.g. email) in the UI.                                                                                                        | `true`   |
 | Use Alternate Screen Buffer          | `ui.useAlternateBuffer`                | Use an alternate screen buffer for the UI, preserving shell history.                                                                                              | `false`  |
 | Use Background Color                 | `ui.useBackgroundColor`                | Whether to use background colors in the UI.                                                                                                                       | `true`   |
 | Incremental Rendering                | `ui.incrementalRendering`              | Enable incremental rendering for the UI. This option will reduce flickering but may cause rendering artifacts. Only supported when useAlternateBuffer is enabled. | `true`   |
@@ -125,7 +125,6 @@ they appear in the UI.
 | ------------------------------------- | ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------- |
 | Disable YOLO Mode                     | `security.disableYoloMode`                      | Disable YOLO mode, even if enabled by a flag.                                                                                                                                                                                        | `false` |
 | Allow Permanent Tool Approval         | `security.enablePermanentToolApproval`          | Enable the "Allow for all future sessions" option in tool confirmation dialogs.                                                                                                                                                      | `false` |
-| Auto-add to Policy by Default         | `security.autoAddToPolicyByDefault`             | When enabled, the "Allow for all future sessions" option becomes the default choice for low-risk tools in trusted workspaces.                                                                                                        | `false` |
 | Blocks extensions from Git            | `security.blockGitExtensions`                   | Blocks installing and loading extensions from Git.                                                                                                                                                                                   | `false` |
 | Extension Source Regex Allowlist      | `security.allowedExtensions`                    | List of Regex patterns for allowed extensions. If nonempty, only extensions that match the patterns in this list are allowed. Overrides the blockGitExtensions setting.                                                              | `[]`    |
 | Folder Trust                          | `security.folderTrust.enabled`                  | Setting to track whether Folder trust is enabled.                                                                                                                                                                                    | `true`  |
@@ -145,7 +144,7 @@ they appear in the UI.
 | Enable Tool Output Masking | `experimental.toolOutputMasking.enabled` | Enables tool output masking to save tokens.                                                                                                               | `true`  |
 | Use OSC 52 Paste           | `experimental.useOSC52Paste`             | Use OSC 52 for pasting. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
 | Use OSC 52 Copy            | `experimental.useOSC52Copy`              | Use OSC 52 for copying. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
-| Plan                       | `experimental.plan`                      | Enable Plan Mode.                                                                                                                                         | `true`  |
+| Plan                       | `experimental.plan`                      | Enable planning features (Plan Mode and tools).                                                                                                           | `false` |
 | Model Steering             | `experimental.modelSteering`             | Enable model steering (user hints) to guide the model during tool execution.                                                                              | `false` |
 | Direct Web Fetch           | `experimental.directWebFetch`            | Enable web fetch behavior that bypasses LLM summarization.                                                                                                | `false` |

@@ -16,8 +16,6 @@ using the `/theme` command within Gemini CLI:
  - `Default`
  - `Dracula`
  - `GitHub`
-  - `Holiday`
-  - `Shades Of Purple`
  - `Solarized Dark`
 - **Light themes:**
  - `ANSI Light`
@@ -187,7 +185,7 @@ untrusted sources.

 ### Example custom theme

-<img src="/docs/assets/theme-custom.png" alt="Custom theme example" width="600" />
+<img src="../assets/theme-custom.png" alt="Custom theme example" width="600" />

 ### Using your custom theme

@@ -214,66 +212,58 @@ identify their source, for example: `shades-of-green (green-extension)`.

 ### ANSI

-<img src="/docs/assets/theme-ansi-dark.png" alt="ANSI theme" width="600">
+<img src="/assets/theme-ansi.png" alt="ANSI theme" width="600" />

-### Atom One
+### Atom OneDark

-<img src="/docs/assets/theme-atom-one-dark.png" alt="Atom One theme" width="600">
+<img src="/assets/theme-atom-one.png" alt="Atom One theme" width="600">

 ### Ayu

-<img src="/docs/assets/theme-ayu-dark.png" alt="Ayu theme" width="600">
+<img src="/assets/theme-ayu.png" alt="Ayu theme" width="600">

 ### Default

-<img src="/docs/assets/theme-default-dark.png" alt="Default theme" width="600">
+<img src="/assets/theme-default.png" alt="Default theme" width="600">

 ### Dracula

-<img src="/docs/assets/theme-dracula-dark.png" alt="Dracula theme" width="600">
+<img src="/assets/theme-dracula.png" alt="Dracula theme" width="600">

 ### GitHub

-<img src="/docs/assets/theme-github-dark.png" alt="GitHub theme" width="600">
-
-### Holiday
-
-<img src="/docs/assets/theme-holiday-dark.png" alt="Holiday theme" width="600">
-
-### Shades Of Purple
-
-<img src="/docs/assets/theme-shades-of-purple-dark.png" alt="Shades Of Purple theme" width="600">
+<img src="/assets/theme-github.png" alt="GitHub theme" width="600">

 ### Solarized Dark

-<img src="/docs/assets/theme-solarized-dark.png" alt="Solarized Dark theme" width="600">
+<img src="/assets/theme-solarized-dark.png" alt="Solarized Dark theme" width="600">

 ## Light themes

 ### ANSI Light

-<img src="/docs/assets/theme-ansi-light.png" alt="ANSI Light theme" width="600">
+<img src="/assets/theme-ansi-light.png" alt="ANSI Light theme" width="600">

 ### Ayu Light

-<img src="/docs/assets/theme-ayu-light.png" alt="Ayu Light theme" width="600">
+<img src="/assets/theme-ayu-light.png" alt="Ayu Light theme" width="600">

 ### Default Light

-<img src="/docs/assets/theme-default-light.png" alt="Default Light theme" width="600">
+<img src="/assets/theme-default-light.png" alt="Default Light theme" width="600">

 ### GitHub Light

-<img src="/docs/assets/theme-github-light.png" alt="GitHub Light theme" width="600">
+<img src="/assets/theme-github-light.png" alt="GitHub Light theme" width="600">

 ### Google Code

-<img src="/docs/assets/theme-google-light.png" alt="Google Code theme" width="600">
+<img src="/assets/theme-google-light.png" alt="Google Code theme" width="600">

 ### Solarized Light

-<img src="/docs/assets/theme-solarized-light.png" alt="Solarized Light theme" width="600">
+<img src="/assets/theme-solarized-light.png" alt="Solarized Light theme" width="600">

 ### Xcode

-<img src="/docs/assets/theme-xcode-light.png" alt="Xcode Light theme" width="600">
+<img src="/assets/theme-xcode-light.png" alt="Xcode Light theme" width="600">
@@ -19,15 +19,14 @@ Headless mode runs Gemini CLI once and exits. It's perfect for:

 ## How to use headless mode

-Run Gemini CLI in headless mode by providing a prompt with the `-p` (or
-`--prompt`) flag. This bypasses the interactive chat interface and prints the
-response to standard output (stdout). Positional arguments without the flag
-default to interactive mode, unless the input or output is piped or redirected.
+Run Gemini CLI in headless mode by providing a prompt as a positional argument.
+This bypasses the interactive chat interface and prints the response to standard
+output (stdout).

 Run a single command:

 ```bash
-gemini -p "Write a poem about TypeScript"
+gemini "Write a poem about TypeScript"
 ```

 ## How to pipe input to Gemini CLI
@@ -41,19 +40,19 @@ Pipe a file:
 **macOS/Linux**

 ```bash
-cat error.log | gemini -p "Explain why this failed"
+cat error.log | gemini "Explain why this failed"
 ```

 **Windows (PowerShell)**

 ```powershell
-Get-Content error.log | gemini -p "Explain why this failed"
+Get-Content error.log | gemini "Explain why this failed"
 ```

 Pipe a command:

 ```bash
-git diff | gemini -p "Write a commit message for these changes"
+git diff | gemini "Write a commit message for these changes"
 ```

 ## Use Gemini CLI output in scripts
@@ -79,7 +78,7 @@ one.
      echo "Generating docs for $file..."

      # Ask Gemini CLI to generate the documentation and print it to stdout
-      gemini -p "Generate a Markdown documentation summary for @$file. Print the
+      gemini "Generate a Markdown documentation summary for @$file. Print the
      result to standard output." > "${file%.py}.md"
    done
    ```
@@ -93,7 +92,7 @@ one.

      $newName = $_.Name -replace '\.py$', '.md'
      # Ask Gemini CLI to generate the documentation and print it to stdout
-      gemini -p "Generate a Markdown documentation summary for @$($_.Name). Print the result to standard output." | Out-File -FilePath $newName -Encoding utf8
+      gemini "Generate a Markdown documentation summary for @$($_.Name). Print the result to standard output." | Out-File -FilePath $newName -Encoding utf8
    }
    ```

@@ -215,7 +214,7 @@ wrapper that writes the message for you.

      # Ask Gemini to write the message
      echo "Generating commit message..."
-      msg=$(echo "$diff" | gemini -p "Write a concise Conventional Commit message for this diff. Output ONLY the message.")
+      msg=$(echo "$diff" | gemini "Write a concise Conventional Commit message for this diff. Output ONLY the message.")

      # Commit with the generated message
      git commit -m "$msg"
@@ -252,7 +251,7 @@ wrapper that writes the message for you.

      # Ask Gemini to write the message
      Write-Host "Generating commit message..."
-      $msg = $diff | gemini -p "Write a concise Conventional Commit message for this diff. Output ONLY the message."
+      $msg = $diff | gemini "Write a concise Conventional Commit message for this diff. Output ONLY the message."

      # Commit with the generated message
      git commit -m "$msg"
@@ -89,7 +89,7 @@ don't need to learn special commands; just ask in natural language.
 The agent will:

 1.  Recognize the request matches a GitHub tool.
-2.  Call `mcp_github_list_pull_requests`.
+2.  Call `github_list_pull_requests`.
 3.  Present the data to you.

 ### Scenario: Creating an issue
@@ -89,9 +89,9 @@ Gemini gives you granular control over the undo process. You can choose to:
 Sometimes you want to try two different approaches to the same problem.

 1.  Start a session and get to a decision point.
-2.  Save the current state with `/resume save decision-point`.
+2.  Save the current state with `/chat save decision-point`.
 3.  Try your first approach.
-4.  Later, use `/resume resume decision-point` to fork the conversation back to
+4.  Later, use `/chat resume decision-point` to fork the conversation back to
    that moment and try a different approach.

 This creates a new branch of history without losing your original work.
@@ -101,5 +101,5 @@ This creates a new branch of history without losing your original work.
 - Learn about [Checkpointing](../../cli/checkpointing.md) to understand the
  underlying safety mechanism.
 - Explore [Task planning](task-planning.md) to keep complex sessions organized.
- See the [Command reference](../../reference/commands.md) for `/resume`
-  options, grouped checkpoint menus, and `/chat` compatibility aliases.
+- See the [Command reference](../../reference/commands.md) for all `/chat` and
+  `/resume` options.
@@ -194,7 +194,7 @@ returns coordinates and element descriptions that the browser agent uses with
 the `click_at` tool for precise, coordinate-based interactions.

 > **Note:** The visual agent requires API key or Vertex AI authentication. It is
-> not available when using "Sign in with Google".
+> not available when using Google Login.

 ## Creating custom subagents

@@ -297,7 +297,7 @@ Gemini CLI can also delegate tasks to remote subagents using the Agent-to-Agent

 > **Note: Remote subagents are currently an experimental feature.**

-See the [Remote Subagents documentation](remote-agents) for detailed
+See the [Remote Subagents documentation](/docs/core/remote-agents) for detailed
 configuration and usage instructions.

 ## Extension subagents
@@ -123,7 +123,6 @@ The manifest file defines the extension's behavior and configuration.
  },
  "contextFileName": "GEMINI.md",
  "excludeTools": ["run_shell_command"],
-  "migratedTo": "https://github.com/new-owner/new-extension-repo",
  "plan": {
    "directory": ".gemini/plans"
  }
@@ -139,9 +138,6 @@ The manifest file defines the extension's behavior and configuration.
 - `version`: The version of the extension.
 - `description`: A short description of the extension. This will be displayed on
  [geminicli.com/extensions](https://geminicli.com/extensions).
- `migratedTo`: The URL of the new repository source for the extension. If this
-  is set, the CLI will automatically check this new source for updates and
-  migrate the extension's installation to the new source if an update is found.
 - `mcpServers`: A map of MCP servers to settings. The key is the name of the
  server, and the value is the server configuration. These servers will be
  loaded on startup just like MCP servers defined in a
@@ -262,14 +258,12 @@ but lower priority than user or admin policies.

 ```toml
 [[rule]]
-mcpName = "my_server"
-toolName = "dangerous_tool"
+toolName = "my_server__dangerous_tool"
 decision = "ask_user"
 priority = 100

 [[safety_checker]]
-mcpName = "my_server"
-toolName = "write_data"
+toolName = "my_server__write_data"
 priority = 200
 [safety_checker.checker]
 type = "in-process"
@@ -152,29 +152,3 @@ jobs:
            release/linux.arm64.my-tool.tar.gz
            release/win32.arm64.my-tool.zip
 ```
-
-## Migrating an Extension Repository
-
-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
-   `gemini-extension.json` file to include the `migratedTo` property, pointing
-   to the new repository URL, and bump the version number. You can optionally
-   change the `name` of your extension at this time in the new repository.
-   ```json
-   {
-     "name": "my-extension",
-     "version": "1.1.0",
-     "migratedTo": "https://github.com/new-owner/new-extension-repo"
-   }
-   ```
-3. **Release the update**: Publish this new version in your old repository.
-
-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
-installation.
@@ -6,7 +6,7 @@ using the CLI.

 > **Note:** Looking for a high-level comparison of all available subscriptions?
 > To compare features and find the right quota for your needs, see our
-> [Plans page](https://geminicli.com/plans/).
+> [Plans page](/plans/).

 For most users, we recommend starting Gemini CLI and logging in with your
 personal Google account.
@@ -17,8 +17,8 @@ Select the authentication method that matches your situation in the table below:

 | User Type / Scenario                                                   | Recommended Authentication Method                                | Google Cloud Project Required                               |
 | :--------------------------------------------------------------------- | :--------------------------------------------------------------- | :---------------------------------------------------------- |
-| Individual Google accounts                                             | [Sign in with Google](#login-google)                             | No, with exceptions                                         |
-| Organization users with a company, school, or Google Workspace account | [Sign in with Google](#login-google)                             | [Yes](#set-gcp)                                             |
+| Individual Google accounts                                             | [Login with Google](#login-google)                               | No, with exceptions                                         |
+| Organization users with a company, school, or Google Workspace account | [Login with Google](#login-google)                               | [Yes](#set-gcp)                                             |
 | AI Studio user with a Gemini API key                                   | [Use Gemini API Key](#gemini-api)                                | No                                                          |
 | Google Cloud Vertex AI user                                            | [Vertex AI](#vertex-ai)                                          | [Yes](#set-gcp)                                             |
 | [Headless mode](#headless)                                             | [Use Gemini API Key](#gemini-api) or<br> [Vertex AI](#vertex-ai) | No (for Gemini API Key)<br> [Yes](#set-gcp) (for Vertex AI) |
@@ -36,7 +36,7 @@ Select the authentication method that matches your situation in the table below:
  [Google AI Ultra for Business](https://support.google.com/a/answer/16345165)
  subscriptions.

-## (Recommended) Sign in with Google <a id="login-google"></a>
+## (Recommended) Login with Google <a id="login-google"></a>

 If you run Gemini CLI on your local machine, the simplest authentication method
 is logging in with your Google account. This method requires a web browser on a
@@ -54,9 +54,9 @@ To authenticate and use Gemini CLI:
   gemini
   ```

-2. Select **Sign in with Google**. Gemini CLI opens a sign in prompt using your
-   web browser. Follow the on-screen instructions. Your credentials will be
-   cached locally for future sessions.
+2. Select **Login with Google**. Gemini CLI opens a login prompt using your web
+   browser. Follow the on-screen instructions. Your credentials will be cached
+   locally for future sessions.

 ### Do I need to set my Google Cloud project?

@@ -391,7 +391,7 @@ on this page.
 [Headless mode](../cli/headless) will use your existing authentication method,
 if an existing authentication credential is cached.

-If you have not already signed in with an authentication credential, you must
+If you have not already logged in with an authentication credential, you must
 configure authentication using environment variables:

 - [Use Gemini API Key](#gemini-api)
@@ -41,7 +41,7 @@ limit resets and Gemini 3 Pro can be used again.

 > **Note:** Looking to upgrade for higher limits? To compare subscription
 > options and find the right quota for your needs, see our
-> [Plans page](https://geminicli.com/plans/).
+> [Plans page](/plans/).

 Similarly, when you reach your daily usage limit for Gemini 2.5 Pro, you’ll see
 a message prompting fallback to Gemini 2.5 Flash.
@@ -38,7 +38,7 @@ cases, you can log in with your existing Google account:
   ```

 2. When asked "How would you like to authenticate for this project?" select **1.
-   Sign in with Google**.
+   Login with Google**.

 3. Select your Google account.

@@ -70,7 +70,7 @@ gemini
 ```

 For a list of options and additional commands, see the
-[CLI cheatsheet](../cli/cli-reference.md).
+[CLI cheatsheet](/docs/cli/cli-reference.md).

 You can also run Gemini CLI using one of the following advanced methods:

@@ -449,7 +449,7 @@ When you open a project with hooks defined in `.gemini/settings.json`:

 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)
+[redaction system](/docs/reference/configuration.md#environment-variable-redaction)
 that automatically filters variables matching sensitive patterns (e.g., `KEY`,
 `TOKEN`).

@@ -22,11 +22,11 @@ With hooks, you can:

 ### Getting started

- **[Writing hooks guide](../hooks/writing-hooks)**: A tutorial on creating your
-  first hook with comprehensive examples.
- **[Best practices](../hooks/best-practices)**: Guidelines on security,
+- **[Writing hooks guide](/docs/hooks/writing-hooks)**: A tutorial on creating
+  your first hook with comprehensive examples.
+- **[Best practices](/docs/hooks/best-practices)**: Guidelines on security,
  performance, and debugging.
- **[Hooks reference](../hooks/reference)**: The definitive technical
+- **[Hooks reference](/docs/hooks/reference)**: The definitive technical
  specification of I/O schemas and exit codes.

 ## Core concepts
@@ -152,8 +152,8 @@ Gemini CLI **fingerprints** project hooks. If a hook's name or command changes
 (e.g., via `git pull`), it is treated as a **new, untrusted hook** and you will
 be warned before it executes.

-See [Security Considerations](../hooks/best-practices#using-hooks-securely) for
-a detailed threat model.
+See [Security Considerations](/docs/hooks/best-practices#using-hooks-securely)
+for a detailed threat model.

 ## Managing hooks

@@ -82,10 +82,10 @@ For `BeforeTool` and `AfterTool` events, the `matcher` field in your settings is
 compared against the name of the tool being executed.

 - **Built-in Tools**: You can match any built-in tool (e.g., `read_file`,
-  `run_shell_command`). See the [Tools Reference](../reference/tools) for a full
-  list of available tool names.
+  `run_shell_command`). See the [Tools Reference](/docs/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>`.
+  `mcp__<server_name>__<tool_name>`.
 - **Regex Support**: Matchers support regular expressions (e.g.,
  `matcher: "read_.*"` matches all file reading tools).

@@ -1,22 +1,23 @@
 # Local development guide

 This guide provides instructions for setting up and using local development
-features for Gemini CLI.
+features, such as tracing.

 ## Tracing

-Gemini CLI uses OpenTelemetry (OTel) to record traces that help you debug agent
-behavior. Traces instrument key events like model calls, tool scheduler
-operations, and tool calls.
+Traces are OpenTelemetry (OTel) records that help you debug your code by
+instrumenting key events like model calls, tool scheduler operations, and tool
+calls.

-Traces provide deep visibility into agent behavior and help you debug complex
-issues. They are captured automatically when you enable telemetry.
+Traces provide deep visibility into agent behavior and are invaluable for
+debugging complex issues. They are captured automatically when telemetry is
+enabled.

-### View traces
+### Viewing traces

-You can view traces using Genkit Developer UI, Jaeger, or Google Cloud.
+You can view traces using either Jaeger or the Genkit Developer UI.

-#### Use Genkit
+#### Using Genkit

 Genkit provides a web-based UI for viewing traces and other telemetry data.

@@ -28,8 +29,11 @@ Genkit provides a web-based UI for viewing traces and other telemetry data.
    npm run telemetry -- --target=genkit
    ```

-    The script will output the URL for the Genkit Developer UI. For example:
-    `Genkit Developer UI: http://localhost:4000`
+    The script will output the URL for the Genkit Developer UI, for example:
+
+    ```
+    Genkit Developer UI: http://localhost:4000
+    ```

 2.  **Run Gemini CLI:**

@@ -44,22 +48,21 @@ Genkit provides a web-based UI for viewing traces and other telemetry data.
    Open the Genkit Developer UI URL in your browser and navigate to the
    **Traces** tab to view the traces.

-#### Use Jaeger
+#### Using Jaeger

-You can view traces in the Jaeger UI for local development.
+You can view traces in the Jaeger UI. To get started, follow these steps:

 1.  **Start the telemetry collector:**

    Run the following command in your terminal to download and start Jaeger and
-    an OTel collector:
+    an OTEL collector:

    ```bash
    npm run telemetry -- --target=local
    ```

-    This command configures your workspace for local telemetry and provides a
-    link to the Jaeger UI (usually `http://localhost:16686`).
-    - **Collector logs:** `~/.gemini/tmp/<projectHash>/otel/collector.log`
+    This command also configures your workspace for local telemetry and provides
+    a link to the Jaeger UI (usually `http://localhost:16686`).

 2.  **Run Gemini CLI:**

@@ -74,63 +77,16 @@ You can view traces in the Jaeger UI for local development.
    After running your command, open the Jaeger UI link in your browser to view
    the traces.

-#### Use Google Cloud
-
-You can use an OpenTelemetry collector to forward telemetry data to Google Cloud
-Trace for custom processing or routing.
-
-> **Warning:** Ensure you complete the
-> [Google Cloud telemetry prerequisites](./cli/telemetry.md#prerequisites)
-> (Project ID, authentication, IAM roles, and APIs) before using this method.
-
-1.  **Configure `.gemini/settings.json`:**
-
-    ```json
-    {
-      "telemetry": {
-        "enabled": true,
-        "target": "gcp",
-        "useCollector": true
-      }
-    }
-    ```
-
-2.  **Start the telemetry collector:**
-
-    Run the following command to start a local OTel collector that forwards to
-    Google Cloud:
-
-    ```bash
-    npm run telemetry -- --target=gcp
-    ```
-
-    The script outputs links to view traces, metrics, and logs in the Google
-    Cloud Console.
-    - **Collector logs:** `~/.gemini/tmp/<projectHash>/otel/collector-gcp.log`
-
-3.  **Run Gemini CLI:**
-
-    In a separate terminal, run your Gemini CLI command:
-
-    ```bash
-    gemini
-    ```
-
-4.  **View logs, metrics, and traces:**
-
-    After sending prompts, view your data in the Google Cloud Console. See the
-    [telemetry documentation](./cli/telemetry.md#view-google-cloud-telemetry)
-    for links to Logs, Metrics, and Trace explorers.
-
 For more detailed information on telemetry, see the
 [telemetry documentation](./cli/telemetry.md).

-### Instrument code with traces
+### Instrumenting code with traces

-You can add traces to your own code for more detailed instrumentation.
+You can add traces to your own code for more detailed instrumentation. This is
+useful for debugging and understanding the flow of execution.

-Adding traces helps you debug and understand the flow of execution. Use the
-`runInDevTraceSpan` function to wrap any section of code in a trace span.
+Use the `runInDevTraceSpan` function to wrap any section of code in a trace
+span.

 Here is a basic example:

@@ -146,13 +102,13 @@ await runInDevTraceSpan(
    },
  },
  async ({ metadata }) => {
-    // metadata allows you to record the input and output of the
+    // The `metadata` object allows you to record the input and output of the
    // operation as well as other attributes.
    metadata.input = { key: 'value' };
    // Set custom attributes.
    metadata.attributes['custom.attribute'] = 'custom.value';

-    // Your code to be traced goes here.
+    // Your code to be traced goes here
    try {
      const output = await somethingRisky();
      metadata.output = output;
@@ -28,33 +28,24 @@ Slash commands provide meta-level control over the CLI itself.

 ### `/chat`

- **Description:** Alias for `/resume`. Both commands now expose the same
-  session browser action and checkpoint subcommands.
- **Menu layout when typing `/chat` (or `/resume`)**:
-  - `-- auto --`
-    - `list` (selecting this opens the auto-saved session browser)
-  - `-- checkpoints --`
-    - `list`, `save`, `resume`, `delete`, `share` (manual tagged checkpoints)
-  - **Note:** Unique prefixes (for example `/cha` or `/resum`) resolve to the
-    same grouped menu.
+- **Description:** Save and resume conversation history for branching
+  conversation state interactively, or resuming a previous state from a later
+  session.
 - **Sub-commands:**
  - **`debug`**
    - **Description:** Export the most recent API request as a JSON payload.
  - **`delete <tag>`**
    - **Description:** Deletes a saved conversation checkpoint.
-    - **Equivalent:** `/resume delete <tag>`
  - **`list`**
-    - **Description:** Lists available tags for manually saved checkpoints.
+    - **Description:** Lists available tags for chat state resumption.
    - **Note:** This command only lists chats saved within the current project.
      Because chat history is project-scoped, chats saved in other project
      directories will not be displayed.
-    - **Equivalent:** `/resume list`
  - **`resume <tag>`**
    - **Description:** Resumes a conversation from a previous save.
    - **Note:** You can only resume chats that were saved within the current
      project. To resume a chat from a different project, you must run the
      Gemini CLI from that project's directory.
-    - **Equivalent:** `/resume resume <tag>`
  - **`save <tag>`**
    - **Description:** Saves the current conversation history. You must add a
      `<tag>` for identifying the conversation state.
@@ -69,12 +60,10 @@ Slash commands provide meta-level control over the CLI itself.
        conversation states. For automatic checkpoints created before file
        modifications, see the
        [Checkpointing documentation](../cli/checkpointing.md).
-      - **Equivalent:** `/resume save <tag>`
  - **`share [filename]`**
-    - **Description:** Writes the current conversation to a provided Markdown or
+    - **Description** Writes the current conversation to a provided Markdown or
      JSON file. If no filename is provided, then the CLI will generate one.
-    - **Usage:** `/chat share file.md` or `/chat share file.json`.
-    - **Equivalent:** `/resume share [filename]`
+    - **Usage** `/chat share file.md` or `/chat share file.json`.

 ### `/clear`

@@ -115,7 +104,7 @@ Slash commands provide meta-level control over the CLI itself.
  - On macOS, it requires `pbcopy`, and on Windows, it requires `clip`. These
    tools are typically pre-installed on their respective systems.

-### `/workspace` (or `/directory`, `/dir`)
+### `/directory` (or `/dir`)

 - **Description:** Manage workspace directories for multi-directory support.
 - **Sub-commands:**
@@ -123,13 +112,13 @@ Slash commands provide meta-level control over the CLI itself.
    - **Description:** Add a directory to the workspace. The path can be
      absolute or relative to the current working directory. Moreover, the
      reference from home directory is supported as well.
-    - **Usage:** `/workspace add <path1>,<path2>`
+    - **Usage:** `/directory add <path1>,<path2>`
    - **Note:** Disabled in restrictive sandbox profiles. If you're using that,
      use `--include-directories` when starting the session instead.
  - **`show`**:
-    - **Description:** Display all directories added by `/workspace add` and
+    - **Description:** Display all directories added by `/directory add` and
      `--include-directories`.
-    - **Usage:** `/workspace show`
+    - **Usage:** `/directory show`

 ### `/docs`

@@ -279,8 +268,8 @@ Slash commands provide meta-level control over the CLI itself.

 - **Description:** Switch to Plan Mode (read-only) and view the current plan if
  one has been generated.
-  - **Note:** This feature is enabled by default. It can be disabled via the
-    `experimental.plan` setting in your configuration.
+  - **Note:** This feature requires the `experimental.plan` setting to be
+    enabled in your configuration.
 - **Sub-commands:**
  - **`copy`**:
    - **Description:** Copy the currently approved plan to your clipboard.
@@ -325,13 +314,10 @@ Slash commands provide meta-level control over the CLI itself.

 ### `/resume`

- **Description:** Browse and resume previous conversation sessions, and manage
-  manual chat checkpoints.
+- **Description:** Browse and resume previous conversation sessions. Opens an
+  interactive session browser where you can search, filter, and select from
+  automatically saved conversations.
 - **Features:**
-  - **Auto sessions:** Run `/resume` to open the interactive session browser for
-    automatically saved conversations.
-  - **Chat checkpoints:** Use checkpoint subcommands directly (`/resume save`,
-    `/resume resume`, etc.).
  - **Management:** Delete unwanted sessions directly from the browser
  - **Resume:** Select any session to resume and continue the conversation
  - **Search:** Use `/` to search through conversation content across all
@@ -342,23 +328,6 @@ Slash commands provide meta-level control over the CLI itself.
 - **Note:** All conversations are automatically saved as you chat - no manual
  saving required. See [Session Management](../cli/session-management.md) for
  complete details.
- **Alias:** `/chat` provides the same behavior and subcommands.
- **Sub-commands:**
-  - **`list`**
-    - **Description:** Lists available tags for manual chat checkpoints.
-  - **`save <tag>`**
-    - **Description:** Saves the current conversation as a tagged checkpoint.
-  - **`resume <tag>`** (alias: `load`)
-    - **Description:** Loads a previously saved tagged checkpoint.
-  - **`delete <tag>`**
-    - **Description:** Deletes a tagged checkpoint.
-  - **`share [filename]`**
-    - **Description:** Exports the current conversation to Markdown or JSON.
-  - **`debug`**
-    - **Description:** Export the most recent API request as JSON payload
-      (nightly builds).
-  - **Compatibility alias:** `/resume checkpoints ...` is still accepted for the
-    same checkpoint commands.

 ### `/settings`

@@ -439,12 +408,6 @@ Slash commands provide meta-level control over the CLI itself.
  - **`nodesc`** or **`nodescriptions`**:
    - **Description:** Hide tool descriptions, showing only the tool names.

-### `/upgrade`
-
- **Description:** Open the Gemini Code Assist upgrade page in your browser.
-  This lets you upgrade your tier for higher usage limits.
- **Note:** This command is only available when logged in with Google.
-
 ### `/vim`

 - **Description:** Toggle vim mode on or off. When vim mode is enabled, the
@@ -261,7 +261,7 @@ their corresponding top-level category object in your `settings.json` file.
  - **Default:** `true`

 - **`ui.footer.hideCWD`** (boolean):
-  - **Description:** Hide the workspace path in the footer.
+  - **Description:** Hide the current working directory in the footer.
  - **Default:** `false`

 - **`ui.footer.hideSandboxStatus`** (boolean):
@@ -297,7 +297,7 @@ their corresponding top-level category object in your `settings.json` file.
  - **Default:** `false`

 - **`ui.showUserIdentity`** (boolean):
-  - **Description:** Show the signed-in user's identity (e.g. email) in the UI.
+  - **Description:** Show the logged-in user's identity (e.g. email) in the UI.
  - **Default:** `true`

 - **`ui.useAlternateBuffer`** (boolean):
@@ -872,11 +872,6 @@ their corresponding top-level category object in your `settings.json` file.
    confirmation dialogs.
  - **Default:** `false`

- **`security.autoAddToPolicyByDefault`** (boolean):
-  - **Description:** When enabled, the "Allow for all future sessions" option
-    becomes the default choice for low-risk tools in trusted workspaces.
-  - **Default:** `false`
-
 - **`security.blockGitExtensions`** (boolean):
  - **Description:** Blocks installing and loading extensions from Git.
  - **Default:** `false`
@@ -1003,12 +998,6 @@ their corresponding top-level category object in your `settings.json` file.
  - **Default:** `false`
  - **Requires restart:** Yes

- **`experimental.extensionRegistryURI`** (string):
-  - **Description:** The URI (web URL or local file path) of the extension
-    registry.
-  - **Default:** `"https://geminicli.com/extensions.json"`
-  - **Requires restart:** Yes
-
 - **`experimental.extensionReloading`** (boolean):
  - **Description:** Enables extension loading/unloading within the CLI session.
  - **Default:** `false`
@@ -1032,8 +1021,8 @@ their corresponding top-level category object in your `settings.json` file.
  - **Default:** `false`

 - **`experimental.plan`** (boolean):
-  - **Description:** Enable Plan Mode.
-  - **Default:** `true`
+  - **Description:** Enable planning features (Plan Mode and tools).
+  - **Default:** `false`
  - **Requires restart:** Yes

 - **`experimental.taskTracker`** (boolean):
@@ -1182,20 +1171,13 @@ their corresponding top-level category object in your `settings.json` file.

 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) (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`.
-
-> **Warning:** 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
-> misidentify the server name, which can cause security policies to fail
-> silently.
+configured MCP server to discover available tools. If multiple MCP servers
+expose a tool with the same name, the tool names will be prefixed with the
+server alias you defined in the configuration (e.g.,
+`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`.

 - **`mcpServers.<SERVER_NAME>`** (object): The server parameters for the named
  server.
@@ -55,13 +55,14 @@ available combinations.

 #### History & Search

-| Action                                       | Keys     |
-| -------------------------------------------- | -------- |
-| Show the previous entry in history.          | `Ctrl+P` |
-| Show the next entry in history.              | `Ctrl+N` |
-| Start reverse search through history.        | `Ctrl+R` |
-| Submit the selected reverse-search match.    | `Enter`  |
-| Accept a suggestion while reverse searching. | `Tab`    |
+| Action                                       | Keys         |
+| -------------------------------------------- | ------------ |
+| Show the previous entry in history.          | `Ctrl+P`     |
+| Show the next entry in history.              | `Ctrl+N`     |
+| Start reverse search through history.        | `Ctrl+R`     |
+| Submit the selected reverse-search match.    | `Enter`      |
+| Accept a suggestion while reverse searching. | `Tab`        |
+| Browse and rewind previous interactions.     | `Double Esc` |

 #### Navigation

@@ -106,25 +107,20 @@ available combinations.
 | Cycle through approval modes: default (prompt), auto_edit (auto-approve edits), and plan (read-only). Plan mode is skipped when the agent is busy. | `Shift+Tab`        |
 | Expand and collapse blocks of content when not in alternate buffer mode.                                                                           | `Ctrl+O`           |
 | Expand or collapse a paste placeholder when cursor is over placeholder.                                                                            | `Ctrl+O`           |
+| Toggle current background shell visibility.                                                                                                        | `Ctrl+B`           |
+| Toggle background shell list.                                                                                                                      | `Ctrl+L`           |
+| Kill the active background shell.                                                                                                                  | `Ctrl+K`           |
+| Confirm selection in background shell list.                                                                                                        | `Enter`            |
+| Dismiss background shell list.                                                                                                                     | `Esc`              |
+| Move focus from background shell to Gemini.                                                                                                        | `Shift+Tab`        |
+| Move focus from background shell list to Gemini.                                                                                                   | `Tab`              |
+| Show warning when trying to move focus away from background shell.                                                                                 | `Tab`              |
+| Show warning when trying to move focus away from shell input.                                                                                      | `Tab`              |
 | Move focus from Gemini to the active shell.                                                                                                        | `Tab`              |
 | Move focus from the shell back to Gemini.                                                                                                          | `Shift+Tab`        |
 | Clear the terminal screen and redraw the UI.                                                                                                       | `Ctrl+L`           |
 | Restart the application.                                                                                                                           | `R`<br />`Shift+R` |
 | Suspend the CLI and move it to the background.                                                                                                     | `Ctrl+Z`           |
-| Show warning when trying to move focus away from shell input.                                                                                      | `Tab`              |
-
-#### Background Shell Controls
-
-| Action                                                             | Keys        |
-| ------------------------------------------------------------------ | ----------- |
-| Dismiss background shell list.                                     | `Esc`       |
-| Confirm selection in background shell list.                        | `Enter`     |
-| Toggle current background shell visibility.                        | `Ctrl+B`    |
-| Toggle background shell list.                                      | `Ctrl+L`    |
-| Kill the active background shell.                                  | `Ctrl+K`    |
-| Move focus from background shell to Gemini.                        | `Shift+Tab` |
-| Move focus from background shell list to Gemini.                   | `Tab`       |
-| Show warning when trying to move focus away from background shell. | `Tab`       |

 <!-- KEYBINDINGS-AUTOGEN:END -->

@@ -76,13 +76,9 @@ The `toolName` in the rule must match the name of the tool being called.

 - **Wildcards**: You can use wildcards to match multiple tools.
  - `*`: Matches **any tool** (built-in or MCP).
-  - `mcp_server_*`: Matches any tool from a specific MCP server.
-  - `mcp_*_toolName`: Matches a specific tool name across **all** MCP servers.
-  - `mcp_*`: Matches **any tool from any MCP server**.
-
-> **Recommendation:** While FQN wildcards are supported, the recommended
-> approach for MCP tools is to use the `mcpName` field in your TOML rules. See
-> [Special syntax for MCP tools](#special-syntax-for-mcp-tools).
+  - `server__*`: Matches any tool from a specific MCP server.
+  - `*__toolName`: Matches a specific tool name across **all** MCP servers.
+  - `*__*`: Matches **any tool from any MCP server**.

 #### Arguments pattern

@@ -95,17 +91,10 @@ the arguments don't match the pattern, the rule does not apply.
 There are three possible decisions a rule can enforce:

 - `allow`: The tool call is executed automatically without user interaction.
- `deny`: The tool call is blocked and is not executed. For global rules (those
-  without an `argsPattern`), tools that are denied are **completely excluded
-  from the model's memory**. This means the model will not even see the tool as
-  an option, which is more secure and saves context window space.
+- `deny`: The tool call is blocked and is not executed.
 - `ask_user`: The user is prompted to approve or deny the tool call. (In
  non-interactive mode, this is treated as `deny`.)

-> **Note:** The `deny` decision is the recommended way to exclude tools. The
-> legacy `tools.exclude` setting in `settings.json` is deprecated in favor of
-> policy rules with a `deny` decision.
-
 ### Priority system and tiers

 The policy engine uses a sophisticated priority system to resolve conflicts when
@@ -154,8 +143,8 @@ always active.
  confirmation.
 - `autoEdit`: Optimized for automated code editing; some write tools may be
  auto-approved.
- `plan`: A strict, read-only mode for research and design. See
-  [Customizing Plan Mode Policies](../cli/plan-mode.md#customizing-policies).
+- `plan`: A strict, read-only mode for research and design. See [Customizing
+  Plan Mode Policies].
 - `yolo`: A mode where all tools are auto-approved (use with extreme caution).

 ## Rule matching
@@ -168,8 +157,8 @@ A rule matches a tool call if all of its conditions are met:

 1.  **Tool name**: The `toolName` in the rule must match the name of the tool
    being called.
-    - **Wildcards**: You can use wildcards like `*`, `mcp_server_*`, or
-      `mcp_*_toolName` to match multiple tools. See [Tool Name](#tool-name) for
+    - **Wildcards**: You can use wildcards like `*`, `server__*`, or
+      `*__toolName` to match multiple tools. See [Tool Name](#tool-name) for
      details.
 2.  **Arguments pattern**: If `argsPattern` is specified, the tool's arguments
    are converted to a stable JSON string, which is then tested against the
@@ -223,12 +212,8 @@ Here is a breakdown of the fields available in a TOML policy rule:
 # A unique name for the tool, or an array of names.
 toolName = "run_shell_command"

-# (Optional) The name of a subagent. If provided, the rule only applies to tool calls
-# made by this specific subagent.
-subagent = "generalist"
-
 # (Optional) The name of an MCP server. Can be combined with toolName
-# to form a composite FQN internally like "mcp_mcpName_toolName".
+# to form a composite name like "mcpName__toolName".
 mcpName = "my-custom-server"

 # (Optional) Metadata hints provided by the tool. A rule matches if all
@@ -305,16 +290,7 @@ priority = 100
 ### Special syntax for MCP tools

 You can create rules that target tools from Model Context Protocol (MCP) servers
-using the `mcpName` field. **This is the recommended approach** for defining MCP
-policies, as it is much more robust than manually writing Fully Qualified Names
-(FQNs) or string wildcards.
-
-> **Warning:** 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
-> misinterpret the server identity, which can cause wildcard rules and security
-> policies to fail silently.
+using the `mcpName` field or composite wildcard patterns.

 **1. Targeting a specific tool on a server**

@@ -384,3 +360,5 @@ out-of-the-box experience.
 - In **`yolo`** mode, a high-priority rule allows all tools.
 - In **`autoEdit`** mode, rules allow certain write operations to happen without
  prompting.
+
+[Customizing Plan Mode Policies]: /docs/cli/plan-mode.md#customizing-policies
@@ -79,8 +79,8 @@ manually run through this checklist.
  - [ ] Verify version: `gemini --version`

 - **Authentication:**
-  - [ ] In interactive mode run `/auth` and verify all sign in flows work:
-    - [ ] Sign in with Google
+  - [ ] In interactive mode run `/auth` and verify all login flows work:
+    - [ ] Login With Google
    - [ ] API Key
    - [ ] Vertex AI

@@ -5,7 +5,7 @@ use cases. For enterprise or professional usage, or if you need increased quota,
 several options are available depending on your authentication account type.

 For a high-level comparison of available subscriptions and to select the right
-quota for your needs, see the [Plans page](https://geminicli.com/plans/).
+quota for your needs, see the [Plans page](/plans/).

 ## Overview

@@ -16,8 +16,8 @@ account.
 Your Gemini CLI Usage Statistics are handled in accordance with Google's Privacy
 Policy.

-**Note:** See [quotas and pricing](quota-and-pricing.md) for the quota and
-pricing details that apply to your usage of the Gemini CLI.
+**Note:** See [quotas and pricing](/docs/resources/quota-and-pricing.md) for the
+quota and pricing details that apply to your usage of the Gemini CLI.

 ## Supported authentication methods

@@ -46,7 +46,7 @@ for further information.
 | Gemini Developer API Key | Gemini API - Paid Services   | [Gemini API Terms of Service - Paid Services](https://ai.google.dev/gemini-api/terms#paid-services)     | [Google Privacy Policy](https://policies.google.com/privacy)                                  |
 | Vertex AI GenAI API Key  | Vertex AI GenAI API          | [Google Cloud Platform Terms of Service](https://cloud.google.com/terms/service-terms/)                 | [Google Cloud Privacy Notice](https://cloud.google.com/terms/cloud-privacy-notice)            |

-## 1. If you have signed in with your Google account to Gemini Code Assist
+## 1. If you have logged in with your Google account to Gemini Code Assist

 For users who use their Google account to access
 [Gemini Code Assist](https://codeassist.google), these Terms of Service and
@@ -68,7 +68,7 @@ Code Assist Standard or Enterprise edition, the terms and privacy policy of
 Gemini Code Assist Standard or Enterprise edition will apply to all your use of
 Gemini Code Assist._

-## 2. If you have signed in with a Gemini API key to the Gemini Developer API
+## 2. If you have logged in with a Gemini API key to the Gemini Developer API

 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
@@ -84,7 +84,7 @@ Service and Privacy Notice documents apply:
 - Privacy Notice: The collection and use of your data is described in the
  [Google Privacy Policy](https://policies.google.com/privacy).

-## 3. If you have signed in with a Gemini API key to the Vertex AI GenAI API
+## 3. If you have logged in with a Gemini API key to the Vertex AI GenAI API

 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)
@@ -29,13 +29,13 @@ topics on:
      added to your organization's Gemini Code Assist subscription.

 - **Error:
-  `Failed to sign in. Message: Your current account is not eligible... because it is not currently available in your location.`**
+  `Failed to login. Message: Your current account is not eligible... because it is not currently available in your location.`**
  - **Cause:** Gemini CLI does not currently support your location. For a full
    list of supported locations, see the following pages:
    - Gemini Code Assist for individuals:
      [Available locations](https://developers.google.com/gemini-code-assist/resources/available-locations#americas)

- **Error: `Failed to sign in. Message: Request contains an invalid argument`**
+- **Error: `Failed to login. Message: Request contains an invalid argument`**
  - **Cause:** Users with Google Workspace accounts or Google Cloud accounts
    associated with their Gmail accounts may not be able to activate the free
    tier of the Google Code Assist plan.
@@ -111,7 +111,7 @@
            "badge": "🔬",
            "slug": "docs/cli/notifications"
          },
-          { "label": "Plan mode", "slug": "docs/cli/plan-mode" },
+          { "label": "Plan mode", "badge": "🔬", "slug": "docs/cli/plan-mode" },
          {
            "label": "Subagents",
            "badge": "🔬",
@@ -67,7 +67,7 @@ Finds files matching specific glob patterns across the workspace.
  `Found 5 file(s) matching "*.ts" within src, sorted by modification time (newest first):\nsrc/file1.ts\nsrc/subdir/file2.ts...`
 - **Confirmation:** No.

-### `grep_search` (SearchText)
+## 5. `grep_search` (SearchText)

 `grep_search` searches for a regular expression pattern within the content of
 files in a specified directory. Can filter files by a glob pattern. Returns the
@@ -103,7 +103,7 @@ lines containing matches, along with their file paths and line numbers.
  ```
 - **Confirmation:** No.

-### `replace` (Edit)
+## 6. `replace` (Edit)

 `replace` replaces text within a file. By default, the tool expects to find and
 replace exactly ONE occurrence of `old_string`. If you want to replace multiple
@@ -372,7 +372,7 @@ To authenticate with a server using Service Account Impersonation, you must set
 the `authProviderType` to `service_account_impersonation` and provide the
 following properties:

- **`targetAudience`** (string): The OAuth Client ID allowlisted on the
+- **`targetAudience`** (string): The OAuth Client ID allowslisted on the
  IAP-protected application you are trying to access.
 - **`targetServiceAccount`** (string): The email address of the Google Cloud
  Service Account to impersonate.
@@ -555,34 +555,21 @@ Upon successful connection:
   `excludeTools` configuration
 4. **Name sanitization:** Tool names are cleaned to meet Gemini API
   requirements:
-   - Characters other than letters, numbers, underscore (`_`), hyphen (`-`), dot
-     (`.`), and colon (`:`) are replaced with underscores
+   - Invalid characters (non-alphanumeric, underscore, dot, hyphen) are replaced
+     with underscores
   - Names longer than 63 characters are truncated with middle replacement
-     (`...`)
+     (`___`)

-### 3. Tool naming and namespaces
+### 3. Conflict resolution

-To prevent collisions across multiple servers or conflicting built-in tools,
-every discovered MCP tool is assigned a strict namespace.
+When multiple servers expose tools with the same name:

-1. **Automatic FQN:** All MCP tools are unconditionally assigned a fully
-   qualified name (FQN) using the format `mcp_{serverName}_{toolName}`.
-2. **Registry tracking:** The tool registry maintains metadata mappings between
-   these FQNs and their original server identities.
-3. **Overwrites:** If two servers share the exact same alias in your
-   configuration and provide tools with the exact same name, the last registered
-   tool overwrites the previous one.
-4. **Policies:** To configure permissions (like auto-approval or denial) for MCP
-   tools, see
-   [Special syntax for MCP tools](../reference/policy-engine.md#special-syntax-for-mcp-tools)
-   in the Policy Engine documentation.
-
-> **Warning:** 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
-> misinterpret the server identity, which can cause wildcard rules and security
-> policies to fail silently.
+1. **First registration wins:** The first server to register a tool name gets
+   the unprefixed name
+2. **Automatic prefixing:** Subsequent servers get prefixed names:
+   `serverName__toolName`
+3. **Registry tracking:** The tool registry maintains mappings between server
+   names and their tools

 ### 4. Schema processing

@@ -708,7 +695,7 @@ MCP Servers Status:

 🐳 dockerizedServer (CONNECTED)
  Command: docker run -i --rm -e API_KEY my-mcp-server:latest
-  Tools: mcp_dockerizedServer_docker_deploy, mcp_dockerizedServer_docker_status
+  Tools: docker__deploy, docker__status

 Discovery State: COMPLETED
 ```
@@ -1011,7 +998,7 @@ gemini mcp add [options] <name> <commandOrUrl> [args...]

 **Options (flags):**

- `-s, --scope`: Configuration scope (user or workspace). [default: "workspace"]
+- `-s, --scope`: Configuration scope (user or project). [default: "project"]
 - `-t, --transport`: Transport type (stdio, sse, http). [default: "stdio"]
 - `-e, --env`: Set environment variables (e.g. -e KEY=value).
 - `-H, --header`: Set HTTP headers for SSE and HTTP transports (e.g. -H
@@ -1122,7 +1109,7 @@ gemini mcp remove <name>

 **Options (flags):**

- `-s, --scope`: Configuration scope (user or workspace). [default: "workspace"]
+- `-s, --scope`: Configuration scope (user or project). [default: "project"]

 **Example:**

@@ -35,11 +35,6 @@ const commonRestrictedSyntaxRules = [
    message:
      'Do not throw string literals or non-Error objects. Throw new Error("...") instead.',
  },
-  {
-    selector: 'CallExpression[callee.name="fetch"]',
-    message:
-      'Use safeFetch() from "@/utils/fetch" instead of the global fetch() to ensure SSRF protection. If you are implementing a custom security layer, use an eslint-disable comment and explain why.',
-  },
 ];

 export default tseslint.config(
@@ -71,4 +71,30 @@ describe('interactive_commands', () => {
      ).toMatch(/(?:^|\s)(--yes|-y|--template\s+\S+)(?:\s|$|\\|")/);
    },
  });
+
+  /**
+   * Validates that the agent does not hang when creating a vite app.
+   */
+  evalTest('ALWAYS_PASSES', {
+    name: 'should not hang when creating a vite app',
+    prompt: 'create a hello world app with vite',
+    files: {
+      //'.npmrc': 'cache=./.npm-cache',
+    },
+    assert: async (rig, result) => {
+      await rig.waitForToolCall('run_shell_command');
+      const logs = rig.readToolLogs();
+      const viteCall = logs.find(
+        (l) =>
+          l.toolRequest.name === 'run_shell_command' &&
+          l.toolRequest.args.toLowerCase().includes('vite'),
+      );
+
+      expect(viteCall, 'Agent should have called vite').toBeDefined();
+      expect(
+        viteCall?.toolRequest.success,
+        'Vite tool call should finish successfully without hanging',
+      ).toBe(true);
+    },
+  });
 });
@@ -1,116 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import {
-  TRACKER_CREATE_TASK_TOOL_NAME,
-  TRACKER_UPDATE_TASK_TOOL_NAME,
-} from '@google/gemini-cli-core';
-import { evalTest, assertModelHasOutput } from './test-helper.js';
-import fs from 'node:fs';
-import path from 'node:path';
-
-const FILES = {
-  'package.json': JSON.stringify({
-    name: 'test-project',
-    version: '1.0.0',
-    scripts: { test: 'echo "All tests passed!"' },
-  }),
-  'src/login.js':
-    'function login(username, password) {\n  if (!username) throw new Error("Missing username");\n  // BUG: missing password check\n  return true;\n}',
-} as const;
-
-describe('tracker_mode', () => {
-  evalTest('USUALLY_PASSES', {
-    name: 'should manage tasks in the tracker when explicitly requested during a bug fix',
-    params: {
-      settings: { experimental: { taskTracker: true } },
-    },
-    files: FILES,
-    prompt:
-      'We have a bug in src/login.js: the password check is missing. First, create a task in the tracker to fix it. Then fix the bug, and mark the task as closed.',
-    assert: async (rig, result) => {
-      const wasCreateCalled = await rig.waitForToolCall(
-        TRACKER_CREATE_TASK_TOOL_NAME,
-      );
-      expect(
-        wasCreateCalled,
-        'Expected tracker_create_task tool to be called',
-      ).toBe(true);
-
-      const toolLogs = rig.readToolLogs();
-      const createCall = toolLogs.find(
-        (log) => log.toolRequest.name === TRACKER_CREATE_TASK_TOOL_NAME,
-      );
-      expect(createCall).toBeDefined();
-      const args = JSON.parse(createCall!.toolRequest.args);
-      expect(
-        (args.title?.toLowerCase() ?? '') +
-          (args.description?.toLowerCase() ?? ''),
-      ).toContain('login');
-
-      const wasUpdateCalled = await rig.waitForToolCall(
-        TRACKER_UPDATE_TASK_TOOL_NAME,
-      );
-      expect(
-        wasUpdateCalled,
-        'Expected tracker_update_task tool to be called',
-      ).toBe(true);
-
-      const updateCall = toolLogs.find(
-        (log) => log.toolRequest.name === TRACKER_UPDATE_TASK_TOOL_NAME,
-      );
-      expect(updateCall).toBeDefined();
-      const updateArgs = JSON.parse(updateCall!.toolRequest.args);
-      expect(updateArgs.status).toBe('closed');
-
-      const loginContent = fs.readFileSync(
-        path.join(rig.testDir!, 'src/login.js'),
-        'utf-8',
-      );
-      expect(loginContent).not.toContain('// BUG: missing password check');
-
-      assertModelHasOutput(result);
-    },
-  });
-
-  evalTest('USUALLY_PASSES', {
-    name: 'should implicitly create tasks when asked to build a feature plan',
-    params: {
-      settings: { experimental: { taskTracker: true } },
-    },
-    files: FILES,
-    prompt:
-      'I need to build a complex new feature for user authentication in our project. Create a detailed implementation plan and organize the work into bite-sized chunks. Do not actually implement the code yet, just plan it.',
-    assert: async (rig, result) => {
-      // The model should proactively use tracker_create_task to organize the work
-      const wasToolCalled = await rig.waitForToolCall(
-        TRACKER_CREATE_TASK_TOOL_NAME,
-      );
-      expect(
-        wasToolCalled,
-        'Expected tracker_create_task to be called implicitly to organize plan',
-      ).toBe(true);
-
-      const toolLogs = rig.readToolLogs();
-      const createCalls = toolLogs.filter(
-        (log) => log.toolRequest.name === TRACKER_CREATE_TASK_TOOL_NAME,
-      );
-
-      // We expect it to create at least one task for authentication, likely more.
-      expect(createCalls.length).toBeGreaterThan(0);
-
-      // Verify it didn't write any code since we asked it to just plan
-      const loginContent = fs.readFileSync(
-        path.join(rig.testDir!, 'src/login.js'),
-        'utf-8',
-      );
-      expect(loginContent).toContain('// BUG: missing password check');
-
-      assertModelHasOutput(result);
-    },
-  });
-});
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli",
-  "version": "0.34.0-nightly.20260310.4653b126f",
+  "version": "0.34.0-nightly.20260304.28af4e127",
  "engines": {
    "node": ">=20.0.0"
  },
@@ -14,7 +14,7 @@
    "url": "git+https://github.com/google-gemini/gemini-cli.git"
  },
  "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.34.0-nightly.20260310.4653b126f"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.34.0-nightly.20260304.28af4e127"
  },
  "scripts": {
    "start": "cross-env NODE_ENV=development node scripts/start.js",
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli-a2a-server",
-  "version": "0.34.0-nightly.20260310.4653b126f",
+  "version": "0.34.0-nightly.20260304.28af4e127",
  "description": "Gemini CLI A2A Server",
  "repository": {
    "type": "git",
@@ -25,7 +25,7 @@
    "dist"
  ],
  "dependencies": {
-    "@a2a-js/sdk": "0.3.11",
+    "@a2a-js/sdk": "^0.3.8",
    "@google-cloud/storage": "^7.16.0",
    "@google/gemini-cli-core": "file:../core",
    "express": "^5.1.0",
@@ -36,7 +36,7 @@
    "winston": "^3.17.0"
  },
  "devDependencies": {
-    "@google/genai": "1.30.0",
+    "@google/genai": "^1.30.0",
    "@types/express": "^5.0.3",
    "@types/fs-extra": "^11.0.4",
    "@types/supertest": "^6.0.3",
@@ -1,248 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { CoderAgentExecutor } from './executor.js';
-import type {
-  ExecutionEventBus,
-  RequestContext,
-  TaskStore,
-} from '@a2a-js/sdk/server';
-import { EventEmitter } from 'node:events';
-import { requestStorage } from '../http/requestStorage.js';
-
-// Mocks for constructor dependencies
-vi.mock('../config/config.js', () => ({
-  loadConfig: vi.fn().mockReturnValue({
-    getSessionId: () => 'test-session',
-    getTargetDir: () => '/tmp',
-    getCheckpointingEnabled: () => false,
-  }),
-  loadEnvironment: vi.fn(),
-  setTargetDir: vi.fn().mockReturnValue('/tmp'),
-}));
-
-vi.mock('../config/settings.js', () => ({
-  loadSettings: vi.fn().mockReturnValue({}),
-}));
-
-vi.mock('../config/extension.js', () => ({
-  loadExtensions: vi.fn().mockReturnValue([]),
-}));
-
-vi.mock('../http/requestStorage.js', () => ({
-  requestStorage: {
-    getStore: vi.fn(),
-  },
-}));
-
-vi.mock('./task.js', () => {
-  const mockTaskInstance = (taskId: string, contextId: string) => ({
-    id: taskId,
-    contextId,
-    taskState: 'working',
-    acceptUserMessage: vi
-      .fn()
-      .mockImplementation(async function* (context, aborted) {
-        const isConfirmation = (
-          context.userMessage.parts as Array<{ kind: string }>
-        ).some((p) => p.kind === 'confirmation');
-        // Hang only for main user messages (text), allow confirmations to finish quickly
-        if (!isConfirmation && aborted) {
-          await new Promise((resolve) => {
-            aborted.addEventListener('abort', resolve, { once: true });
-          });
-        }
-        yield { type: 'content', value: 'hello' };
-      }),
-    acceptAgentMessage: vi.fn().mockResolvedValue(undefined),
-    scheduleToolCalls: vi.fn().mockResolvedValue(undefined),
-    waitForPendingTools: vi.fn().mockResolvedValue(undefined),
-    getAndClearCompletedTools: vi.fn().mockReturnValue([]),
-    addToolResponsesToHistory: vi.fn(),
-    sendCompletedToolsToLlm: vi.fn().mockImplementation(async function* () {}),
-    cancelPendingTools: vi.fn(),
-    setTaskStateAndPublishUpdate: vi.fn(),
-    dispose: vi.fn(),
-    getMetadata: vi.fn().mockResolvedValue({}),
-    geminiClient: {
-      initialize: vi.fn().mockResolvedValue(undefined),
-    },
-    toSDKTask: () => ({
-      id: taskId,
-      contextId,
-      kind: 'task',
-      status: { state: 'working', timestamp: new Date().toISOString() },
-      metadata: {},
-      history: [],
-      artifacts: [],
-    }),
-  });
-
-  const MockTask = vi.fn().mockImplementation(mockTaskInstance);
-  (MockTask as unknown as { create: Mock }).create = vi
-    .fn()
-    .mockImplementation(async (taskId: string, contextId: string) =>
-      mockTaskInstance(taskId, contextId),
-    );
-
-  return { Task: MockTask };
-});
-
-describe('CoderAgentExecutor', () => {
-  let executor: CoderAgentExecutor;
-  let mockTaskStore: TaskStore;
-  let mockEventBus: ExecutionEventBus;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mockTaskStore = {
-      save: vi.fn().mockResolvedValue(undefined),
-      load: vi.fn().mockResolvedValue(undefined),
-      delete: vi.fn().mockResolvedValue(undefined),
-      list: vi.fn().mockResolvedValue([]),
-    } as unknown as TaskStore;
-
-    mockEventBus = new EventEmitter() as unknown as ExecutionEventBus;
-    mockEventBus.publish = vi.fn();
-    mockEventBus.finished = vi.fn();
-
-    executor = new CoderAgentExecutor(mockTaskStore);
-  });
-
-  it('should distinguish between primary and secondary execution', async () => {
-    const taskId = 'test-task';
-    const contextId = 'test-context';
-
-    const mockSocket = new EventEmitter();
-    const requestContext = {
-      userMessage: {
-        messageId: 'msg-1',
-        taskId,
-        contextId,
-        parts: [{ kind: 'text', text: 'hi' }],
-        metadata: {
-          coderAgent: { kind: 'agent-settings', workspacePath: '/tmp' },
-        },
-      },
-    } as unknown as RequestContext;
-
-    // Mock requestStorage for primary
-    (requestStorage.getStore as Mock).mockReturnValue({
-      req: { socket: mockSocket },
-    });
-
-    // First execution (Primary)
-    const primaryPromise = executor.execute(requestContext, mockEventBus);
-
-    // Give it enough time to reach line 490 in executor.ts
-    await new Promise((resolve) => setTimeout(resolve, 50));
-
-    expect(
-      (
-        executor as unknown as { executingTasks: Set<string> }
-      ).executingTasks.has(taskId),
-    ).toBe(true);
-    const wrapper = executor.getTask(taskId);
-    expect(wrapper).toBeDefined();
-
-    // Mock requestStorage for secondary
-    const secondarySocket = new EventEmitter();
-    (requestStorage.getStore as Mock).mockReturnValue({
-      req: { socket: secondarySocket },
-    });
-
-    const secondaryRequestContext = {
-      userMessage: {
-        messageId: 'msg-2',
-        taskId,
-        contextId,
-        parts: [{ kind: 'confirmation', callId: '1', outcome: 'proceed' }],
-        metadata: {
-          coderAgent: { kind: 'agent-settings', workspacePath: '/tmp' },
-        },
-      },
-    } as unknown as RequestContext;
-
-    const secondaryPromise = executor.execute(
-      secondaryRequestContext,
-      mockEventBus,
-    );
-
-    // Secondary execution should NOT add to executingTasks (already there)
-    // and should return early after its loop
-    await secondaryPromise;
-
-    // Task should still be in executingTasks and NOT disposed
-    expect(
-      (
-        executor as unknown as { executingTasks: Set<string> }
-      ).executingTasks.has(taskId),
-    ).toBe(true);
-    expect(wrapper?.task.dispose).not.toHaveBeenCalled();
-
-    // Now simulate secondary socket closure - it should NOT affect primary
-    secondarySocket.emit('end');
-    expect(
-      (
-        executor as unknown as { executingTasks: Set<string> }
-      ).executingTasks.has(taskId),
-    ).toBe(true);
-    expect(wrapper?.task.dispose).not.toHaveBeenCalled();
-
-    // Set to terminal state to verify disposal on finish
-    wrapper!.task.taskState = 'completed';
-
-    // Now close primary socket
-    mockSocket.emit('end');
-
-    await primaryPromise;
-
-    expect(
-      (
-        executor as unknown as { executingTasks: Set<string> }
-      ).executingTasks.has(taskId),
-    ).toBe(false);
-    expect(wrapper?.task.dispose).toHaveBeenCalled();
-  });
-
-  it('should evict task from cache when it reaches terminal state', async () => {
-    const taskId = 'test-task-terminal';
-    const contextId = 'test-context';
-
-    const mockSocket = new EventEmitter();
-    (requestStorage.getStore as Mock).mockReturnValue({
-      req: { socket: mockSocket },
-    });
-
-    const requestContext = {
-      userMessage: {
-        messageId: 'msg-1',
-        taskId,
-        contextId,
-        parts: [{ kind: 'text', text: 'hi' }],
-        metadata: {
-          coderAgent: { kind: 'agent-settings', workspacePath: '/tmp' },
-        },
-      },
-    } as unknown as RequestContext;
-
-    const primaryPromise = executor.execute(requestContext, mockEventBus);
-    await new Promise((resolve) => setTimeout(resolve, 50));
-
-    const wrapper = executor.getTask(taskId)!;
-    expect(wrapper).toBeDefined();
-    // Simulate terminal state
-    wrapper.task.taskState = 'completed';
-
-    // Finish primary execution
-    mockSocket.emit('end');
-    await primaryPromise;
-
-    expect(executor.getTask(taskId)).toBeUndefined();
-    expect(wrapper.task.dispose).toHaveBeenCalled();
-  });
-});
@@ -252,10 +252,6 @@ export class CoderAgentExecutor implements AgentExecutor {
      );
      await this.taskStore?.save(wrapper.toSDKTask());
      logger.info(`[CoderAgentExecutor] Task ${taskId} state CANCELED saved.`);
-
-      // Cleanup listener subscriptions to avoid memory leaks.
-      wrapper.task.dispose();
-      this.tasks.delete(taskId);
    } catch (error) {
      const errorMessage =
        error instanceof Error ? error.message : 'Unknown error';
@@ -324,26 +320,23 @@ export class CoderAgentExecutor implements AgentExecutor {
    if (store) {
      // Grab the raw socket from the request object
      const socket = store.req.socket;
-      const onSocketEnd = () => {
+      const onClientEnd = () => {
        logger.info(
-          `[CoderAgentExecutor] Socket ended for message ${userMessage.messageId} (task ${taskId}). Aborting execution loop.`,
+          `[CoderAgentExecutor] Client socket closed for task ${taskId}. Cancelling execution.`,
        );
        if (!abortController.signal.aborted) {
          abortController.abort();
        }
        // Clean up the listener to prevent memory leaks
-        socket.removeListener('end', onSocketEnd);
+        socket.removeListener('close', onClientEnd);
      };

      // Listen on the socket's 'end' event (remote closed the connection)
-      socket.on('end', onSocketEnd);
-      socket.once('close', () => {
-        socket.removeListener('end', onSocketEnd);
-      });
+      socket.on('end', onClientEnd);

      // It's also good practice to remove the listener if the task completes successfully
      abortSignal.addEventListener('abort', () => {
-        socket.removeListener('end', onSocketEnd);
+        socket.removeListener('end', onClientEnd);
      });
      logger.info(
        `[CoderAgentExecutor] Socket close handler set up for task ${taskId}.`,
@@ -464,26 +457,6 @@ export class CoderAgentExecutor implements AgentExecutor {
      return;
    }

-    // Check if this is the primary/initial execution for this task
-    const isPrimaryExecution = !this.executingTasks.has(taskId);
-
-    if (!isPrimaryExecution) {
-      logger.info(
-        `[CoderAgentExecutor] Primary execution already active for task ${taskId}. Starting secondary loop for message ${userMessage.messageId}.`,
-      );
-      currentTask.eventBus = eventBus;
-      for await (const _ of currentTask.acceptUserMessage(
-        requestContext,
-        abortController.signal,
-      )) {
-        logger.info(
-          `[CoderAgentExecutor] Processing user message ${userMessage.messageId} in secondary execution loop for task ${taskId}.`,
-        );
-      }
-      // End this execution-- the original/source will be resumed.
-      return;
-    }
-
    logger.info(
      `[CoderAgentExecutor] Starting main execution for message ${userMessage.messageId} for task ${taskId}.`,
    );
@@ -625,30 +598,18 @@ export class CoderAgentExecutor implements AgentExecutor {
        }
      }
    } finally {
-      if (isPrimaryExecution) {
-        this.executingTasks.delete(taskId);
-        logger.info(
-          `[CoderAgentExecutor] Saving final state for task ${taskId}.`,
+      this.executingTasks.delete(taskId);
+      logger.info(
+        `[CoderAgentExecutor] Saving final state for task ${taskId}.`,
+      );
+      try {
+        await this.taskStore?.save(wrapper.toSDKTask());
+        logger.info(`[CoderAgentExecutor] Task ${taskId} state saved.`);
+      } catch (saveError) {
+        logger.error(
+          `[CoderAgentExecutor] Failed to save task ${taskId} state in finally block:`,
+          saveError,
        );
-        try {
-          await this.taskStore?.save(wrapper.toSDKTask());
-          logger.info(`[CoderAgentExecutor] Task ${taskId} state saved.`);
-        } catch (saveError) {
-          logger.error(
-            `[CoderAgentExecutor] Failed to save task ${taskId} state in finally block:`,
-            saveError,
-          );
-        }
-
-        if (
-          ['canceled', 'failed', 'completed'].includes(currentTask.taskState)
-        ) {
-          logger.info(
-            `[CoderAgentExecutor] Task ${taskId} reached terminal state ${currentTask.taskState}. Evicting and disposing.`,
-          );
-          wrapper.task.dispose();
-          this.tasks.delete(taskId);
-        }
      }
    }
  }
@@ -1,655 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { Task } from './task.js';
-import {
-  type Config,
-  MessageBusType,
-  ToolConfirmationOutcome,
-  ApprovalMode,
-  Scheduler,
-  type MessageBus,
-} from '@google/gemini-cli-core';
-import { createMockConfig } from '../utils/testing_utils.js';
-import type { ExecutionEventBus } from '@a2a-js/sdk/server';
-
-describe('Task Event-Driven Scheduler', () => {
-  let mockConfig: Config;
-  let mockEventBus: ExecutionEventBus;
-  let messageBus: MessageBus;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mockConfig = createMockConfig({
-      isEventDrivenSchedulerEnabled: () => true,
-    }) as Config;
-    messageBus = mockConfig.getMessageBus();
-    mockEventBus = {
-      publish: vi.fn(),
-      on: vi.fn(),
-      off: vi.fn(),
-      once: vi.fn(),
-      removeAllListeners: vi.fn(),
-      finished: vi.fn(),
-    };
-  });
-
-  it('should instantiate Scheduler when enabled', () => {
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-    expect(task.scheduler).toBeInstanceOf(Scheduler);
-  });
-
-  it('should subscribe to TOOL_CALLS_UPDATE and map status changes', async () => {
-    // @ts-expect-error - Calling private constructor
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-
-    const toolCall = {
-      request: { callId: '1', name: 'ls', args: {} },
-      status: 'executing',
-    };
-
-    // Simulate MessageBus event
-    // Simulate MessageBus event
-    const handler = (messageBus.subscribe as Mock).mock.calls.find(
-      (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
-    )?.[1];
-
-    if (!handler) {
-      throw new Error('TOOL_CALLS_UPDATE handler not found');
-    }
-
-    handler({
-      type: MessageBusType.TOOL_CALLS_UPDATE,
-      toolCalls: [toolCall],
-    });
-
-    expect(mockEventBus.publish).toHaveBeenCalledWith(
-      expect.objectContaining({
-        status: expect.objectContaining({
-          state: 'submitted', // initial task state
-        }),
-        metadata: expect.objectContaining({
-          coderAgent: expect.objectContaining({
-            kind: 'tool-call-update',
-          }),
-        }),
-      }),
-    );
-  });
-
-  it('should handle tool confirmations by publishing to MessageBus', async () => {
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-
-    const toolCall = {
-      request: { callId: '1', name: 'ls', args: {} },
-      status: 'awaiting_approval',
-      correlationId: 'corr-1',
-      confirmationDetails: { type: 'info', title: 'test', prompt: 'test' },
-    };
-
-    // Simulate MessageBus event to stash the correlationId
-    // Simulate MessageBus event
-    const handler = (messageBus.subscribe as Mock).mock.calls.find(
-      (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
-    )?.[1];
-
-    if (!handler) {
-      throw new Error('TOOL_CALLS_UPDATE handler not found');
-    }
-
-    handler({
-      type: MessageBusType.TOOL_CALLS_UPDATE,
-      toolCalls: [toolCall],
-    });
-
-    // Simulate A2A client confirmation
-    const part = {
-      kind: 'data',
-      data: {
-        callId: '1',
-        outcome: 'proceed_once',
-      },
-    };
-
-    const handled = await (
-      task as unknown as {
-        _handleToolConfirmationPart: (part: unknown) => Promise<boolean>;
-      }
-    )._handleToolConfirmationPart(part);
-    expect(handled).toBe(true);
-
-    expect(messageBus.publish).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'corr-1',
-        confirmed: true,
-        outcome: ToolConfirmationOutcome.ProceedOnce,
-      }),
-    );
-  });
-
-  it('should handle Rejection (Cancel) and Modification (ModifyWithEditor)', async () => {
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-
-    const toolCall = {
-      request: { callId: '1', name: 'ls', args: {} },
-      status: 'awaiting_approval',
-      correlationId: 'corr-1',
-      confirmationDetails: { type: 'info', title: 'test', prompt: 'test' },
-    };
-
-    const handler = (messageBus.subscribe as Mock).mock.calls.find(
-      (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
-    )?.[1];
-    handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall] });
-
-    // Simulate Rejection (Cancel)
-    const handled = await (
-      task as unknown as {
-        _handleToolConfirmationPart: (part: unknown) => Promise<boolean>;
-      }
-    )._handleToolConfirmationPart({
-      kind: 'data',
-      data: { callId: '1', outcome: 'cancel' },
-    });
-    expect(handled).toBe(true);
-    expect(messageBus.publish).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'corr-1',
-        confirmed: false,
-      }),
-    );
-
-    const toolCall2 = {
-      request: { callId: '2', name: 'ls', args: {} },
-      status: 'awaiting_approval',
-      correlationId: 'corr-2',
-      confirmationDetails: { type: 'info', title: 'test', prompt: 'test' },
-    };
-    handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall2] });
-
-    // Simulate ModifyWithEditor
-    const handled2 = await (
-      task as unknown as {
-        _handleToolConfirmationPart: (part: unknown) => Promise<boolean>;
-      }
-    )._handleToolConfirmationPart({
-      kind: 'data',
-      data: { callId: '2', outcome: 'modify_with_editor' },
-    });
-    expect(handled2).toBe(true);
-    expect(messageBus.publish).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'corr-2',
-        confirmed: false,
-        outcome: ToolConfirmationOutcome.ModifyWithEditor,
-        payload: undefined,
-      }),
-    );
-  });
-
-  it('should handle MCP Server tool operations correctly', async () => {
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-
-    const toolCall = {
-      request: { callId: '1', name: 'call_mcp_tool', args: {} },
-      status: 'awaiting_approval',
-      correlationId: 'corr-mcp-1',
-      confirmationDetails: {
-        type: 'mcp',
-        title: 'MCP Server Operation',
-        prompt: 'test_mcp',
-      },
-    };
-
-    const handler = (messageBus.subscribe as Mock).mock.calls.find(
-      (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
-    )?.[1];
-    handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall] });
-
-    // Simulate ProceedOnce for MCP
-    const handled = await (
-      task as unknown as {
-        _handleToolConfirmationPart: (part: unknown) => Promise<boolean>;
-      }
-    )._handleToolConfirmationPart({
-      kind: 'data',
-      data: { callId: '1', outcome: 'proceed_once' },
-    });
-    expect(handled).toBe(true);
-    expect(messageBus.publish).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'corr-mcp-1',
-        confirmed: true,
-        outcome: ToolConfirmationOutcome.ProceedOnce,
-      }),
-    );
-  });
-
-  it('should handle MCP Server tool ProceedAlwaysServer outcome', async () => {
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-
-    const toolCall = {
-      request: { callId: '1', name: 'call_mcp_tool', args: {} },
-      status: 'awaiting_approval',
-      correlationId: 'corr-mcp-2',
-      confirmationDetails: {
-        type: 'mcp',
-        title: 'MCP Server Operation',
-        prompt: 'test_mcp',
-      },
-    };
-
-    const handler = (messageBus.subscribe as Mock).mock.calls.find(
-      (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
-    )?.[1];
-    handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall] });
-
-    const handled = await (
-      task as unknown as {
-        _handleToolConfirmationPart: (part: unknown) => Promise<boolean>;
-      }
-    )._handleToolConfirmationPart({
-      kind: 'data',
-      data: { callId: '1', outcome: 'proceed_always_server' },
-    });
-    expect(handled).toBe(true);
-    expect(messageBus.publish).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'corr-mcp-2',
-        confirmed: true,
-        outcome: ToolConfirmationOutcome.ProceedAlwaysServer,
-      }),
-    );
-  });
-
-  it('should handle MCP Server tool ProceedAlwaysTool outcome', async () => {
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-
-    const toolCall = {
-      request: { callId: '1', name: 'call_mcp_tool', args: {} },
-      status: 'awaiting_approval',
-      correlationId: 'corr-mcp-3',
-      confirmationDetails: {
-        type: 'mcp',
-        title: 'MCP Server Operation',
-        prompt: 'test_mcp',
-      },
-    };
-
-    const handler = (messageBus.subscribe as Mock).mock.calls.find(
-      (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
-    )?.[1];
-    handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall] });
-
-    const handled = await (
-      task as unknown as {
-        _handleToolConfirmationPart: (part: unknown) => Promise<boolean>;
-      }
-    )._handleToolConfirmationPart({
-      kind: 'data',
-      data: { callId: '1', outcome: 'proceed_always_tool' },
-    });
-    expect(handled).toBe(true);
-    expect(messageBus.publish).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'corr-mcp-3',
-        confirmed: true,
-        outcome: ToolConfirmationOutcome.ProceedAlwaysTool,
-      }),
-    );
-  });
-
-  it('should handle MCP Server tool ProceedAlwaysAndSave outcome', async () => {
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-
-    const toolCall = {
-      request: { callId: '1', name: 'call_mcp_tool', args: {} },
-      status: 'awaiting_approval',
-      correlationId: 'corr-mcp-4',
-      confirmationDetails: {
-        type: 'mcp',
-        title: 'MCP Server Operation',
-        prompt: 'test_mcp',
-      },
-    };
-
-    const handler = (messageBus.subscribe as Mock).mock.calls.find(
-      (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
-    )?.[1];
-    handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall] });
-
-    const handled = await (
-      task as unknown as {
-        _handleToolConfirmationPart: (part: unknown) => Promise<boolean>;
-      }
-    )._handleToolConfirmationPart({
-      kind: 'data',
-      data: { callId: '1', outcome: 'proceed_always_and_save' },
-    });
-    expect(handled).toBe(true);
-    expect(messageBus.publish).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'corr-mcp-4',
-        confirmed: true,
-        outcome: ToolConfirmationOutcome.ProceedAlwaysAndSave,
-      }),
-    );
-  });
-
-  it('should execute without confirmation in YOLO mode and not transition to input-required', async () => {
-    // Enable YOLO mode
-    const yoloConfig = createMockConfig({
-      isEventDrivenSchedulerEnabled: () => true,
-      getApprovalMode: () => ApprovalMode.YOLO,
-    }) as Config;
-    const yoloMessageBus = yoloConfig.getMessageBus();
-
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', yoloConfig, mockEventBus);
-    task.setTaskStateAndPublishUpdate = vi.fn();
-
-    const toolCall = {
-      request: { callId: '1', name: 'ls', args: {} },
-      status: 'awaiting_approval',
-      correlationId: 'corr-1',
-      confirmationDetails: { type: 'info', title: 'test', prompt: 'test' },
-    };
-
-    const handler = (yoloMessageBus.subscribe as Mock).mock.calls.find(
-      (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
-    )?.[1];
-    handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall] });
-
-    // Should NOT auto-publish ProceedOnce anymore, because PolicyEngine handles it directly
-    expect(yoloMessageBus.publish).not.toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-      }),
-    );
-
-    // Should NOT transition to input-required since it was auto-approved
-    expect(task.setTaskStateAndPublishUpdate).not.toHaveBeenCalledWith(
-      'input-required',
-      expect.anything(),
-      undefined,
-      undefined,
-      true,
-    );
-  });
-
-  it('should handle output updates via the message bus', async () => {
-    // @ts-expect-error - Calling private constructor
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-
-    const toolCall = {
-      request: { callId: '1', name: 'ls', args: {} },
-      status: 'executing',
-      liveOutput: 'chunk1',
-    };
-
-    // Simulate MessageBus event
-    // Simulate MessageBus event
-    const handler = (messageBus.subscribe as Mock).mock.calls.find(
-      (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
-    )?.[1];
-
-    if (!handler) {
-      throw new Error('TOOL_CALLS_UPDATE handler not found');
-    }
-
-    handler({
-      type: MessageBusType.TOOL_CALLS_UPDATE,
-      toolCalls: [toolCall],
-    });
-
-    // Should publish artifact update for output
-    expect(mockEventBus.publish).toHaveBeenCalledWith(
-      expect.objectContaining({
-        kind: 'artifact-update',
-        artifact: expect.objectContaining({
-          artifactId: 'tool-1-output',
-          parts: [{ kind: 'text', text: 'chunk1' }],
-        }),
-      }),
-    );
-  });
-
-  it('should complete artifact creation without hanging', async () => {
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-
-    const toolCallId = 'create-file-123';
-    task['_registerToolCall'](toolCallId, 'executing');
-
-    const toolCall = {
-      request: {
-        callId: toolCallId,
-        name: 'writeFile',
-        args: { path: 'test.sh' },
-      },
-      status: 'success',
-      result: { ok: true },
-    };
-
-    const handler = (messageBus.subscribe as Mock).mock.calls.find(
-      (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
-    )?.[1];
-    handler({ type: MessageBusType.TOOL_CALLS_UPDATE, toolCalls: [toolCall] });
-
-    // The tool should be complete and registered appropriately, eventually
-    // triggering the toolCompletionPromise resolution when all clear.
-    const internalTask = task as unknown as {
-      completedToolCalls: unknown[];
-      pendingToolCalls: Map<string, string>;
-    };
-    expect(internalTask.completedToolCalls.length).toBe(1);
-    expect(internalTask.pendingToolCalls.size).toBe(0);
-  });
-
-  it('should preserve messageId across multiple text chunks to prevent UI duplication', async () => {
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-
-    // Initialize the ID for the first turn (happens internally upon LLM stream)
-    task.currentAgentMessageId = 'test-id-123';
-
-    // Simulate sending multiple text chunks
-    task._sendTextContent('chunk 1');
-    task._sendTextContent('chunk 2');
-
-    // Both text contents should have been published with the same messageId
-    const textCalls = (mockEventBus.publish as Mock).mock.calls.filter(
-      (call) => call[0].status?.message?.kind === 'message',
-    );
-    expect(textCalls.length).toBe(2);
-    expect(textCalls[0][0].status.message.messageId).toBe('test-id-123');
-    expect(textCalls[1][0].status.message.messageId).toBe('test-id-123');
-
-    // Simulate starting a new turn by calling getAndClearCompletedTools
-    // (which precedes sendCompletedToolsToLlm where a new ID is minted)
-    task.getAndClearCompletedTools();
-
-    // sendCompletedToolsToLlm internally rolls the ID forward.
-    // Simulate what sendCompletedToolsToLlm does:
-    const internalTask = task as unknown as {
-      setTaskStateAndPublishUpdate: (state: string, change: unknown) => void;
-    };
-    internalTask.setTaskStateAndPublishUpdate('working', {});
-
-    // Simulate what sendCompletedToolsToLlm does: generate a new UUID for the next turn
-    task.currentAgentMessageId = 'test-id-456';
-
-    task._sendTextContent('chunk 3');
-
-    const secondTurnCalls = (mockEventBus.publish as Mock).mock.calls.filter(
-      (call) => call[0].status?.message?.messageId === 'test-id-456',
-    );
-    expect(secondTurnCalls.length).toBe(1);
-    expect(secondTurnCalls[0][0].status.message.parts[0].text).toBe('chunk 3');
-  });
-
-  it('should handle parallel tool calls correctly', async () => {
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-
-    const toolCall1 = {
-      request: { callId: '1', name: 'ls', args: {} },
-      status: 'awaiting_approval',
-      correlationId: 'corr-1',
-      confirmationDetails: { type: 'info', title: 'test 1', prompt: 'test 1' },
-    };
-
-    const toolCall2 = {
-      request: { callId: '2', name: 'pwd', args: {} },
-      status: 'awaiting_approval',
-      correlationId: 'corr-2',
-      confirmationDetails: { type: 'info', title: 'test 2', prompt: 'test 2' },
-    };
-
-    const handler = (messageBus.subscribe as Mock).mock.calls.find(
-      (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
-    )?.[1];
-
-    // Publish update for both tool calls simultaneously
-    handler({
-      type: MessageBusType.TOOL_CALLS_UPDATE,
-      toolCalls: [toolCall1, toolCall2],
-    });
-
-    // Confirm first tool call
-    const handled1 = await (
-      task as unknown as {
-        _handleToolConfirmationPart: (part: unknown) => Promise<boolean>;
-      }
-    )._handleToolConfirmationPart({
-      kind: 'data',
-      data: { callId: '1', outcome: 'proceed_once' },
-    });
-    expect(handled1).toBe(true);
-    expect(messageBus.publish).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'corr-1',
-        confirmed: true,
-      }),
-    );
-
-    // Confirm second tool call
-    const handled2 = await (
-      task as unknown as {
-        _handleToolConfirmationPart: (part: unknown) => Promise<boolean>;
-      }
-    )._handleToolConfirmationPart({
-      kind: 'data',
-      data: { callId: '2', outcome: 'cancel' },
-    });
-    expect(handled2).toBe(true);
-    expect(messageBus.publish).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'corr-2',
-        confirmed: false,
-      }),
-    );
-  });
-
-  it('should wait for executing tools before transitioning to input-required state', async () => {
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-
-    task.setTaskStateAndPublishUpdate = vi.fn();
-
-    // Register tool 1 as executing
-    task['_registerToolCall']('1', 'executing');
-
-    const toolCall1 = {
-      request: { callId: '1', name: 'ls', args: {} },
-      status: 'executing',
-    };
-
-    const toolCall2 = {
-      request: { callId: '2', name: 'pwd', args: {} },
-      status: 'awaiting_approval',
-      correlationId: 'corr-2',
-      confirmationDetails: { type: 'info', title: 'test 2', prompt: 'test 2' },
-    };
-
-    const handler = (messageBus.subscribe as Mock).mock.calls.find(
-      (call: unknown[]) => call[0] === MessageBusType.TOOL_CALLS_UPDATE,
-    )?.[1];
-
-    handler({
-      type: MessageBusType.TOOL_CALLS_UPDATE,
-      toolCalls: [toolCall1, toolCall2],
-    });
-
-    // Should NOT transition to input-required yet
-    expect(task.setTaskStateAndPublishUpdate).not.toHaveBeenCalledWith(
-      'input-required',
-      expect.anything(),
-      undefined,
-      undefined,
-      true,
-    );
-
-    // Complete tool 1
-    const toolCall1Complete = {
-      ...toolCall1,
-      status: 'success',
-      result: { ok: true },
-    };
-
-    handler({
-      type: MessageBusType.TOOL_CALLS_UPDATE,
-      toolCalls: [toolCall1Complete, toolCall2],
-    });
-
-    // Now it should transition
-    expect(task.setTaskStateAndPublishUpdate).toHaveBeenCalledWith(
-      'input-required',
-      expect.anything(),
-      undefined,
-      undefined,
-      true,
-    );
-  });
-
-  it('should ignore confirmations for unknown tool calls', async () => {
-    // @ts-expect-error - Calling private constructor
-    const task = new Task('task-id', 'context-id', mockConfig, mockEventBus);
-
-    const handled = await (
-      task as unknown as {
-        _handleToolConfirmationPart: (part: unknown) => Promise<boolean>;
-      }
-    )._handleToolConfirmationPart({
-      kind: 'data',
-      data: { callId: 'unknown-id', outcome: 'proceed_once' },
-    });
-
-    // Should return false for unhandled tool call
-    expect(handled).toBe(false);
-
-    // Should not publish anything to the message bus
-    expect(messageBus.publish).not.toHaveBeenCalled();
-  });
-});
@@ -504,14 +504,13 @@ describe('Task', () => {
    });

    describe('auto-approval', () => {
-      it('should NOT publish ToolCallConfirmationEvent when autoExecute is true', () => {
+      it('should auto-approve tool calls when autoExecute is true', () => {
        task.autoExecute = true;
        const onConfirmSpy = vi.fn();
        const toolCalls = [
          {
            request: { callId: '1' },
            status: 'awaiting_approval',
-            correlationId: 'test-corr-id',
            confirmationDetails: {
              type: 'edit',
              onConfirm: onConfirmSpy,
@@ -525,17 +524,9 @@ describe('Task', () => {
        expect(onConfirmSpy).toHaveBeenCalledWith(
          ToolConfirmationOutcome.ProceedOnce,
        );
-        const calls = (mockEventBus.publish as Mock).mock.calls;
-        // Search if ToolCallConfirmationEvent was published
-        const confEvent = calls.find(
-          (call) =>
-            call[0].metadata?.coderAgent?.kind ===
-            CoderAgentEvent.ToolCallConfirmationEvent,
-        );
-        expect(confEvent).toBeUndefined();
      });

-      it('should NOT publish ToolCallConfirmationEvent when approval mode is YOLO', () => {
+      it('should auto-approve tool calls when approval mode is YOLO', () => {
        (mockConfig.getApprovalMode as Mock).mockReturnValue(ApprovalMode.YOLO);
        task.autoExecute = false;
        const onConfirmSpy = vi.fn();
@@ -543,7 +534,6 @@ describe('Task', () => {
          {
            request: { callId: '1' },
            status: 'awaiting_approval',
-            correlationId: 'test-corr-id',
            confirmationDetails: {
              type: 'edit',
              onConfirm: onConfirmSpy,
@@ -557,14 +547,6 @@ describe('Task', () => {
        expect(onConfirmSpy).toHaveBeenCalledWith(
          ToolConfirmationOutcome.ProceedOnce,
        );
-        const calls = (mockEventBus.publish as Mock).mock.calls;
-        // Search if ToolCallConfirmationEvent was published
-        const confEvent = calls.find(
-          (call) =>
-            call[0].metadata?.coderAgent?.kind ===
-            CoderAgentEvent.ToolCallConfirmationEvent,
-        );
-        expect(confEvent).toBeUndefined();
      });

      it('should NOT auto-approve when autoExecute is false and mode is not YOLO', () => {
@@ -585,14 +567,6 @@ describe('Task', () => {
        task._schedulerToolCallsUpdate(toolCalls);

        expect(onConfirmSpy).not.toHaveBeenCalled();
-        const calls = (mockEventBus.publish as Mock).mock.calls;
-        // Search if ToolCallConfirmationEvent was published
-        const confEvent = calls.find(
-          (call) =>
-            call[0].metadata?.coderAgent?.kind ===
-            CoderAgentEvent.ToolCallConfirmationEvent,
-        );
-        expect(confEvent).toBeDefined();
      });
    });
  });
@@ -5,7 +5,6 @@
 */

 import {
-  Scheduler,
  CoreToolScheduler,
  type GeminiClient,
  GeminiEventType,
@@ -35,8 +34,6 @@ import {
  isSubagentProgress,
  EDIT_TOOL_NAMES,
  processRestorableToolCalls,
-  MessageBusType,
-  type ToolCallsUpdateMessage,
 } from '@google/gemini-cli-core';
 import {
  type ExecutionEventBus,
@@ -99,30 +96,21 @@ function isToolCallConfirmationDetails(
 export class Task {
  id: string;
  contextId: string;
-  scheduler: Scheduler | CoreToolScheduler;
+  scheduler: CoreToolScheduler;
  config: Config;
  geminiClient: GeminiClient;
  pendingToolConfirmationDetails: Map<string, ToolCallConfirmationDetails>;
-  pendingCorrelationIds: Map<string, string> = new Map();
  taskState: TaskState;
  eventBus?: ExecutionEventBus;
  completedToolCalls: CompletedToolCall[];
-  processedToolCallIds: Set<string> = new Set();
  skipFinalTrueAfterInlineEdit = false;
  modelInfo?: string;
  currentPromptId: string | undefined;
-  currentAgentMessageId = uuidv4();
  promptCount = 0;
  autoExecute: boolean;
-  private get isYoloMatch(): boolean {
-    return (
-      this.autoExecute || this.config.getApprovalMode() === ApprovalMode.YOLO
-    );
-  }

  // For tool waiting logic
  private pendingToolCalls: Map<string, string> = new Map(); //toolCallId --> status
-  private toolsAlreadyConfirmed: Set<string> = new Set();
  private toolCompletionPromise?: Promise<void>;
  private toolCompletionNotifier?: {
    resolve: () => void;
@@ -139,13 +127,7 @@ export class Task {
    this.id = id;
    this.contextId = contextId;
    this.config = config;
-
-    if (this.config.isEventDrivenSchedulerEnabled()) {
-      this.scheduler = this.setupEventDrivenScheduler();
-    } else {
-      this.scheduler = this.createLegacyScheduler();
-    }
-
+    this.scheduler = this.createScheduler();
    this.geminiClient = this.config.getGeminiClient();
    this.pendingToolConfirmationDetails = new Map();
    this.taskState = 'submitted';
@@ -245,7 +227,7 @@ export class Task {
    logger.info(
      `[Task] Waiting for ${this.pendingToolCalls.size} pending tool(s)...`,
    );
-    await this.toolCompletionPromise;
+    return this.toolCompletionPromise;
  }

  cancelPendingTools(reason: string): void {
@@ -258,13 +240,6 @@ export class Task {
      this.toolCompletionNotifier.reject(new Error(reason));
    }
    this.pendingToolCalls.clear();
-    this.pendingCorrelationIds.clear();
-
-    if (this.scheduler instanceof Scheduler) {
-      this.scheduler.cancelAll();
-    } else {
-      this.scheduler.cancelAll(new AbortController().signal);
-    }
    // Reset the promise for any future operations, ensuring it's in a clean state.
    this._resetToolCompletionPromise();
  }
@@ -277,7 +252,7 @@ export class Task {
      kind: 'message',
      role,
      parts: [{ kind: 'text', text }],
-      messageId: role === 'agent' ? this.currentAgentMessageId : uuidv4(),
+      messageId: uuidv4(),
      taskId: this.id,
      contextId: this.contextId,
    };
@@ -450,34 +425,26 @@ export class Task {

      // Only send an update if the status has actually changed.
      if (hasChanged) {
-        // Skip sending confirmation event if we are going to auto-approve it anyway
-        if (
-          tc.status === 'awaiting_approval' &&
-          tc.confirmationDetails &&
-          this.isYoloMatch
-        ) {
-          logger.info(
-            `[Task] Skipping ToolCallConfirmationEvent for ${tc.request.callId} due to YOLO mode.`,
-          );
-        } else {
-          const coderAgentMessage: CoderAgentMessage =
-            tc.status === 'awaiting_approval'
-              ? { kind: CoderAgentEvent.ToolCallConfirmationEvent }
-              : { kind: CoderAgentEvent.ToolCallUpdateEvent };
-          const message = this.toolStatusMessage(tc, this.id, this.contextId);
+        const coderAgentMessage: CoderAgentMessage =
+          tc.status === 'awaiting_approval'
+            ? { kind: CoderAgentEvent.ToolCallConfirmationEvent }
+            : { kind: CoderAgentEvent.ToolCallUpdateEvent };
+        const message = this.toolStatusMessage(tc, this.id, this.contextId);

-          const event = this._createStatusUpdateEvent(
-            this.taskState,
-            coderAgentMessage,
-            message,
-            false, // Always false for these continuous updates
-          );
-          this.eventBus?.publish(event);
-        }
+        const event = this._createStatusUpdateEvent(
+          this.taskState,
+          coderAgentMessage,
+          message,
+          false, // Always false for these continuous updates
+        );
+        this.eventBus?.publish(event);
      }
    });

-    if (this.isYoloMatch) {
+    if (
+      this.autoExecute ||
+      this.config.getApprovalMode() === ApprovalMode.YOLO
+    ) {
      logger.info(
        '[Task] ' +
          (this.autoExecute ? '' : 'YOLO mode enabled. ') +
@@ -525,7 +492,7 @@ export class Task {
    }
  }

-  private createLegacyScheduler(): CoreToolScheduler {
+  private createScheduler(): CoreToolScheduler {
    const scheduler = new CoreToolScheduler({
      outputUpdateHandler: this._schedulerOutputUpdate.bind(this),
      onAllToolCallsComplete: this._schedulerAllToolCallsComplete.bind(this),
@@ -536,171 +503,6 @@ export class Task {
    return scheduler;
  }

-  private messageBusListener?: (message: ToolCallsUpdateMessage) => void;
-
-  private setupEventDrivenScheduler(): Scheduler {
-    const messageBus = this.config.getMessageBus();
-    const scheduler = new Scheduler({
-      schedulerId: this.id,
-      config: this.config,
-      messageBus,
-      getPreferredEditor: () => DEFAULT_GUI_EDITOR,
-    });
-
-    this.messageBusListener = this.handleEventDrivenToolCallsUpdate.bind(this);
-    messageBus.subscribe<ToolCallsUpdateMessage>(
-      MessageBusType.TOOL_CALLS_UPDATE,
-      this.messageBusListener,
-    );
-
-    return scheduler;
-  }
-
-  dispose(): void {
-    if (this.messageBusListener) {
-      this.config
-        .getMessageBus()
-        .unsubscribe(MessageBusType.TOOL_CALLS_UPDATE, this.messageBusListener);
-      this.messageBusListener = undefined;
-    }
-
-    if (this.scheduler instanceof Scheduler) {
-      this.scheduler.dispose();
-    }
-  }
-
-  private handleEventDrivenToolCallsUpdate(
-    event: ToolCallsUpdateMessage,
-  ): void {
-    if (event.type !== MessageBusType.TOOL_CALLS_UPDATE) {
-      return;
-    }
-
-    const toolCalls = event.toolCalls;
-
-    toolCalls.forEach((tc) => {
-      this.handleEventDrivenToolCall(tc);
-    });
-
-    this.checkInputRequiredState();
-  }
-
-  private handleEventDrivenToolCall(tc: ToolCall): void {
-    const callId = tc.request.callId;
-
-    // Do not process events for tools that have already been finalized.
-    // This prevents duplicate completions if the state manager emits a snapshot containing
-    // already resolved tools whose IDs were removed from pendingToolCalls.
-    if (
-      this.processedToolCallIds.has(callId) ||
-      this.completedToolCalls.some((c) => c.request.callId === callId)
-    ) {
-      return;
-    }
-
-    const previousStatus = this.pendingToolCalls.get(callId);
-    const hasChanged = previousStatus !== tc.status;
-
-    // 1. Handle Output
-    if (tc.status === 'executing' && tc.liveOutput) {
-      this._schedulerOutputUpdate(callId, tc.liveOutput);
-    }
-
-    // 2. Handle terminal states
-    if (
-      tc.status === 'success' ||
-      tc.status === 'error' ||
-      tc.status === 'cancelled'
-    ) {
-      this.toolsAlreadyConfirmed.delete(callId);
-      if (hasChanged) {
-        logger.info(
-          `[Task] Tool call ${callId} completed with status: ${tc.status}`,
-        );
-        this.completedToolCalls.push(tc);
-        this._resolveToolCall(callId);
-      }
-    } else {
-      // Keep track of pending tools
-      this._registerToolCall(callId, tc.status);
-    }
-
-    // 3. Handle Confirmation Stash
-    if (tc.status === 'awaiting_approval' && tc.confirmationDetails) {
-      const details = tc.confirmationDetails;
-
-      if (tc.correlationId) {
-        this.pendingCorrelationIds.set(callId, tc.correlationId);
-      }
-
-      this.pendingToolConfirmationDetails.set(callId, {
-        ...details,
-        onConfirm: async () => {},
-      } as ToolCallConfirmationDetails);
-    }
-
-    // 4. Publish Status Updates to A2A event bus
-    if (hasChanged) {
-      const coderAgentMessage: CoderAgentMessage =
-        tc.status === 'awaiting_approval'
-          ? { kind: CoderAgentEvent.ToolCallConfirmationEvent }
-          : { kind: CoderAgentEvent.ToolCallUpdateEvent };
-
-      const message = this.toolStatusMessage(tc, this.id, this.contextId);
-      const statusUpdate = this._createStatusUpdateEvent(
-        this.taskState,
-        coderAgentMessage,
-        message,
-        false,
-      );
-      this.eventBus?.publish(statusUpdate);
-    }
-  }
-
-  private checkInputRequiredState(): void {
-    if (this.isYoloMatch) {
-      return;
-    }
-
-    // 6. Handle Input Required State
-    let isAwaitingApproval = false;
-    let isExecuting = false;
-
-    for (const [callId, status] of this.pendingToolCalls.entries()) {
-      if (status === 'executing' || status === 'scheduled') {
-        isExecuting = true;
-      } else if (
-        status === 'awaiting_approval' &&
-        !this.toolsAlreadyConfirmed.has(callId)
-      ) {
-        isAwaitingApproval = true;
-      }
-    }
-
-    if (
-      isAwaitingApproval &&
-      !isExecuting &&
-      !this.skipFinalTrueAfterInlineEdit
-    ) {
-      this.skipFinalTrueAfterInlineEdit = false;
-      const wasAlreadyInputRequired = this.taskState === 'input-required';
-
-      this.setTaskStateAndPublishUpdate(
-        'input-required',
-        { kind: CoderAgentEvent.StateChangeEvent },
-        undefined,
-        undefined,
-        /*final*/ true,
-      );
-
-      // Unblock waitForPendingTools to correctly end the executor loop and release the HTTP response stream.
-      // The IDE client will open a new stream with the confirmation reply.
-      if (!wasAlreadyInputRequired && this.toolCompletionNotifier) {
-        this.toolCompletionNotifier.resolve();
-      }
-    }
-  }
-
  private _pickFields<
    T extends ToolCall | AnyDeclarativeTool,
    K extends UnionKeys<T>,
@@ -911,16 +713,7 @@ export class Task {
    };
    this.setTaskStateAndPublishUpdate('working', stateChange);

-    // Pre-register tools to ensure waitForPendingTools sees them as pending
-    // before the async scheduler enqueues them and fires the event bus update.
-    for (const req of updatedRequests) {
-      if (!this.pendingToolCalls.has(req.callId)) {
-        this._registerToolCall(req.callId, 'scheduled');
-      }
-    }
-
-    // Fire and forget so we don't block the executor loop before waitForPendingTools can be called
-    void this.scheduler.schedule(updatedRequests, abortSignal);
+    await this.scheduler.schedule(updatedRequests, abortSignal);
  }

  async acceptAgentMessage(event: ServerGeminiStreamEvent): Promise<void> {
@@ -1046,15 +839,9 @@ export class Task {
    ) {
      return false;
    }
-    if (!part.data['outcome']) {
-      return false;
-    }

    const callId = part.data['callId'];
    const outcomeString = part.data['outcome'];
-
-    this.toolsAlreadyConfirmed.add(callId);
-
    let confirmationOutcome: ToolConfirmationOutcome | undefined;

    if (outcomeString === 'proceed_once') {
@@ -1067,8 +854,6 @@ export class Task {
      confirmationOutcome = ToolConfirmationOutcome.ProceedAlwaysServer;
    } else if (outcomeString === 'proceed_always_tool') {
      confirmationOutcome = ToolConfirmationOutcome.ProceedAlwaysTool;
-    } else if (outcomeString === 'proceed_always_and_save') {
-      confirmationOutcome = ToolConfirmationOutcome.ProceedAlwaysAndSave;
    } else if (outcomeString === 'modify_with_editor') {
      confirmationOutcome = ToolConfirmationOutcome.ModifyWithEditor;
    } else {
@@ -1079,9 +864,8 @@ export class Task {
    }

    const confirmationDetails = this.pendingToolConfirmationDetails.get(callId);
-    const correlationId = this.pendingCorrelationIds.get(callId);

-    if (!confirmationDetails && !correlationId) {
+    if (!confirmationDetails) {
      logger.warn(
        `[Task] Received tool confirmation for unknown or already processed callId: ${callId}`,
      );
@@ -1103,35 +887,24 @@ export class Task {
        // This will trigger the scheduler to continue or cancel the specific tool.
        // The scheduler's onToolCallsUpdate will then reflect the new state (e.g., executing or cancelled).

-        // If `edit` tool call, pass updated payload if present
-        const newContent = part.data['newContent'];
-        const payload =
-          confirmationDetails?.type === 'edit' && typeof newContent === 'string'
-            ? ({ newContent } as ToolConfirmationPayload)
-            : undefined;
-        this.skipFinalTrueAfterInlineEdit = !!payload;
-
-        try {
-          if (correlationId) {
-            await this.config.getMessageBus().publish({
-              type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-              correlationId,
-              confirmed:
-                confirmationOutcome !== ToolConfirmationOutcome.Cancel &&
-                confirmationOutcome !==
-                  ToolConfirmationOutcome.ModifyWithEditor,
-              outcome: confirmationOutcome,
-              payload,
-            });
-          } else if (confirmationDetails?.onConfirm) {
-            // Fallback for legacy callback-based confirmation
+        // If `edit` tool call, pass updated payload if presesent
+        if (confirmationDetails.type === 'edit') {
+          const newContent = part.data['newContent'];
+          const payload =
+            typeof newContent === 'string'
+              ? ({ newContent } as ToolConfirmationPayload)
+              : undefined;
+          this.skipFinalTrueAfterInlineEdit = !!payload;
+          try {
            await confirmationDetails.onConfirm(confirmationOutcome, payload);
+          } finally {
+            // Once confirmationDetails.onConfirm finishes (or fails) with a payload,
+            // reset skipFinalTrueAfterInlineEdit so that external callers receive
+            // their call has been completed.
+            this.skipFinalTrueAfterInlineEdit = false;
          }
-        } finally {
-          // Once confirmation payload is sent or callback finishes,
-          // reset skipFinalTrueAfterInlineEdit so that external callers receive
-          // their call has been completed.
-          this.skipFinalTrueAfterInlineEdit = false;
+        } else {
+          await confirmationDetails.onConfirm(confirmationOutcome);
        }
      } finally {
        if (gcpProject) {
@@ -1147,7 +920,6 @@ export class Task {
      // Note !== ToolConfirmationOutcome.ModifyWithEditor does not work!
      if (confirmationOutcome !== 'modify_with_editor') {
        this.pendingToolConfirmationDetails.delete(callId);
-        this.pendingCorrelationIds.delete(callId);
      }

      // If outcome is Cancel, scheduler should update status to 'cancelled', which then resolves the tool.
@@ -1181,9 +953,6 @@ export class Task {

  getAndClearCompletedTools(): CompletedToolCall[] {
    const tools = [...this.completedToolCalls];
-    for (const tool of tools) {
-      this.processedToolCallIds.add(tool.request.callId);
-    }
    this.completedToolCalls = [];
    return tools;
  }
@@ -1244,7 +1013,6 @@ export class Task {
    };
    // Set task state to working as we are about to call LLM
    this.setTaskStateAndPublishUpdate('working', stateChange);
-    this.currentAgentMessageId = uuidv4();
    yield* this.geminiClient.sendMessageStream(
      llmParts,
      aborted,
@@ -1266,10 +1034,6 @@ export class Task {
      if (confirmationHandled) {
        anyConfirmationHandled = true;
        // If a confirmation was handled, the scheduler will now run the tool (or cancel it).
-        // We resolve the toolCompletionPromise manually in checkInputRequiredState
-        // to break the original execution loop, so we must reset it here so the
-        // new loop correctly awaits the tool's final execution.
-        this._resetToolCompletionPromise();
        // We don't send anything to the LLM for this part.
        // The subsequent tool execution will eventually lead to resolveToolCall.
        continue;
@@ -1284,7 +1048,6 @@ export class Task {
    if (hasContentForLlm) {
      this.currentPromptId =
        this.config.getSessionId() + '########' + this.promptCount++;
-      this.currentAgentMessageId = uuidv4();
      logger.info('[Task] Sending new parts to LLM.');
      const stateChange: StateChange = {
        kind: CoderAgentEvent.StateChangeEvent,
@@ -1330,6 +1093,7 @@ export class Task {
    if (content === '') {
      return;
    }
+    logger.info('[Task] Sending text content to event bus.');
    const message = this._createTextMessage(content);
    const textContent: TextContent = {
      kind: CoderAgentEvent.TextContentEvent,
@@ -1361,7 +1125,7 @@ export class Task {
          data: content,
        } as Part,
      ],
-      messageId: this.currentAgentMessageId,
+      messageId: uuidv4(),
      taskId: this.id,
      contextId: this.contextId,
    };
@@ -106,8 +106,6 @@ export async function loadConfig(
    trustedFolder: true,
    extensionLoader,
    checkpointing,
-    enableEventDrivenScheduler:
-      settings.experimental?.enableEventDrivenScheduler ?? true,
    interactive: !isHeadlessMode(),
    enableInteractiveShell: !isHeadlessMode(),
    ptyInfo: 'auto',
@@ -37,12 +37,6 @@ export interface Settings {
  showMemoryUsage?: boolean;
  checkpointing?: CheckpointingSettings;
  folderTrust?: boolean;
-  general?: {
-    previewFeatures?: boolean;
-  };
-  experimental?: {
-    enableEventDrivenScheduler?: boolean;
-  };

  // Git-aware file filtering settings
  fileFiltering?: {
@@ -64,7 +64,6 @@ export function createMockConfig(
    getEmbeddingModel: vi.fn().mockReturnValue('text-embedding-004'),
    getSessionId: vi.fn().mockReturnValue('test-session-id'),
    getUserTier: vi.fn(),
-    isEventDrivenSchedulerEnabled: vi.fn().mockReturnValue(false),
    getMessageBus: vi.fn(),
    getPolicyEngine: vi.fn(),
    getEnableExtensionReloading: vi.fn().mockReturnValue(false),
@@ -76,14 +75,6 @@ export function createMockConfig(
    validatePathAccess: vi.fn().mockReturnValue(undefined),
    ...overrides,
  } as unknown as Config;
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-  (mockConfig as unknown as { config: Config; promptId: string }).config =
-    mockConfig;
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-  (mockConfig as unknown as { config: Config; promptId: string }).promptId =
-    'test-prompt-id';
-
  mockConfig.getMessageBus = vi.fn().mockReturnValue(createMockMessageBus());
  mockConfig.getHookSystem = vi
    .fn()
@@ -1,6 +1,6 @@
 {
  "name": "@google/gemini-cli",
-  "version": "0.34.0-nightly.20260310.4653b126f",
+  "version": "0.34.0-nightly.20260304.28af4e127",
  "description": "Gemini CLI",
  "license": "Apache-2.0",
  "repository": {
@@ -26,12 +26,12 @@
    "dist"
  ],
  "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.34.0-nightly.20260310.4653b126f"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.34.0-nightly.20260304.28af4e127"
  },
  "dependencies": {
    "@agentclientprotocol/sdk": "^0.12.0",
    "@google/gemini-cli-core": "file:../core",
-    "@google/genai": "1.30.0",
+    "@google/genai": "1.41.0",
    "@iarna/toml": "^2.2.5",
    "@modelcontextprotocol/sdk": "^1.23.0",
    "ansi-escapes": "^7.3.0",
@@ -4,7 +4,7 @@ exports[`runNonInteractive > should emit appropriate error event in streaming JS
 "{"type":"init","timestamp":"<TIMESTAMP>","session_id":"test-session-id","model":"test-model"}
 {"type":"message","timestamp":"<TIMESTAMP>","role":"user","content":"Loop test"}
 {"type":"error","timestamp":"<TIMESTAMP>","severity":"warning","message":"Loop detected, stopping execution"}
-{"type":"result","timestamp":"<TIMESTAMP>","status":"success","stats":{"total_tokens":0,"input_tokens":0,"output_tokens":0,"cached":0,"input":0,"duration_ms":<DURATION>,"tool_calls":0,"models":{}}}
+{"type":"result","timestamp":"<TIMESTAMP>","status":"success","stats":{"total_tokens":0,"input_tokens":0,"output_tokens":0,"cached":0,"input":0,"duration_ms":<DURATION>,"tool_calls":0}}
 "
 `;

@@ -12,7 +12,7 @@ exports[`runNonInteractive > should emit appropriate error event in streaming JS
 "{"type":"init","timestamp":"<TIMESTAMP>","session_id":"test-session-id","model":"test-model"}
 {"type":"message","timestamp":"<TIMESTAMP>","role":"user","content":"Max turns test"}
 {"type":"error","timestamp":"<TIMESTAMP>","severity":"error","message":"Maximum session turns exceeded"}
-{"type":"result","timestamp":"<TIMESTAMP>","status":"success","stats":{"total_tokens":0,"input_tokens":0,"output_tokens":0,"cached":0,"input":0,"duration_ms":<DURATION>,"tool_calls":0,"models":{}}}
+{"type":"result","timestamp":"<TIMESTAMP>","status":"success","stats":{"total_tokens":0,"input_tokens":0,"output_tokens":0,"cached":0,"input":0,"duration_ms":<DURATION>,"tool_calls":0}}
 "
 `;

@@ -23,7 +23,7 @@ exports[`runNonInteractive > should emit appropriate events for streaming JSON o
 {"type":"tool_use","timestamp":"<TIMESTAMP>","tool_name":"testTool","tool_id":"tool-1","parameters":{"arg1":"value1"}}
 {"type":"tool_result","timestamp":"<TIMESTAMP>","tool_id":"tool-1","status":"success","output":"Tool executed successfully"}
 {"type":"message","timestamp":"<TIMESTAMP>","role":"assistant","content":"Final answer","delta":true}
-{"type":"result","timestamp":"<TIMESTAMP>","status":"success","stats":{"total_tokens":0,"input_tokens":0,"output_tokens":0,"cached":0,"input":0,"duration_ms":<DURATION>,"tool_calls":0,"models":{}}}
+{"type":"result","timestamp":"<TIMESTAMP>","status":"success","stats":{"total_tokens":0,"input_tokens":0,"output_tokens":0,"cached":0,"input":0,"duration_ms":<DURATION>,"tool_calls":0}}
 "
 `;

@@ -172,7 +172,7 @@ describe('GeminiAgent', () => {
        unsubscribe: vi.fn(),
      }),
      getApprovalMode: vi.fn().mockReturnValue('default'),
-      isPlanEnabled: vi.fn().mockReturnValue(true),
+      isPlanEnabled: vi.fn().mockReturnValue(false),
      getGemini31LaunchedSync: vi.fn().mockReturnValue(false),
      getHasAccessToPreviewModel: vi.fn().mockReturnValue(false),
      getCheckpointingEnabled: vi.fn().mockReturnValue(false),
@@ -650,7 +650,7 @@ describe('Session', () => {
      getMessageBus: vi.fn().mockReturnValue(mockMessageBus),
      setApprovalMode: vi.fn(),
      setModel: vi.fn(),
-      isPlanEnabled: vi.fn().mockReturnValue(true),
+      isPlanEnabled: vi.fn().mockReturnValue(false),
      getCheckpointingEnabled: vi.fn().mockReturnValue(false),
      getGitService: vi.fn().mockResolvedValue({} as GitService),
      waitForMcpInit: vi.fn(),
@@ -92,7 +92,7 @@ describe('GeminiAgent Session Resume', () => {
        getProjectTempDir: vi.fn().mockReturnValue('/tmp/project'),
      },
      getApprovalMode: vi.fn().mockReturnValue('default'),
-      isPlanEnabled: vi.fn().mockReturnValue(true),
+      isPlanEnabled: vi.fn().mockReturnValue(false),
      getModel: vi.fn().mockReturnValue('gemini-pro'),
      getHasAccessToPreviewModel: vi.fn().mockReturnValue(false),
      getGemini31LaunchedSync: vi.fn().mockReturnValue(false),
@@ -204,11 +204,6 @@ describe('GeminiAgent Session Resume', () => {
            name: 'YOLO',
            description: 'Auto-approves all tools',
          },
-          {
-            id: ApprovalMode.PLAN,
-            name: 'Plan',
-            description: 'Read-only mode',
-          },
        ],
        currentModeId: ApprovalMode.DEFAULT,
      },
@@ -71,7 +71,7 @@ describe('mcp add command', () => {
    });
  });

-  it('should add a stdio server to workspace settings', async () => {
+  it('should add a stdio server to project settings', async () => {
    await parser.parseAsync(
      'add -e FOO=bar my-server /path/to/server arg1 arg2',
    );
@@ -121,7 +121,7 @@ describe('mcp add command', () => {
    });
  });

-  it('should add an http server to workspace settings', async () => {
+  it('should add an http server to project settings', async () => {
    await parser.parseAsync(
      'add --transport http -H "Authorization: Bearer your-token" http-server https://example.com/mcp',
    );
@@ -219,12 +219,12 @@ describe('mcp add command', () => {
      });
    };

-    describe('when in a workspace directory', () => {
+    describe('when in a project directory', () => {
      beforeEach(() => {
        setupMocks('/path/to/project', '/path/to/project');
      });

-      it('should use workspace scope by default', async () => {
+      it('should use project scope by default', async () => {
        await parser.parseAsync(`add ${serverName} ${command}`);
        expect(mockSetValue).toHaveBeenCalledWith(
          SettingScope.Workspace,
@@ -233,7 +233,7 @@ describe('mcp add command', () => {
        );
      });

-      it('should support --scope=project as a compatibility alias', async () => {
+      it('should use project scope when --scope=project is used', async () => {
        await parser.parseAsync(`add --scope project ${serverName} ${command}`);
        expect(mockSetValue).toHaveBeenCalledWith(
          SettingScope.Workspace,
@@ -252,12 +252,12 @@ describe('mcp add command', () => {
      });
    });

-    describe('when in a subdirectory of a workspace', () => {
+    describe('when in a subdirectory of a project', () => {
      beforeEach(() => {
        setupMocks('/path/to/project/subdir', '/path/to/project');
      });

-      it('should use workspace scope by default', async () => {
+      it('should use project scope by default', async () => {
        await parser.parseAsync(`add ${serverName} ${command}`);
        expect(mockSetValue).toHaveBeenCalledWith(
          SettingScope.Workspace,
@@ -290,7 +290,7 @@ describe('mcp add command', () => {
        expect(mockSetValue).not.toHaveBeenCalled();
      });

-      it('should show an error when --scope=project is used as a compatibility alias', async () => {
+      it('should show an error when --scope=project is used explicitly', async () => {
        const mockProcessExit = vi
          .spyOn(process, 'exit')
          .mockImplementation((() => {
@@ -319,12 +319,12 @@ describe('mcp add command', () => {
      });
    });

-    describe('when in a subdirectory of home (not a workspace)', () => {
+    describe('when in a subdirectory of home (not a project)', () => {
      beforeEach(() => {
        setupMocks('/home/user/some/dir', '/home/user/some/dir');
      });

-      it('should use workspace scope by default', async () => {
+      it('should use project scope by default', async () => {
        await parser.parseAsync(`add ${serverName} ${command}`);
        expect(mockSetValue).toHaveBeenCalledWith(
          SettingScope.Workspace,
@@ -347,12 +347,12 @@ describe('mcp add command', () => {
      });
    });

-    describe('when outside of home (not a workspace)', () => {
+    describe('when outside of home (not a project)', () => {
      beforeEach(() => {
        setupMocks('/tmp/foo', '/tmp/foo');
      });

-      it('should use workspace scope by default', async () => {
+      it('should use project scope by default', async () => {
        await parser.parseAsync(`add ${serverName} ${command}`);
        expect(mockSetValue).toHaveBeenCalledWith(
          SettingScope.Workspace,
@@ -386,7 +386,7 @@ describe('mcp add command', () => {
      });
    });

-    it('should update the existing server in the workspace scope', async () => {
+    it('should update the existing server in the project scope', async () => {
      await parser.parseAsync(
        `add ${serverName} ${updatedCommand} ${updatedArgs.join(' ')}`,
      );
@@ -38,12 +38,10 @@ async function addMcpServer(
    excludeTools,
  } = options;

-  const displayScope = scope === 'user' ? 'user' : 'workspace';
-
  const settings = loadSettings(process.cwd());
  const inHome = settings.workspace.path === settings.user.path;

-  if (displayScope === 'workspace' && inHome) {
+  if (scope === 'project' && inHome) {
    debugLogger.error(
      'Error: Please use --scope user to edit settings in the home directory.',
    );
@@ -122,7 +120,7 @@ async function addMcpServer(
  const isExistingServer = !!mcpServers[name];
  if (isExistingServer) {
    debugLogger.log(
-      `MCP server "${name}" is already configured within ${displayScope} settings.`,
+      `MCP server "${name}" is already configured within ${scope} settings.`,
    );
  }

@@ -131,12 +129,10 @@ async function addMcpServer(
  settings.setValue(settingsScope, 'mcpServers', mcpServers);

  if (isExistingServer) {
-    debugLogger.log(
-      `MCP server "${name}" updated in ${displayScope} settings.`,
-    );
+    debugLogger.log(`MCP server "${name}" updated in ${scope} settings.`);
  } else {
    debugLogger.log(
-      `MCP server "${name}" added to ${displayScope} settings. (${transport})`,
+      `MCP server "${name}" added to ${scope} settings. (${transport})`,
    );
  }
 }
@@ -163,10 +159,10 @@ export const addCommand: CommandModule = {
      })
      .option('scope', {
        alias: 's',
-        describe: 'Configuration scope (user or workspace)',
+        describe: 'Configuration scope (user or project)',
        type: 'string',
-        default: 'workspace',
-        choices: ['user', 'workspace', 'project'],
+        default: 'project',
+        choices: ['user', 'project'],
      })
      .option('transport', {
        alias: ['t', 'type'],
@@ -14,16 +14,11 @@ import {
  type Mock,
 } from 'vitest';
 import { listMcpServers } from './list.js';
-import {
-  loadSettings,
-  mergeSettings,
-  type LoadedSettings,
-} from '../../config/settings.js';
+import { loadSettings, mergeSettings } from '../../config/settings.js';
 import { createTransport, debugLogger } from '@google/gemini-cli-core';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { ExtensionStorage } from '../../config/extensions/storage.js';
 import { ExtensionManager } from '../../config/extension-manager.js';
-import { McpServerEnablementManager } from '../../config/mcp/index.js';

 vi.mock('../../config/settings.js', async (importOriginal) => {
  const actual =
@@ -50,8 +45,6 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
      CONNECTED: 'CONNECTED',
      CONNECTING: 'CONNECTING',
      DISCONNECTED: 'DISCONNECTED',
-      BLOCKED: 'BLOCKED',
-      DISABLED: 'DISABLED',
    },
    Storage: Object.assign(
      vi.fn().mockImplementation((_cwd: string) => ({
@@ -61,7 +54,6 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
      })),
      {
        getGlobalSettingsPath: () => '/tmp/gemini/settings.json',
-        getGlobalGeminiDir: () => '/tmp/gemini',
      },
    ),
    GEMINI_DIR: '.gemini',
@@ -104,12 +96,6 @@ describe('mcp list command', () => {
  beforeEach(() => {
    vi.resetAllMocks();
    vi.spyOn(debugLogger, 'log').mockImplementation(() => {});
-    McpServerEnablementManager.resetInstance();
-    // Use a mock for isFileEnabled to avoid reading real files
-    vi.spyOn(
-      McpServerEnablementManager.prototype,
-      'isFileEnabled',
-    ).mockResolvedValue(true);

    mockTransport = { close: vi.fn() };
    mockClient = {
@@ -279,10 +265,7 @@ describe('mcp list command', () => {
    mockClient.connect.mockResolvedValue(undefined);
    mockClient.ping.mockResolvedValue(undefined);

-    await listMcpServers({
-      merged: settingsWithAllowlist,
-      isTrusted: true,
-    } as unknown as LoadedSettings);
+    await listMcpServers(settingsWithAllowlist);

    expect(debugLogger.log).toHaveBeenCalledWith(
      expect.stringContaining('allowed-server'),
@@ -321,56 +304,4 @@ describe('mcp list command', () => {
      ),
    );
  });
-
-  it('should display blocked status for servers in excluded list', async () => {
-    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
-    mockedLoadSettings.mockReturnValue({
-      merged: {
-        ...defaultMergedSettings,
-        mcp: {
-          excluded: ['blocked-server'],
-        },
-        mcpServers: {
-          'blocked-server': { command: '/test/server' },
-        },
-      },
-      isTrusted: true,
-    });
-
-    await listMcpServers();
-
-    expect(debugLogger.log).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'blocked-server: /test/server  (stdio) - Blocked',
-      ),
-    );
-    expect(mockedCreateTransport).not.toHaveBeenCalled();
-  });
-
-  it('should display disabled status for servers disabled via enablement manager', async () => {
-    const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
-    mockedLoadSettings.mockReturnValue({
-      merged: {
-        ...defaultMergedSettings,
-        mcpServers: {
-          'disabled-server': { command: '/test/server' },
-        },
-      },
-      isTrusted: true,
-    });
-
-    vi.spyOn(
-      McpServerEnablementManager.prototype,
-      'isFileEnabled',
-    ).mockResolvedValue(false);
-
-    await listMcpServers();
-
-    expect(debugLogger.log).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'disabled-server: /test/server  (stdio) - Disabled',
-      ),
-    );
-    expect(mockedCreateTransport).not.toHaveBeenCalled();
-  });
 });
@@ -6,11 +6,8 @@

 // File for 'gemini mcp list' command
 import type { CommandModule } from 'yargs';
-import {
-  type MergedSettings,
-  loadSettings,
-  type LoadedSettings,
-} from '../../config/settings.js';
+import { type MergedSettings, loadSettings } from '../../config/settings.js';
+import type { MCPServerConfig } from '@google/gemini-cli-core';
 import {
  MCPServerStatus,
  createTransport,
@@ -18,13 +15,8 @@ import {
  applyAdminAllowlist,
  getAdminBlockedMcpServersMessage,
 } from '@google/gemini-cli-core';
-import type { MCPServerConfig } from '@google/gemini-cli-core';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { ExtensionManager } from '../../config/extension-manager.js';
-import {
-  canLoadServer,
-  McpServerEnablementManager,
-} from '../../config/mcp/index.js';
 import { requestConsentNonInteractive } from '../../config/extensions/consent.js';
 import { promptForSetting } from '../../config/extensions/extensionSettings.js';
 import { exitCli } from '../utils.js';
@@ -69,13 +61,13 @@ export async function getMcpServersFromConfig(
 async function testMCPConnection(
  serverName: string,
  config: MCPServerConfig,
-  isTrusted: boolean,
-  activeSettings: MergedSettings,
 ): Promise<MCPServerStatus> {
+  const settings = loadSettings();
+
  // SECURITY: Only test connection if workspace is trusted or if it's a remote server.
  // stdio servers execute local commands and must never run in untrusted workspaces.
  const isStdio = !!config.command;
-  if (isStdio && !isTrusted) {
+  if (isStdio && !settings.isTrusted) {
    return MCPServerStatus.DISCONNECTED;
  }

@@ -88,7 +80,7 @@ async function testMCPConnection(
    sanitizationConfig: {
      enableEnvironmentVariableRedaction: true,
      allowedEnvironmentVariables: [],
-      blockedEnvironmentVariables: activeSettings.advanced.excludedEnvVars,
+      blockedEnvironmentVariables: settings.merged.advanced.excludedEnvVars,
    },
    emitMcpDiagnostic: (
      severity: 'info' | 'warning' | 'error',
@@ -113,7 +105,7 @@ async function testMCPConnection(
        debugLogger.log(message, error);
      }
    },
-    isTrustedFolder: () => isTrusted,
+    isTrustedFolder: () => settings.isTrusted,
  };

  let transport;
@@ -143,40 +135,14 @@ async function testMCPConnection(
 async function getServerStatus(
  serverName: string,
  server: MCPServerConfig,
-  isTrusted: boolean,
-  activeSettings: MergedSettings,
 ): Promise<MCPServerStatus> {
-  const mcpEnablementManager = McpServerEnablementManager.getInstance();
-  const loadResult = await canLoadServer(serverName, {
-    adminMcpEnabled: activeSettings.admin?.mcp?.enabled ?? true,
-    allowedList: activeSettings.mcp?.allowed,
-    excludedList: activeSettings.mcp?.excluded,
-    enablement: mcpEnablementManager.getEnablementCallbacks(),
-  });
-
-  if (!loadResult.allowed) {
-    if (
-      loadResult.blockType === 'admin' ||
-      loadResult.blockType === 'allowlist' ||
-      loadResult.blockType === 'excludelist'
-    ) {
-      return MCPServerStatus.BLOCKED;
-    }
-    return MCPServerStatus.DISABLED;
-  }
-
  // Test all server types by attempting actual connection
-  return testMCPConnection(serverName, server, isTrusted, activeSettings);
+  return testMCPConnection(serverName, server);
 }

-export async function listMcpServers(
-  loadedSettingsArg?: LoadedSettings,
-): Promise<void> {
-  const loadedSettings = loadedSettingsArg ?? loadSettings();
-  const activeSettings = loadedSettings.merged;
-
+export async function listMcpServers(settings?: MergedSettings): Promise<void> {
  const { mcpServers, blockedServerNames } =
-    await getMcpServersFromConfig(activeSettings);
+    await getMcpServersFromConfig(settings);
  const serverNames = Object.keys(mcpServers);

  if (blockedServerNames.length > 0) {
@@ -199,12 +165,7 @@ export async function listMcpServers(
  for (const serverName of serverNames) {
    const server = mcpServers[serverName];

-    const status = await getServerStatus(
-      serverName,
-      server,
-      loadedSettings.isTrusted,
-      activeSettings,
-    );
+    const status = await getServerStatus(serverName, server);

    let statusIndicator = '';
    let statusText = '';
@@ -217,14 +178,6 @@ export async function listMcpServers(
        statusIndicator = chalk.yellow('…');
        statusText = 'Connecting';
        break;
-      case MCPServerStatus.BLOCKED:
-        statusIndicator = chalk.red('⛔');
-        statusText = 'Blocked';
-        break;
-      case MCPServerStatus.DISABLED:
-        statusIndicator = chalk.gray('○');
-        statusText = 'Disabled';
-        break;
      case MCPServerStatus.DISCONNECTED:
      default:
        statusIndicator = chalk.red('✗');
@@ -250,14 +203,14 @@ export async function listMcpServers(
 }

 interface ListArgs {
-  loadedSettings?: LoadedSettings;
+  settings?: MergedSettings;
 }

 export const listCommand: CommandModule<object, ListArgs> = {
  command: 'list',
  describe: 'List all configured MCP servers',
  handler: async (argv) => {
-    await listMcpServers(argv.loadedSettings);
+    await listMcpServers(argv.settings);
    await exitCli();
  },
 };
@@ -81,7 +81,7 @@ describe('mcp remove command', () => {
      parser = yargsInstance;
    });

-    it('should remove a server from workspace settings', async () => {
+    it('should remove a server from project settings', async () => {
      await parser.parseAsync('remove test-server');

      expect(mockSetValue).toHaveBeenCalledWith(
@@ -99,7 +99,7 @@ describe('mcp remove command', () => {

      expect(mockSetValue).not.toHaveBeenCalled();
      expect(debugLogSpy).toHaveBeenCalledWith(
-        'Server "non-existent-server" not found in workspace settings.',
+        'Server "non-existent-server" not found in project settings.',
      );
      debugLogSpy.mockRestore();
    });
@@ -159,7 +159,7 @@ describe('mcp remove command', () => {
      expect(updatedContent).not.toContain('"server-to-remove"');

      expect(debugLogSpy).toHaveBeenCalledWith(
-        'Server "server-to-remove" removed from workspace settings.',
+        'Server "server-to-remove" removed from project settings.',
      );

      debugLogSpy.mockRestore();
@@ -17,7 +17,6 @@ async function removeMcpServer(
  },
 ) {
  const { scope } = options;
-  const displayScope = scope === 'user' ? 'user' : 'workspace';
  const settingsScope =
    scope === 'user' ? SettingScope.User : SettingScope.Workspace;
  const settings = loadSettings();
@@ -26,7 +25,7 @@ async function removeMcpServer(
  const mcpServers = existingSettings.mcpServers || {};

  if (!mcpServers[name]) {
-    debugLogger.log(`Server "${name}" not found in ${displayScope} settings.`);
+    debugLogger.log(`Server "${name}" not found in ${scope} settings.`);
    return;
  }

@@ -34,7 +33,7 @@ async function removeMcpServer(

  settings.setValue(settingsScope, 'mcpServers', mcpServers);

-  debugLogger.log(`Server "${name}" removed from ${displayScope} settings.`);
+  debugLogger.log(`Server "${name}" removed from ${scope} settings.`);
 }

 export const removeCommand: CommandModule = {
@@ -50,10 +49,10 @@ export const removeCommand: CommandModule = {
      })
      .option('scope', {
        alias: 's',
-        describe: 'Configuration scope (user or workspace)',
+        describe: 'Configuration scope (user or project)',
        type: 'string',
-        default: 'workspace',
-        choices: ['user', 'workspace', 'project'],
+        default: 'project',
+        choices: ['user', 'project'],
      }),
  handler: async (argv) => {
    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
@@ -2622,13 +2622,13 @@ describe('loadCliConfig approval mode', () => {
    expect(config.getApprovalMode()).toBe(ApprovalMode.DEFAULT);
  });

-  it('should allow plan approval mode by default when --approval-mode=plan is used', async () => {
+  it('should throw error when --approval-mode=plan is used but experimental.plan setting is missing', async () => {
    process.argv = ['node', 'script.js', '--approval-mode', 'plan'];
    const argv = await parseArguments(createTestMergedSettings());
    const settings = createTestMergedSettings({});

    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getApprovalMode()).toBe(ApprovalMode.PLAN);
+    expect(config.getApprovalMode()).toBe(ApprovalMode.DEFAULT);
  });

  it('should pass planSettings.directory from settings to config', async () => {
@@ -7,7 +7,6 @@
 import yargs from 'yargs/yargs';
 import { hideBin } from 'yargs/helpers';
 import process from 'node:process';
-import * as path from 'node:path';
 import { mcpCommand } from '../commands/mcp.js';
 import { extensionsCommand } from '../commands/extensions.js';
 import { skillsCommand } from '../commands/skills.js';
@@ -34,7 +33,6 @@ import {
  getAdminErrorMessage,
  isHeadlessMode,
  Config,
-  resolveToRealPath,
  applyAdminAllowlist,
  getAdminBlockedMcpServersMessage,
  type HookDefinition,
@@ -490,15 +488,6 @@ export async function loadCliConfig(

  const experimentalJitContext = settings.experimental?.jitContext ?? false;

-  let extensionRegistryURI: string | undefined = trustedFolder
-    ? settings.experimental?.extensionRegistryURI
-    : undefined;
-  if (extensionRegistryURI && !extensionRegistryURI.startsWith('http')) {
-    extensionRegistryURI = resolveToRealPath(
-      path.resolve(cwd, resolvePath(extensionRegistryURI)),
-    );
-  }
-
  let memoryContent: string | HierarchicalMemory = '';
  let fileCount = 0;
  let filePaths: string[] = [];
@@ -775,7 +764,6 @@ export async function loadCliConfig(
    deleteSession: argv.deleteSession,
    enabledExtensions: argv.extensions,
    extensionLoader: extensionManager,
-    extensionRegistryURI,
    enableExtensionReloading: settings.experimental?.extensionReloading,
    enableAgents: settings.experimental?.enableAgents,
    plan: settings.experimental?.plan,
@@ -345,144 +345,4 @@ describe('ExtensionManager', () => {
      }
    });
  });
-
-  describe('Extension Renaming', () => {
-    it('should support renaming an extension during update', async () => {
-      // 1. Setup existing extension
-      const oldName = 'old-name';
-      const newName = 'new-name';
-      const extDir = path.join(userExtensionsDir, oldName);
-      fs.mkdirSync(extDir, { recursive: true });
-      fs.writeFileSync(
-        path.join(extDir, 'gemini-extension.json'),
-        JSON.stringify({ name: oldName, version: '1.0.0' }),
-      );
-      fs.writeFileSync(
-        path.join(extDir, 'metadata.json'),
-        JSON.stringify({ type: 'local', source: extDir }),
-      );
-
-      await extensionManager.loadExtensions();
-
-      // 2. Create a temporary "new" version with a different name
-      const newSourceDir = fs.mkdtempSync(
-        path.join(tempHomeDir, 'new-source-'),
-      );
-      fs.writeFileSync(
-        path.join(newSourceDir, 'gemini-extension.json'),
-        JSON.stringify({ name: newName, version: '1.1.0' }),
-      );
-      fs.writeFileSync(
-        path.join(newSourceDir, 'metadata.json'),
-        JSON.stringify({ type: 'local', source: newSourceDir }),
-      );
-
-      // 3. Update the extension
-      await extensionManager.installOrUpdateExtension(
-        { type: 'local', source: newSourceDir },
-        { name: oldName, version: '1.0.0' },
-      );
-
-      // 4. Verify old directory is gone and new one exists
-      expect(fs.existsSync(path.join(userExtensionsDir, oldName))).toBe(false);
-      expect(fs.existsSync(path.join(userExtensionsDir, newName))).toBe(true);
-
-      // Verify the loaded state is updated
-      const extensions = extensionManager.getExtensions();
-      expect(extensions.some((e) => e.name === newName)).toBe(true);
-      expect(extensions.some((e) => e.name === oldName)).toBe(false);
-    });
-
-    it('should carry over enablement status when renaming', async () => {
-      const oldName = 'old-name';
-      const newName = 'new-name';
-      const extDir = path.join(userExtensionsDir, oldName);
-      fs.mkdirSync(extDir, { recursive: true });
-      fs.writeFileSync(
-        path.join(extDir, 'gemini-extension.json'),
-        JSON.stringify({ name: oldName, version: '1.0.0' }),
-      );
-      fs.writeFileSync(
-        path.join(extDir, 'metadata.json'),
-        JSON.stringify({ type: 'local', source: extDir }),
-      );
-
-      // Enable it
-      const enablementManager = extensionManager.getEnablementManager();
-      enablementManager.enable(oldName, true, tempHomeDir);
-
-      await extensionManager.loadExtensions();
-      const extension = extensionManager.getExtensions()[0];
-      expect(extension.isActive).toBe(true);
-
-      const newSourceDir = fs.mkdtempSync(
-        path.join(tempHomeDir, 'new-source-'),
-      );
-      fs.writeFileSync(
-        path.join(newSourceDir, 'gemini-extension.json'),
-        JSON.stringify({ name: newName, version: '1.1.0' }),
-      );
-      fs.writeFileSync(
-        path.join(newSourceDir, 'metadata.json'),
-        JSON.stringify({ type: 'local', source: newSourceDir }),
-      );
-
-      await extensionManager.installOrUpdateExtension(
-        { type: 'local', source: newSourceDir },
-        { name: oldName, version: '1.0.0' },
-      );
-
-      // Verify new name is enabled
-      expect(enablementManager.isEnabled(newName, tempHomeDir)).toBe(true);
-      // Verify old name is removed from enablement
-      expect(enablementManager.readConfig()[oldName]).toBeUndefined();
-    });
-
-    it('should prevent renaming if the new name conflicts with an existing extension', async () => {
-      // Setup two extensions
-      const ext1Dir = path.join(userExtensionsDir, 'ext1');
-      fs.mkdirSync(ext1Dir, { recursive: true });
-      fs.writeFileSync(
-        path.join(ext1Dir, 'gemini-extension.json'),
-        JSON.stringify({ name: 'ext1', version: '1.0.0' }),
-      );
-      fs.writeFileSync(
-        path.join(ext1Dir, 'metadata.json'),
-        JSON.stringify({ type: 'local', source: ext1Dir }),
-      );
-
-      const ext2Dir = path.join(userExtensionsDir, 'ext2');
-      fs.mkdirSync(ext2Dir, { recursive: true });
-      fs.writeFileSync(
-        path.join(ext2Dir, 'gemini-extension.json'),
-        JSON.stringify({ name: 'ext2', version: '1.0.0' }),
-      );
-      fs.writeFileSync(
-        path.join(ext2Dir, 'metadata.json'),
-        JSON.stringify({ type: 'local', source: ext2Dir }),
-      );
-
-      await extensionManager.loadExtensions();
-
-      // Try to update ext1 to name 'ext2'
-      const newSourceDir = fs.mkdtempSync(
-        path.join(tempHomeDir, 'new-source-'),
-      );
-      fs.writeFileSync(
-        path.join(newSourceDir, 'gemini-extension.json'),
-        JSON.stringify({ name: 'ext2', version: '1.1.0' }),
-      );
-      fs.writeFileSync(
-        path.join(newSourceDir, 'metadata.json'),
-        JSON.stringify({ type: 'local', source: newSourceDir }),
-      );
-
-      await expect(
-        extensionManager.installOrUpdateExtension(
-          { type: 'local', source: newSourceDir },
-          { name: 'ext1', version: '1.0.0' },
-        ),
-      ).rejects.toThrow(/already installed/);
-    });
-  });
 });
@@ -129,10 +129,6 @@ export class ExtensionManager extends ExtensionLoader {
    this.requestSetting = options.requestSetting ?? undefined;
  }

-  getEnablementManager(): ExtensionEnablementManager {
-    return this.extensionEnablementManager;
-  }
-
  setRequestConsent(
    requestConsent: (consent: string) => Promise<boolean>,
  ): void {
@@ -157,7 +153,6 @@ export class ExtensionManager extends ExtensionLoader {
  async installOrUpdateExtension(
    installMetadata: ExtensionInstallMetadata,
    previousExtensionConfig?: ExtensionConfig,
-    requestConsentOverride?: (consent: string) => Promise<boolean>,
  ): Promise<GeminiCLIExtension> {
    if (
      this.settings.security?.allowedExtensions &&
@@ -248,7 +243,7 @@ export class ExtensionManager extends ExtensionLoader {
            (result.failureReason === 'no release data' &&
              installMetadata.type === 'git') ||
            // Otherwise ask the user if they would like to try a git clone.
-            (await (requestConsentOverride ?? this.requestConsent)(
+            (await this.requestConsent(
              `Error downloading github release for ${installMetadata.source} with the following error: ${result.errorMessage}.

 Would you like to attempt to install via "git clone" instead?`,
@@ -276,28 +271,17 @@ Would you like to attempt to install via "git clone" instead?`,
        newExtensionConfig = await this.loadExtensionConfig(localSourcePath);

        const newExtensionName = newExtensionConfig.name;
-        const previousName = previousExtensionConfig?.name ?? newExtensionName;
        const previous = this.getExtensions().find(
-          (installed) => installed.name === previousName,
+          (installed) => installed.name === newExtensionName,
        );
-        const nameConflict = this.getExtensions().find(
-          (installed) =>
-            installed.name === newExtensionName &&
-            installed.name !== previousName,
-        );
-
        if (isUpdate && !previous) {
          throw new Error(
-            `Extension "${previousName}" was not already installed, cannot update it.`,
+            `Extension "${newExtensionName}" was not already installed, cannot update it.`,
          );
        } else if (!isUpdate && previous) {
          throw new Error(
            `Extension "${newExtensionName}" is already installed. Please uninstall it first.`,
          );
-        } else if (isUpdate && nameConflict) {
-          throw new Error(
-            `Cannot update to "${newExtensionName}" because an extension with that name is already installed.`,
-          );
        }

        const newHasHooks = fs.existsSync(
@@ -314,60 +298,28 @@ Would you like to attempt to install via "git clone" instead?`,
          path.join(localSourcePath, 'skills'),
        );
        const previousSkills = previous?.skills ?? [];
-        const isMigrating = Boolean(
-          previous &&
-            previous.installMetadata &&
-            previous.installMetadata.source !== installMetadata.source,
-        );

        await maybeRequestConsentOrFail(
          newExtensionConfig,
-          requestConsentOverride ?? this.requestConsent,
+          this.requestConsent,
          newHasHooks,
          previousExtensionConfig,
          previousHasHooks,
          newSkills,
          previousSkills,
-          isMigrating,
        );
        const extensionId = getExtensionId(newExtensionConfig, installMetadata);
        const destinationPath = new ExtensionStorage(
          newExtensionName,
        ).getExtensionDir();
-
-        if (
-          (!isUpdate || newExtensionName !== previousName) &&
-          fs.existsSync(destinationPath)
-        ) {
-          throw new Error(
-            `Cannot install extension "${newExtensionName}" because a directory with that name already exists. Please remove it manually.`,
-          );
-        }
-
        let previousSettings: Record<string, string> | undefined;
-        let wasEnabledGlobally = false;
-        let wasEnabledWorkspace = false;
-        if (isUpdate && previousExtensionConfig) {
-          const previousExtensionId = previous?.installMetadata
-            ? getExtensionId(previousExtensionConfig, previous.installMetadata)
-            : extensionId;
+        if (isUpdate) {
          previousSettings = await getEnvContents(
            previousExtensionConfig,
-            previousExtensionId,
+            extensionId,
            this.workspaceDir,
          );
-          if (newExtensionName !== previousName) {
-            wasEnabledGlobally = this.extensionEnablementManager.isEnabled(
-              previousName,
-              homedir(),
-            );
-            wasEnabledWorkspace = this.extensionEnablementManager.isEnabled(
-              previousName,
-              this.workspaceDir,
-            );
-            this.extensionEnablementManager.remove(previousName);
-          }
-          await this.uninstallExtension(previousName, isUpdate);
+          await this.uninstallExtension(newExtensionName, isUpdate);
        }

        await fs.promises.mkdir(destinationPath, { recursive: true });
@@ -440,18 +392,6 @@ Would you like to attempt to install via "git clone" instead?`,
              CoreToolCallStatus.Success,
            ),
          );
-
-          if (newExtensionName !== previousName) {
-            if (wasEnabledGlobally) {
-              await this.enableExtension(newExtensionName, SettingScope.User);
-            }
-            if (wasEnabledWorkspace) {
-              await this.enableExtension(
-                newExtensionName,
-                SettingScope.Workspace,
-              );
-            }
-          }
        } else {
          await logExtensionInstallEvent(
            this.telemetryConfig,
@@ -933,7 +873,6 @@ Would you like to attempt to install via "git clone" instead?`,
        path: effectiveExtensionPath,
        contextFiles,
        installMetadata,
-        migratedTo: config.migratedTo,
        mcpServers: config.mcpServers,
        excludeTools: config.excludeTools,
        hooks,
@@ -31,7 +31,6 @@ import {
  loadSettings,
  createTestMergedSettings,
  SettingScope,
-  resetSettingsCacheForTesting,
 } from './settings.js';
 import {
  isWorkspaceTrusted,
@@ -162,7 +161,6 @@ describe('extension tests', () => {

  beforeEach(() => {
    vi.clearAllMocks();
-    resetSettingsCacheForTesting();
    keychainData = {};
    mockKeychainStorage = {
      getSecret: vi
@@ -42,10 +42,6 @@ export interface ExtensionConfig {
     */
    directory?: string;
  };
-  /**
-   * Used to migrate an extension to a new repository source.
-   */
-  migratedTo?: string;
 }

 export interface ExtensionUpdateInfo {
@@ -13,24 +13,14 @@ import {
  afterEach,
  type Mock,
 } from 'vitest';
-import * as fs from 'node:fs/promises';
 import {
  ExtensionRegistryClient,
  type RegistryExtension,
 } from './extensionRegistryClient.js';
-import { fetchWithTimeout, resolveToRealPath } from '@google/gemini-cli-core';
+import { fetchWithTimeout } from '@google/gemini-cli-core';

-vi.mock('@google/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@google/gemini-cli-core')>();
-  return {
-    ...actual,
-    fetchWithTimeout: vi.fn(),
-  };
-});
-
-vi.mock('node:fs/promises', () => ({
-  readFile: vi.fn(),
+vi.mock('@google/gemini-cli-core', () => ({
+  fetchWithTimeout: vi.fn(),
 }));

 const mockExtensions: RegistryExtension[] = [
@@ -289,32 +279,4 @@ describe('ExtensionRegistryClient', () => {
    expect(ids).not.toContain('dataplex');
    expect(ids).toContain('conductor');
  });
-
-  it('should fetch extensions from a local file path', async () => {
-    const filePath = '/path/to/extensions.json';
-    const clientWithFile = new ExtensionRegistryClient(filePath);
-    const mockReadFile = vi.mocked(fs.readFile);
-    mockReadFile.mockResolvedValue(JSON.stringify(mockExtensions));
-
-    const result = await clientWithFile.getExtensions();
-    expect(result.extensions).toHaveLength(3);
-    expect(mockReadFile).toHaveBeenCalledWith(
-      resolveToRealPath(filePath),
-      'utf-8',
-    );
-  });
-
-  it('should fetch extensions from a file:// URL', async () => {
-    const fileUrl = 'file:///path/to/extensions.json';
-    const clientWithFileUrl = new ExtensionRegistryClient(fileUrl);
-    const mockReadFile = vi.mocked(fs.readFile);
-    mockReadFile.mockResolvedValue(JSON.stringify(mockExtensions));
-
-    const result = await clientWithFileUrl.getExtensions();
-    expect(result.extensions).toHaveLength(3);
-    expect(mockReadFile).toHaveBeenCalledWith(
-      resolveToRealPath(fileUrl),
-      'utf-8',
-    );
-  });
 });
@@ -4,12 +4,7 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import * as fs from 'node:fs/promises';
-import {
-  fetchWithTimeout,
-  resolveToRealPath,
-  isPrivateIp,
-} from '@google/gemini-cli-core';
+import { fetchWithTimeout } from '@google/gemini-cli-core';
 import { AsyncFzf } from 'fzf';

 export interface RegistryExtension {
@@ -34,19 +29,12 @@ export interface RegistryExtension {
 }

 export class ExtensionRegistryClient {
-  static readonly DEFAULT_REGISTRY_URL =
+  private static readonly REGISTRY_URL =
    'https://geminicli.com/extensions.json';
  private static readonly FETCH_TIMEOUT_MS = 10000; // 10 seconds

  private static fetchPromise: Promise<RegistryExtension[]> | null = null;

-  private readonly registryURI: string;
-
-  constructor(registryURI?: string) {
-    this.registryURI =
-      registryURI || ExtensionRegistryClient.DEFAULT_REGISTRY_URL;
-  }
-
  /** @internal */
  static resetCache() {
    ExtensionRegistryClient.fetchPromise = null;
@@ -109,34 +97,18 @@ export class ExtensionRegistryClient {
      return ExtensionRegistryClient.fetchPromise;
    }

-    const uri = this.registryURI;
    ExtensionRegistryClient.fetchPromise = (async () => {
      try {
-        if (uri.startsWith('http')) {
-          if (isPrivateIp(uri)) {
-            throw new Error(
-              'Private IP addresses are not allowed for the extension registry.',
-            );
-          }
-          const response = await fetchWithTimeout(
-            uri,
-            ExtensionRegistryClient.FETCH_TIMEOUT_MS,
-          );
-          if (!response.ok) {
-            throw new Error(
-              `Failed to fetch extensions: ${response.statusText}`,
-            );
-          }
-
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-          return (await response.json()) as RegistryExtension[];
-        } else {
-          // Handle local file path
-          const filePath = resolveToRealPath(uri);
-          const content = await fs.readFile(filePath, 'utf-8');
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-          return JSON.parse(content) as RegistryExtension[];
+        const response = await fetchWithTimeout(
+          ExtensionRegistryClient.REGISTRY_URL,
+          ExtensionRegistryClient.FETCH_TIMEOUT_MS,
+        );
+        if (!response.ok) {
+          throw new Error(`Failed to fetch extensions: ${response.statusText}`);
        }
+
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+        return (await response.json()) as RegistryExtension[];
      } catch (error) {
        ExtensionRegistryClient.fetchPromise = null;
        throw error;
@@ -1,13 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="122" viewBox="0 0 920 122">
-  <style>
-    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
-  </style>
-  <rect width="920" height="122" fill="#000000" />
-  <g transform="translate(10, 10)">
-    <text x="0" y="2" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">Migrating extension &quot;old-ext&quot; to a new repository, renaming to &quot;test-ext&quot;, and installing updates.  </text>
-    <text x="0" y="36" fill="#cdcd00" textLength="891" lengthAdjust="spacingAndGlyphs">The extension you are about to install may have been created by a third-party developer and sourced</text>
-    <text x="0" y="53" fill="#cdcd00" textLength="882" lengthAdjust="spacingAndGlyphs">from a public repository. Google does not vet, endorse, or guarantee the functionality or security</text>
-    <text x="0" y="70" fill="#cdcd00" textLength="846" lengthAdjust="spacingAndGlyphs">of extensions. Please carefully inspect any extension and its source code before installing to</text>
-    <text x="0" y="87" fill="#cdcd00" textLength="630" lengthAdjust="spacingAndGlyphs">understand the permissions it requires and the actions it may perform.</text>
-  </g>
-</svg>
@@ -24,15 +24,6 @@ of extensions. Please carefully inspect any extension and its source code before
 understand the permissions it requires and the actions it may perform."
 `;

-exports[`consent > maybeRequestConsentOrFail > consent string generation > should request consent if extension is migrated 1`] = `
-"Migrating extension "old-ext" to a new repository, renaming to "test-ext", and installing updates.
-
-The extension you are about to install may have been created by a third-party developer and sourced
-from a public repository. Google does not vet, endorse, or guarantee the functionality or security
-of extensions. Please carefully inspect any extension and its source code before installing to
-understand the permissions it requires and the actions it may perform."
-`;
-
 exports[`consent > maybeRequestConsentOrFail > consent string generation > should request consent if skills change 1`] = `
 "Installing extension "test-ext".
 This extension will run the following MCP servers:
@@ -287,25 +287,6 @@ describe('consent', () => {
        expect(requestConsent).toHaveBeenCalledTimes(1);
      });

-      it('should request consent if extension is migrated', async () => {
-        const requestConsent = vi.fn().mockResolvedValue(true);
-        await maybeRequestConsentOrFail(
-          baseConfig,
-          requestConsent,
-          false,
-          { ...baseConfig, name: 'old-ext' },
-          false,
-          [],
-          [],
-          true,
-        );
-
-        expect(requestConsent).toHaveBeenCalledTimes(1);
-        let consentString = requestConsent.mock.calls[0][0] as string;
-        consentString = normalizePathsForSnapshot(consentString, tempDir);
-        await expectConsentSnapshot(consentString);
-      });
-
      it('should request consent if skills change', async () => {
        const skill1Dir = path.join(tempDir, 'skill1');
        const skill2Dir = path.join(tempDir, 'skill2');
@@ -148,30 +148,11 @@ async function extensionConsentString(
  extensionConfig: ExtensionConfig,
  hasHooks: boolean,
  skills: SkillDefinition[] = [],
-  previousName?: string,
-  wasMigrated?: boolean,
 ): Promise<string> {
  const sanitizedConfig = escapeAnsiCtrlCodes(extensionConfig);
  const output: string[] = [];
  const mcpServerEntries = Object.entries(sanitizedConfig.mcpServers || {});
-
-  if (wasMigrated) {
-    if (previousName && previousName !== sanitizedConfig.name) {
-      output.push(
-        `Migrating extension "${previousName}" to a new repository, renaming to "${sanitizedConfig.name}", and installing updates.`,
-      );
-    } else {
-      output.push(
-        `Migrating extension "${sanitizedConfig.name}" to a new repository and installing updates.`,
-      );
-    }
-  } else if (previousName && previousName !== sanitizedConfig.name) {
-    output.push(
-      `Renaming extension "${previousName}" to "${sanitizedConfig.name}" and installing updates.`,
-    );
-  } else {
-    output.push(`Installing extension "${sanitizedConfig.name}".`);
-  }
+  output.push(`Installing extension "${sanitizedConfig.name}".`);

  if (mcpServerEntries.length) {
    output.push('This extension will run the following MCP servers:');
@@ -250,14 +231,11 @@ export async function maybeRequestConsentOrFail(
  previousHasHooks?: boolean,
  skills: SkillDefinition[] = [],
  previousSkills: SkillDefinition[] = [],
-  isMigrating: boolean = false,
 ) {
  const extensionConsent = await extensionConsentString(
    extensionConfig,
    hasHooks,
    skills,
-    previousExtensionConfig?.name,
-    isMigrating,
  );
  if (previousExtensionConfig) {
    const previousExtensionConsent = await extensionConsentString(
@@ -285,23 +285,6 @@ describe('github.ts', () => {
        ExtensionUpdateState.NOT_UPDATABLE,
      );
    });
-
-    it('should check migratedTo source if present and return UPDATE_AVAILABLE', async () => {
-      mockGit.getRemotes.mockResolvedValue([
-        { name: 'origin', refs: { fetch: 'new-url' } },
-      ]);
-      mockGit.listRemote.mockResolvedValue('hash\tHEAD');
-      mockGit.revparse.mockResolvedValue('hash');
-
-      const ext = {
-        path: '/path',
-        migratedTo: 'new-url',
-        installMetadata: { type: 'git', source: 'old-url' },
-      } as unknown as GeminiCLIExtension;
-      expect(await checkForExtensionUpdate(ext, mockExtensionManager)).toBe(
-        ExtensionUpdateState.UPDATE_AVAILABLE,
-      );
-    });
  });

  describe('downloadFromGitHubRelease', () => {
@@ -203,24 +203,6 @@ export async function checkForExtensionUpdate(
  ) {
    return ExtensionUpdateState.NOT_UPDATABLE;
  }
-
-  if (extension.migratedTo) {
-    const migratedState = await checkForExtensionUpdate(
-      {
-        ...extension,
-        installMetadata: { ...installMetadata, source: extension.migratedTo },
-        migratedTo: undefined,
-      },
-      extensionManager,
-    );
-    if (
-      migratedState === ExtensionUpdateState.UPDATE_AVAILABLE ||
-      migratedState === ExtensionUpdateState.UP_TO_DATE
-    ) {
-      return ExtensionUpdateState.UPDATE_AVAILABLE;
-    }
-  }
-
  try {
    if (installMetadata.type === 'git') {
      const git = simpleGit(extension.path);
@@ -184,54 +184,6 @@ describe('Extension Update Logic', () => {
      });
    });

-    it('should migrate source if migratedTo is set and an update is available', async () => {
-      vi.mocked(mockExtensionManager.loadExtensionConfig).mockReturnValue(
-        Promise.resolve({
-          name: 'test-extension',
-          version: '1.0.0',
-        }),
-      );
-      vi.mocked(
-        mockExtensionManager.installOrUpdateExtension,
-      ).mockResolvedValue({
-        ...mockExtension,
-        version: '1.1.0',
-      });
-      vi.mocked(checkForExtensionUpdate).mockResolvedValue(
-        ExtensionUpdateState.UPDATE_AVAILABLE,
-      );
-
-      const extensionWithMigratedTo = {
-        ...mockExtension,
-        migratedTo: 'https://new-source.com/repo.git',
-      };
-
-      await updateExtension(
-        extensionWithMigratedTo,
-        mockExtensionManager,
-        ExtensionUpdateState.UPDATE_AVAILABLE,
-        mockDispatch,
-      );
-
-      expect(checkForExtensionUpdate).toHaveBeenCalledWith(
-        expect.objectContaining({
-          installMetadata: expect.objectContaining({
-            source: 'https://new-source.com/repo.git',
-          }),
-        }),
-        mockExtensionManager,
-      );
-
-      expect(
-        mockExtensionManager.installOrUpdateExtension,
-      ).toHaveBeenCalledWith(
-        expect.objectContaining({
-          source: 'https://new-source.com/repo.git',
-        }),
-        expect.anything(),
-      );
-    });
-
    it('should set state to UPDATED if enableExtensionReloading is true', async () => {
      vi.mocked(mockExtensionManager.loadExtensionConfig).mockReturnValue(
        Promise.resolve({
--- a/Show More
+++ b/Show More