feat(cli): add /insights slash command to analyze past sessions

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

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

.gemini/settings.json

@@ -1,8 +1,7 @@
 {
   "experimental": {
-    "plan": true
-  },
-  "general": {
-    "devtools": true
+    "toolOutputMasking": {
+      "enabled": true
+    }
   }
 }

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

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

.github/workflows/ci.yml

@@ -356,17 +356,11 @@ jobs:
           clean-script: 'clean'
 
   test_windows:
-    name: 'Slow Test - Win - ${{ matrix.shard }}'
+    name: 'Slow Test - Win'
     runs-on: 'gemini-cli-windows-16-core'
     needs: 'merge_queue_skipper'
     if: "${{needs.merge_queue_skipper.outputs.skip == 'false'}}"
     continue-on-error: true
-    timeout-minutes: 60
-    strategy:
-      matrix:
-        shard:
-          - 'cli'
-          - 'others'
 
     steps:
       - name: 'Checkout'
@@ -417,14 +411,7 @@ jobs:
           NODE_OPTIONS: '--max-old-space-size=32768 --max-semi-space-size=256'
           UV_THREADPOOL_SIZE: '32'
           NODE_ENV: 'test'
-        run: |
-          if ("${{ matrix.shard }}" -eq "cli") {
-            npm run test:ci --workspace @google/gemini-cli -- --coverage.enabled=false
-          } else {
-            # Explicitly list non-cli packages to ensure they are sharded correctly
-            npm run test:ci --workspace @google/gemini-cli-core --workspace @google/gemini-cli-a2a-server --workspace gemini-cli-vscode-ide-companion --workspace @google/gemini-cli-test-utils --if-present -- --coverage.enabled=false
-            npm run test:scripts
-          }
+        run: 'npm run test:ci -- --coverage.enabled=false'
         shell: 'pwsh'
 
       - name: 'Bundle'

.github/workflows/release-notes.yml

@@ -4,7 +4,7 @@ name: 'Generate Release Notes'
 
 on:
   release:
-    types: ['published']
+    types: ['created']
   workflow_dispatch:
     inputs:
       version:

GEMINI.md

@@ -67,9 +67,6 @@ powerful tool for developers.
   and `packages/core` (Backend logic).
 - **Imports:** Use specific imports and avoid restricted relative imports
   between packages (enforced by ESLint).
-- **License Headers:** For all new source code files (`.ts`, `.tsx`, `.js`),
-  include the Apache-2.0 license header with the current year. (e.g.,
-  `Copyright 2026 Google LLC`). This is enforced by ESLint.
 
 ## Testing Conventions
 

docs/cli/keyboard-shortcuts.md

@@ -106,7 +106,6 @@ available combinations.
 | Toggle YOLO (auto-approval) mode for tool calls.                                                      | `Ctrl + Y`                 |
 | Cycle through approval modes: default (prompt), auto_edit (auto-approve edits), and plan (read-only). | `Shift + Tab`              |
 | Expand a height-constrained response to show additional lines when not in alternate buffer mode.      | `Ctrl + O`<br />`Ctrl + S` |
-| 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`                 |
@@ -131,8 +130,7 @@ available combinations.
 - `!` on an empty prompt: Enter or exit shell mode.
 - `?` on an empty prompt: Toggle the shortcuts panel above the input. Press
   `Esc`, `Backspace`, or any printable key to close it. Press `?` again to close
-  the panel and insert a `?` into the prompt. You can hide only the hint text
-  via `ui.showShortcutsHint`, without changing this keyboard behavior.
+  the panel and insert a `?` into the prompt.
 - `\` (at end of a line) + `Enter`: Insert a newline without leaving single-line
   mode.
 - `Esc` pressed twice quickly: Clear the input prompt if it is not empty,
@@ -141,7 +139,6 @@ available combinations.
   single-line input, navigate backward or forward through prompt history.
 - `Number keys (1-9, multi-digit)` inside selection dialogs: Jump directly to
   the numbered radio option and confirm when the full number is entered.
-- `Ctrl + O`: Expand or collapse paste placeholders (`[Pasted Text: X lines]`)
-  inline when the cursor is over the placeholder.
-- `Double-click` on a paste placeholder (alternate buffer mode only): Expand to
-  view full content inline. Double-click again to collapse.
+- `Double-click` on a paste placeholder (`[Pasted Text: X lines]`) in alternate
+  buffer mode: Expand to view full content inline. Double-click again to
+  collapse.

docs/cli/plan-mode.md

@@ -1,4 +1,4 @@
-# Plan Mode (experimental)
+# Plan Mode (experimental) <!-- omit in toc -->
 
 Plan Mode is a safe, read-only mode for researching and designing complex
 changes. It prevents modifications while you research, design and plan an
@@ -30,15 +30,13 @@ implementation strategy.
   - [The Planning Workflow](#the-planning-workflow)
   - [Exiting Plan Mode](#exiting-plan-mode)
 - [Tool Restrictions](#tool-restrictions)
-  - [Customizing Planning with Skills](#customizing-planning-with-skills)
-  - [Customizing Policies](#customizing-policies)
 
 ## Starting in Plan Mode
 
 You can configure Gemini CLI to start directly in Plan Mode by default:
 
 1.  Type `/settings` in the CLI.
-2.  Search for `Default Approval Mode`.
+2.  Search for `Approval Mode`.
 3.  Set the value to `Plan`.
 
 Other ways to start in Plan Mode:
@@ -48,8 +46,8 @@ Other ways to start in Plan Mode:
 
   ```json
   {
-    "general": {
-      "defaultApprovalMode": "plan"
+    "tools": {
+      "approvalMode": "plan"
     }
   }
   ```
@@ -70,10 +68,8 @@ You can enter Plan Mode in three ways:
 1.  **Requirements:** The agent clarifies goals using `ask_user`.
 2.  **Exploration:** The agent uses read-only tools (like [`read_file`]) to map
     the codebase and validate assumptions.
-3.  **Design:** The agent proposes alternative approaches with a recommended
-    solution for you to choose from.
-4.  **Planning:** A detailed plan is written to a temporary Markdown file.
-5.  **Review:** You review the plan.
+3.  **Planning:** A detailed plan is written to a temporary Markdown file.
+4.  **Review:** You review the plan.
     - **Approve:** Exit Plan Mode and start implementation (switching to
       Auto-Edit or Default approval mode).
     - **Iterate:** Provide feedback to refine the plan.
@@ -99,75 +95,6 @@ These are the only allowed tools:
   `postgres_read_schema`) are allowed.
 - **Planning (Write):** [`write_file`] and [`replace`] ONLY allowed for `.md`
   files in the `~/.gemini/tmp/<project>/plans/` directory.
-- **Skills:** [`activate_skill`] (allows loading specialized instructions and
-  resources in a read-only manner)
-
-### Customizing Planning with Skills
-
-You can leverage [Agent Skills](./skills.md) to customize how Gemini CLI
-approaches planning for specific types of tasks. When a skill is activated
-during Plan Mode, its specialized instructions and procedural workflows will
-guide the research and design phases.
-
-For example:
-
-- A **"Database Migration"** skill could ensure the plan includes data safety
-  checks and rollback strategies.
-- A **"Security Audit"** skill could prompt the agent to look for specific
-  vulnerabilities during codebase exploration.
-- A **"Frontend Design"** skill could guide the agent to use specific UI
-  components and accessibility standards in its proposal.
-
-To use a skill in Plan Mode, you can explicitly ask the agent to "use the
-[skill-name] skill to plan..." or the agent may autonomously activate it based
-on the task description.
-
-### Customizing Policies
-
-Plan Mode is designed to be read-only by default to ensure safety during the
-research phase. However, you may occasionally need to allow specific tools to
-assist in your planning.
-
-Because user policies (Tier 2) have a higher base priority than built-in
-policies (Tier 1), you can override Plan Mode's default restrictions by creating
-a rule in your `~/.gemini/policies/` directory.
-
-#### Example: Allow `git status` and `git diff` in Plan Mode
-
-This rule allows you to check the repository status and see changes while in
-Plan Mode.
-
-`~/.gemini/policies/git-research.toml`
-
-```toml
-[[rule]]
-toolName = "run_shell_command"
-commandPrefix = ["git status", "git diff"]
-decision = "allow"
-priority = 100
-modes = ["plan"]
-```
-
-#### Example: Enable research sub-agents in Plan Mode
-
-You can enable [experimental research sub-agents] like `codebase_investigator`
-to help gather architecture details during the planning phase.
-
-`~/.gemini/policies/research-subagents.toml`
-
-```toml
-[[rule]]
-toolName = "codebase_investigator"
-decision = "allow"
-priority = 100
-modes = ["plan"]
-```
-
-Tell the agent it can use these tools in your prompt, for example: _"You can
-check ongoing changes in git."_
-
-For more information on how the policy engine works, see the [Policy Engine
-Guide].
 
 [`list_directory`]: /docs/tools/file-system.md#1-list_directory-readfolder
 [`read_file`]: /docs/tools/file-system.md#2-read_file-readfile
@@ -177,6 +104,3 @@ Guide].
 [`google_web_search`]: /docs/tools/web-search.md
 [`replace`]: /docs/tools/file-system.md#6-replace-edit
 [MCP tools]: /docs/tools/mcp-server.md
-[`activate_skill`]: /docs/cli/skills.md
-[experimental research sub-agents]: /docs/core/subagents.md
-[Policy Engine Guide]: /docs/core/policy-engine.md

docs/cli/settings.md

@@ -22,14 +22,13 @@ they appear in the UI.
 
 ### General
 
-| UI Label                 | Setting                            | Description                                                                                                                                                                    | Default     |
-| ------------------------ | ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------- |
-| Vim Mode                 | `general.vimMode`                  | Enable Vim keybindings                                                                                                                                                         | `false`     |
-| Default Approval Mode    | `general.defaultApprovalMode`      | The default approval mode for tool execution. 'default' prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is read-only mode. 'yolo' is not supported yet. | `"default"` |
-| Enable Auto Update       | `general.enableAutoUpdate`         | Enable automatic updates.                                                                                                                                                      | `true`      |
-| Enable Prompt Completion | `general.enablePromptCompletion`   | Enable AI-powered prompt completion suggestions while typing.                                                                                                                  | `false`     |
-| Debug Keystroke Logging  | `general.debugKeystrokeLogging`    | Enable debug logging of keystrokes to the console.                                                                                                                             | `false`     |
-| Enable Session Cleanup   | `general.sessionRetention.enabled` | Enable automatic session cleanup                                                                                                                                               | `false`     |
+| UI Label                 | Setting                            | Description                                                   | Default |
+| ------------------------ | ---------------------------------- | ------------------------------------------------------------- | ------- |
+| Vim Mode                 | `general.vimMode`                  | Enable Vim keybindings                                        | `false` |
+| Enable Auto Update       | `general.enableAutoUpdate`         | Enable automatic updates.                                     | `true`  |
+| Enable Prompt Completion | `general.enablePromptCompletion`   | Enable AI-powered prompt completion suggestions while typing. | `false` |
+| Debug Keystroke Logging  | `general.debugKeystrokeLogging`    | Enable debug logging of keystrokes to the console.            | `false` |
+| Enable Session Cleanup   | `general.sessionRetention.enabled` | Enable automatic session cleanup                              | `false` |
 
 ### Output
 
@@ -44,12 +43,10 @@ they appear in the UI.
 | Auto Theme Switching                 | `ui.autoThemeSwitching`                 | Automatically switch between default light and dark themes based on terminal background color.                                                                    | `true`  |
 | Terminal Background Polling Interval | `ui.terminalBackgroundPollingInterval`  | Interval in seconds to poll the terminal background color.                                                                                                        | `60`    |
 | Hide Window Title                    | `ui.hideWindowTitle`                    | Hide the window title bar                                                                                                                                         | `false` |
-| Inline Thinking                      | `ui.inlineThinkingMode`                 | Display model thinking inline: off or full.                                                                                                                       | `"off"` |
 | Show Thoughts in Title               | `ui.showStatusInTitle`                  | Show Gemini CLI model thoughts in the terminal window title during the working phase                                                                              | `false` |
 | Dynamic Window Title                 | `ui.dynamicWindowTitle`                 | Update the terminal window title with current status icons (Ready: ◇, Action Required: ✋, Working: ✦)                                                            | `true`  |
 | Show Home Directory Warning          | `ui.showHomeDirectoryWarning`           | Show a warning when running Gemini CLI in the home directory.                                                                                                     | `true`  |
 | Hide Tips                            | `ui.hideTips`                           | Hide helpful tips in the UI                                                                                                                                       | `false` |
-| Show Shortcuts Hint                  | `ui.showShortcutsHint`                  | Show the "? for shortcuts" hint above the input.                                                                                                                  | `true`  |
 | Hide Banner                          | `ui.hideBanner`                         | Hide the application banner                                                                                                                                       | `false` |
 | Hide Context Summary                 | `ui.hideContextSummary`                 | Hide the context summary (GEMINI.md, MCP servers) above the input.                                                                                                | `false` |
 | Hide CWD                             | `ui.footer.hideCWD`                     | Hide the current working directory path in the footer.                                                                                                            | `false` |
@@ -98,13 +95,14 @@ they appear in the UI.
 
 ### Tools
 
-| UI Label                         | Setting                              | Description                                                                                                                                                                | Default |
-| -------------------------------- | ------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Enable Interactive Shell         | `tools.shell.enableInteractiveShell` | Use node-pty for an interactive shell experience. Fallback to child_process still applies.                                                                                 | `true`  |
-| Show Color                       | `tools.shell.showColor`              | Show color in shell output.                                                                                                                                                | `false` |
-| Use Ripgrep                      | `tools.useRipgrep`                   | Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance.                                                            | `true`  |
-| Tool Output Truncation Threshold | `tools.truncateToolOutputThreshold`  | Maximum characters to show when truncating large tool outputs. Set to 0 or negative to disable truncation.                                                                 | `40000` |
-| Disable LLM Correction           | `tools.disableLLMCorrection`         | Disable LLM-based error correction for edit tools. When enabled, tools will fail immediately if exact string matches are not found, instead of attempting to self-correct. | `true`  |
+| UI Label                         | Setting                              | Description                                                                                                                                                                    | Default     |
+| -------------------------------- | ------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------- |
+| Enable Interactive Shell         | `tools.shell.enableInteractiveShell` | Use node-pty for an interactive shell experience. Fallback to child_process still applies.                                                                                     | `true`      |
+| Show Color                       | `tools.shell.showColor`              | Show color in shell output.                                                                                                                                                    | `false`     |
+| Approval Mode                    | `tools.approvalMode`                 | The default approval mode for tool execution. 'default' prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is read-only mode. 'yolo' is not supported yet. | `"default"` |
+| Use Ripgrep                      | `tools.useRipgrep`                   | Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance.                                                                | `true`      |
+| Tool Output Truncation Threshold | `tools.truncateToolOutputThreshold`  | Maximum characters to show when truncating large tool outputs. Set to 0 or negative to disable truncation.                                                                     | `40000`     |
+| Disable LLM Correction           | `tools.disableLLMCorrection`         | Disable LLM-based error correction for edit tools. When enabled, tools will fail immediately if exact string matches are not found, instead of attempting to self-correct.     | `true`      |
 
 ### Security
 
@@ -117,19 +115,12 @@ they appear in the UI.
 | Folder Trust                          | `security.folderTrust.enabled`                  | Setting to track whether Folder trust is enabled.                                                                                                                       | `true`  |
 | Enable Environment Variable Redaction | `security.environmentVariableRedaction.enabled` | Enable redaction of environment variables that may contain secrets.                                                                                                     | `false` |
 
-### Advanced
-
-| UI Label                          | Setting                        | Description                                   | Default |
-| --------------------------------- | ------------------------------ | --------------------------------------------- | ------- |
-| Auto Configure Max Old Space Size | `advanced.autoConfigureMemory` | Automatically configure Node.js memory limits | `false` |
-
 ### Experimental
 
-| UI Label                   | Setting                                  | Description                                                                         | Default |
-| -------------------------- | ---------------------------------------- | ----------------------------------------------------------------------------------- | ------- |
-| Enable Tool Output Masking | `experimental.toolOutputMasking.enabled` | Enables tool output masking to save tokens.                                         | `true`  |
-| Use OSC 52 Paste           | `experimental.useOSC52Paste`             | Use OSC 52 sequence for pasting instead of clipboardy (useful for remote sessions). | `false` |
-| Plan                       | `experimental.plan`                      | Enable planning features (Plan Mode and tools).                                     | `false` |
+| UI Label         | Setting                      | Description                                                                         | Default |
+| ---------------- | ---------------------------- | ----------------------------------------------------------------------------------- | ------- |
+| Use OSC 52 Paste | `experimental.useOSC52Paste` | Use OSC 52 sequence for pasting instead of clipboardy (useful for remote sessions). | `false` |
+| Plan             | `experimental.plan`          | Enable planning features (Plan Mode and tools).                                     | `false` |
 
 ### Skills
 

docs/core/policy-engine.md

@@ -119,17 +119,9 @@ For example:
 
 Approval modes allow the policy engine to apply different sets of rules based on
 the CLI's operational mode. A rule can be associated with one or more modes
-(e.g., `yolo`, `autoEdit`, `plan`). The rule will only be active if the CLI is
-running in one of its specified modes. If a rule has no modes specified, it is
-always active.
-
-- `default`: The standard interactive mode where most write tools require
-  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].
-- `yolo`: A mode where all tools are auto-approved (use with extreme caution).
+(e.g., `yolo`, `autoEdit`). The rule will only be active if the CLI is running
+in one of its specified modes. If a rule has no modes specified, it is always
+active.
 
 ## Rule matching
 
@@ -311,5 +303,3 @@ 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

docs/get-started/configuration.md

@@ -106,17 +106,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Enable Vim keybindings
   - **Default:** `false`
 
-- **`general.defaultApprovalMode`** (enum):
-  - **Description:** The default approval mode for tool execution. 'default'
-    prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is
-    read-only mode. 'yolo' is not supported yet.
-  - **Default:** `"default"`
-  - **Values:** `"default"`, `"auto_edit"`, `"plan"`
-
-- **`general.devtools`** (boolean):
-  - **Description:** Enable DevTools inspector on launch.
-  - **Default:** `false`
-
 - **`general.enableAutoUpdate`** (boolean):
   - **Description:** Enable automatic updates.
   - **Default:** `true`
@@ -195,11 +184,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `false`
   - **Requires restart:** Yes
 
-- **`ui.inlineThinkingMode`** (enum):
-  - **Description:** Display model thinking inline: off or full.
-  - **Default:** `"off"`
-  - **Values:** `"off"`, `"full"`
-
 - **`ui.showStatusInTitle`** (boolean):
   - **Description:** Show Gemini CLI model thoughts in the terminal window title
     during the working phase
@@ -220,10 +204,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Description:** Hide helpful tips in the UI
   - **Default:** `false`
 
-- **`ui.showShortcutsHint`** (boolean):
-  - **Description:** Show the "? for shortcuts" hint above the input.
-  - **Default:** `true`
-
 - **`ui.hideBanner`** (boolean):
   - **Description:** Hide the application banner
   - **Default:** `false`
@@ -692,6 +672,13 @@ their corresponding top-level category object in your `settings.json` file.
     performance.
   - **Default:** `true`
 
+- **`tools.approvalMode`** (enum):
+  - **Description:** The default approval mode for tool execution. 'default'
+    prompts for approval, 'auto_edit' auto-approves edit tools, and 'plan' is
+    read-only mode. 'yolo' is not supported yet.
+  - **Default:** `"default"`
+  - **Values:** `"default"`, `"auto_edit"`, `"plan"`
+
 - **`tools.core`** (array):
   - **Description:** Restrict the set of built-in tools with an allowlist. Match
     semantics mirror tools.allowed; see the built-in tools documentation for
@@ -852,28 +839,6 @@ their corresponding top-level category object in your `settings.json` file.
 
 #### `experimental`
 
-- **`experimental.toolOutputMasking.enabled`** (boolean):
-  - **Description:** Enables tool output masking to save tokens.
-  - **Default:** `true`
-  - **Requires restart:** Yes
-
-- **`experimental.toolOutputMasking.toolProtectionThreshold`** (number):
-  - **Description:** Minimum number of tokens to protect from masking (most
-    recent tool outputs).
-  - **Default:** `50000`
-  - **Requires restart:** Yes
-
-- **`experimental.toolOutputMasking.minPrunableTokensThreshold`** (number):
-  - **Description:** Minimum prunable tokens required to trigger a masking pass.
-  - **Default:** `30000`
-  - **Requires restart:** Yes
-
-- **`experimental.toolOutputMasking.protectLatestTurn`** (boolean):
-  - **Description:** Ensures the absolute latest turn is never masked,
-    regardless of token count.
-  - **Default:** `true`
-  - **Requires restart:** Yes
-
 - **`experimental.enableAgents`** (boolean):
   - **Description:** Enable local and remote subagents. Warning: Experimental
     feature, uses YOLO mode for subagents
@@ -890,11 +855,6 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `true`
   - **Requires restart:** Yes
 
-- **`experimental.extensionRegistry`** (boolean):
-  - **Description:** Enable extension registry explore UI.
-  - **Default:** `false`
-  - **Requires restart:** Yes
-
 - **`experimental.extensionReloading`** (boolean):
   - **Description:** Enables extension loading/unloading within the CLI session.
   - **Default:** `false`

esbuild.config.js

@@ -63,7 +63,6 @@ const external = [
   '@lydell/node-pty-win32-arm64',
   '@lydell/node-pty-win32-x64',
   'keytar',
-  'gemini-cli-devtools',
 ];
 
 const baseConfig = {

eslint.config.js

@@ -23,7 +23,6 @@ const __dirname = path.dirname(__filename);
 
 // Determine the monorepo root (assuming eslint.config.js is at the root)
 const projectRoot = __dirname;
-const currentYear = new Date().getFullYear();
 
 export default tseslint.config(
   {
@@ -193,14 +192,6 @@ export default tseslint.config(
       ],
     },
   },
-  {
-    // Rules that only apply to product code
-    files: ['packages/*/src/**/*.{ts,tsx}'],
-    ignores: ['**/*.test.ts', '**/*.test.tsx'],
-    rules: {
-      '@typescript-eslint/no-unsafe-type-assertion': 'error',
-    },
-  },
   {
     // Allow os.homedir() in tests and paths.ts where it is used to implement the helper
     files: [
@@ -268,8 +259,8 @@ export default tseslint.config(
           ].join('\n'),
           patterns: {
             year: {
-              pattern: `202[5-${currentYear.toString().slice(-1)}]`,
-              defaultValue: currentYear.toString(),
+              pattern: '202[5-6]',
+              defaultValue: '2026',
             },
           },
         },

evals/edit-locations-eval.eval.ts

@@ -1,110 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-
-describe('Edits location eval', () => {
-  /**
-   * Ensure that Gemini CLI always updates existing test files, if present,
-   * instead of creating a new one.
-   */
-  evalTest('USUALLY_PASSES', {
-    name: 'should update existing test file instead of creating a new one',
-    files: {
-      'package.json': JSON.stringify(
-        {
-          name: 'test-location-repro',
-          version: '1.0.0',
-          scripts: {
-            test: 'vitest run',
-          },
-          devDependencies: {
-            vitest: '^1.0.0',
-            typescript: '^5.0.0',
-          },
-        },
-        null,
-        2,
-      ),
-      'src/math.ts': `
-export function add(a: number, b: number): number {
-  return a + b;
-}
-
-export function subtract(a: number, b: number): number {
-  return a - b;
-}
-
-export function multiply(a: number, b: number): number {
-  return a + b;
-}
-`,
-      'src/math.test.ts': `
-import { expect, test } from 'vitest';
-import { add, subtract } from './math';
-
-test('add adds two numbers', () => {
-  expect(add(2, 3)).toBe(5);
-});
-
-test('subtract subtracts two numbers', () => {
-  expect(subtract(5, 3)).toBe(2);
-});
-`,
-      'src/utils.ts': `
-export function capitalize(s: string): string {
-  return s.charAt(0).toUpperCase() + s.slice(1);
-}
-`,
-      'src/utils.test.ts': `
-import { expect, test } from 'vitest';
-import { capitalize } from './utils';
-
-test('capitalize capitalizes the first letter', () => {
-  expect(capitalize('hello')).toBe('Hello');
-});
-`,
-    },
-    prompt: 'Fix the bug in src/math.ts. Do not run the code.',
-    timeout: 180000,
-    assert: async (rig) => {
-      const toolLogs = rig.readToolLogs();
-      const replaceCalls = toolLogs.filter(
-        (t) => t.toolRequest.name === 'replace',
-      );
-      const writeFileCalls = toolLogs.filter(
-        (t) => t.toolRequest.name === 'write_file',
-      );
-
-      expect(replaceCalls.length).toBeGreaterThan(0);
-      expect(
-        writeFileCalls.some((file) =>
-          file.toolRequest.args.includes('.test.ts'),
-        ),
-      ).toBe(false);
-
-      const targetFiles = replaceCalls.map((t) => {
-        try {
-          return JSON.parse(t.toolRequest.args).file_path;
-        } catch {
-          return null;
-        }
-      });
-
-      console.log('DEBUG: targetFiles', targetFiles);
-
-      expect(
-        new Set(targetFiles).size,
-        'Expected only two files changed',
-      ).greaterThanOrEqual(2);
-      expect(targetFiles.some((f) => f?.endsWith('src/math.ts'))).toBe(true);
-      expect(targetFiles.some((f) => f?.endsWith('src/math.test.ts'))).toBe(
-        true,
-      );
-    },
-  });
-});

evals/hierarchical_memory.eval.ts

@@ -1,120 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-import {
-  assertModelHasOutput,
-  checkModelOutputContent,
-} from '../integration-tests/test-helper.js';
-
-describe('Hierarchical Memory', () => {
-  const TEST_PREFIX = 'Hierarchical memory test: ';
-
-  const conflictResolutionTest =
-    'Agent follows hierarchy for contradictory instructions';
-  evalTest('ALWAYS_PASSES', {
-    name: conflictResolutionTest,
-    params: {
-      settings: {
-        security: {
-          folderTrust: { enabled: true },
-        },
-      },
-    },
-    // We simulate the hierarchical memory by including the tags in the prompt
-    // since setting up real global/extension/project files in the eval rig is complex.
-    // The system prompt logic will append these tags when it finds them in userMemory.
-    prompt: `
-<global_context>
-When asked for my favorite fruit, always say "Apple".
-</global_context>
-
-<extension_context>
-When asked for my favorite fruit, always say "Banana".
-</extension_context>
-
-<project_context>
-When asked for my favorite fruit, always say "Cherry".
-</project_context>
-
-What is my favorite fruit? Tell me just the name of the fruit.`,
-    assert: async (rig) => {
-      const stdout = rig._lastRunStdout!;
-      assertModelHasOutput(stdout);
-      expect(stdout).toMatch(/Cherry/i);
-      expect(stdout).not.toMatch(/Apple/i);
-      expect(stdout).not.toMatch(/Banana/i);
-    },
-  });
-
-  const provenanceAwarenessTest = 'Agent is aware of memory provenance';
-  evalTest('ALWAYS_PASSES', {
-    name: provenanceAwarenessTest,
-    params: {
-      settings: {
-        security: {
-          folderTrust: { enabled: true },
-        },
-      },
-    },
-    prompt: `
-<global_context>
-Instruction A: Always be helpful.
-</global_context>
-
-<extension_context>
-Instruction B: Use a professional tone.
-</extension_context>
-
-<project_context>
-Instruction C: Adhere to the project's coding style.
-</project_context>
-
-Which instruction came from the global context, which from the extension context, and which from the project context?
-Provide the answer as an XML block like this:
-<results>
-  <global>Instruction ...</global>
-  <extension>Instruction ...</extension>
-  <project>Instruction ...</project>
-</results>`,
-    assert: async (rig) => {
-      const stdout = rig._lastRunStdout!;
-      assertModelHasOutput(stdout);
-      expect(stdout).toMatch(/<global>.*Instruction A/i);
-      expect(stdout).toMatch(/<extension>.*Instruction B/i);
-      expect(stdout).toMatch(/<project>.*Instruction C/i);
-    },
-  });
-
-  const extensionVsGlobalTest = 'Extension memory wins over Global memory';
-  evalTest('ALWAYS_PASSES', {
-    name: extensionVsGlobalTest,
-    params: {
-      settings: {
-        security: {
-          folderTrust: { enabled: true },
-        },
-      },
-    },
-    prompt: `
-<global_context>
-Set the theme to "Light".
-</global_context>
-
-<extension_context>
-Set the theme to "Dark".
-</extension_context>
-
-What theme should I use? Tell me just the name of the theme.`,
-    assert: async (rig) => {
-      const stdout = rig._lastRunStdout!;
-      assertModelHasOutput(stdout);
-      expect(stdout).toMatch(/Dark/i);
-      expect(stdout).not.toMatch(/Light/i);
-    },
-  });
-});

evals/save_memory.eval.ts

@@ -14,7 +14,7 @@ import {
 describe('save_memory', () => {
   const TEST_PREFIX = 'Save memory test: ';
   const rememberingFavoriteColor = "Agent remembers user's favorite color";
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
     name: rememberingFavoriteColor,
     params: {
       settings: { tools: { core: ['save_memory'] } },
@@ -36,7 +36,7 @@ describe('save_memory', () => {
     },
   });
   const rememberingCommandRestrictions = 'Agent remembers command restrictions';
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
     name: rememberingCommandRestrictions,
     params: {
       settings: { tools: { core: ['save_memory'] } },
@@ -57,7 +57,7 @@ describe('save_memory', () => {
   });
 
   const rememberingWorkflow = 'Agent remembers workflow preferences';
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
     name: rememberingWorkflow,
     params: {
       settings: { tools: { core: ['save_memory'] } },
@@ -79,7 +79,7 @@ describe('save_memory', () => {
 
   const ignoringTemporaryInformation =
     'Agent ignores temporary conversation details';
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
     name: ignoringTemporaryInformation,
     params: {
       settings: { tools: { core: ['save_memory'] } },
@@ -104,7 +104,7 @@ describe('save_memory', () => {
   });
 
   const rememberingPetName = "Agent remembers user's pet's name";
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
     name: rememberingPetName,
     params: {
       settings: { tools: { core: ['save_memory'] } },
@@ -125,7 +125,7 @@ describe('save_memory', () => {
   });
 
   const rememberingCommandAlias = 'Agent remembers custom command aliases';
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
     name: rememberingCommandAlias,
     params: {
       settings: { tools: { core: ['save_memory'] } },
@@ -147,7 +147,7 @@ describe('save_memory', () => {
 
   const ignoringDbSchemaLocation =
     "Agent ignores workspace's database schema location";
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
     name: ignoringDbSchemaLocation,
     params: {
       settings: {
@@ -178,7 +178,7 @@ describe('save_memory', () => {
 
   const rememberingCodingStyle =
     "Agent remembers user's coding style preference";
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
     name: rememberingCodingStyle,
     params: {
       settings: { tools: { core: ['save_memory'] } },
@@ -200,7 +200,7 @@ describe('save_memory', () => {
 
   const ignoringBuildArtifactLocation =
     'Agent ignores workspace build artifact location';
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
     name: ignoringBuildArtifactLocation,
     params: {
       settings: {
@@ -230,7 +230,7 @@ describe('save_memory', () => {
   });
 
   const ignoringMainEntryPoint = "Agent ignores workspace's main entry point";
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
     name: ignoringMainEntryPoint,
     params: {
       settings: {
@@ -260,7 +260,7 @@ describe('save_memory', () => {
   });
 
   const rememberingBirthday = "Agent remembers user's birthday";
-  evalTest('USUALLY_PASSES', {
+  evalTest('ALWAYS_PASSES', {
     name: rememberingBirthday,
     params: {
       settings: { tools: { core: ['save_memory'] } },

evals/shell-efficiency.eval.ts

@@ -1,110 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect } from 'vitest';
-import { evalTest } from './test-helper.js';
-
-describe('Shell Efficiency', () => {
-  const getCommand = (call: any): string | undefined => {
-    let args = call.toolRequest.args;
-    if (typeof args === 'string') {
-      try {
-        args = JSON.parse(args);
-      } catch (e) {
-        // Ignore parse errors
-      }
-    }
-    return typeof args === 'string' ? args : (args as any)['command'];
-  };
-
-  evalTest('USUALLY_PASSES', {
-    name: 'should use --silent/--quiet flags when installing packages',
-    prompt: 'Install the "lodash" package using npm.',
-    assert: async (rig) => {
-      const toolCalls = rig.readToolLogs();
-      const shellCalls = toolCalls.filter(
-        (call) => call.toolRequest.name === 'run_shell_command',
-      );
-
-      const hasEfficiencyFlag = shellCalls.some((call) => {
-        const cmd = getCommand(call);
-        return (
-          cmd &&
-          cmd.includes('npm install') &&
-          (cmd.includes('--silent') ||
-            cmd.includes('--quiet') ||
-            cmd.includes('-q'))
-        );
-      });
-
-      expect(
-        hasEfficiencyFlag,
-        `Expected agent to use efficiency flags for npm install. Commands used: ${shellCalls
-          .map(getCommand)
-          .join(', ')}`,
-      ).toBe(true);
-    },
-  });
-
-  evalTest('USUALLY_PASSES', {
-    name: 'should use --no-pager with git commands',
-    prompt: 'Show the git log.',
-    assert: async (rig) => {
-      const toolCalls = rig.readToolLogs();
-      const shellCalls = toolCalls.filter(
-        (call) => call.toolRequest.name === 'run_shell_command',
-      );
-
-      const hasNoPager = shellCalls.some((call) => {
-        const cmd = getCommand(call);
-        return cmd && cmd.includes('git') && cmd.includes('--no-pager');
-      });
-
-      expect(
-        hasNoPager,
-        `Expected agent to use --no-pager with git. Commands used: ${shellCalls
-          .map(getCommand)
-          .join(', ')}`,
-      ).toBe(true);
-    },
-  });
-
-  evalTest('USUALLY_PASSES', {
-    name: 'should NOT use efficiency flags when enableShellOutputEfficiency is disabled',
-    params: {
-      settings: {
-        tools: {
-          shell: {
-            enableShellOutputEfficiency: false,
-          },
-        },
-      },
-    },
-    prompt: 'Install the "lodash" package using npm.',
-    assert: async (rig) => {
-      const toolCalls = rig.readToolLogs();
-      const shellCalls = toolCalls.filter(
-        (call) => call.toolRequest.name === 'run_shell_command',
-      );
-
-      const hasEfficiencyFlag = shellCalls.some((call) => {
-        const cmd = getCommand(call);
-        return (
-          cmd &&
-          cmd.includes('npm install') &&
-          (cmd.includes('--silent') ||
-            cmd.includes('--quiet') ||
-            cmd.includes('-q'))
-        );
-      });
-
-      expect(
-        hasEfficiencyFlag,
-        'Agent used efficiency flags even though enableShellOutputEfficiency was disabled',
-      ).toBe(false);
-    },
-  });
-});

integration-tests/ripgrep-real.test.ts

@@ -11,7 +11,6 @@ import * as os from 'node:os';
 import { RipGrepTool } from '../packages/core/src/tools/ripGrep.js';
 import { Config } from '../packages/core/src/config/config.js';
 import { WorkspaceContext } from '../packages/core/src/utils/workspaceContext.js';
-import { createMockMessageBus } from '../packages/core/src/test-utils/mock-message-bus.js';
 
 // Mock Config to provide necessary context
 class MockConfig {
@@ -67,7 +66,7 @@ describe('ripgrep-real-direct', () => {
     await fs.writeFile(path.join(tempDir, 'file3.txt'), 'goodbye moon\n');
 
     const config = new MockConfig(tempDir) as unknown as Config;
-    tool = new RipGrepTool(config, createMockMessageBus());
+    tool = new RipGrepTool(config);
   });
 
   afterAll(async () => {
@@ -109,24 +108,4 @@ describe('ripgrep-real-direct', () => {
     expect(result.llmContent).toContain('script.js');
     expect(result.llmContent).not.toContain('file1.txt');
   });
-
-  it('should support context parameters', async () => {
-    // Create a file with multiple lines
-    await fs.writeFile(
-      path.join(tempDir, 'context.txt'),
-      'line1\nline2\nline3 match\nline4\nline5\n',
-    );
-
-    const invocation = tool.build({
-      pattern: 'match',
-      context: 1,
-    });
-    const result = await invocation.execute(new AbortController().signal);
-
-    expect(result.llmContent).toContain('Found 1 match');
-    expect(result.llmContent).toContain('context.txt');
-    expect(result.llmContent).toContain('L2- line2');
-    expect(result.llmContent).toContain('L3: line3 match');
-    expect(result.llmContent).toContain('L4- line4');
-  });
 });

integration-tests/vitest.config.ts

@@ -20,8 +20,5 @@ export default defineConfig({
         maxThreads: 16,
       },
     },
-    env: {
-      GEMINI_TEST_TYPE: 'integration',
-    },
   },
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.30.0-nightly.20260210.a2174751d",
+  "version": "0.29.0-nightly.20260203.71f46f116",
   "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.30.0-nightly.20260210.a2174751d"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.29.0-nightly.20260203.71f46f116"
   },
   "scripts": {
     "start": "cross-env NODE_ENV=development node scripts/start.js",
@@ -64,7 +64,7 @@
     "pre-commit": "node scripts/pre-commit.js"
   },
   "overrides": {
-    "ink": "npm:@jrichman/ink@6.4.10",
+    "ink": "npm:@jrichman/ink@6.4.8",
     "wrap-ansi": "9.0.2",
     "cliui": {
       "wrap-ansi": "7.0.0"
@@ -126,7 +126,7 @@
     "yargs": "^17.7.2"
   },
   "dependencies": {
-    "ink": "npm:@jrichman/ink@6.4.10",
+    "ink": "npm:@jrichman/ink@6.4.8",
     "latest-version": "^9.0.0",
     "proper-lockfile": "^4.1.2",
     "simple-git": "^3.28.0"
@@ -138,7 +138,6 @@
     "@lydell/node-pty-linux-x64": "1.1.0",
     "@lydell/node-pty-win32-arm64": "1.1.0",
     "@lydell/node-pty-win32-x64": "1.1.0",
-    "gemini-cli-devtools": "^0.2.1",
     "keytar": "^7.9.0",
     "node-pty": "^1.0.0"
   },

packages/a2a-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli-a2a-server",
-  "version": "0.30.0-nightly.20260210.a2174751d",
+  "version": "0.29.0-nightly.20260203.71f46f116",
   "description": "Gemini CLI A2A Server",
   "repository": {
     "type": "git",

packages/a2a-server/src/agent/executor.ts

@@ -117,7 +117,6 @@ export class CoderAgentExecutor implements AgentExecutor {
     const agentSettings = persistedState._agentSettings;
     const config = await this.getConfig(agentSettings, sdkTask.id);
     const contextId: string =
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       (metadata['_contextId'] as string) || sdkTask.contextId;
     const runtimeTask = await Task.create(
       sdkTask.id,
@@ -141,7 +140,6 @@ export class CoderAgentExecutor implements AgentExecutor {
     agentSettingsInput?: AgentSettings,
     eventBus?: ExecutionEventBus,
   ): Promise<TaskWrapper> {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     const agentSettings = agentSettingsInput || ({} as AgentSettings);
     const config = await this.getConfig(agentSettings, taskId);
     const runtimeTask = await Task.create(
@@ -292,7 +290,6 @@ export class CoderAgentExecutor implements AgentExecutor {
     const contextId: string =
       userMessage.contextId ||
       sdkTask?.contextId ||
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       (sdkTask?.metadata?.['_contextId'] as string) ||
       uuidv4();
 
@@ -388,7 +385,6 @@ export class CoderAgentExecutor implements AgentExecutor {
       }
     } else {
       logger.info(`[CoderAgentExecutor] Creating new task ${taskId}.`);
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       const agentSettings = userMessage.metadata?.[
         'coderAgent'
       ] as AgentSettings;

packages/a2a-server/src/agent/task.ts

@@ -378,7 +378,6 @@ export class Task {
       if (tc.status === 'awaiting_approval' && tc.confirmationDetails) {
         this.pendingToolConfirmationDetails.set(
           tc.request.callId,
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
           tc.confirmationDetails as ToolCallConfirmationDetails,
         );
       }
@@ -412,7 +411,7 @@ export class Task {
       );
       toolCalls.forEach((tc: ToolCall) => {
         if (tc.status === 'awaiting_approval' && tc.confirmationDetails) {
-          // eslint-disable-next-line @typescript-eslint/no-floating-promises, @typescript-eslint/no-unsafe-type-assertion
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
           (tc.confirmationDetails as ToolCallConfirmationDetails).onConfirm(
             ToolConfirmationOutcome.ProceedOnce,
           );
@@ -466,14 +465,12 @@ export class Task {
     T extends ToolCall | AnyDeclarativeTool,
     K extends UnionKeys<T>,
   >(from: T, ...fields: K[]): Partial<T> {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     const ret = {} as Pick<T, K>;
     for (const field of fields) {
       if (field in from) {
         ret[field] = from[field];
       }
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     return ret as Partial<T>;
   }
 
@@ -496,7 +493,6 @@ export class Task {
     );
 
     if (tc.tool) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       serializableToolCall.tool = this._pickFields(
         tc.tool,
         'name',
@@ -626,11 +622,8 @@ export class Task {
           request.args['new_string']
         ) {
           const newContent = await this.getProposedContent(
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
             request.args['file_path'] as string,
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
             request.args['old_string'] as string,
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
             request.args['new_string'] as string,
           );
           return { ...request, args: { ...request.args, newContent } };
@@ -726,7 +719,6 @@ export class Task {
       case GeminiEventType.Error:
       default: {
         // Block scope for lexical declaration
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         const errorEvent = event as ServerGeminiErrorEvent; // Type assertion
         const errorMessage =
           errorEvent.value?.error.message ?? 'Unknown error from LLM stream';
@@ -815,7 +807,6 @@ export class Task {
         if (confirmationDetails.type === 'edit') {
           const payload = part.data['newContent']
             ? ({
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
                 newContent: part.data['newContent'] as string,
               } as ToolConfirmationPayload)
             : undefined;

packages/a2a-server/src/commands/init.ts

@@ -85,7 +85,6 @@ export class InitCommand implements Command {
     if (!context.agentExecutor) {
       throw new Error('Agent executor not found in context.');
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     const agentExecutor = context.agentExecutor as CoderAgentExecutor;
 
     const agentSettings: AgentSettings = {

packages/a2a-server/src/config/config.test.ts

@@ -41,11 +41,9 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
       };
       return mockConfig;
     }),
-    loadServerHierarchicalMemory: vi.fn().mockResolvedValue({
-      memoryContent: { global: '', extension: '', project: '' },
-      fileCount: 0,
-      filePaths: [],
-    }),
+    loadServerHierarchicalMemory: vi
+      .fn()
+      .mockResolvedValue({ memoryContent: '', fileCount: 0, filePaths: [] }),
     startupProfiler: {
       flush: vi.fn(),
     },

packages/a2a-server/src/config/config.ts

@@ -77,7 +77,6 @@ export async function loadConfig(
     cwd: workspaceDir,
     telemetry: {
       enabled: settings.telemetry?.enabled,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       target: settings.telemetry?.target as TelemetryTarget,
       otlpEndpoint:
         process.env['OTEL_EXPORTER_OTLP_ENDPOINT'] ??

packages/a2a-server/src/config/extension.ts

@@ -93,7 +93,6 @@ function loadExtension(extensionDir: string): GeminiCLIExtension | null {
 
   try {
     const configContent = fs.readFileSync(configFilePath, 'utf-8');
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     const config = JSON.parse(configContent) as ExtensionConfig;
     if (!config.name || !config.version) {
       logger.error(
@@ -108,7 +107,6 @@ function loadExtension(extensionDir: string): GeminiCLIExtension | null {
       .map((contextFileName) => path.join(extensionDir, contextFileName))
       .filter((contextFilePath) => fs.existsSync(contextFilePath));
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     return {
       name: config.name,
       version: config.version,
@@ -142,7 +140,6 @@ export function loadInstallMetadata(
   const metadataFilePath = path.join(extensionDir, INSTALL_METADATA_FILENAME);
   try {
     const configContent = fs.readFileSync(metadataFilePath, 'utf-8');
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     const metadata = JSON.parse(configContent) as ExtensionInstallMetadata;
     return metadata;
   } catch (e) {

packages/a2a-server/src/config/settings.ts

@@ -67,7 +67,6 @@ export function loadSettings(workspaceDir: string): Settings {
   try {
     if (fs.existsSync(USER_SETTINGS_PATH)) {
       const userContent = fs.readFileSync(USER_SETTINGS_PATH, 'utf-8');
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       const parsedUserSettings = JSON.parse(
         stripJsonComments(userContent),
       ) as Settings;
@@ -90,7 +89,6 @@ export function loadSettings(workspaceDir: string): Settings {
   try {
     if (fs.existsSync(workspaceSettingsPath)) {
       const projectContent = fs.readFileSync(workspaceSettingsPath, 'utf-8');
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       const parsedWorkspaceSettings = JSON.parse(
         stripJsonComments(projectContent),
       ) as Settings;
@@ -141,12 +139,10 @@ function resolveEnvVarsInObject<T>(obj: T): T {
   }
 
   if (typeof obj === 'string') {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     return resolveEnvVarsInString(obj) as unknown as T;
   }
 
   if (Array.isArray(obj)) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     return obj.map((item) => resolveEnvVarsInObject(item)) as unknown as T;
   }
 

packages/a2a-server/src/http/app.ts

@@ -118,7 +118,6 @@ async function handleExecuteCommand(
       const eventHandler = (event: AgentExecutionEvent) => {
         const jsonRpcResponse = {
           jsonrpc: '2.0',
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
           id: 'taskId' in event ? event.taskId : (event as Message).messageId,
           result: event,
         };
@@ -207,7 +206,6 @@ export async function createApp() {
     expressApp.post('/tasks', async (req, res) => {
       try {
         const taskId = uuidv4();
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         const agentSettings = req.body.agentSettings as
           | AgentSettings
           | undefined;

packages/a2a-server/src/persistence/gcs.ts

@@ -95,7 +95,6 @@ export class GCSTaskStore implements TaskStore {
     await this.ensureBucketInitialized();
     const taskId = task.id;
     const persistedState = getPersistedState(
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       task.metadata as PersistedTaskMetadata,
     );
 

packages/a2a-server/src/types.ts

@@ -125,7 +125,6 @@ export const METADATA_KEY = '__persistedState';
 export function getPersistedState(
   metadata: PersistedTaskMetadata,
 ): PersistedStateMetadata | undefined {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   return metadata?.[METADATA_KEY] as PersistedStateMetadata | undefined;
 }
 

packages/a2a-server/src/utils/testing_utils.ts

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
 import type {
   Task as SDKTask,
   TaskStatusUpdateEvent,
@@ -17,7 +16,6 @@ import {
   GeminiClient,
   HookSystem,
   PolicyDecision,
-  tmpdir,
 } from '@google/gemini-cli-core';
 import { createMockMessageBus } from '@google/gemini-cli-core/src/test-utils/mock-message-bus.js';
 import type { Config, Storage } from '@google/gemini-cli-core';
@@ -26,8 +24,6 @@ import { expect, vi } from 'vitest';
 export function createMockConfig(
   overrides: Partial<Config> = {},
 ): Partial<Config> {
-  const tmpDir = tmpdir();
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const mockConfig = {
     getToolRegistry: vi.fn().mockReturnValue({
       getTool: vi.fn(),
@@ -42,12 +38,11 @@ export function createMockConfig(
     getWorkspaceContext: vi.fn().mockReturnValue({
       isPathWithinWorkspace: () => true,
     }),
-    getTargetDir: () => tmpDir,
+    getTargetDir: () => '/test',
     getCheckpointingEnabled: vi.fn().mockReturnValue(false),
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     storage: {
-      getProjectTempDir: () => tmpDir,
-      getProjectTempCheckpointsDir: () => path.join(tmpDir, 'checkpoints'),
+      getProjectTempDir: () => '/tmp',
+      getProjectTempCheckpointsDir: () => '/tmp/checkpoints',
     } as Storage,
     getTruncateToolOutputThreshold: () =>
       DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
@@ -150,7 +145,6 @@ export function assertUniqueFinalEventIsLast(
   events: SendStreamingMessageSuccessResponse[],
 ) {
   // Final event is input-required & final
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const finalEvent = events[events.length - 1].result as TaskStatusUpdateEvent;
   expect(finalEvent.metadata?.['coderAgent']).toMatchObject({
     kind: 'state-change',
@@ -160,11 +154,9 @@ export function assertUniqueFinalEventIsLast(
 
   // There is only one event with final and its the last
   expect(
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     events.filter((e) => (e.result as TaskStatusUpdateEvent).final).length,
   ).toBe(1);
   expect(
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     events.findIndex((e) => (e.result as TaskStatusUpdateEvent).final),
   ).toBe(events.length - 1);
 }
@@ -173,13 +165,11 @@ export function assertTaskCreationAndWorkingStatus(
   events: SendStreamingMessageSuccessResponse[],
 ) {
   // Initial task creation event
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const taskEvent = events[0].result as SDKTask;
   expect(taskEvent.kind).toBe('task');
   expect(taskEvent.status.state).toBe('submitted');
 
   // Status update: working
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const workingEvent = events[1].result as TaskStatusUpdateEvent;
   expect(workingEvent.kind).toBe('status-update');
   expect(workingEvent.status.state).toBe('working');

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.30.0-nightly.20260210.a2174751d",
+  "version": "0.29.0-nightly.20260203.71f46f116",
   "description": "Gemini CLI",
   "license": "Apache-2.0",
   "repository": {
@@ -26,7 +26,7 @@
     "dist"
   ],
   "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.30.0-nightly.20260210.a2174751d"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.29.0-nightly.20260203.71f46f116"
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^0.12.0",
@@ -34,11 +34,10 @@
     "@google/genai": "1.30.0",
     "@iarna/toml": "^2.2.5",
     "@modelcontextprotocol/sdk": "^1.23.0",
-    "ansi-escapes": "^7.3.0",
+    "@types/update-notifier": "^6.0.8",
     "ansi-regex": "^6.2.2",
-    "chalk": "^4.1.2",
-    "cli-spinners": "^2.9.2",
     "clipboardy": "^5.0.0",
+    "color-convert": "^2.0.1",
     "command-exists": "^1.2.9",
     "comment-json": "^4.2.5",
     "diff": "^8.0.3",
@@ -47,7 +46,7 @@
     "fzf": "^0.5.2",
     "glob": "^12.0.0",
     "highlight.js": "^11.11.1",
-    "ink": "npm:@jrichman/ink@6.4.10",
+    "ink": "npm:@jrichman/ink@6.4.8",
     "ink-gradient": "^3.0.0",
     "ink-spinner": "^5.0.0",
     "latest-version": "^9.0.0",
@@ -57,6 +56,7 @@
     "prompts": "^2.4.2",
     "proper-lockfile": "^4.1.2",
     "react": "^19.2.0",
+    "read-package-up": "^11.0.0",
     "shell-quote": "^1.8.3",
     "simple-git": "^3.28.0",
     "string-width": "^8.1.0",
@@ -65,21 +65,29 @@
     "tar": "^7.5.2",
     "tinygradient": "^1.1.5",
     "undici": "^7.10.0",
+    "wrap-ansi": "9.0.2",
     "ws": "^8.16.0",
     "yargs": "^17.7.2",
     "zod": "^3.23.8"
   },
   "devDependencies": {
+    "@babel/runtime": "^7.27.6",
     "@google/gemini-cli-test-utils": "file:../test-utils",
+    "@types/archiver": "^6.0.3",
     "@types/command-exists": "^1.2.3",
-    "@types/hast": "^3.0.4",
+    "@types/dotenv": "^6.1.1",
     "@types/node": "^20.11.24",
     "@types/react": "^19.2.0",
+    "@types/react-dom": "^19.2.0",
     "@types/semver": "^7.7.0",
     "@types/shell-quote": "^1.7.5",
+    "@types/tar": "^6.1.13",
     "@types/ws": "^8.5.10",
     "@types/yargs": "^17.0.32",
+    "archiver": "^7.0.1",
     "ink-testing-library": "^4.0.0",
+    "pretty-format": "^30.0.2",
+    "react-dom": "^19.2.0",
     "typescript": "^5.3.3",
     "vitest": "^3.1.1"
   },

packages/cli/src/commands/extensions/configure.ts

@@ -71,7 +71,6 @@ export const configureCommand: CommandModule<object, ConfigureArgs> = {
         extensionManager,
         name,
         setting,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         scope as ExtensionSettingScope,
       );
     }
@@ -80,7 +79,6 @@ export const configureCommand: CommandModule<object, ConfigureArgs> = {
       await configureExtension(
         extensionManager,
         name,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         scope as ExtensionSettingScope,
       );
     }
@@ -88,7 +86,6 @@ export const configureCommand: CommandModule<object, ConfigureArgs> = {
     else {
       await configureAllExtensions(
         extensionManager,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         scope as ExtensionSettingScope,
       );
     }

packages/cli/src/commands/extensions/disable.ts

@@ -79,9 +79,7 @@ export const disableCommand: CommandModule = {
       }),
   handler: async (argv) => {
     await handleDisable({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       name: argv['name'] as string,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       scope: argv['scope'] as string,
     });
     await exitCli();

packages/cli/src/commands/extensions/enable.ts

@@ -105,9 +105,7 @@ export const enableCommand: CommandModule = {
       }),
   handler: async (argv) => {
     await handleEnable({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       name: argv['name'] as string,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       scope: argv['scope'] as string,
     });
     await exitCli();

packages/cli/src/commands/extensions/install.ts

@@ -99,15 +99,10 @@ export const installCommand: CommandModule = {
       }),
   handler: async (argv) => {
     await handleInstall({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       source: argv['source'] as string,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       ref: argv['ref'] as string | undefined,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       autoUpdate: argv['auto-update'] as boolean | undefined,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       allowPreRelease: argv['pre-release'] as boolean | undefined,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       consent: argv['consent'] as boolean | undefined,
     });
     await exitCli();

packages/cli/src/commands/extensions/link.ts

@@ -79,9 +79,7 @@ export const linkCommand: CommandModule = {
       .check((_) => true),
   handler: async (argv) => {
     await handleLink({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       path: argv['path'] as string,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       consent: argv['consent'] as boolean | undefined,
     });
     await exitCli();

packages/cli/src/commands/extensions/list.ts

@@ -62,7 +62,6 @@ export const listCommand: CommandModule = {
     }),
   handler: async (argv) => {
     await handleList({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       outputFormat: argv['output-format'] as 'text' | 'json',
     });
     await exitCli();

packages/cli/src/commands/extensions/new.ts

@@ -98,9 +98,7 @@ export const newCommand: CommandModule = {
   },
   handler: async (args) => {
     await handleNew({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       path: args['path'] as string,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       template: args['template'] as string | undefined,
     });
     await exitCli();

packages/cli/src/commands/extensions/uninstall.ts

@@ -71,7 +71,6 @@ export const uninstallCommand: CommandModule = {
       }),
   handler: async (argv) => {
     await handleUninstall({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       names: argv['names'] as string[],
     });
     await exitCli();

packages/cli/src/commands/extensions/update.ts

@@ -155,9 +155,7 @@ export const updateCommand: CommandModule = {
       }),
   handler: async (argv) => {
     await handleUpdate({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       name: argv['name'] as string | undefined,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       all: argv['all'] as boolean | undefined,
     });
     await exitCli();

packages/cli/src/commands/extensions/validate.ts

@@ -100,7 +100,6 @@ export const validateCommand: CommandModule = {
     }),
   handler: async (args) => {
     await handleValidate({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       path: args['path'] as string,
     });
     await exitCli();

packages/cli/src/commands/hooks/migrate.ts

@@ -70,7 +70,6 @@ function migrateClaudeHook(claudeHook: unknown): unknown {
     return claudeHook;
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const hook = claudeHook as Record<string, unknown>;
   const migrated: Record<string, unknown> = {};
 
@@ -108,12 +107,10 @@ function migrateClaudeHooks(claudeConfig: unknown): Record<string, unknown> {
     return {};
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const config = claudeConfig as Record<string, unknown>;
   const geminiHooks: Record<string, unknown> = {};
 
   // Check if there's a hooks section
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const hooksSection = config['hooks'] as Record<string, unknown> | undefined;
   if (!hooksSection || typeof hooksSection !== 'object') {
     return {};
@@ -133,7 +130,6 @@ function migrateClaudeHooks(claudeConfig: unknown): Record<string, unknown> {
         return def;
       }
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       const definition = def as Record<string, unknown>;
       const migratedDef: Record<string, unknown> = {};
 
@@ -183,7 +179,6 @@ export async function handleMigrateFromClaude() {
     sourceFile = claudeLocalSettingsPath;
     try {
       const content = fs.readFileSync(claudeLocalSettingsPath, 'utf-8');
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       claudeSettings = JSON.parse(stripJsonComments(content)) as Record<
         string,
         unknown
@@ -197,7 +192,6 @@ export async function handleMigrateFromClaude() {
     sourceFile = claudeSettingsPath;
     try {
       const content = fs.readFileSync(claudeSettingsPath, 'utf-8');
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       claudeSettings = JSON.parse(stripJsonComments(content)) as Record<
         string,
         unknown
@@ -265,7 +259,6 @@ export const migrateCommand: CommandModule = {
       default: false,
     }),
   handler: async (argv) => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     const args = argv as unknown as MigrateArgs;
     if (args.fromClaude) {
       await handleMigrateFromClaude();

packages/cli/src/commands/mcp/add.ts

@@ -219,38 +219,24 @@ export const addCommand: CommandModule = {
       .middleware((argv) => {
         // Handle -- separator args as server args if present
         if (argv['--']) {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
           const existingArgs = (argv['args'] as Array<string | number>) || [];
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
           argv['args'] = [...existingArgs, ...(argv['--'] as string[])];
         }
       }),
   handler: async (argv) => {
     await addMcpServer(
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       argv['name'] as string,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       argv['commandOrUrl'] as string,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       argv['args'] as Array<string | number>,
       {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         scope: argv['scope'] as string,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         transport: argv['transport'] as string,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         env: argv['env'] as string[],
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         header: argv['header'] as string[],
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         timeout: argv['timeout'] as number | undefined,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         trust: argv['trust'] as boolean | undefined,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         description: argv['description'] as string | undefined,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         includeTools: argv['includeTools'] as string[] | undefined,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         excludeTools: argv['excludeTools'] as string[] | undefined,
       },
     );

packages/cli/src/commands/mcp/remove.ts

@@ -55,9 +55,7 @@ export const removeCommand: CommandModule = {
         choices: ['user', 'project'],
       }),
   handler: async (argv) => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     await removeMcpServer(argv['name'] as string, {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       scope: argv['scope'] as string,
     });
     await exitCli();

packages/cli/src/commands/skills/disable.ts

@@ -53,7 +53,6 @@ export const disableCommand: CommandModule = {
         ? SettingScope.Workspace
         : SettingScope.User;
     await handleDisable({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       name: argv['name'] as string,
       scope,
     });

packages/cli/src/commands/skills/enable.ts

@@ -40,7 +40,6 @@ export const enableCommand: CommandModule = {
     }),
   handler: async (argv) => {
     await handleEnable({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       name: argv['name'] as string,
     });
     await exitCli();

packages/cli/src/commands/skills/install.ts

@@ -102,13 +102,9 @@ export const installCommand: CommandModule = {
       }),
   handler: async (argv) => {
     await handleInstall({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       source: argv['source'] as string,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       scope: argv['scope'] as 'user' | 'workspace',
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       path: argv['path'] as string | undefined,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       consent: argv['consent'] as boolean | undefined,
     });
     await exitCli();

packages/cli/src/commands/skills/link.ts

@@ -84,11 +84,8 @@ export const linkCommand: CommandModule = {
       }),
   handler: async (argv) => {
     await handleLink({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       path: argv['path'] as string,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       scope: argv['scope'] as 'user' | 'workspace',
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       consent: argv['consent'] as boolean | undefined,
     });
     await exitCli();

packages/cli/src/commands/skills/list.ts

@@ -18,7 +18,6 @@ export async function handleList(args: { all?: boolean }) {
   const config = await loadCliConfig(
     settings.merged,
     'skills-list-session',
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     {
       debug: false,
     } as Partial<CliArgs> as CliArgs,
@@ -73,7 +72,6 @@ export const listCommand: CommandModule = {
       default: false,
     }),
   handler: async (argv) => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     await handleList({ all: argv['all'] as boolean });
     await exitCli();
   },

packages/cli/src/commands/skills/uninstall.ts

@@ -64,9 +64,7 @@ export const uninstallCommand: CommandModule = {
       }),
   handler: async (argv) => {
     await handleUninstall({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       name: argv['name'] as string,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       scope: argv['scope'] as 'user' | 'workspace',
     });
     await exitCli();

packages/cli/src/config/config.test.ts

@@ -141,22 +141,6 @@ vi.mock('@google/gemini-cli-core', async () => {
       defaultDecision: ServerConfig.PolicyDecision.ASK_USER,
       approvalMode: ServerConfig.ApprovalMode.DEFAULT,
     })),
-    isHeadlessMode: vi.fn((opts) => {
-      if (process.env['VITEST'] === 'true') {
-        return (
-          !!opts?.prompt ||
-          (!!process.stdin && !process.stdin.isTTY) ||
-          (!!process.stdout && !process.stdout.isTTY)
-        );
-      }
-      return (
-        !!opts?.prompt ||
-        process.env['CI'] === 'true' ||
-        process.env['GITHUB_ACTIONS'] === 'true' ||
-        (!!process.stdin && !process.stdin.isTTY) ||
-        (!!process.stdout && !process.stdout.isTTY)
-      );
-    }),
   };
 });
 
@@ -170,8 +154,6 @@ vi.mock('./extension-manager.js', () => {
 // Global setup to ensure clean environment for all tests in this file
 const originalArgv = process.argv;
 const originalGeminiModel = process.env['GEMINI_MODEL'];
-const originalStdoutIsTTY = process.stdout.isTTY;
-const originalStdinIsTTY = process.stdin.isTTY;
 
 beforeEach(() => {
   delete process.env['GEMINI_MODEL'];
@@ -180,18 +162,6 @@ beforeEach(() => {
   ExtensionManager.prototype.loadExtensions = vi
     .fn()
     .mockResolvedValue(undefined);
-
-  // Default to interactive mode for tests unless otherwise specified
-  Object.defineProperty(process.stdout, 'isTTY', {
-    value: true,
-    configurable: true,
-    writable: true,
-  });
-  Object.defineProperty(process.stdin, 'isTTY', {
-    value: true,
-    configurable: true,
-    writable: true,
-  });
 });
 
 afterEach(() => {
@@ -201,16 +171,6 @@ afterEach(() => {
   } else {
     delete process.env['GEMINI_MODEL'];
   }
-  Object.defineProperty(process.stdout, 'isTTY', {
-    value: originalStdoutIsTTY,
-    configurable: true,
-    writable: true,
-  });
-  Object.defineProperty(process.stdin, 'isTTY', {
-    value: originalStdinIsTTY,
-    configurable: true,
-    writable: true,
-  });
 });
 
 describe('parseArguments', () => {
@@ -289,16 +249,6 @@ describe('parseArguments', () => {
   });
 
   describe('positional arguments and @commands', () => {
-    beforeEach(() => {
-      // Default to headless mode for these tests as they mostly expect one-shot behavior
-      process.stdin.isTTY = false;
-      Object.defineProperty(process.stdout, 'isTTY', {
-        value: false,
-        configurable: true,
-        writable: true,
-      });
-    });
-
     it.each([
       {
         description:
@@ -429,12 +379,8 @@ describe('parseArguments', () => {
     );
 
     it('should include a startup message when converting positional query to interactive prompt', async () => {
+      const originalIsTTY = process.stdin.isTTY;
       process.stdin.isTTY = true;
-      Object.defineProperty(process.stdout, 'isTTY', {
-        value: true,
-        configurable: true,
-        writable: true,
-      });
       process.argv = ['node', 'script.js', 'hello'];
 
       try {
@@ -443,7 +389,7 @@ describe('parseArguments', () => {
           'Positional arguments now default to interactive mode. To run in non-interactive mode, use the --prompt (-p) flag.',
         );
       } finally {
-        // beforeEach handles resetting
+        process.stdin.isTTY = originalIsTTY;
       }
     });
   });
@@ -1786,29 +1732,14 @@ describe('loadCliConfig model selection', () => {
 });
 
 describe('loadCliConfig folderTrust', () => {
-  let originalVitest: string | undefined;
-  let originalIntegrationTest: string | undefined;
-
   beforeEach(() => {
     vi.resetAllMocks();
     vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
     vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
     vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
-
-    originalVitest = process.env['VITEST'];
-    originalIntegrationTest = process.env['GEMINI_CLI_INTEGRATION_TEST'];
-    delete process.env['VITEST'];
-    delete process.env['GEMINI_CLI_INTEGRATION_TEST'];
   });
 
   afterEach(() => {
-    if (originalVitest !== undefined) {
-      process.env['VITEST'] = originalVitest;
-    }
-    if (originalIntegrationTest !== undefined) {
-      process.env['GEMINI_CLI_INTEGRATION_TEST'] = originalIntegrationTest;
-    }
-
     vi.unstubAllEnvs();
     vi.restoreAllMocks();
   });
@@ -1867,11 +1798,10 @@ describe('loadCliConfig with includeDirectories', () => {
     vi.restoreAllMocks();
   });
 
-  it.skip('should combine and resolve paths from settings and CLI arguments', async () => {
+  it('should combine and resolve paths from settings and CLI arguments', async () => {
     const mockCwd = path.resolve(path.sep, 'home', 'user', 'project');
     process.argv = [
       'node',
-
       'script.js',
       '--include-directories',
       `${path.resolve(path.sep, 'cli', 'path1')},${path.join(mockCwd, 'cli', 'path2')}`,
@@ -2625,7 +2555,7 @@ describe('loadCliConfig approval mode', () => {
     it('should use approvalMode from settings when no CLI flags are set', async () => {
       process.argv = ['node', 'script.js'];
       const settings = createTestMergedSettings({
-        general: { defaultApprovalMode: 'auto_edit' },
+        tools: { approvalMode: 'auto_edit' },
       });
       const argv = await parseArguments(settings);
       const config = await loadCliConfig(settings, 'test-session', argv);
@@ -2637,7 +2567,7 @@ describe('loadCliConfig approval mode', () => {
     it('should prioritize --approval-mode flag over settings', async () => {
       process.argv = ['node', 'script.js', '--approval-mode', 'auto_edit'];
       const settings = createTestMergedSettings({
-        general: { defaultApprovalMode: 'default' },
+        tools: { approvalMode: 'default' },
       });
       const argv = await parseArguments(settings);
       const config = await loadCliConfig(settings, 'test-session', argv);
@@ -2649,7 +2579,7 @@ describe('loadCliConfig approval mode', () => {
     it('should prioritize --yolo flag over settings', async () => {
       process.argv = ['node', 'script.js', '--yolo'];
       const settings = createTestMergedSettings({
-        general: { defaultApprovalMode: 'auto_edit' },
+        tools: { approvalMode: 'auto_edit' },
       });
       const argv = await parseArguments(settings);
       const config = await loadCliConfig(settings, 'test-session', argv);
@@ -2659,7 +2589,7 @@ describe('loadCliConfig approval mode', () => {
     it('should respect plan mode from settings when experimental.plan is enabled', async () => {
       process.argv = ['node', 'script.js'];
       const settings = createTestMergedSettings({
-        general: { defaultApprovalMode: 'plan' },
+        tools: { approvalMode: 'plan' },
         experimental: { plan: true },
       });
       const argv = await parseArguments(settings);
@@ -2670,7 +2600,7 @@ describe('loadCliConfig approval mode', () => {
     it('should throw error if plan mode is in settings but experimental.plan is disabled', async () => {
       process.argv = ['node', 'script.js'];
       const settings = createTestMergedSettings({
-        general: { defaultApprovalMode: 'plan' },
+        tools: { approvalMode: 'plan' },
         experimental: { plan: false },
       });
       const argv = await parseArguments(settings);
@@ -2849,16 +2779,6 @@ describe('Output format', () => {
 describe('parseArguments with positional prompt', () => {
   const originalArgv = process.argv;
 
-  beforeEach(() => {
-    // Default to headless mode for these tests as they mostly expect one-shot behavior
-    process.stdin.isTTY = false;
-    Object.defineProperty(process.stdout, 'isTTY', {
-      value: false,
-      configurable: true,
-      writable: true,
-    });
-  });
-
   afterEach(() => {
     process.argv = originalArgv;
   });

packages/cli/src/config/config.ts

@@ -32,17 +32,17 @@ import {
   ASK_USER_TOOL_NAME,
   getVersion,
   PREVIEW_GEMINI_MODEL_AUTO,
-  type HierarchicalMemory,
   coreEvents,
   GEMINI_MODEL_ALIAS_AUTO,
   getAdminErrorMessage,
-  isHeadlessMode,
   Config,
   applyAdminAllowlist,
   getAdminBlockedMcpServersMessage,
-  type HookDefinition,
-  type HookEventName,
-  type OutputFormat,
+} from '@google/gemini-cli-core';
+import type {
+  HookDefinition,
+  HookEventName,
+  OutputFormat,
 } from '@google/gemini-cli-core';
 import {
   type Settings,
@@ -280,7 +280,6 @@ export async function parseArguments(
     .check((argv) => {
       // The 'query' positional can be a string (for one arg) or string[] (for multiple).
       // This guard safely checks if any positional argument was provided.
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       const query = argv['query'] as string | string[] | undefined;
       const hasPositionalQuery = Array.isArray(query)
         ? query.length > 0
@@ -298,7 +297,6 @@ export async function parseArguments(
       if (
         argv['outputFormat'] &&
         !['text', 'json', 'stream-json'].includes(
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
           argv['outputFormat'] as string,
         )
       ) {
@@ -347,7 +345,6 @@ export async function parseArguments(
   }
 
   // Normalize query args: handle both quoted "@path file" and unquoted @path file
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const queryArg = (result as { query?: string | string[] | undefined }).query;
   const q: string | undefined = Array.isArray(queryArg)
     ? queryArg.join(' ')
@@ -355,7 +352,7 @@ export async function parseArguments(
 
   // -p/--prompt forces non-interactive mode; positional args default to interactive in TTY
   if (q && !result['prompt']) {
-    if (!isHeadlessMode()) {
+    if (process.stdin.isTTY) {
       startupMessages.push(
         'Positional arguments now default to interactive mode. To run in non-interactive mode, use the --prompt (-p) flag.',
       );
@@ -371,7 +368,6 @@ export async function parseArguments(
 
   // The import format is now only controlled by settings.memoryImportFormat
   // We no longer accept it as a CLI argument
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   return result as unknown as CliArgs;
 }
 
@@ -440,11 +436,7 @@ export async function loadCliConfig(
 
   const ideMode = settings.ide?.enabled ?? false;
 
-  const folderTrust =
-    process.env['GEMINI_CLI_INTEGRATION_TEST'] === 'true' ||
-    process.env['VITEST'] === 'true'
-      ? false
-      : (settings.security?.folderTrust?.enabled ?? false);
+  const folderTrust = settings.security?.folderTrust?.enabled ?? false;
   const trustedFolder = isWorkspaceTrusted(settings, cwd)?.isTrusted ?? false;
 
   // Set the context filename in the server's memoryTool module BEFORE loading memory
@@ -480,7 +472,6 @@ export async function loadCliConfig(
     requestSetting: promptForSetting,
     workspaceDir: cwd,
     enabledExtensionOverrides: argv.extensions,
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     eventEmitter: coreEvents as EventEmitter<ExtensionEvents>,
     clientVersion: await getVersion(),
   });
@@ -488,7 +479,7 @@ export async function loadCliConfig(
 
   const experimentalJitContext = settings.experimental?.jitContext ?? false;
 
-  let memoryContent: string | HierarchicalMemory = '';
+  let memoryContent = '';
   let fileCount = 0;
   let filePaths: string[] = [];
 
@@ -519,8 +510,8 @@ export async function loadCliConfig(
   const rawApprovalMode =
     argv.approvalMode ||
     (argv.yolo ? 'yolo' : undefined) ||
-    ((settings.general?.defaultApprovalMode as string) !== 'yolo'
-      ? settings.general?.defaultApprovalMode
+    ((settings.tools?.approvalMode as string) !== 'yolo'
+      ? settings.tools.approvalMode
       : undefined);
 
   if (rawApprovalMode) {
@@ -584,7 +575,6 @@ export async function loadCliConfig(
   let telemetrySettings;
   try {
     telemetrySettings = await resolveTelemetrySettings({
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       env: process.env as unknown as Record<string, string | undefined>,
       settings: settings.telemetry,
     });
@@ -602,9 +592,7 @@ export async function loadCliConfig(
   const interactive =
     !!argv.promptInteractive ||
     !!argv.experimentalAcp ||
-    (!isHeadlessMode({ prompt: argv.prompt }) &&
-      !argv.query &&
-      !argv.isCommand);
+    (process.stdin.isTTY && !argv.query && !argv.prompt && !argv.isCommand);
 
   const allowedTools = argv.allowedTools || settings.tools?.allowed || [];
   const allowedToolsSet = new Set(allowedTools);
@@ -796,8 +784,6 @@ export async function loadCliConfig(
     toolOutputMasking: settings.experimental?.toolOutputMasking,
     noBrowser: !!process.env['NO_BROWSER'],
     summarizeToolOutput: settings.model?.summarizeToolOutput,
-    sessionLearnings: settings.general?.sessionLearnings?.enabled,
-    sessionLearningsOutputPath: settings.general?.sessionLearnings?.outputPath,
     ideMode,
     disableLoopDetection: settings.model?.disableLoopDetection,
     compressionThreshold: settings.model?.compressionThreshold,
@@ -816,7 +802,6 @@ export async function loadCliConfig(
     eventEmitter: coreEvents,
     useWriteTodos: argv.useWriteTodos ?? settings.useWriteTodos,
     output: {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       format: (argv.outputFormat ?? settings.output?.format) as OutputFormat,
     },
     fakeResponses: argv.fakeResponses,

packages/cli/src/config/extension-manager-themes.spec.ts

@@ -16,11 +16,10 @@ import {
   vi,
   afterEach,
 } from 'vitest';
-
 import { createExtension } from '../test-utils/createExtension.js';
 import { ExtensionManager } from './extension-manager.js';
 import { themeManager, DEFAULT_THEME } from '../ui/themes/theme-manager.js';
-import { GEMINI_DIR, type Config, tmpdir } from '@google/gemini-cli-core';
+import { GEMINI_DIR, type Config } from '@google/gemini-cli-core';
 import { createTestMergedSettings, SettingScope } from './settings.js';
 
 describe('ExtensionManager theme loading', () => {
@@ -30,7 +29,7 @@ describe('ExtensionManager theme loading', () => {
 
   beforeAll(async () => {
     tempHomeDir = await fs.promises.mkdtemp(
-      path.join(tmpdir(), 'gemini-cli-test-'),
+      path.join(fs.realpathSync('/tmp'), 'gemini-cli-test-'),
     );
   });
 
@@ -86,7 +85,6 @@ describe('ExtensionManager theme loading', () => {
 
     await extensionManager.loadExtensions();
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     const mockConfig = {
       getEnableExtensionReloading: () => false,
       getMcpClientManager: () => ({
@@ -172,7 +170,6 @@ describe('ExtensionManager theme loading', () => {
 
     await extensionManager.loadExtensions();
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     const mockConfig = {
       getWorkingDir: () => tempHomeDir,
       shouldLoadMemoryFromIncludeDirectories: () => false,

packages/cli/src/config/extension-manager.ts

@@ -730,7 +730,6 @@ Would you like to attempt to install via "git clone" instead?`,
 
         if (Object.keys(hookEnv).length > 0) {
           for (const eventName of Object.keys(hooks)) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
             const eventHooks = hooks[eventName as HookEventName];
             if (eventHooks) {
               for (const definition of eventHooks) {
@@ -827,16 +826,13 @@ Would you like to attempt to install via "git clone" instead?`,
     }
     try {
       const configContent = await fs.promises.readFile(configFilePath, 'utf-8');
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       const rawConfig = JSON.parse(configContent) as ExtensionConfig;
       if (!rawConfig.name || !rawConfig.version) {
         throw new Error(
           `Invalid configuration in ${configFilePath}: missing ${!rawConfig.name ? '"name"' : '"version"'}`,
         );
       }
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       const config = recursivelyHydrateStrings(
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         rawConfig as unknown as JsonObject,
         {
           extensionPath: extensionDir,
@@ -882,7 +878,6 @@ Would you like to attempt to install via "git clone" instead?`,
 
       // Hydrate variables in the hooks configuration
       const hydratedHooks = recursivelyHydrateStrings(
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         rawHooks.hooks as unknown as JsonObject,
         {
           ...context,
@@ -893,7 +888,6 @@ Would you like to attempt to install via "git clone" instead?`,
 
       return hydratedHooks;
     } catch (e) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       if ((e as NodeJS.ErrnoException).code === 'ENOENT') {
         return undefined; // File not found is not an error here.
       }

packages/cli/src/config/extension.ts

@@ -47,7 +47,6 @@ export function loadInstallMetadata(
   const metadataFilePath = path.join(extensionDir, INSTALL_METADATA_FILENAME);
   try {
     const configContent = fs.readFileSync(metadataFilePath, 'utf-8');
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     const metadata = JSON.parse(configContent) as ExtensionInstallMetadata;
     return metadata;
   } catch (_e) {

packages/cli/src/config/extensionRegistryClient.ts

@@ -105,7 +105,6 @@ export class ExtensionRegistryClient {
           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) {
         // Clear the promise on failure so that subsequent calls can try again

packages/cli/src/config/extensions/extensionUpdates.test.ts

@@ -67,14 +67,6 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     loadAgentsFromDirectory: vi
       .fn()
       .mockResolvedValue({ agents: [], errors: [] }),
-    logExtensionInstallEvent: vi.fn().mockResolvedValue(undefined),
-    logExtensionUpdateEvent: vi.fn().mockResolvedValue(undefined),
-    logExtensionUninstall: vi.fn().mockResolvedValue(undefined),
-    logExtensionEnable: vi.fn().mockResolvedValue(undefined),
-    logExtensionDisable: vi.fn().mockResolvedValue(undefined),
-    Config: vi.fn().mockImplementation(() => ({
-      getEnableExtensionReloading: vi.fn().mockReturnValue(true),
-    })),
   };
 });
 

packages/cli/src/config/extensions/github_fetch.ts

@@ -45,7 +45,6 @@ export async function fetchJson<T>(
         res.on('data', (chunk) => chunks.push(chunk));
         res.on('end', () => {
           const data = Buffer.concat(chunks).toString();
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
           resolve(JSON.parse(data) as T);
         });
       })

packages/cli/src/config/extensions/variables.ts

@@ -52,11 +52,9 @@ export function recursivelyHydrateStrings<T>(
   values: VariableContext,
 ): T {
   if (typeof obj === 'string') {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     return hydrateString(obj, values) as unknown as T;
   }
   if (Array.isArray(obj)) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     return obj.map((item) =>
       recursivelyHydrateStrings(item, values),
     ) as unknown as T;
@@ -66,13 +64,11 @@ export function recursivelyHydrateStrings<T>(
     for (const key in obj) {
       if (Object.prototype.hasOwnProperty.call(obj, key)) {
         newObj[key] = recursivelyHydrateStrings(
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
           (obj as Record<string, unknown>)[key],
           values,
         );
       }
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     return newObj as T;
   }
   return obj;

packages/cli/src/config/keyBindings.ts

@@ -91,7 +91,6 @@ export enum Command {
   TOGGLE_YOLO = 'app.toggleYolo',
   CYCLE_APPROVAL_MODE = 'app.cycleApprovalMode',
   SHOW_MORE_LINES = 'app.showMoreLines',
-  EXPAND_PASTE = 'app.expandPaste',
   FOCUS_SHELL_INPUT = 'app.focusShellInput',
   UNFOCUS_SHELL_INPUT = 'app.unfocusShellInput',
   CLEAR_SCREEN = 'app.clearScreen',
@@ -290,7 +289,6 @@ export const defaultKeyBindings: KeyBindingConfig = {
     { key: 'o', ctrl: true },
     { key: 's', ctrl: true },
   ],
-  [Command.EXPAND_PASTE]: [{ key: 'o', ctrl: true }],
   [Command.FOCUS_SHELL_INPUT]: [{ key: 'tab', shift: false }],
   [Command.UNFOCUS_SHELL_INPUT]: [{ key: 'tab', shift: true }],
   [Command.CLEAR_SCREEN]: [{ key: 'l', ctrl: true }],
@@ -401,7 +399,6 @@ export const commandCategories: readonly CommandCategory[] = [
       Command.TOGGLE_YOLO,
       Command.CYCLE_APPROVAL_MODE,
       Command.SHOW_MORE_LINES,
-      Command.EXPAND_PASTE,
       Command.TOGGLE_BACKGROUND_SHELL,
       Command.TOGGLE_BACKGROUND_SHELL_LIST,
       Command.KILL_BACKGROUND_SHELL,
@@ -502,8 +499,6 @@ export const commandDescriptions: Readonly<Record<Command, string>> = {
     'Cycle through approval modes: default (prompt), auto_edit (auto-approve edits), and plan (read-only).',
   [Command.SHOW_MORE_LINES]:
     'Expand a height-constrained response to show additional lines when not in alternate buffer mode.',
-  [Command.EXPAND_PASTE]:
-    'Expand or collapse a paste placeholder when cursor is over placeholder.',
   [Command.BACKGROUND_SHELL_SELECT]:
     'Confirm selection in background shell list.',
   [Command.BACKGROUND_SHELL_ESCAPE]: 'Dismiss background shell list.',

packages/cli/src/config/mcp/mcpServerEnablement.ts

@@ -358,7 +358,6 @@ export class McpServerEnablementManager {
   private async readConfig(): Promise<McpServerEnablementConfig> {
     try {
       const content = await fs.readFile(this.configFilePath, 'utf-8');
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       return JSON.parse(content) as McpServerEnablementConfig;
     } catch (error) {
       if (

packages/cli/src/config/settings-validation.ts

@@ -23,7 +23,6 @@ function buildZodSchemaFromJsonSchema(def: any): z.ZodTypeAny {
   }
 
   if (def.type === 'string') {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     if (def.enum) return z.enum(def.enum as [string, ...string[]]);
     return z.string();
   }
@@ -41,7 +40,7 @@ function buildZodSchemaFromJsonSchema(def: any): z.ZodTypeAny {
     let schema;
     if (def.properties) {
       const shape: Record<string, z.ZodTypeAny> = {};
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       for (const [key, propDef] of Object.entries(def.properties) as any) {
         let propSchema = buildZodSchemaFromJsonSchema(propDef);
         if (
@@ -87,11 +86,9 @@ function buildEnumSchema(
   }
   const values = options.map((opt) => opt.value);
   if (values.every((v) => typeof v === 'string')) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     return z.enum(values as [string, ...string[]]);
   } else if (values.every((v) => typeof v === 'number')) {
     return z.union(
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       values.map((v) => z.literal(v)) as [
         z.ZodLiteral<number>,
         z.ZodLiteral<number>,
@@ -100,7 +97,6 @@ function buildEnumSchema(
     );
   } else {
     return z.union(
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       values.map((v) => z.literal(v)) as [
         z.ZodLiteral<unknown>,
         z.ZodLiteral<unknown>,

packages/cli/src/config/settings.test.ts

@@ -1936,40 +1936,6 @@ describe('Settings Loading and Merging', () => {
       );
     });
 
-    it('should migrate tools.approvalMode to general.defaultApprovalMode', () => {
-      const userSettingsContent = {
-        tools: {
-          approvalMode: 'plan',
-        },
-      };
-
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          return '{}';
-        },
-      );
-
-      const setValueSpy = vi.spyOn(LoadedSettings.prototype, 'setValue');
-      const loadedSettings = loadSettings(MOCK_WORKSPACE_DIR);
-
-      migrateDeprecatedSettings(loadedSettings, true);
-
-      expect(setValueSpy).toHaveBeenCalledWith(
-        SettingScope.User,
-        'general',
-        expect.objectContaining({ defaultApprovalMode: 'plan' }),
-      );
-
-      // Verify removal
-      expect(setValueSpy).toHaveBeenCalledWith(
-        SettingScope.User,
-        'tools',
-        expect.not.objectContaining({ approvalMode: 'plan' }),
-      );
-    });
-
     it('should migrate all 4 inverted boolean settings', () => {
       const userSettingsContent = {
         general: {

packages/cli/src/config/settings.ts

@@ -213,7 +213,6 @@ function setNestedProperty(
     }
     const next = current[key];
     if (typeof next === 'object' && next !== null) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       current = next as Record<string, unknown>;
     } else {
       // This path is invalid, so we stop.
@@ -255,7 +254,6 @@ export function mergeSettings(
   // 3. User Settings
   // 4. Workspace Settings
   // 5. System Settings (as overrides)
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   return customDeepMerge(
     getMergeStrategyForPath,
     schemaDefaults,
@@ -276,7 +274,6 @@ export function mergeSettings(
 export function createTestMergedSettings(
   overrides: Partial<Settings> = {},
 ): MergedSettings {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   return customDeepMerge(
     getMergeStrategyForPath,
     getDefaultsFromSchema(),
@@ -358,7 +355,6 @@ export class LoadedSettings {
 
       // The final admin settings are the defaults overridden by remote settings.
       // Any admin settings from files are ignored.
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       merged.admin = customDeepMerge(
         (path: string[]) => getMergeStrategyForPath(['admin', ...path]),
         adminDefaults,
@@ -621,7 +617,6 @@ export function loadSettings(
           return { settings: {} };
         }
 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         const settingsObject = rawSettings as Record<string, unknown>;
 
         // Validate settings structure with Zod
@@ -855,7 +850,6 @@ export function migrateDeprecatedSettings(
     const uiSettings = settings.ui as Record<string, unknown> | undefined;
     if (uiSettings) {
       const newUi = { ...uiSettings };
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       const accessibilitySettings = newUi['accessibility'] as
         | Record<string, unknown>
         | undefined;
@@ -886,7 +880,6 @@ export function migrateDeprecatedSettings(
       | undefined;
     if (contextSettings) {
       const newContext = { ...contextSettings };
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       const fileFilteringSettings = newContext['fileFiltering'] as
         | Record<string, unknown>
         | undefined;
@@ -911,36 +904,6 @@ export function migrateDeprecatedSettings(
       }
     }
 
-    // Migrate tools settings
-    const toolsSettings = settings.tools as Record<string, unknown> | undefined;
-    if (toolsSettings) {
-      if (toolsSettings['approvalMode'] !== undefined) {
-        foundDeprecated.push('tools.approvalMode');
-
-        const generalSettings =
-          (settings.general as Record<string, unknown> | undefined) || {};
-        const newGeneral = { ...generalSettings };
-
-        // Only set defaultApprovalMode if it's not already set
-        if (newGeneral['defaultApprovalMode'] === undefined) {
-          newGeneral['defaultApprovalMode'] = toolsSettings['approvalMode'];
-          loadedSettings.setValue(scope, 'general', newGeneral);
-          if (!settingsFile.readOnly) {
-            anyModified = true;
-          }
-        }
-
-        if (removeDeprecated) {
-          const newTools = { ...toolsSettings };
-          delete newTools['approvalMode'];
-          loadedSettings.setValue(scope, 'tools', newTools);
-          if (!settingsFile.readOnly) {
-            anyModified = true;
-          }
-        }
-      }
-    }
-
     // Migrate experimental agent settings
     const experimentalModified = migrateExperimentalSettings(
       settings,
@@ -1037,7 +1000,6 @@ function migrateExperimentalSettings(
       ...(settings.agents as Record<string, unknown> | undefined),
     };
     const agentsOverrides = {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       ...((agentsSettings['overrides'] as Record<string, unknown>) || {}),
     };
     let modified = false;
@@ -1049,7 +1011,6 @@ function migrateExperimentalSettings(
       const old = experimentalSettings[oldKey];
       if (old) {
         foundDeprecated?.push(`experimental.${oldKey}`);
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         migrateFn(old as Record<string, unknown>);
         modified = true;
       }
@@ -1058,7 +1019,6 @@ function migrateExperimentalSettings(
     // Migrate codebaseInvestigatorSettings -> agents.overrides.codebase_investigator
     migrateExperimental('codebaseInvestigatorSettings', (old) => {
       const override = {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         ...(agentsOverrides['codebase_investigator'] as
           | Record<string, unknown>
           | undefined),
@@ -1067,7 +1027,6 @@ function migrateExperimentalSettings(
       if (old['enabled'] !== undefined) override['enabled'] = old['enabled'];
 
       const runConfig = {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         ...(override['runConfig'] as Record<string, unknown> | undefined),
       };
       if (old['maxNumTurns'] !== undefined)
@@ -1078,19 +1037,16 @@ function migrateExperimentalSettings(
 
       if (old['model'] !== undefined || old['thinkingBudget'] !== undefined) {
         const modelConfig = {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
           ...(override['modelConfig'] as Record<string, unknown> | undefined),
         };
         if (old['model'] !== undefined) modelConfig['model'] = old['model'];
         if (old['thinkingBudget'] !== undefined) {
           const generateContentConfig = {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
             ...(modelConfig['generateContentConfig'] as
               | Record<string, unknown>
               | undefined),
           };
           const thinkingConfig = {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
             ...(generateContentConfig['thinkingConfig'] as
               | Record<string, unknown>
               | undefined),
@@ -1108,7 +1064,6 @@ function migrateExperimentalSettings(
     // Migrate cliHelpAgentSettings -> agents.overrides.cli_help
     migrateExperimental('cliHelpAgentSettings', (old) => {
       const override = {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         ...(agentsOverrides['cli_help'] as Record<string, unknown> | undefined),
       };
       if (old['enabled'] !== undefined) override['enabled'] = old['enabled'];

packages/cli/src/config/settingsSchema.test.ts

@@ -186,9 +186,6 @@ describe('SettingsSchema', () => {
       expect(getSettingsSchema().ui.properties.hideTips.showInDialog).toBe(
         true,
       );
-      expect(
-        getSettingsSchema().ui.properties.showShortcutsHint.showInDialog,
-      ).toBe(true);
       expect(getSettingsSchema().ui.properties.hideBanner.showInDialog).toBe(
         true,
       );
@@ -227,7 +224,7 @@ describe('SettingsSchema', () => {
       expect(
         getSettingsSchema().advanced.properties.autoConfigureMemory
           .showInDialog,
-      ).toBe(true);
+      ).toBe(false);
     });
 
     it('should infer Settings type correctly', () => {
@@ -331,28 +328,6 @@ describe('SettingsSchema', () => {
       ).toBe('Enable debug logging of keystrokes to the console.');
     });
 
-    it('should have showShortcutsHint setting in schema', () => {
-      expect(getSettingsSchema().ui.properties.showShortcutsHint).toBeDefined();
-      expect(getSettingsSchema().ui.properties.showShortcutsHint.type).toBe(
-        'boolean',
-      );
-      expect(getSettingsSchema().ui.properties.showShortcutsHint.category).toBe(
-        'UI',
-      );
-      expect(getSettingsSchema().ui.properties.showShortcutsHint.default).toBe(
-        true,
-      );
-      expect(
-        getSettingsSchema().ui.properties.showShortcutsHint.requiresRestart,
-      ).toBe(false);
-      expect(
-        getSettingsSchema().ui.properties.showShortcutsHint.showInDialog,
-      ).toBe(true);
-      expect(
-        getSettingsSchema().ui.properties.showShortcutsHint.description,
-      ).toBe('Show the "? for shortcuts" hint above the input.');
-    });
-
     it('should have enableAgents setting in schema', () => {
       const setting = getSettingsSchema().experimental.properties.enableAgents;
       expect(setting).toBeDefined();

packages/cli/src/config/settingsSchema.ts

@@ -179,33 +179,6 @@ const SETTINGS_SCHEMA = {
         description: 'Enable Vim keybindings',
         showInDialog: true,
       },
-      defaultApprovalMode: {
-        type: 'enum',
-        label: 'Default Approval Mode',
-        category: 'General',
-        requiresRestart: false,
-        default: 'default',
-        description: oneLine`
-          The default approval mode for tool execution.
-          'default' prompts for approval, 'auto_edit' auto-approves edit tools,
-          and 'plan' is read-only mode. 'yolo' is not supported yet.
-        `,
-        showInDialog: true,
-        options: [
-          { value: 'default', label: 'Default' },
-          { value: 'auto_edit', label: 'Auto Edit' },
-          { value: 'plan', label: 'Plan' },
-        ],
-      },
-      devtools: {
-        type: 'boolean',
-        label: 'DevTools',
-        category: 'General',
-        requiresRestart: false,
-        default: false,
-        description: 'Enable DevTools inspector on launch.',
-        showInDialog: false,
-      },
       enableAutoUpdate: {
         type: 'boolean',
         label: 'Enable Auto Update',
@@ -322,37 +295,6 @@ const SETTINGS_SCHEMA = {
         },
         description: 'Settings for automatic session cleanup.',
       },
-      sessionLearnings: {
-        type: 'object',
-        label: 'Session Learnings',
-        category: 'General',
-        requiresRestart: false,
-        default: {},
-        description: 'Settings for session learning summaries.',
-        showInDialog: false,
-        properties: {
-          enabled: {
-            type: 'boolean',
-            label: 'Enable Session Learnings',
-            category: 'General',
-            requiresRestart: false,
-            default: false,
-            description:
-              'Automatically generate a session-learnings.md file when the session ends.',
-            showInDialog: true,
-          },
-          outputPath: {
-            type: 'string',
-            label: 'Output Path',
-            category: 'General',
-            requiresRestart: false,
-            default: undefined as string | undefined,
-            description:
-              'Directory where session-learnings files should be saved. Defaults to project root.',
-            showInDialog: true,
-          },
-        },
-      },
     },
   },
   output: {
@@ -441,19 +383,6 @@ const SETTINGS_SCHEMA = {
         description: 'Hide the window title bar',
         showInDialog: true,
       },
-      inlineThinkingMode: {
-        type: 'enum',
-        label: 'Inline Thinking',
-        category: 'UI',
-        requiresRestart: false,
-        default: 'off',
-        description: 'Display model thinking inline: off or full.',
-        showInDialog: true,
-        options: [
-          { value: 'off', label: 'Off' },
-          { value: 'full', label: 'Full' },
-        ],
-      },
       showStatusInTitle: {
         type: 'boolean',
         label: 'Show Thoughts in Title',
@@ -493,15 +422,6 @@ const SETTINGS_SCHEMA = {
         description: 'Hide helpful tips in the UI',
         showInDialog: true,
       },
-      showShortcutsHint: {
-        type: 'boolean',
-        label: 'Show Shortcuts Hint',
-        category: 'UI',
-        requiresRestart: false,
-        default: true,
-        description: 'Show the "? for shortcuts" hint above the input.',
-        showInDialog: true,
-      },
       hideBanner: {
         type: 'boolean',
         label: 'Hide Banner',
@@ -1141,7 +1061,24 @@ const SETTINGS_SCHEMA = {
           },
         },
       },
-
+      approvalMode: {
+        type: 'enum',
+        label: 'Approval Mode',
+        category: 'Tools',
+        requiresRestart: false,
+        default: 'default',
+        description: oneLine`
+          The default approval mode for tool execution.
+          'default' prompts for approval, 'auto_edit' auto-approves edit tools,
+          and 'plan' is read-only mode. 'yolo' is not supported yet.
+        `,
+        showInDialog: true,
+        options: [
+          { value: 'default', label: 'Default' },
+          { value: 'auto_edit', label: 'Auto Edit' },
+          { value: 'plan', label: 'Plan' },
+        ],
+      },
       core: {
         type: 'array',
         label: 'Core Tools',
@@ -1453,7 +1390,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: true,
         default: false,
         description: 'Automatically configure Node.js memory limits',
-        showInDialog: true,
+        showInDialog: false,
       },
       dnsResolutionOrder: {
         type: 'string',
@@ -1502,7 +1439,7 @@ const SETTINGS_SCHEMA = {
         label: 'Tool Output Masking',
         category: 'Experimental',
         requiresRestart: true,
-        ignoreInDocs: false,
+        ignoreInDocs: true,
         default: {},
         description:
           'Advanced settings for tool output masking to manage context window efficiency.',
@@ -1513,9 +1450,9 @@ const SETTINGS_SCHEMA = {
             label: 'Enable Tool Output Masking',
             category: 'Experimental',
             requiresRestart: true,
-            default: true,
+            default: false,
             description: 'Enables tool output masking to save tokens.',
-            showInDialog: true,
+            showInDialog: false,
           },
           toolProtectionThreshold: {
             type: 'number',
@@ -1577,15 +1514,6 @@ const SETTINGS_SCHEMA = {
         description: 'Enable requesting and fetching of extension settings.',
         showInDialog: false,
       },
-      extensionRegistry: {
-        type: 'boolean',
-        label: 'Extension Registry Explore UI',
-        category: 'Experimental',
-        requiresRestart: true,
-        default: false,
-        description: 'Enable extension registry explore UI.',
-        showInDialog: false,
-      },
       extensionReloading: {
         type: 'boolean',
         label: 'Extension Reloading',

packages/cli/src/config/trustedFolders.test.ts

@@ -32,7 +32,6 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
   return {
     ...actual,
     homedir: () => '/mock/home/user',
-    isHeadlessMode: vi.fn(() => false),
     coreEvents: {
       emitFeedback: vi.fn(),
     },
@@ -281,26 +280,6 @@ describe('Trusted Folders', () => {
       });
     });
 
-    it('should return true for a child of a trusted folder', () => {
-      const config = { '/projectA': TrustLevel.TRUST_FOLDER };
-      fs.writeFileSync(trustedFoldersPath, JSON.stringify(config), 'utf-8');
-
-      expect(isWorkspaceTrusted(mockSettings, '/projectA/src')).toEqual({
-        isTrusted: true,
-        source: 'file',
-      });
-    });
-
-    it('should return true for a child of a trusted parent folder', () => {
-      const config = { '/projectB/somefile.txt': TrustLevel.TRUST_PARENT };
-      fs.writeFileSync(trustedFoldersPath, JSON.stringify(config), 'utf-8');
-
-      expect(isWorkspaceTrusted(mockSettings, '/projectB')).toEqual({
-        isTrusted: true,
-        source: 'file',
-      });
-    });
-
     it('should return false for a directly untrusted folder', () => {
       const config = { '/untrusted': TrustLevel.DO_NOT_TRUST };
       fs.writeFileSync(trustedFoldersPath, JSON.stringify(config), 'utf-8');
@@ -311,15 +290,6 @@ describe('Trusted Folders', () => {
       });
     });
 
-    it('should return false for a child of an untrusted folder', () => {
-      const config = { '/untrusted': TrustLevel.DO_NOT_TRUST };
-      fs.writeFileSync(trustedFoldersPath, JSON.stringify(config), 'utf-8');
-
-      expect(isWorkspaceTrusted(mockSettings, '/untrusted/src').isTrusted).toBe(
-        false,
-      );
-    });
-
     it('should return undefined when no rules match', () => {
       fs.writeFileSync(trustedFoldersPath, '{}', 'utf-8');
       expect(
@@ -327,47 +297,6 @@ describe('Trusted Folders', () => {
       ).toBeUndefined();
     });
 
-    it('should prioritize specific distrust over parent trust', () => {
-      const config = {
-        '/projectA': TrustLevel.TRUST_FOLDER,
-        '/projectA/untrusted': TrustLevel.DO_NOT_TRUST,
-      };
-      fs.writeFileSync(trustedFoldersPath, JSON.stringify(config), 'utf-8');
-
-      expect(isWorkspaceTrusted(mockSettings, '/projectA/untrusted')).toEqual({
-        isTrusted: false,
-        source: 'file',
-      });
-    });
-
-    it('should use workspaceDir instead of process.cwd() when provided', () => {
-      const config = {
-        '/projectA': TrustLevel.TRUST_FOLDER,
-        '/untrusted': TrustLevel.DO_NOT_TRUST,
-      };
-      fs.writeFileSync(trustedFoldersPath, JSON.stringify(config), 'utf-8');
-
-      vi.spyOn(process, 'cwd').mockImplementation(() => '/untrusted');
-
-      // process.cwd() is untrusted, but workspaceDir is trusted
-      expect(isWorkspaceTrusted(mockSettings, '/projectA')).toEqual({
-        isTrusted: true,
-        source: 'file',
-      });
-    });
-
-    it('should handle path normalization', () => {
-      const config = { '/home/user/projectA': TrustLevel.TRUST_FOLDER };
-      fs.writeFileSync(trustedFoldersPath, JSON.stringify(config), 'utf-8');
-
-      expect(
-        isWorkspaceTrusted(mockSettings, '/home/user/../user/projectA'),
-      ).toEqual({
-        isTrusted: true,
-        source: 'file',
-      });
-    });
-
     it('should prioritize IDE override over file config', () => {
       const config = { '/projectA': TrustLevel.DO_NOT_TRUST };
       fs.writeFileSync(trustedFoldersPath, JSON.stringify(config), 'utf-8');
@@ -384,30 +313,6 @@ describe('Trusted Folders', () => {
       }
     });
 
-    it('should return false when IDE override is false', () => {
-      const config = { '/projectA': TrustLevel.TRUST_FOLDER };
-      fs.writeFileSync(trustedFoldersPath, JSON.stringify(config), 'utf-8');
-
-      ideContextStore.set({ workspaceState: { isTrusted: false } });
-
-      try {
-        expect(isWorkspaceTrusted(mockSettings, '/projectA')).toEqual({
-          isTrusted: false,
-          source: 'ide',
-        });
-      } finally {
-        ideContextStore.clear();
-      }
-    });
-
-    it('should throw FatalConfigError when the config file is invalid', () => {
-      fs.writeFileSync(trustedFoldersPath, 'invalid json', 'utf-8');
-
-      expect(() => isWorkspaceTrusted(mockSettings, '/any')).toThrow(
-        FatalConfigError,
-      );
-    });
-
     it('should always return true if folderTrust setting is disabled', () => {
       const disabledSettings: Settings = {
         security: { folderTrust: { enabled: false } },
@@ -419,75 +324,7 @@ describe('Trusted Folders', () => {
     });
   });
 
-  describe('isWorkspaceTrusted headless mode', () => {
-    const mockSettings: Settings = {
-      security: {
-        folderTrust: {
-          enabled: true,
-        },
-      },
-    };
-
-    it('should return true when isHeadlessMode is true, ignoring config', async () => {
-      const geminiCore = await import('@google/gemini-cli-core');
-      vi.spyOn(geminiCore, 'isHeadlessMode').mockReturnValue(true);
-
-      expect(isWorkspaceTrusted(mockSettings)).toEqual({
-        isTrusted: true,
-        source: undefined,
-      });
-    });
-
-    it('should fall back to config when isHeadlessMode is false', async () => {
-      const geminiCore = await import('@google/gemini-cli-core');
-      vi.spyOn(geminiCore, 'isHeadlessMode').mockReturnValue(false);
-
-      const config = { '/projectA': TrustLevel.DO_NOT_TRUST };
-      fs.writeFileSync(trustedFoldersPath, JSON.stringify(config), 'utf-8');
-
-      expect(isWorkspaceTrusted(mockSettings, '/projectA').isTrusted).toBe(
-        false,
-      );
-    });
-  });
-
-  describe('Trusted Folders Caching', () => {
-    it('should cache the loaded folders object', () => {
-      // First call should load and cache
-      const folders1 = loadTrustedFolders();
-
-      // Second call should return the same instance from cache
-      const folders2 = loadTrustedFolders();
-      expect(folders1).toBe(folders2);
-
-      // Resetting should clear the cache
-      resetTrustedFoldersForTesting();
-
-      // Third call should return a new instance
-      const folders3 = loadTrustedFolders();
-      expect(folders3).not.toBe(folders1);
-    });
-  });
-
-  describe('invalid trust levels', () => {
-    it('should create a comprehensive error message for invalid trust level', () => {
-      const config = { '/user/folder': 'INVALID_TRUST_LEVEL' };
-      fs.writeFileSync(trustedFoldersPath, JSON.stringify(config), 'utf-8');
-
-      const { errors } = loadTrustedFolders();
-      const possibleValues = Object.values(TrustLevel).join(', ');
-      expect(errors.length).toBe(1);
-      expect(errors[0].message).toBe(
-        `Invalid trust level "INVALID_TRUST_LEVEL" for path "/user/folder". Possible values are: ${possibleValues}.`,
-      );
-    });
-  });
-
   describe('Symlinks Support', () => {
-    const mockSettings: Settings = {
-      security: { folderTrust: { enabled: true } },
-    };
-
     it('should trust a folder if the rule matches the realpath', () => {
       // Create a real directory and a symlink
       const realDir = path.join(tempDir, 'real');
@@ -502,6 +339,10 @@ describe('Trusted Folders', () => {
       // Check against symlink path
       expect(isWorkspaceTrusted(mockSettings, symlinkDir).isTrusted).toBe(true);
     });
+
+    const mockSettings: Settings = {
+      security: { folderTrust: { enabled: true } },
+    };
   });
 
   describe('Verification: Auth and Trust Interaction', () => {

packages/cli/src/config/trustedFolders.ts

@@ -15,7 +15,6 @@ import {
   ideContextStore,
   GEMINI_DIR,
   homedir,
-  isHeadlessMode,
   coreEvents,
 } from '@google/gemini-cli-core';
 import type { Settings } from './settings.js';
@@ -47,7 +46,6 @@ export function isTrustLevel(
 ): value is TrustLevel {
   return (
     typeof value === 'string' &&
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     Object.values(TrustLevel).includes(value as TrustLevel)
   );
 }
@@ -198,7 +196,6 @@ export class LoadedTrustedFolders {
       const content = await fsPromises.readFile(this.user.path, 'utf-8');
       let config: Record<string, TrustLevel>;
       try {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         config = parseTrustedFoldersJson(content) as Record<string, TrustLevel>;
       } catch (error) {
         coreEvents.emitFeedback(
@@ -253,7 +250,6 @@ export function loadTrustedFolders(): LoadedTrustedFolders {
   try {
     if (fs.existsSync(userPath)) {
       const content = fs.readFileSync(userPath, 'utf-8');
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       const parsed = parseTrustedFoldersJson(content) as Record<string, string>;
 
       if (
@@ -358,10 +354,6 @@ export function isWorkspaceTrusted(
   workspaceDir: string = process.cwd(),
   trustConfig?: Record<string, TrustLevel>,
 ): TrustResult {
-  if (isHeadlessMode()) {
-    return { isTrusted: true, source: undefined };
-  }
-
   if (!isFolderTrustEnabled(settings)) {
     return { isTrusted: true, source: undefined };
   }

packages/cli/src/deferred.ts

@@ -86,11 +86,9 @@ export function defer<T = object, U = object>(
     ...commandModule,
     handler: (argv: ArgumentsCamelCase<U>) => {
       setDeferredCommand({
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         handler: commandModule.handler as (
           argv: ArgumentsCamelCase,
         ) => void | Promise<void>,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         argv: argv as unknown as ArgumentsCamelCase,
         commandName: parentCommandName || 'unknown',
       });

packages/cli/src/gemini.test.tsx

@@ -238,15 +238,18 @@ vi.mock('./validateNonInterActiveAuth.js', () => ({
 }));
 
 describe('gemini.tsx main function', () => {
+  let originalEnvGeminiSandbox: string | undefined;
+  let originalEnvSandbox: string | undefined;
   let originalIsTTY: boolean | undefined;
   let initialUnhandledRejectionListeners: NodeJS.UnhandledRejectionListener[] =
     [];
 
   beforeEach(() => {
     // Store and clear sandbox-related env variables to ensure a consistent test environment
-    vi.stubEnv('GEMINI_SANDBOX', '');
-    vi.stubEnv('SANDBOX', '');
-    vi.stubEnv('SHPOOL_SESSION_NAME', '');
+    originalEnvGeminiSandbox = process.env['GEMINI_SANDBOX'];
+    originalEnvSandbox = process.env['SANDBOX'];
+    delete process.env['GEMINI_SANDBOX'];
+    delete process.env['SANDBOX'];
 
     initialUnhandledRejectionListeners =
       process.listeners('unhandledRejection');
@@ -257,6 +260,18 @@ describe('gemini.tsx main function', () => {
   });
 
   afterEach(() => {
+    // Restore original env variables
+    if (originalEnvGeminiSandbox !== undefined) {
+      process.env['GEMINI_SANDBOX'] = originalEnvGeminiSandbox;
+    } else {
+      delete process.env['GEMINI_SANDBOX'];
+    }
+    if (originalEnvSandbox !== undefined) {
+      process.env['SANDBOX'] = originalEnvSandbox;
+    } else {
+      delete process.env['SANDBOX'];
+    }
+
     const currentListeners = process.listeners('unhandledRejection');
     currentListeners.forEach((listener) => {
       if (!initialUnhandledRejectionListeners.includes(listener)) {
@@ -267,7 +282,6 @@ describe('gemini.tsx main function', () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (process.stdin as any).isTTY = originalIsTTY;
 
-    vi.unstubAllEnvs();
     vi.restoreAllMocks();
   });
 
@@ -1195,12 +1209,7 @@ describe('startInteractiveUI', () => {
     registerTelemetryConfig: vi.fn(),
   }));
 
-  beforeEach(() => {
-    vi.stubEnv('SHPOOL_SESSION_NAME', '');
-  });
-
   afterEach(() => {
-    vi.unstubAllEnvs();
     vi.restoreAllMocks();
   });
 
@@ -1299,7 +1308,7 @@ describe('startInteractiveUI', () => {
 
     // Verify all startup tasks were called
     expect(getVersion).toHaveBeenCalledTimes(1);
-    expect(registerCleanup).toHaveBeenCalledTimes(4);
+    expect(registerCleanup).toHaveBeenCalledTimes(3);
 
     // Verify cleanup handler is registered with unmount function
     const cleanupFn = vi.mocked(registerCleanup).mock.calls[0][0];

packages/cli/src/gemini.tsx

@@ -57,8 +57,8 @@ import {
   writeToStderr,
   disableMouseEvents,
   enableMouseEvents,
+  enterAlternateScreen,
   disableLineWrapping,
-  enableLineWrapping,
   shouldEnterAlternateScreen,
   startupProfiler,
   ExitCodes,
@@ -89,7 +89,6 @@ import { SessionStatsProvider } from './ui/contexts/SessionContext.js';
 import { VimModeProvider } from './ui/contexts/VimModeContext.js';
 import { KeypressProvider } from './ui/contexts/KeypressContext.js';
 import { useKittyKeyboardProtocol } from './ui/hooks/useKittyKeyboardProtocol.js';
-import { useTerminalSize } from './ui/hooks/useTerminalSize.js';
 import {
   relaunchAppInChildProcess,
   relaunchOnExitCode,
@@ -215,13 +214,9 @@ export async function startInteractiveUI(
 
   const { stdout: inkStdout, stderr: inkStderr } = createWorkingStdio();
 
-  const isShpool = !!process.env['SHPOOL_SESSION_NAME'];
-
   // Create wrapper component to use hooks inside render
   const AppWrapper = () => {
     useKittyKeyboardProtocol();
-    const { columns, rows } = useTerminalSize();
-
     return (
       <SettingsContext.Provider value={settings}>
         <KeypressProvider
@@ -239,7 +234,6 @@ export async function startInteractiveUI(
                 <SessionStatsProvider>
                   <VimModeProvider settings={settings}>
                     <AppContainer
-                      key={`${columns}-${rows}`}
                       config={config}
                       startupWarnings={startupWarnings}
                       version={version}
@@ -256,17 +250,6 @@ export async function startInteractiveUI(
     );
   };
 
-  if (isShpool) {
-    // Wait a moment for shpool to stabilize terminal size and state.
-    // shpool is a persistence tool that restores terminal state by replaying it.
-    // This delay gives shpool time to finish its restoration replay and send
-    // the actual terminal size (often via an immediate SIGWINCH) before we
-    // render the first TUI frame. Without this, the first frame may be
-    // garbled or rendered at an incorrect size, which disabling incremental
-    // rendering alone cannot fix for the initial frame.
-    await new Promise((resolve) => setTimeout(resolve, 100));
-  }
-
   const instance = render(
     process.env['DEBUG'] ? (
       <React.StrictMode>
@@ -290,19 +273,10 @@ export async function startInteractiveUI(
       patchConsole: false,
       alternateBuffer: useAlternateBuffer,
       incrementalRendering:
-        settings.merged.ui.incrementalRendering !== false &&
-        useAlternateBuffer &&
-        !isShpool,
+        settings.merged.ui.incrementalRendering !== false && useAlternateBuffer,
     },
   );
 
-  if (useAlternateBuffer) {
-    disableLineWrapping();
-    registerCleanup(() => {
-      enableLineWrapping();
-    });
-  }
-
   checkForUpdates(settings)
     .then((info) => {
       handleAutoUpdate(info, settings, config.getProjectRoot());
@@ -544,11 +518,11 @@ export async function main() {
 
     adminControlsListner.setConfig(config);
 
-    if (config.isInteractive() && settings.merged.general.devtools) {
-      const { setupInitialActivityLogger } = await import(
-        './utils/devtoolsService.js'
+    if (config.isInteractive() && config.getDebugMode()) {
+      const { registerActivityLogger } = await import(
+        './utils/activityLogger.js'
       );
-      await setupInitialActivityLogger(config);
+      registerActivityLogger(config);
     }
 
     // Register config for telemetry shutdown
@@ -616,6 +590,18 @@ export async function main() {
       // input showing up in the output.
       process.stdin.setRawMode(true);
 
+      if (
+        shouldEnterAlternateScreen(
+          isAlternateBufferEnabled(settings),
+          config.getScreenReader(),
+        )
+      ) {
+        enterAlternateScreen();
+        disableLineWrapping();
+
+        // Ink will cleanup so there is no need for us to manually cleanup.
+      }
+
       // This cleanup isn't strictly needed but may help in certain situations.
       process.on('SIGTERM', () => {
         process.stdin.setRawMode(wasRaw);
@@ -833,7 +819,6 @@ function setupAdminControlsListener() {
   let config: Config | undefined;
 
   const messageHandler = (msg: unknown) => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     const message = msg as {
       type?: string;
       settings?: AdminControlsSettings;

packages/cli/src/nonInteractiveCli.test.ts

@@ -38,9 +38,9 @@ import type { LoadedSettings } from './config/settings.js';
 // Mock core modules
 vi.mock('./ui/hooks/atCommandProcessor.js');
 
-const mockSetupInitialActivityLogger = vi.hoisted(() => vi.fn());
-vi.mock('./utils/devtoolsService.js', () => ({
-  setupInitialActivityLogger: mockSetupInitialActivityLogger,
+const mockRegisterActivityLogger = vi.hoisted(() => vi.fn());
+vi.mock('./utils/activityLogger.js', () => ({
+  registerActivityLogger: mockRegisterActivityLogger,
 }));
 
 const mockCoreEvents = vi.hoisted(() => ({
@@ -286,7 +286,7 @@ describe('runNonInteractive', () => {
       prompt_id: 'prompt-id-activity-logger',
     });
 
-    expect(mockSetupInitialActivityLogger).toHaveBeenCalledWith(mockConfig);
+    expect(mockRegisterActivityLogger).toHaveBeenCalledWith(mockConfig);
     vi.unstubAllEnvs();
   });
 
@@ -309,7 +309,7 @@ describe('runNonInteractive', () => {
       prompt_id: 'prompt-id-activity-logger-off',
     });
 
-    expect(mockSetupInitialActivityLogger).not.toHaveBeenCalled();
+    expect(mockRegisterActivityLogger).not.toHaveBeenCalled();
     vi.unstubAllEnvs();
   });
 

packages/cli/src/nonInteractiveCli.ts

@@ -72,10 +72,10 @@ export async function runNonInteractive({
     });
 
     if (process.env['GEMINI_CLI_ACTIVITY_LOG_TARGET']) {
-      const { setupInitialActivityLogger } = await import(
-        './utils/devtoolsService.js'
+      const { registerActivityLogger } = await import(
+        './utils/activityLogger.js'
       );
-      await setupInitialActivityLogger(config);
+      registerActivityLogger(config);
     }
 
     const { stdout: workingStdout } = createWorkingStdio();
@@ -250,7 +250,6 @@ export async function runNonInteractive({
         // Otherwise, slashCommandResult falls through to the default prompt
         // handling.
         if (slashCommandResult) {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
           query = slashCommandResult as Part[];
         }
       }
@@ -272,7 +271,6 @@ export async function runNonInteractive({
             error || 'Exiting due to an error processing the @ command.',
           );
         }
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         query = processedQuery as Part[];
       }
 

packages/cli/src/services/BuiltinCommandLoader.ts

@@ -31,6 +31,7 @@ import { directoryCommand } from '../ui/commands/directoryCommand.js';
 import { editorCommand } from '../ui/commands/editorCommand.js';
 import { extensionsCommand } from '../ui/commands/extensionsCommand.js';
 import { helpCommand } from '../ui/commands/helpCommand.js';
+import { insightsCommand } from '../ui/commands/insightsCommand.js';
 import { shortcutsCommand } from '../ui/commands/shortcutsCommand.js';
 import { rewindCommand } from '../ui/commands/rewindCommand.js';
 import { hooksCommand } from '../ui/commands/hooksCommand.js';
@@ -117,6 +118,7 @@ export class BuiltinCommandLoader implements ICommandLoader {
           ]
         : [extensionsCommand(this.config?.getEnableExtensionReloading())]),
       helpCommand,
+      insightsCommand,
       shortcutsCommand,
       ...(this.config?.getEnableHooksUI() ? [hooksCommand] : []),
       rewindCommand,

packages/cli/src/services/FileCommandLoader.ts

@@ -125,7 +125,6 @@ export class FileCommandLoader implements ICommandLoader {
       } catch (error) {
         if (
           !signal.aborted &&
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
           (error as { code?: string })?.code !== 'ENOENT'
         ) {
           coreEvents.emitFeedback(

packages/cli/src/test-utils/async.ts

@@ -5,7 +5,6 @@
  */
 
 import { act } from 'react';
-import { vi } from 'vitest';
 
 // The waitFor from vitest doesn't properly wrap in act(), so we have to
 // implement our own like the one in @testing-library/react
@@ -14,7 +13,7 @@ import { vi } from 'vitest';
 // for React state updates.
 export async function waitFor(
   assertion: () => void,
-  { timeout = 2000, interval = 50 } = {},
+  { timeout = 1000, interval = 50 } = {},
 ): Promise<void> {
   const startTime = Date.now();
 
@@ -28,11 +27,7 @@ export async function waitFor(
       }
 
       await act(async () => {
-        if (vi.isFakeTimers()) {
-          await vi.advanceTimersByTimeAsync(interval);
-        } else {
-          await new Promise((resolve) => setTimeout(resolve, interval));
-        }
+        await new Promise((resolve) => setTimeout(resolve, interval));
       });
     }
   }

packages/cli/src/test-utils/customMatchers.ts

@@ -21,7 +21,7 @@ import type { TextBuffer } from '../ui/components/shared/text-buffer.js';
 const invalidCharsRegex = /[\b\x1b]/;
 
 function toHaveOnlyValidCharacters(this: Assertion, buffer: TextBuffer) {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const { isNot } = this as any;
   let pass = true;
   const invalidLines: Array<{ line: number; content: string }> = [];
@@ -50,7 +50,6 @@ function toHaveOnlyValidCharacters(this: Assertion, buffer: TextBuffer) {
   };
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 expect.extend({
   toHaveOnlyValidCharacters,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

packages/cli/src/test-utils/mockCommandContext.ts

@@ -38,14 +38,12 @@ export const createMockCommandContext = (
     },
     services: {
       config: null,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       settings: {
         merged: defaultMergedSettings,
         setValue: vi.fn(),
         forScope: vi.fn().mockReturnValue({ settings: {} }),
       } as unknown as LoadedSettings,
       git: undefined as GitService | undefined,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       logger: {
         log: vi.fn(),
         logMessage: vi.fn(),
@@ -54,7 +52,6 @@ export const createMockCommandContext = (
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any, // Cast because Logger is a class.
     },
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     ui: {
       addItem: vi.fn(),
       clear: vi.fn(),
@@ -73,7 +70,6 @@ export const createMockCommandContext = (
     } as any,
     session: {
       sessionShellAllowlist: new Set<string>(),
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       stats: {
         sessionStartTime: new Date(),
         lastPromptTokenCount: 0,

packages/cli/src/test-utils/mockConfig.ts

@@ -13,7 +13,6 @@ import { createTestMergedSettings } from '../config/settings.js';
  * Creates a mocked Config object with default values and allows overrides.
  */
 export const createMockConfig = (overrides: Partial<Config> = {}): Config =>
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   ({
     getSandbox: vi.fn(() => undefined),
     getQuestion: vi.fn(() => ''),
@@ -153,7 +152,6 @@ export const createMockConfig = (overrides: Partial<Config> = {}): Config =>
     getBlockedMcpServers: vi.fn().mockReturnValue([]),
     getExperiments: vi.fn().mockReturnValue(undefined),
     getHasAccessToPreviewModel: vi.fn().mockReturnValue(false),
-    validatePathAccess: vi.fn().mockReturnValue(null),
     ...overrides,
   }) as unknown as Config;
 
@@ -164,11 +162,9 @@ export function createMockSettings(
   overrides: Record<string, unknown> = {},
 ): LoadedSettings {
   const merged = createTestMergedSettings(
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     (overrides['merged'] as Partial<Settings>) || {},
   );
 
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   return {
     system: { settings: {} },
     systemDefaults: { settings: {} },

packages/cli/src/test-utils/render.tsx

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -52,7 +52,6 @@ export const render = (
   terminalWidth?: number,
 ): ReturnType<typeof inkRender> => {
   let renderResult: ReturnType<typeof inkRender> =
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     undefined as unknown as ReturnType<typeof inkRender>;
   act(() => {
     renderResult = inkRender(tree);
@@ -114,19 +113,14 @@ const getMockConfigInternal = (): Config => {
   return mockConfigInternal;
 };
 
-// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
 const configProxy = new Proxy({} as Config, {
   get(_target, prop) {
     if (prop === 'getTargetDir') {
       return () =>
         '/Users/test/project/foo/bar/and/some/more/directories/to/make/it/long';
     }
-    if (prop === 'getUseBackgroundColor') {
-      return () => true;
-    }
     const internal = getMockConfigInternal();
     if (prop in internal) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       return internal[prop as keyof typeof internal];
     }
     throw new Error(`mockConfig does not have property ${String(prop)}`);
@@ -154,12 +148,6 @@ const baseMockUiState = {
   activePtyId: undefined,
   backgroundShells: new Map(),
   backgroundShellHeight: 0,
-  quota: {
-    userTier: undefined,
-    stats: undefined,
-    proQuotaRequest: null,
-    validationRequest: null,
-  },
 };
 
 export const mockAppState: AppState = {
@@ -209,6 +197,7 @@ const mockUIActions: UIActions = {
   setActiveBackgroundShellPid: vi.fn(),
   setIsBackgroundShellListOpen: vi.fn(),
   setAuthContext: vi.fn(),
+  handleWarning: vi.fn(),
   handleRestart: vi.fn(),
   handleNewAgentsSelect: vi.fn(),
 };
@@ -221,7 +210,6 @@ export const renderWithProviders = (
     uiState: providedUiState,
     width,
     mouseEventsEnabled = false,
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     config = configProxy as unknown as Config,
     useAlternateBuffer = true,
     uiActions,
@@ -243,20 +231,17 @@ export const renderWithProviders = (
     appState?: AppState;
   } = {},
 ): ReturnType<typeof render> & { simulateClick: typeof simulateClick } => {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const baseState: UIState = new Proxy(
     { ...baseMockUiState, ...providedUiState },
     {
       get(target, prop) {
         if (prop in target) {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
           return target[prop as keyof typeof target];
         }
         // For properties not in the base mock or provided state,
         // we'll check the original proxy to see if it's a defined but
         // unprovided property, and if not, throw.
         if (prop in baseMockUiState) {
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
           return baseMockUiState[prop as keyof typeof baseMockUiState];
         }
         throw new Error(`mockUiState does not have property ${String(prop)}`);
@@ -362,9 +347,7 @@ export function renderHook<Result, Props>(
   rerender: (props?: Props) => void;
   unmount: () => void;
 } {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const result = { current: undefined as unknown as Result };
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   let currentProps = options?.initialProps as Props;
 
   function TestComponent({
@@ -395,7 +378,6 @@ export function renderHook<Result, Props>(
 
   function rerender(props?: Props) {
     if (arguments.length > 0) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       currentProps = props as Props;
     }
     act(() => {
@@ -429,7 +411,6 @@ export function renderHookWithProviders<Result, Props>(
   rerender: (props?: Props) => void;
   unmount: () => void;
 } {
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const result = { current: undefined as unknown as Result };
 
   let setPropsFn: ((props: Props) => void) | undefined;
@@ -451,7 +432,6 @@ export function renderHookWithProviders<Result, Props>(
   act(() => {
     renderResult = renderWithProviders(
       <Wrapper>
-        {/* eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion */}
         <TestComponent initialProps={options.initialProps as Props} />
       </Wrapper>,
       options,
@@ -461,7 +441,6 @@ export function renderHookWithProviders<Result, Props>(
   function rerender(newProps?: Props) {
     act(() => {
       if (arguments.length > 0 && setPropsFn) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         setPropsFn(newProps as Props);
       } else if (forceUpdateFn) {
         forceUpdateFn();

packages/cli/src/test-utils/settings.ts

@@ -51,17 +51,13 @@ export const createMockSettings = (
   } = overrides;
 
   const loaded = new LoadedSettings(
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     (system as any) || { path: '', settings: {}, originalSettings: {} },
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     (systemDefaults as any) || { path: '', settings: {}, originalSettings: {} },
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     (user as any) || {
       path: '',
       settings: settingsOverrides,
       originalSettings: settingsOverrides,
     },
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     (workspace as any) || { path: '', settings: {}, originalSettings: {} },
     isTrusted ?? true,
     errors || [],
@@ -75,7 +71,6 @@ export const createMockSettings = (
   // Assign any function overrides (e.g., vi.fn() for methods)
   for (const key in overrides) {
     if (typeof overrides[key] === 'function') {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       (loaded as any)[key] = overrides[key];
     }
   }

packages/cli/src/ui/App.test.tsx

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 

packages/cli/src/ui/AppContainer.test.tsx

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -84,7 +84,7 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
   };
 });
 import ansiEscapes from 'ansi-escapes';
-import { mergeSettings, type LoadedSettings } from '../config/settings.js';
+import { type LoadedSettings, mergeSettings } from '../config/settings.js';
 import type { InitializationResult } from '../core/initializer.js';
 import { useQuotaAndFallback } from './hooks/useQuotaAndFallback.js';
 import { UIStateContext, type UIState } from './contexts/UIStateContext.js';
@@ -92,7 +92,6 @@ import {
   UIActionsContext,
   type UIActions,
 } from './contexts/UIActionsContext.js';
-import { KeypressProvider } from './contexts/KeypressContext.js';
 
 // Mock useStdout to capture terminal title writes
 vi.mock('ink', async (importOriginal) => {
@@ -134,6 +133,7 @@ vi.mock('./hooks/useGeminiStream.js');
 vi.mock('./hooks/vim.js');
 vi.mock('./hooks/useFocus.js');
 vi.mock('./hooks/useBracketedPaste.js');
+vi.mock('./hooks/useKeypress.js');
 vi.mock('./hooks/useLoadingIndicator.js');
 vi.mock('./hooks/useFolderTrust.js');
 vi.mock('./hooks/useIdeTrustListener.js');
@@ -145,30 +145,13 @@ vi.mock('./contexts/SessionContext.js');
 vi.mock('./components/shared/text-buffer.js');
 vi.mock('./hooks/useLogger.js');
 vi.mock('./hooks/useInputHistoryStore.js');
-vi.mock('./hooks/atCommandProcessor.js');
 vi.mock('./hooks/useHookDisplayState.js');
-vi.mock('./hooks/useBanner.js', () => ({
-  useBanner: vi.fn((bannerData) => ({
-    bannerText: (
-      bannerData.warningText ||
-      bannerData.defaultText ||
-      ''
-    ).replace(/\\n/g, '\n'),
-  })),
-}));
-vi.mock('./hooks/useShellInactivityStatus.js', () => ({
-  useShellInactivityStatus: vi.fn(() => ({
-    shouldShowFocusHint: false,
-    inactivityStatus: 'none',
-  })),
-}));
 vi.mock('./hooks/useTerminalTheme.js', () => ({
   useTerminalTheme: vi.fn(),
 }));
 
 import { useHookDisplayState } from './hooks/useHookDisplayState.js';
 import { useTerminalTheme } from './hooks/useTerminalTheme.js';
-import { useShellInactivityStatus } from './hooks/useShellInactivityStatus.js';
 
 // Mock external utilities
 vi.mock('../utils/events.js');
@@ -197,7 +180,7 @@ import { useTextBuffer } from './components/shared/text-buffer.js';
 import { useLogger } from './hooks/useLogger.js';
 import { useLoadingIndicator } from './hooks/useLoadingIndicator.js';
 import { useInputHistoryStore } from './hooks/useInputHistoryStore.js';
-import { useKeypress } from './hooks/useKeypress.js';
+import { useKeypress, type Key } from './hooks/useKeypress.js';
 import { measureElement } from 'ink';
 import { useTerminalSize } from './hooks/useTerminalSize.js';
 import {
@@ -232,15 +215,13 @@ describe('AppContainer State Management', () => {
     resumedSessionData?: ResumedSessionData;
   } = {}) => (
     <SettingsContext.Provider value={settings}>
-      <KeypressProvider config={config}>
-        <AppContainer
-          config={config}
-          version={version}
-          initializationResult={initResult}
-          startupWarnings={startupWarnings}
-          resumedSessionData={resumedSessionData}
-        />
-      </KeypressProvider>
+      <AppContainer
+        config={config}
+        version={version}
+        initializationResult={initResult}
+        startupWarnings={startupWarnings}
+        resumedSessionData={resumedSessionData}
+      />
     </SettingsContext.Provider>
   );
 
@@ -270,10 +251,10 @@ describe('AppContainer State Management', () => {
   const mockedUseTextBuffer = useTextBuffer as Mock;
   const mockedUseLogger = useLogger as Mock;
   const mockedUseLoadingIndicator = useLoadingIndicator as Mock;
+  const mockedUseKeypress = useKeypress as Mock;
   const mockedUseInputHistoryStore = useInputHistoryStore as Mock;
   const mockedUseHookDisplayState = useHookDisplayState as Mock;
   const mockedUseTerminalTheme = useTerminalTheme as Mock;
-  const mockedUseShellInactivityStatus = useShellInactivityStatus as Mock;
 
   const DEFAULT_GEMINI_STREAM_MOCK = {
     streamingState: 'idle',
@@ -403,10 +384,6 @@ describe('AppContainer State Management', () => {
     });
     mockedUseHookDisplayState.mockReturnValue([]);
     mockedUseTerminalTheme.mockReturnValue(undefined);
-    mockedUseShellInactivityStatus.mockReturnValue({
-      shouldShowFocusHint: false,
-      inactivityStatus: 'none',
-    });
 
     // Mock Config
     mockConfig = makeFakeConfig();
@@ -973,7 +950,7 @@ describe('AppContainer State Management', () => {
       });
       await waitFor(() => {
         // Assert that the context value is as expected
-        expect(capturedUIState.quota.proQuotaRequest).toBeNull();
+        expect(capturedUIState.proQuotaRequest).toBeNull();
       });
       unmount!();
     });
@@ -998,7 +975,7 @@ describe('AppContainer State Management', () => {
       });
       await waitFor(() => {
         // Assert: The mock request is correctly passed through the context
-        expect(capturedUIState.quota.proQuotaRequest).toEqual(mockRequest);
+        expect(capturedUIState.proQuotaRequest).toEqual(mockRequest);
       });
       unmount!();
     });
@@ -1269,15 +1246,8 @@ describe('AppContainer State Management', () => {
     });
 
     describe('Shell Focus Action Required', () => {
-      beforeEach(async () => {
+      beforeEach(() => {
         vi.useFakeTimers();
-        // Use real implementation for these tests to verify title updates
-        const actual = await vi.importActual<
-          typeof import('./hooks/useShellInactivityStatus.js')
-        >('./hooks/useShellInactivityStatus.js');
-        mockedUseShellInactivityStatus.mockImplementation(
-          actual.useShellInactivityStatus,
-        );
       });
 
       afterEach(() => {
@@ -1771,36 +1741,47 @@ describe('AppContainer State Management', () => {
   });
 
   describe('Keyboard Input Handling (CTRL+C / CTRL+D)', () => {
+    let handleGlobalKeypress: (key: Key) => boolean;
     let mockHandleSlashCommand: Mock;
     let mockCancelOngoingRequest: Mock;
     let rerender: () => void;
     let unmount: () => void;
-    let stdin: ReturnType<typeof render>['stdin'];
 
     // Helper function to reduce boilerplate in tests
     const setupKeypressTest = async () => {
       const renderResult = renderAppContainer();
-      stdin = renderResult.stdin;
       await act(async () => {
         vi.advanceTimersByTime(0);
       });
 
-      rerender = () => {
-        renderResult.rerender(getAppContainer());
-      };
+      rerender = () => renderResult.rerender(getAppContainer());
       unmount = renderResult.unmount;
     };
 
-    const pressKey = (sequence: string, times = 1) => {
+    const pressKey = (key: Partial<Key>, times = 1) => {
       for (let i = 0; i < times; i++) {
         act(() => {
-          stdin.write(sequence);
+          handleGlobalKeypress({
+            name: 'c',
+            shift: false,
+            alt: false,
+            ctrl: false,
+            cmd: false,
+            ...key,
+          } as Key);
         });
         rerender();
       }
     };
 
     beforeEach(() => {
+      // Capture the keypress handler from the AppContainer
+      mockedUseKeypress.mockImplementation(
+        (callback: (key: Key) => boolean) => {
+          handleGlobalKeypress = callback;
+        },
+      );
+
       // Mock slash command handler
       mockHandleSlashCommand = vi.fn();
       mockedUseSlashCommandProcessor.mockReturnValue({
@@ -1845,7 +1826,7 @@ describe('AppContainer State Management', () => {
         });
         await setupKeypressTest();
 
-        pressKey('\x03'); // Ctrl+C
+        pressKey({ name: 'c', ctrl: true });
 
         expect(mockCancelOngoingRequest).toHaveBeenCalledTimes(1);
         expect(mockHandleSlashCommand).not.toHaveBeenCalled();
@@ -1855,7 +1836,7 @@ describe('AppContainer State Management', () => {
       it('should quit on second press', async () => {
         await setupKeypressTest();
 
-        pressKey('\x03', 2); // Ctrl+C
+        pressKey({ name: 'c', ctrl: true }, 2);
 
         expect(mockCancelOngoingRequest).toHaveBeenCalledTimes(2);
         expect(mockHandleSlashCommand).toHaveBeenCalledWith(
@@ -1870,7 +1851,7 @@ describe('AppContainer State Management', () => {
       it('should reset press count after a timeout', async () => {
         await setupKeypressTest();
 
-        pressKey('\x03'); // Ctrl+C
+        pressKey({ name: 'c', ctrl: true });
         expect(mockHandleSlashCommand).not.toHaveBeenCalled();
 
         // Advance timer past the reset threshold
@@ -1878,7 +1859,7 @@ describe('AppContainer State Management', () => {
           vi.advanceTimersByTime(WARNING_PROMPT_DURATION_MS + 1);
         });
 
-        pressKey('\x03'); // Ctrl+C
+        pressKey({ name: 'c', ctrl: true });
         expect(mockHandleSlashCommand).not.toHaveBeenCalled();
         unmount();
       });
@@ -1888,7 +1869,7 @@ describe('AppContainer State Management', () => {
       it('should quit on second press if buffer is empty', async () => {
         await setupKeypressTest();
 
-        pressKey('\x04', 2); // Ctrl+D
+        pressKey({ name: 'd', ctrl: true }, 2);
 
         expect(mockHandleSlashCommand).toHaveBeenCalledWith(
           '/quit',
@@ -1899,7 +1880,7 @@ describe('AppContainer State Management', () => {
         unmount();
       });
 
-      it('should NOT quit if buffer is not empty', async () => {
+      it('should NOT quit if buffer is not empty (bubbles from InputPrompt)', async () => {
         mockedUseTextBuffer.mockReturnValue({
           text: 'some text',
           setText: vi.fn(),
@@ -1909,12 +1890,30 @@ describe('AppContainer State Management', () => {
         });
         await setupKeypressTest();
 
-        pressKey('\x04'); // Ctrl+D
+        // Capture return value
+        let result = true;
+        const originalPressKey = (key: Partial<Key>) => {
+          act(() => {
+            result = handleGlobalKeypress({
+              name: 'd',
+              shift: false,
+              alt: false,
+              ctrl: true,
+              cmd: false,
+              ...key,
+            } as Key);
+          });
+          rerender();
+        };
 
-        // Should only be called once, so count is 1, not quitting yet.
+        originalPressKey({ name: 'd', ctrl: true });
+
+        // AppContainer's handler should return true if it reaches it
+        expect(result).toBe(true);
+        // But it should only be called once, so count is 1, not quitting yet.
         expect(mockHandleSlashCommand).not.toHaveBeenCalled();
 
-        pressKey('\x04'); // Ctrl+D
+        originalPressKey({ name: 'd', ctrl: true });
         // Now count is 2, it should quit.
         expect(mockHandleSlashCommand).toHaveBeenCalledWith(
           '/quit',
@@ -1928,7 +1927,7 @@ describe('AppContainer State Management', () => {
       it('should reset press count after a timeout', async () => {
         await setupKeypressTest();
 
-        pressKey('\x04'); // Ctrl+D
+        pressKey({ name: 'd', ctrl: true });
         expect(mockHandleSlashCommand).not.toHaveBeenCalled();
 
         // Advance timer past the reset threshold
@@ -1936,7 +1935,7 @@ describe('AppContainer State Management', () => {
           vi.advanceTimersByTime(WARNING_PROMPT_DURATION_MS + 1);
         });
 
-        pressKey('\x04'); // Ctrl+D
+        pressKey({ name: 'd', ctrl: true });
         expect(mockHandleSlashCommand).not.toHaveBeenCalled();
         unmount();
       });
@@ -1954,7 +1953,7 @@ describe('AppContainer State Management', () => {
       it('should focus shell input on Tab', async () => {
         await setupKeypressTest();
 
-        pressKey('\t');
+        pressKey({ name: 'tab', shift: false });
 
         expect(capturedUIState.embeddedShellFocused).toBe(true);
         unmount();
@@ -1964,11 +1963,11 @@ describe('AppContainer State Management', () => {
         await setupKeypressTest();
 
         // Focus first
-        pressKey('\t');
+        pressKey({ name: 'tab', shift: false });
         expect(capturedUIState.embeddedShellFocused).toBe(true);
 
         // Unfocus via Shift+Tab
-        pressKey('\x1b[Z');
+        pressKey({ name: 'tab', shift: true });
         expect(capturedUIState.embeddedShellFocused).toBe(false);
         unmount();
       });
@@ -1987,7 +1986,13 @@ describe('AppContainer State Management', () => {
 
         // Focus it
         act(() => {
-          renderResult.stdin.write('\t');
+          handleGlobalKeypress({
+            name: 'tab',
+            shift: false,
+            alt: false,
+            ctrl: false,
+            cmd: false,
+          } as Key);
         });
         expect(capturedUIState.embeddedShellFocused).toBe(true);
 
@@ -2022,7 +2027,7 @@ describe('AppContainer State Management', () => {
         expect(capturedUIState.embeddedShellFocused).toBe(false);
 
         // Press Tab
-        pressKey('\t');
+        pressKey({ name: 'tab', shift: false });
 
         // Should be focused
         expect(capturedUIState.embeddedShellFocused).toBe(true);
@@ -2050,7 +2055,7 @@ describe('AppContainer State Management', () => {
         expect(capturedUIState.embeddedShellFocused).toBe(false);
 
         // Press Ctrl+B
-        pressKey('\x02');
+        pressKey({ name: 'b', ctrl: true });
 
         // Should have toggled (closed) the shell
         expect(mockToggleBackgroundShell).toHaveBeenCalled();
@@ -2079,7 +2084,7 @@ describe('AppContainer State Management', () => {
         });
 
         // Press Ctrl+B
-        pressKey('\x02');
+        pressKey({ name: 'b', ctrl: true });
 
         // Should have toggled (shown) the shell
         expect(mockToggleBackgroundShell).toHaveBeenCalled();
@@ -2092,14 +2097,11 @@ describe('AppContainer State Management', () => {
   });
 
   describe('Copy Mode (CTRL+S)', () => {
+    let handleGlobalKeypress: (key: Key) => boolean;
     let rerender: () => void;
     let unmount: () => void;
-    let stdin: ReturnType<typeof render>['stdin'];
 
-    const setupCopyModeTest = async (
-      isAlternateMode = false,
-      childHandler?: Mock,
-    ) => {
+    const setupCopyModeTest = async (isAlternateMode = false) => {
       // Update settings for this test run
       const defaultMergedSettings = mergeSettings({}, {}, {}, {}, true);
       const testSettings = {
@@ -2113,39 +2115,23 @@ describe('AppContainer State Management', () => {
         },
       } as unknown as LoadedSettings;
 
-      function TestChild() {
-        useKeypress(childHandler || (() => {}), {
-          isActive: !!childHandler,
-          priority: true,
-        });
-        return null;
-      }
-
-      const getTree = (settings: LoadedSettings) => (
-        <SettingsContext.Provider value={settings}>
-          <KeypressProvider config={mockConfig}>
-            <AppContainer
-              config={mockConfig}
-              version="1.0.0"
-              initializationResult={mockInitResult}
-            />
-            <TestChild />
-          </KeypressProvider>
-        </SettingsContext.Provider>
-      );
-
-      const renderResult = render(getTree(testSettings));
-      stdin = renderResult.stdin;
+      const renderResult = renderAppContainer({ settings: testSettings });
       await act(async () => {
         vi.advanceTimersByTime(0);
       });
 
-      rerender = () => renderResult.rerender(getTree(testSettings));
+      rerender = () =>
+        renderResult.rerender(getAppContainer({ settings: testSettings }));
       unmount = renderResult.unmount;
     };
 
     beforeEach(() => {
       mocks.mockStdout.write.mockClear();
+      mockedUseKeypress.mockImplementation(
+        (callback: (key: Key) => boolean) => {
+          handleGlobalKeypress = callback;
+        },
+      );
       vi.useFakeTimers();
     });
 
@@ -2171,7 +2157,15 @@ describe('AppContainer State Management', () => {
         mocks.mockStdout.write.mockClear(); // Clear initial enable call
 
         act(() => {
-          stdin.write('\x13'); // Ctrl+S
+          handleGlobalKeypress({
+            name: 's',
+            shift: false,
+            alt: false,
+            ctrl: true,
+            cmd: false,
+            insertable: false,
+            sequence: '\x13',
+          });
         });
         rerender();
 
@@ -2190,14 +2184,30 @@ describe('AppContainer State Management', () => {
 
           // Turn it on (disable mouse)
           act(() => {
-            stdin.write('\x13'); // Ctrl+S
+            handleGlobalKeypress({
+              name: 's',
+              shift: false,
+              alt: false,
+              ctrl: true,
+              cmd: false,
+              insertable: false,
+              sequence: '\x13',
+            });
           });
           rerender();
           expect(disableMouseEvents).toHaveBeenCalled();
 
           // Turn it off (enable mouse)
           act(() => {
-            stdin.write('a'); // Any key should exit copy mode
+            handleGlobalKeypress({
+              name: 'any', // Any key should exit copy mode
+              shift: false,
+              alt: false,
+              ctrl: false,
+              cmd: false,
+              insertable: true,
+              sequence: 'a',
+            });
           });
           rerender();
 
@@ -2210,7 +2220,15 @@ describe('AppContainer State Management', () => {
 
           // Enter copy mode
           act(() => {
-            stdin.write('\x13'); // Ctrl+S
+            handleGlobalKeypress({
+              name: 's',
+              shift: false,
+              alt: false,
+              ctrl: true,
+              cmd: false,
+              insertable: false,
+              sequence: '\x13',
+            });
           });
           rerender();
 
@@ -2218,7 +2236,15 @@ describe('AppContainer State Management', () => {
 
           // Press any other key
           act(() => {
-            stdin.write('a');
+            handleGlobalKeypress({
+              name: 'a',
+              shift: false,
+              alt: false,
+              ctrl: false,
+              cmd: false,
+              insertable: true,
+              sequence: 'a',
+            });
           });
           rerender();
 
@@ -2226,37 +2252,6 @@ describe('AppContainer State Management', () => {
           expect(enableMouseEvents).toHaveBeenCalled();
           unmount();
         });
-
-        it('should have higher priority than other priority listeners when enabled', async () => {
-          // 1. Initial state with a child component's priority listener (already subscribed)
-          // It should NOT handle Ctrl+S so we can enter copy mode.
-          const childHandler = vi.fn().mockReturnValue(false);
-          await setupCopyModeTest(true, childHandler);
-
-          // 2. Enter copy mode
-          act(() => {
-            stdin.write('\x13'); // Ctrl+S
-          });
-          rerender();
-
-          // 3. Verify we are in copy mode
-          expect(disableMouseEvents).toHaveBeenCalled();
-
-          // 4. Press any key
-          childHandler.mockClear();
-          // Now childHandler should return true for other keys, simulating a greedy listener
-          childHandler.mockReturnValue(true);
-
-          act(() => {
-            stdin.write('a');
-          });
-          rerender();
-
-          // 5. Verify that the exit handler took priority and childHandler was NOT called
-          expect(childHandler).not.toHaveBeenCalled();
-          expect(enableMouseEvents).toHaveBeenCalled();
-          unmount();
-        });
       }
     });
   });
@@ -2739,67 +2734,4 @@ describe('AppContainer State Management', () => {
       compUnmount();
     });
   });
-
-  describe('Permission Handling', () => {
-    it('shows permission dialog when checkPermissions returns paths', async () => {
-      const { checkPermissions } = await import(
-        './hooks/atCommandProcessor.js'
-      );
-      vi.mocked(checkPermissions).mockResolvedValue(['/test/file.txt']);
-
-      let unmount: () => void;
-      await act(async () => (unmount = renderAppContainer().unmount));
-
-      await waitFor(() => expect(capturedUIActions).toBeTruthy());
-
-      await act(async () =>
-        capturedUIActions.handleFinalSubmit('read @file.txt'),
-      );
-
-      expect(capturedUIState.permissionConfirmationRequest).not.toBeNull();
-      expect(capturedUIState.permissionConfirmationRequest?.files).toEqual([
-        '/test/file.txt',
-      ]);
-      await act(async () => unmount!());
-    });
-
-    it.each([true, false])(
-      'handles permissions when allowed is %s',
-      async (allowed) => {
-        const { checkPermissions } = await import(
-          './hooks/atCommandProcessor.js'
-        );
-        vi.mocked(checkPermissions).mockResolvedValue(['/test/file.txt']);
-        const addReadOnlyPathSpy = vi.spyOn(
-          mockConfig.getWorkspaceContext(),
-          'addReadOnlyPath',
-        );
-        const { submitQuery } = mockedUseGeminiStream();
-
-        let unmount: () => void;
-        await act(async () => (unmount = renderAppContainer().unmount));
-
-        await waitFor(() => expect(capturedUIActions).toBeTruthy());
-
-        await act(async () =>
-          capturedUIActions.handleFinalSubmit('read @file.txt'),
-        );
-
-        await act(async () =>
-          capturedUIState.permissionConfirmationRequest?.onComplete({
-            allowed,
-          }),
-        );
-
-        if (allowed) {
-          expect(addReadOnlyPathSpy).toHaveBeenCalledWith('/test/file.txt');
-        } else {
-          expect(addReadOnlyPathSpy).not.toHaveBeenCalled();
-        }
-        expect(submitQuery).toHaveBeenCalledWith('read @file.txt');
-        expect(capturedUIState.permissionConfirmationRequest).toBeNull();
-        await act(async () => unmount!());
-      },
-    );
-  });
 });

packages/cli/src/ui/AppContainer.tsx

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -28,10 +28,7 @@ import {
   type HistoryItemToolGroup,
   AuthState,
   type ConfirmationRequest,
-  type PermissionConfirmationRequest,
-  type QuotaStats,
 } from './types.js';
-import { checkPermissions } from './hooks/atCommandProcessor.js';
 import { MessageType, StreamingState } from './types.js';
 import { ToolActionsProvider } from './contexts/ToolActionsContext.js';
 import {
@@ -56,7 +53,6 @@ import {
   coreEvents,
   CoreEvent,
   refreshServerHierarchicalMemory,
-  flattenMemory,
   type MemoryChangedPayload,
   writeToStdout,
   disableMouseEvents,
@@ -90,6 +86,7 @@ import { calculatePromptWidths } from './components/InputPrompt.js';
 import { useApp, useStdout, useStdin } from 'ink';
 import { calculateMainAreaWidth } from './utils/ui-sizing.js';
 import ansiEscapes from 'ansi-escapes';
+import * as fs from 'node:fs';
 import { basename } from 'node:path';
 import { computeTerminalTitle } from '../utils/windowTitle.js';
 import { useTextBuffer } from './components/shared/text-buffer.js';
@@ -101,14 +98,13 @@ import { type LoadableSettingScope, SettingScope } from '../config/settings.js';
 import { type InitializationResult } from '../core/initializer.js';
 import { useFocus } from './hooks/useFocus.js';
 import { useKeypress, type Key } from './hooks/useKeypress.js';
-import { KeypressPriority } from './contexts/KeypressContext.js';
 import { keyMatchers, Command } from './keyMatchers.js';
 import { useLoadingIndicator } from './hooks/useLoadingIndicator.js';
 import { useShellInactivityStatus } from './hooks/useShellInactivityStatus.js';
 import { useFolderTrust } from './hooks/useFolderTrust.js';
 import { useIdeTrustListener } from './hooks/useIdeTrustListener.js';
 import { type IdeIntegrationNudgeResult } from './IdeIntegrationNudge.js';
-import { appEvents, AppEvent, TransientMessageType } from '../utils/events.js';
+import { appEvents, AppEvent } from '../utils/events.js';
 import { type UpdateObject } from './utils/updateCheck.js';
 import { setUpdateHandler } from '../utils/handleAutoUpdate.js';
 import { registerCleanup, runExitCleanup } from '../utils/cleanup.js';
@@ -145,7 +141,6 @@ import { LoginWithGoogleRestartDialog } from './auth/LoginWithGoogleRestartDialo
 import { NewAgentsChoice } from './components/NewAgentsNotification.js';
 import { isSlashCommand } from './utils/commandUtils.js';
 import { useTerminalTheme } from './hooks/useTerminalTheme.js';
-import { useTimedMessage } from './hooks/useTimedMessage.js';
 import { isITerm2 } from './utils/terminalUtils.js';
 
 function isToolExecuting(pendingHistoryItems: HistoryItemWithoutId[]) {
@@ -253,7 +248,6 @@ export const AppContainer = (props: AppContainerProps) => {
 
   const { bannerText } = useBanner(bannerData);
 
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const extensionManager = config.getExtensionLoader() as ExtensionManager;
   // We are in the interactive CLI, update how we request consent and settings.
   extensionManager.setRequestConsent((description) =>
@@ -325,16 +319,6 @@ export const AppContainer = (props: AppContainerProps) => {
   const [currentModel, setCurrentModel] = useState(config.getModel());
 
   const [userTier, setUserTier] = useState<UserTierId | undefined>(undefined);
-  const [quotaStats, setQuotaStats] = useState<QuotaStats | undefined>(() => {
-    const remaining = config.getQuotaRemaining();
-    const limit = config.getQuotaLimit();
-    const resetTime = config.getQuotaResetTime();
-    return remaining !== undefined ||
-      limit !== undefined ||
-      resetTime !== undefined
-      ? { remaining, limit, resetTime }
-      : undefined;
-  });
 
   const [isConfigInitialized, setConfigInitialized] = useState(false);
 
@@ -364,9 +348,7 @@ export const AppContainer = (props: AppContainerProps) => {
     (async () => {
       // Note: the program will not work if this fails so let errors be
       // handled by the global catch.
-      if (!config.isInitialized()) {
-        await config.initialize();
-      }
+      await config.initialize();
       setConfigInitialized(true);
       startupProfiler.flush(config);
 
@@ -439,23 +421,9 @@ export const AppContainer = (props: AppContainerProps) => {
       setCurrentModel(config.getModel());
     };
 
-    const handleQuotaChanged = (payload: {
-      remaining: number | undefined;
-      limit: number | undefined;
-      resetTime?: string;
-    }) => {
-      setQuotaStats({
-        remaining: payload.remaining,
-        limit: payload.limit,
-        resetTime: payload.resetTime,
-      });
-    };
-
     coreEvents.on(CoreEvent.ModelChanged, handleModelChanged);
-    coreEvents.on(CoreEvent.QuotaChanged, handleQuotaChanged);
     return () => {
       coreEvents.off(CoreEvent.ModelChanged, handleModelChanged);
-      coreEvents.off(CoreEvent.QuotaChanged, handleQuotaChanged);
     };
   }, [config]);
 
@@ -498,8 +466,15 @@ export const AppContainer = (props: AppContainerProps) => {
 
   const staticAreaMaxItemHeight = Math.max(terminalHeight * 4, 100);
 
+  const isValidPath = useCallback((filePath: string): boolean => {
+    try {
+      return fs.existsSync(filePath) && fs.statSync(filePath).isFile();
+    } catch (_e) {
+      return false;
+    }
+  }, []);
+
   const getPreferredEditor = useCallback(
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     () => settings.merged.general.preferredEditor as EditorType,
     [settings.merged.general.preferredEditor],
   );
@@ -509,7 +484,7 @@ export const AppContainer = (props: AppContainerProps) => {
     viewport: { height: 10, width: inputWidth },
     stdin,
     setRawMode,
-    escapePastedPaths: true,
+    isValidPath,
     shellModeActive,
     getPreferredEditor,
   });
@@ -869,8 +844,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
   const [authConsentRequest, setAuthConsentRequest] =
     useState<ConfirmationRequest | null>(null);
-  const [permissionConfirmationRequest, setPermissionConfirmationRequest] =
-    useState<PermissionConfirmationRequest | null>(null);
 
   useEffect(() => {
     const handleConsentRequest = (payload: ConsentRequestPayload) => {
@@ -901,14 +874,12 @@ Logging in with Google... Restarting Gemini CLI to continue.
       const { memoryContent, fileCount } =
         await refreshServerHierarchicalMemory(config);
 
-      const flattenedMemory = flattenMemory(memoryContent);
-
       historyManager.addItem(
         {
           type: MessageType.INFO,
           text: `Memory refreshed successfully. ${
-            flattenedMemory.length > 0
-              ? `Loaded ${flattenedMemory.length} characters from ${fileCount} file(s).`
+            memoryContent.length > 0
+              ? `Loaded ${memoryContent.length} characters from ${fileCount} file(s).`
               : 'No memory content found.'
           }`,
         },
@@ -916,7 +887,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       );
       if (config.getDebugMode()) {
         debugLogger.log(
-          `[DEBUG] Refreshed memory content in config: ${flattenedMemory.substring(
+          `[DEBUG] Refreshed memory content in config: ${memoryContent.substring(
             0,
             200,
           )}...`,
@@ -1107,30 +1078,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
   );
 
   const handleFinalSubmit = useCallback(
-    async (submittedValue: string) => {
+    (submittedValue: string) => {
       const isSlash = isSlashCommand(submittedValue.trim());
       const isIdle = streamingState === StreamingState.Idle;
 
       if (isSlash || (isIdle && isMcpReady)) {
-        if (!isSlash) {
-          const permissions = await checkPermissions(submittedValue, config);
-          if (permissions.length > 0) {
-            setPermissionConfirmationRequest({
-              files: permissions,
-              onComplete: (result) => {
-                setPermissionConfirmationRequest(null);
-                if (result.allowed) {
-                  permissions.forEach((p) =>
-                    config.getWorkspaceContext().addReadOnlyPath(p),
-                  );
-                }
-                void submitQuery(submittedValue);
-              },
-            });
-            addInput(submittedValue);
-            return;
-          }
-        }
         void submitQuery(submittedValue);
       } else {
         // Check messageQueue.length === 0 to only notify on the first queued item
@@ -1151,7 +1103,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       isMcpReady,
       streamingState,
       messageQueue.length,
-      config,
     ],
   );
 
@@ -1186,9 +1137,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
   useLayoutEffect(() => {
     if (mainControlsRef.current) {
       const fullFooterMeasurement = measureElement(mainControlsRef.current);
-      const roundedHeight = Math.round(fullFooterMeasurement.height);
-      if (roundedHeight > 0 && roundedHeight !== controlsHeight) {
-        setControlsHeight(roundedHeight);
+      if (
+        fullFooterMeasurement.height > 0 &&
+        fullFooterMeasurement.height !== controlsHeight
+      ) {
+        setControlsHeight(fullFooterMeasurement.height);
       }
     }
   }, [buffer, terminalWidth, terminalHeight, controlsHeight]);
@@ -1268,7 +1221,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       !showPrivacyNotice &&
       geminiClient?.isInitialized?.()
     ) {
-      void handleFinalSubmit(initialPrompt);
+      handleFinalSubmit(initialPrompt);
       initialPromptSubmitted.current = true;
     }
   }, [
@@ -1316,11 +1269,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
   >();
   const [showEscapePrompt, setShowEscapePrompt] = useState(false);
   const [showIdeRestartPrompt, setShowIdeRestartPrompt] = useState(false);
-
-  const [transientMessage, showTransientMessage] = useTimedMessage<{
-    text: string;
-    type: TransientMessageType;
-  }>(WARNING_PROMPT_DURATION_MS);
+  const [warningMessage, setWarningMessage] = useState<string | null>(null);
 
   const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } =
     useFolderTrust(settings, setIsTrustedFolder, historyManager.addItem);
@@ -1332,42 +1281,41 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
   useIncludeDirsTrust(config, isTrustedFolder, historyManager, setCustomDialog);
 
+  const warningTimeoutRef = useRef<NodeJS.Timeout | null>(null);
   const tabFocusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
 
-  useEffect(() => {
-    const handleTransientMessage = (payload: {
-      message: string;
-      type: TransientMessageType;
-    }) => {
-      showTransientMessage({ text: payload.message, type: payload.type });
-    };
+  const handleWarning = useCallback((message: string) => {
+    setWarningMessage(message);
+    if (warningTimeoutRef.current) {
+      clearTimeout(warningTimeoutRef.current);
+    }
+    warningTimeoutRef.current = setTimeout(() => {
+      setWarningMessage(null);
+    }, WARNING_PROMPT_DURATION_MS);
+  }, []);
 
-    const handleSelectionWarning = () => {
-      showTransientMessage({
-        text: 'Press Ctrl-S to enter selection mode to copy text.',
-        type: TransientMessageType.Warning,
-      });
-    };
-    const handlePasteTimeout = () => {
-      showTransientMessage({
-        text: 'Paste Timed out. Possibly due to slow connection.',
-        type: TransientMessageType.Warning,
-      });
-    };
-
-    appEvents.on(AppEvent.TransientMessage, handleTransientMessage);
-    appEvents.on(AppEvent.SelectionWarning, handleSelectionWarning);
-    appEvents.on(AppEvent.PasteTimeout, handlePasteTimeout);
-
-    return () => {
-      appEvents.off(AppEvent.TransientMessage, handleTransientMessage);
-      appEvents.off(AppEvent.SelectionWarning, handleSelectionWarning);
-      appEvents.off(AppEvent.PasteTimeout, handlePasteTimeout);
+  // Handle timeout cleanup on unmount
+  useEffect(
+    () => () => {
+      if (warningTimeoutRef.current) {
+        clearTimeout(warningTimeoutRef.current);
+      }
       if (tabFocusTimeoutRef.current) {
         clearTimeout(tabFocusTimeoutRef.current);
       }
+    },
+    [],
+  );
+
+  useEffect(() => {
+    const handlePasteTimeout = () => {
+      handleWarning('Paste Timed out. Possibly due to slow connection.');
     };
-  }, [showTransientMessage]);
+    appEvents.on(AppEvent.PasteTimeout, handlePasteTimeout);
+    return () => {
+      appEvents.off(AppEvent.PasteTimeout, handlePasteTimeout);
+    };
+  }, [handleWarning]);
 
   useEffect(() => {
     if (ideNeedsRestart) {
@@ -1467,9 +1415,17 @@ Logging in with Google... Restarting Gemini CLI to continue.
       if (result.userSelection === 'yes') {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         handleSlashCommand('/ide install');
-        settings.setValue(SettingScope.User, 'ide.hasSeenNudge', true);
+        settings.setValue(
+          SettingScope.User,
+          'hasSeenIdeIntegrationNudge',
+          true,
+        );
       } else if (result.userSelection === 'dismiss') {
-        settings.setValue(SettingScope.User, 'ide.hasSeenNudge', true);
+        settings.setValue(
+          SettingScope.User,
+          'hasSeenIdeIntegrationNudge',
+          true,
+        );
       }
       setIdePromptAnswered(true);
     },
@@ -1484,6 +1440,13 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
   const handleGlobalKeypress = useCallback(
     (key: Key): boolean => {
+      if (copyModeEnabled) {
+        setCopyModeEnabled(false);
+        enableMouseEvents();
+        // We don't want to process any other keys if we're in copy mode.
+        return true;
+      }
+
       // Debug log keystrokes if enabled
       if (settings.merged.general.debugKeystrokeLogging) {
         debugLogger.log('[DEBUG] Keystroke:', JSON.stringify(key));
@@ -1514,30 +1477,13 @@ Logging in with Google... Restarting Gemini CLI to continue.
       }
 
       if (keyMatchers[Command.SHOW_ERROR_DETAILS](key)) {
-        if (settings.merged.general.devtools) {
-          void (async () => {
-            const { toggleDevToolsPanel } = await import(
-              '../utils/devtoolsService.js'
-            );
-            await toggleDevToolsPanel(
-              config,
-              showErrorDetails,
-              () => setShowErrorDetails((prev) => !prev),
-              () => setShowErrorDetails(true),
-            );
-          })();
-        } else {
-          setShowErrorDetails((prev) => !prev);
-        }
+        setShowErrorDetails((prev) => !prev);
         return true;
       } else if (keyMatchers[Command.SUSPEND_APP](key)) {
         const undoMessage = isITerm2()
           ? 'Undo has been moved to Option + Z'
           : 'Undo has been moved to Alt/Option + Z or Cmd + Z';
-        showTransientMessage({
-          text: undoMessage,
-          type: TransientMessageType.Warning,
-        });
+        handleWarning(undoMessage);
         return true;
       } else if (keyMatchers[Command.SHOW_FULL_TODOS](key)) {
         setShowFullTodos((prev) => !prev);
@@ -1577,10 +1523,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
             if (lastOutputTimeRef.current === capturedTime) {
               setEmbeddedShellFocused(false);
             } else {
-              showTransientMessage({
-                text: 'Use Shift+Tab to unfocus',
-                type: TransientMessageType.Warning,
-              });
+              handleWarning('Use Shift+Tab to unfocus');
             }
           }, 150);
           return false;
@@ -1651,6 +1594,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       settings.merged.general.debugKeystrokeLogging,
       refreshStatic,
       setCopyModeEnabled,
+      copyModeEnabled,
       isAlternateBuffer,
       backgroundCurrentShell,
       toggleBackgroundShell,
@@ -1659,28 +1603,12 @@ Logging in with Google... Restarting Gemini CLI to continue.
       setIsBackgroundShellListOpen,
       lastOutputTimeRef,
       tabFocusTimeoutRef,
-      showTransientMessage,
-      settings.merged.general.devtools,
-      showErrorDetails,
+      handleWarning,
     ],
   );
 
   useKeypress(handleGlobalKeypress, { isActive: true, priority: true });
 
-  useKeypress(
-    () => {
-      setCopyModeEnabled(false);
-      enableMouseEvents();
-      return true;
-    },
-    {
-      isActive: copyModeEnabled,
-      // We need to receive keypresses first so they do not bubble to other
-      // handlers.
-      priority: KeypressPriority.Critical,
-    },
-  );
-
   useEffect(() => {
     // Respect hideWindowTitle settings
     if (settings.merged.ui.hideWindowTitle) return;
@@ -1786,7 +1714,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
     adminSettingsChanged ||
     !!commandConfirmationRequest ||
     !!authConsentRequest ||
-    !!permissionConfirmationRequest ||
     !!customDialog ||
     confirmUpdateExtensionRequests.length > 0 ||
     !!loopDetectionConfirmationRequest ||
@@ -1892,7 +1819,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       authConsentRequest,
       confirmUpdateExtensionRequests,
       loopDetectionConfirmationRequest,
-      permissionConfirmationRequest,
       geminiMdFileCount,
       streamingState,
       initError,
@@ -1927,12 +1853,9 @@ Logging in with Google... Restarting Gemini CLI to continue.
       queueErrorMessage,
       showApprovalModeIndicator,
       currentModel,
-      quota: {
-        userTier,
-        stats: quotaStats,
-        proQuotaRequest,
-        validationRequest,
-      },
+      userTier,
+      proQuotaRequest,
+      validationRequest,
       contextFileNames,
       errorCount,
       availableTerminalHeight,
@@ -1961,7 +1884,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       showDebugProfiler,
       customDialog,
       copyModeEnabled,
-      transientMessage,
+      warningMessage,
       bannerData,
       bannerVisible,
       terminalBackgroundColor: config.getTerminalBackground(),
@@ -2002,7 +1925,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       authConsentRequest,
       confirmUpdateExtensionRequests,
       loopDetectionConfirmationRequest,
-      permissionConfirmationRequest,
       geminiMdFileCount,
       streamingState,
       initError,
@@ -2037,7 +1959,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
       queueErrorMessage,
       showApprovalModeIndicator,
       userTier,
-      quotaStats,
       proQuotaRequest,
       validationRequest,
       contextFileNames,
@@ -2072,7 +1993,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       apiKeyDefaultValue,
       authState,
       copyModeEnabled,
-      transientMessage,
+      warningMessage,
       bannerData,
       bannerVisible,
       config,
@@ -2129,6 +2050,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       handleApiKeyCancel,
       setBannerVisible,
       setShortcutsHelpVisible,
+      handleWarning,
       setEmbeddedShellFocused,
       dismissBackgroundShell,
       setActiveBackgroundShellPid,
@@ -2205,6 +2127,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       handleApiKeyCancel,
       setBannerVisible,
       setShortcutsHelpVisible,
+      handleWarning,
       setEmbeddedShellFocused,
       dismissBackgroundShell,
       setActiveBackgroundShellPid,

packages/cli/src/ui/auth/ApiAuthDialog.test.tsx

@@ -110,7 +110,6 @@ describe('ApiAuthDialog', () => {
       keypressHandler({
         name: keyName,
         shift: false,
-        alt: false,
         ctrl: false,
         cmd: false,
         sequence,

packages/cli/src/ui/auth/ApiAuthDialog.tsx

@@ -49,6 +49,7 @@ export function ApiAuthDialog({
       width: viewportWidth,
       height: 4,
     },
+    isValidPath: () => false, // No path validation needed for API key
     inputFilter: (text) =>
       text.replace(/[^a-zA-Z0-9_-]/g, '').replace(/[\r\n]/g, ''),
     singleLine: true,

packages/cli/src/ui/auth/AuthDialog.tsx

@@ -88,10 +88,8 @@ export function AuthDialog({
   const defaultAuthTypeEnv = process.env['GEMINI_DEFAULT_AUTH_TYPE'];
   if (
     defaultAuthTypeEnv &&
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     Object.values(AuthType).includes(defaultAuthTypeEnv as AuthType)
   ) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     defaultAuthType = defaultAuthTypeEnv as AuthType;
   }
 

packages/cli/src/ui/auth/useAuth.ts

@@ -113,7 +113,6 @@ export const useAuthCommand = (
       const defaultAuthType = process.env['GEMINI_DEFAULT_AUTH_TYPE'];
       if (
         defaultAuthType &&
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         !Object.values(AuthType).includes(defaultAuthType as AuthType)
       ) {
         onAuthError(

packages/cli/src/ui/commands/chatCommand.ts

@@ -213,7 +213,6 @@ const resumeCommand: SlashCommand = {
         continue;
       }
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       uiHistory.push({
         type: (item.role && rolemap[item.role]) || MessageType.GEMINI,
         text,

packages/cli/src/ui/commands/directoryCommand.tsx

@@ -49,7 +49,6 @@ async function finishAddingDirectories(
         text: `Successfully added GEMINI.md files from the following directories if there are:\n- ${added.join('\n- ')}`,
       });
     } catch (error) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       errors.push(`Error refreshing memory: ${(error as Error).message}`);
     }
   }

packages/cli/src/ui/commands/initCommand.ts

@@ -48,7 +48,6 @@ export const initCommand: SlashCommand = {
       );
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     return result as SlashCommandActionReturn;
   },
 };

packages/cli/src/ui/commands/insightsCommand.ts

@@ -0,0 +1,56 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { InsightsService } from '@google/gemini-cli-core';
+import { MessageType } from '../types.js';
+import {
+  type CommandContext,
+  type SlashCommand,
+  CommandKind,
+} from './types.js';
+
+/**
+ * Slash command to generate usage insights based on past sessions.
+ */
+export const insightsCommand: SlashCommand = {
+  name: 'insights',
+  description: 'Analyze past sessions and get usage improvements and summary.',
+  kind: CommandKind.BUILT_IN,
+  autoExecute: true,
+  action: async (context: CommandContext) => {
+    const config = context.services.config;
+    if (!config) {
+      context.ui.addItem({
+        type: MessageType.ERROR,
+        text: 'Config is not available.',
+      });
+      return;
+    }
+
+    context.ui.addItem({
+      type: MessageType.INFO,
+      text: 'Analyzing your past sessions to generate insights...',
+    });
+
+    try {
+      const insightsService = new InsightsService(config);
+      const baseLlmClient = config.getBaseLlmClient();
+
+      const reportMarkdown =
+        await insightsService.generateInsightsReport(baseLlmClient);
+
+      context.ui.addItem({
+        type: MessageType.GEMINI,
+        text: reportMarkdown,
+      });
+    } catch (error) {
+      context.ui.addItem({
+        type: MessageType.ERROR,
+        text: `Failed to generate insights: ${error instanceof Error ? error.message : String(error)}`,
+      });
+    }
+  },
+};

packages/cli/src/ui/commands/memoryCommand.test.ts

@@ -19,7 +19,6 @@ import {
   showMemory,
   addMemory,
   listMemoryFiles,
-  flattenMemory,
 } from '@google/gemini-cli-core';
 
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
@@ -34,7 +33,7 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     refreshMemory: vi.fn(async (config) => {
       if (config.isJitContextEnabled()) {
         await config.getContextManager()?.refresh();
-        const memoryContent = original.flattenMemory(config.getUserMemory());
+        const memoryContent = config.getUserMemory() || '';
         const fileCount = config.getGeminiMdFileCount() || 0;
         return {
           type: 'message',
@@ -86,7 +85,7 @@ describe('memoryCommand', () => {
       mockGetGeminiMdFileCount = vi.fn();
 
       vi.mocked(showMemory).mockImplementation((config) => {
-        const memoryContent = flattenMemory(config.getUserMemory());
+        const memoryContent = config.getUserMemory() || '';
         const fileCount = config.getGeminiMdFileCount() || 0;
         let content;
         if (memoryContent.length > 0) {

packages/cli/src/ui/commands/memoryCommand.ts

@@ -93,7 +93,6 @@ export const memoryCommand: SlashCommand = {
           context.ui.addItem(
             {
               type: MessageType.ERROR,
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
               text: `Error refreshing memory: ${(error as Error).message}`,
             },
             Date.now(),

packages/cli/src/ui/commands/statsCommand.test.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -54,7 +54,6 @@ describe('statsCommand', () => {
       selectedAuthType: '',
       tier: undefined,
       userEmail: 'mock@example.com',
-      currentModel: undefined,
     });
   });
 
@@ -64,20 +63,9 @@ describe('statsCommand', () => {
     const mockQuota = { buckets: [] };
     const mockRefreshUserQuota = vi.fn().mockResolvedValue(mockQuota);
     const mockGetUserTierName = vi.fn().mockReturnValue('Basic');
-    const mockGetModel = vi.fn().mockReturnValue('gemini-pro');
-    const mockGetQuotaRemaining = vi.fn().mockReturnValue(85);
-    const mockGetQuotaLimit = vi.fn().mockReturnValue(100);
-    const mockGetQuotaResetTime = vi
-      .fn()
-      .mockReturnValue('2025-01-01T12:00:00Z');
-
     mockContext.services.config = {
       refreshUserQuota: mockRefreshUserQuota,
       getUserTierName: mockGetUserTierName,
-      getModel: mockGetModel,
-      getQuotaRemaining: mockGetQuotaRemaining,
-      getQuotaLimit: mockGetQuotaLimit,
-      getQuotaResetTime: mockGetQuotaResetTime,
     } as unknown as Config;
 
     await statsCommand.action(mockContext, '');
@@ -87,10 +75,6 @@ describe('statsCommand', () => {
       expect.objectContaining({
         quotas: mockQuota,
         tier: 'Basic',
-        currentModel: 'gemini-pro',
-        pooledRemaining: 85,
-        pooledLimit: 100,
-        pooledResetTime: '2025-01-01T12:00:00Z',
       }),
     );
   });
@@ -109,9 +93,6 @@ describe('statsCommand', () => {
       selectedAuthType: '',
       tier: undefined,
       userEmail: 'mock@example.com',
-      currentModel: undefined,
-      pooledRemaining: undefined,
-      pooledLimit: undefined,
     });
   });
 

packages/cli/src/ui/commands/statsCommand.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -44,7 +44,6 @@ async function defaultSessionView(context: CommandContext) {
   const wallDuration = now.getTime() - sessionStartTime.getTime();
 
   const { selectedAuthType, userEmail, tier } = getUserIdentity(context);
-  const currentModel = context.services.config?.getModel();
 
   const statsItem: HistoryItemStats = {
     type: MessageType.STATS,
@@ -52,16 +51,12 @@ async function defaultSessionView(context: CommandContext) {
     selectedAuthType,
     userEmail,
     tier,
-    currentModel,
   };
 
   if (context.services.config) {
     const quota = await context.services.config.refreshUserQuota();
     if (quota) {
       statsItem.quotas = quota;
-      statsItem.pooledRemaining = context.services.config.getQuotaRemaining();
-      statsItem.pooledLimit = context.services.config.getQuotaLimit();
-      statsItem.pooledResetTime = context.services.config.getQuotaResetTime();
     }
   }
 
@@ -94,19 +89,11 @@ export const statsCommand: SlashCommand = {
       autoExecute: true,
       action: (context: CommandContext) => {
         const { selectedAuthType, userEmail, tier } = getUserIdentity(context);
-        const currentModel = context.services.config?.getModel();
-        const pooledRemaining = context.services.config?.getQuotaRemaining();
-        const pooledLimit = context.services.config?.getQuotaLimit();
-        const pooledResetTime = context.services.config?.getQuotaResetTime();
         context.ui.addItem({
           type: MessageType.MODEL_STATS,
           selectedAuthType,
           userEmail,
           tier,
-          currentModel,
-          pooledRemaining,
-          pooledLimit,
-          pooledResetTime,
         } as HistoryItemModelStats);
       },
     },

packages/cli/src/ui/components/AgentConfigDialog.tsx

@@ -123,7 +123,6 @@ function getNestedValue(
   for (const key of path) {
     if (current === null || current === undefined) return undefined;
     if (typeof current !== 'object') return undefined;
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     current = (current as Record<string, unknown>)[key];
   }
   return current;
@@ -145,10 +144,8 @@ function setNestedValue(
     if (current[key] === undefined || current[key] === null) {
       current[key] = {};
     } else {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       current[key] = { ...(current[key] as Record<string, unknown>) };
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     current = current[key] as Record<string, unknown>;
   }
 
@@ -268,7 +265,6 @@ export function AgentConfigDialog({
     () =>
       AGENT_CONFIG_FIELDS.map((field) => {
         const currentValue = getNestedValue(
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
           pendingOverride as Record<string, unknown>,
           field.path,
         );
@@ -304,7 +300,6 @@ export function AgentConfigDialog({
           displayValue,
           isGreyedOut: currentValue === undefined,
           scopeMessage: undefined,
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
           rawValue: rawValue as string | number | boolean | undefined,
         };
       }),
@@ -325,7 +320,6 @@ export function AgentConfigDialog({
       if (!field || field.type !== 'boolean') return;
 
       const currentValue = getNestedValue(
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         pendingOverride as Record<string, unknown>,
         field.path,
       );
@@ -335,7 +329,6 @@ export function AgentConfigDialog({
       const newValue = !effectiveValue;
 
       const newOverride = setNestedValue(
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         pendingOverride as Record<string, unknown>,
         field.path,
         newValue,
@@ -376,7 +369,6 @@ export function AgentConfigDialog({
 
       // Update pending override locally
       const newOverride = setNestedValue(
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         pendingOverride as Record<string, unknown>,
         field.path,
         parsed,
@@ -399,7 +391,6 @@ export function AgentConfigDialog({
 
       // Remove the override (set to undefined)
       const newOverride = setNestedValue(
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
         pendingOverride as Record<string, unknown>,
         field.path,
         undefined,