fix: resolve TS4111 build error by using bracket notation for index signatures

feat: refine adaptive thinking budget (stickiness, context-awareness, recursion prevention)
feat: instrument adaptive thinking metrics in telemetry and chat logs
2026-07-27 18:21:00 -07:00 · 2026-02-11 18:32:45 -05:00 · 2026-02-10 14:43:18 -05:00 · 2026-02-09 14:49:40 -05:00 · 2026-02-09 13:35:58 -05:00 · 2026-02-09 13:24:17 -05:00
382 changed files with 3912 additions and 8596 deletions
@@ -2,10 +2,6 @@
  "experimental": {
    "toolOutputMasking": {
      "enabled": true
-    },
-    "plan": true
-  },
-  "general": {
-    "devtools": true
+    }
  }
 }
@@ -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.
@@ -1,9 +1,5 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
+/* eslint-disable @typescript-eslint/no-require-imports */
+/* global process, console, require */
 const { Octokit } = require('@octokit/rest');

 /**
@@ -4,7 +4,7 @@ name: 'Generate Release Notes'

 on:
  release:
-    types: ['published']
+    types: ['created']
  workflow_dispatch:
    inputs:
      version:
@@ -52,10 +52,6 @@ powerful tool for developers.

 ## Development Conventions

- **Legacy Snippets:** `packages/core/src/prompts/snippets.legacy.ts` is a
-  snapshot of an older system prompt. Avoid changing the prompting verbiage to
-  preserve its historical behavior; however, structural changes to ensure
-  compilation or simplify the code are permitted.
 - **Contributions:** Follow the process outlined in `CONTRIBUTING.md`. Requires
  signing the Google CLA.
 - **Pull Requests:** Keep PRs small, focused, and linked to an existing issue.
@@ -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`                 |
@@ -140,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.
@@ -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
@@ -36,7 +36,7 @@ implementation strategy.
 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:
@@ -46,8 +46,8 @@ Other ways to start in Plan Mode:

  ```json
  {
-    "general": {
-      "defaultApprovalMode": "plan"
+    "tools": {
+      "approvalMode": "plan"
    }
  }
  ```
@@ -96,11 +96,11 @@ These are the only allowed tools:
 - **Planning (Write):** [`write_file`] and [`replace`] ONLY allowed for `.md`
  files in the `~/.gemini/tmp/<project>/plans/` directory.

-[`list_directory`]: /docs/tools/file-system.md#1-list_directory-readfolder
-[`read_file`]: /docs/tools/file-system.md#2-read_file-readfile
-[`grep_search`]: /docs/tools/file-system.md#5-grep_search-searchtext
-[`write_file`]: /docs/tools/file-system.md#3-write_file-writefile
-[`glob`]: /docs/tools/file-system.md#4-glob-findfiles
-[`google_web_search`]: /docs/tools/web-search.md
-[`replace`]: /docs/tools/file-system.md#6-replace-edit
-[MCP tools]: /docs/tools/mcp-server.md
+[`list_directory`]: ../tools/file-system.md#1-list_directory-readfolder
+[`read_file`]: ../tools/file-system.md#2-read_file-readfile
+[`grep_search`]: ../tools/file-system.md#5-grep_search-searchtext
+[`write_file`]: ../tools/file-system.md#3-write_file-writefile
+[`glob`]: ../tools/file-system.md#4-glob-findfiles
+[`google_web_search`]: ../tools/web-search.md
+[`replace`]: ../tools/file-system.md#6-replace-edit
+[MCP tools]: ../tools/mcp-server.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,7 +43,6 @@ 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`  |
@@ -97,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

@@ -49,19 +49,8 @@ Gemini CLI comes with the following built-in sub-agents:
  dependencies.
 - **When to use:** "How does the authentication system work?", "Map out the
  dependencies of the `AgentRegistry` class."
- **Configuration:** Enabled by default. You can configure it in
-  `settings.json`. Example (forcing a specific model):
-  ```json
-  {
-    "experimental": {
-      "codebaseInvestigatorSettings": {
-        "enabled": true,
-        "maxNumTurns": 20,
-        "model": "gemini-2.5-pro"
-      }
-    }
-  }
-  ```
+- **Configuration:** Enabled by default. You can configure it using agent
+  overrides in `settings.json`.

 ### CLI Help Agent

@@ -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
@@ -688,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
@@ -63,7 +63,6 @@ const external = [
  '@lydell/node-pty-win32-arm64',
  '@lydell/node-pty-win32-x64',
  'keytar',
-  'gemini-cli-devtools',
 ];

 const baseConfig = {
@@ -37,6 +37,7 @@ export default tseslint.config(
      'dist/**',
      'evals/**',
      'packages/test-utils/**',
+      'packages/core/src/skills/builtin/skill-creator/scripts/*.cjs',
    ],
  },
  eslint.configs.recommended,
@@ -192,14 +193,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: [
@@ -250,7 +243,7 @@ export default tseslint.config(
    },
  },
  {
-    files: ['./**/*.{tsx,ts,js,cjs}'],
+    files: ['./**/*.{tsx,ts,js}'],
    plugins: {
      headers,
      import: importPlugin,
@@ -276,6 +269,7 @@ export default tseslint.config(
      'import/enforce-node-protocol-usage': ['error', 'always'],
    },
  },
+  // extra settings for scripts that we run directly with node
  {
    files: ['./scripts/**/*.js', 'esbuild.config.js'],
    languageOptions: {
@@ -296,30 +290,6 @@ export default tseslint.config(
      ],
    },
  },
-  {
-    files: ['**/*.cjs'],
-    languageOptions: {
-      sourceType: 'commonjs',
-      globals: {
-        ...globals.node,
-      },
-    },
-    rules: {
-      'no-restricted-syntax': 'off',
-      'no-console': 'off',
-      'no-empty': 'off',
-      'no-redeclare': 'off',
-      '@typescript-eslint/no-require-imports': 'off',
-      '@typescript-eslint/no-unused-vars': [
-        'error',
-        {
-          argsIgnorePattern: '^_',
-          varsIgnorePattern: '^_',
-          caughtErrorsIgnorePattern: '^_',
-        },
-      ],
-    },
-  },
  {
    files: ['packages/vscode-ide-companion/esbuild.js'],
    languageOptions: {
@@ -1,117 +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, result) => {
-      assertModelHasOutput(result);
-      expect(result).toMatch(/Cherry/i);
-      expect(result).not.toMatch(/Apple/i);
-      expect(result).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, result) => {
-      assertModelHasOutput(result);
-      expect(result).toMatch(/<global>.*Instruction A/i);
-      expect(result).toMatch(/<extension>.*Instruction B/i);
-      expect(result).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?`,
-    assert: async (_rig, result) => {
-      assertModelHasOutput(result);
-      expect(result).toMatch(/Dark/i);
-      expect(result).not.toMatch(/Light/i);
-    },
-  });
-});
@@ -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);
-    },
-  });
-});
@@ -20,8 +20,5 @@ export default defineConfig({
        maxThreads: 16,
      },
    },
-    env: {
-      GEMINI_TEST_TYPE: 'integration',
-    },
  },
 });
@@ -31,7 +31,6 @@
        "@types/react": "^19.2.0",
        "@types/react-dom": "^19.2.0",
        "@types/shell-quote": "^1.7.5",
-        "@types/ws": "^8.18.1",
        "@vitest/coverage-v8": "^3.1.1",
        "@vitest/eslint-plugin": "^1.3.4",
        "cross-env": "^7.0.3",
@@ -76,7 +75,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"
      }
@@ -2255,6 +2253,7 @@
      "integrity": "sha512-t54CUOsFMappY1Jbzb7fetWeO0n6K0k/4+/ZpkS+3Joz8I4VcvY9OiEBFRYISqaI2fq5sCiPtAjRDOzVYG8m+Q==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@octokit/auth-token": "^6.0.0",
        "@octokit/graphql": "^9.0.2",
@@ -2435,6 +2434,7 @@
      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
      "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
      "license": "Apache-2.0",
+      "peer": true,
      "engines": {
        "node": ">=8.0.0"
      }
@@ -2468,6 +2468,7 @@
      "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.0.1.tgz",
      "integrity": "sha512-MaZk9SJIDgo1peKevlbhP6+IwIiNPNmswNL4AF0WaQJLbHXjr9SrZMgS12+iqr9ToV4ZVosCcc0f8Rg67LXjxw==",
      "license": "Apache-2.0",
+      "peer": true,
      "dependencies": {
        "@opentelemetry/semantic-conventions": "^1.29.0"
      },
@@ -2836,6 +2837,7 @@
      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.0.1.tgz",
      "integrity": "sha512-dZOB3R6zvBwDKnHDTB4X1xtMArB/d324VsbiPkX/Yu0Q8T2xceRthoIVFhJdvgVM2QhGVUyX9tzwiNxGtoBJUw==",
      "license": "Apache-2.0",
+      "peer": true,
      "dependencies": {
        "@opentelemetry/core": "2.0.1",
        "@opentelemetry/semantic-conventions": "^1.29.0"
@@ -2869,6 +2871,7 @@
      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-2.0.1.tgz",
      "integrity": "sha512-wf8OaJoSnujMAHWR3g+/hGvNcsC16rf9s1So4JlMiFaFHiE4HpIA3oUh+uWZQ7CNuK8gVW/pQSkgoa5HkkOl0g==",
      "license": "Apache-2.0",
+      "peer": true,
      "dependencies": {
        "@opentelemetry/core": "2.0.1",
        "@opentelemetry/resources": "2.0.1"
@@ -2921,6 +2924,7 @@
      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.0.1.tgz",
      "integrity": "sha512-xYLlvk/xdScGx1aEqvxLwf6sXQLXCjk3/1SQT9X9AoN5rXRhkdvIFShuNNmtTEPRBqcsMbS4p/gJLNI2wXaDuQ==",
      "license": "Apache-2.0",
+      "peer": true,
      "dependencies": {
        "@opentelemetry/core": "2.0.1",
        "@opentelemetry/resources": "2.0.1",
@@ -4136,6 +4140,7 @@
      "integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==",
      "devOptional": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "csstype": "^3.0.2"
      }
@@ -4430,6 +4435,7 @@
      "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@typescript-eslint/scope-manager": "8.35.0",
        "@typescript-eslint/types": "8.35.0",
@@ -5422,6 +5428,7 @@
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
      "license": "MIT",
+      "peer": true,
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -8431,6 +8438,7 @@
      "integrity": "sha512-GsGizj2Y1rCWDu6XoEekL3RLilp0voSePurjZIkxL3wlm5o5EC9VpgaP7lrCvjnkuLvzFBQWB3vWB3K5KQTveQ==",
      "dev": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.2.0",
        "@eslint-community/regexpp": "^4.12.1",
@@ -8971,6 +8979,7 @@
      "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz",
      "integrity": "sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "accepts": "^2.0.0",
        "body-parser": "^2.2.1",
@@ -9606,18 +9615,6 @@
        "node": ">=14"
      }
    },
-    "node_modules/gemini-cli-devtools": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/gemini-cli-devtools/-/gemini-cli-devtools-0.2.1.tgz",
-      "integrity": "sha512-PcqPL9ZZjgjsp3oYhcXnUc6yNeLvdZuU/UQp0aT+DA8pt3BZzPzXthlOmIrRRqHBdLjMLPwN5GD29zR5bASXtQ==",
-      "optional": true,
-      "dependencies": {
-        "ws": "^8.16.0"
-      },
-      "engines": {
-        "node": ">=20"
-      }
-    },
    "node_modules/gemini-cli-vscode-ide-companion": {
      "resolved": "packages/vscode-ide-companion",
      "link": true
@@ -10584,6 +10581,7 @@
      "resolved": "https://registry.npmjs.org/@jrichman/ink/-/ink-6.4.8.tgz",
      "integrity": "sha512-v0thcXIKl9hqF/1w4HqA6MKxIcMoWSP3YtEZIAA+eeJngXpN5lGnMkb6rllB7FnOdwyEyYaFTcu1ZVr4/JZpWQ==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@alcalzone/ansi-tokenize": "^0.2.1",
        "ansi-escapes": "^7.0.0",
@@ -14368,6 +14366,7 @@
      "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
      "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -14378,6 +14377,7 @@
      "integrity": "sha512-ePrwPfxAnB+7hgnEr8vpKxL9cmnp7F322t8oqcPshbIQQhDKgFDW4tjhF2wjVbdXF9O/nyuy3sQWd9JGpiLPvA==",
      "devOptional": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "shell-quote": "^1.6.1",
        "ws": "^7"
@@ -16614,6 +16614,7 @@
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -16837,7 +16838,8 @@
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
      "dev": true,
-      "license": "0BSD"
+      "license": "0BSD",
+      "peer": true
    },
    "node_modules/tsx": {
      "version": "4.20.3",
@@ -16845,6 +16847,7 @@
      "integrity": "sha512-qjbnuR9Tr+FJOMBqJCW5ehvIo/buZq7vH7qD7JziU98h6l3qGy0a/yPFjwO+y0/T7GFpNgNAvEcPPVfyT8rrPQ==",
      "devOptional": true,
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "esbuild": "~0.25.0",
        "get-tsconfig": "^4.7.5"
@@ -17017,6 +17020,7 @@
      "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
      "devOptional": true,
      "license": "Apache-2.0",
+      "peer": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -17224,6 +17228,7 @@
      "resolved": "https://registry.npmjs.org/vite/-/vite-7.2.2.tgz",
      "integrity": "sha512-BxAKBWmIbrDgrokdGZH1IgkIk/5mMHDreLDmCJ0qpyJaAteP8NvMhkwr/ZCQNqNH97bw/dANTE9PDzqwJghfMQ==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "esbuild": "^0.25.0",
        "fdir": "^6.5.0",
@@ -17337,6 +17342,7 @@
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -17349,6 +17355,7 @@
      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
      "license": "MIT",
+      "peer": true,
      "dependencies": {
        "@types/chai": "^5.2.2",
        "@vitest/expect": "3.2.4",
@@ -18053,6 +18060,7 @@
      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
      "license": "MIT",
+      "peer": true,
      "funding": {
        "url": "https://github.com/sponsors/colinhacks"
      }
@@ -18152,7 +18160,6 @@
        "mnemonist": "^0.40.3",
        "open": "^10.1.2",
        "prompts": "^2.4.2",
-        "proper-lockfile": "^4.1.2",
        "react": "^19.2.0",
        "read-package-up": "^11.0.0",
        "shell-quote": "^1.8.3",
@@ -18256,7 +18263,6 @@
        "mnemonist": "^0.40.3",
        "open": "^10.1.2",
        "picomatch": "^4.0.1",
-        "proper-lockfile": "^4.1.2",
        "read-package-up": "^11.0.0",
        "shell-quote": "^1.8.3",
        "simple-git": "^3.28.0",
@@ -18351,6 +18357,7 @@
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
      "license": "MIT",
+      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -90,7 +90,6 @@
    "@types/react": "^19.2.0",
    "@types/react-dom": "^19.2.0",
    "@types/shell-quote": "^1.7.5",
-    "@types/ws": "^8.18.1",
    "@vitest/coverage-v8": "^3.1.1",
    "@vitest/eslint-plugin": "^1.3.4",
    "cross-env": "^7.0.3",
@@ -138,7 +137,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"
  },
@@ -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;
@@ -24,6 +24,7 @@ import {
  type ServerGeminiErrorEvent,
  type ServerGeminiStreamEvent,
  type ToolCallConfirmationDetails,
+  type SerializableConfirmationDetails,
  type Config,
  type UserTierId,
  type AnsiOutput,
@@ -65,7 +66,10 @@ export class Task {
  scheduler: CoreToolScheduler;
  config: Config;
  geminiClient: GeminiClient;
-  pendingToolConfirmationDetails: Map<string, ToolCallConfirmationDetails>;
+  pendingToolConfirmationDetails: Map<
+    string,
+    ToolCallConfirmationDetails | SerializableConfirmationDetails
+  >;
  taskState: TaskState;
  eventBus?: ExecutionEventBus;
  completedToolCalls: CompletedToolCall[];
@@ -378,8 +382,7 @@ 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,
+          tc.confirmationDetails,
        );
      }

@@ -412,10 +415,12 @@ 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
-          (tc.confirmationDetails as ToolCallConfirmationDetails).onConfirm(
-            ToolConfirmationOutcome.ProceedOnce,
-          );
+          if ('onConfirm' in tc.confirmationDetails) {
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            tc.confirmationDetails.onConfirm(
+              ToolConfirmationOutcome.ProceedOnce,
+            );
+          }
          this.pendingToolConfirmationDetails.delete(tc.request.callId);
        }
      });
@@ -466,14 +471,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 +499,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 +628,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 +725,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';
@@ -811,11 +809,17 @@ export class Task {
        // This will trigger the scheduler to continue or cancel the specific tool.
        // The scheduler's onToolCallsUpdate will then reflect the new state (e.g., executing or cancelled).

+        if (!('onConfirm' in confirmationDetails)) {
+          logger.error(
+            `[Task] Serializable confirmation details not supported yet in a2a-server for callId: ${callId}`,
+          );
+          return false;
+        }
+
        // If `edit` tool call, pass updated payload if presesent
        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;
@@ -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 = {
@@ -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(),
    },
@@ -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'] ??
@@ -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) {
@@ -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;
  }

@@ -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;
@@ -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,
    );

@@ -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;
 }

@@ -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');
@@ -54,7 +54,6 @@
    "mnemonist": "^0.40.3",
    "open": "^10.1.2",
    "prompts": "^2.4.2",
-    "proper-lockfile": "^4.1.2",
    "react": "^19.2.0",
    "read-package-up": "^11.0.0",
    "shell-quote": "^1.8.3",
@@ -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,
      );
    }
@@ -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();
@@ -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();
@@ -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();
@@ -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();
@@ -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();
@@ -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();
@@ -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();
@@ -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();
@@ -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();
@@ -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();
@@ -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,
      },
    );
@@ -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();
@@ -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,
    });
@@ -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();
@@ -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();
@@ -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();
@@ -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();
  },
@@ -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();
@@ -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();
  });
@@ -2624,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);
@@ -2636,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);
@@ -2648,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);
@@ -2658,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);
@@ -2669,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);
@@ -2848,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;
  });
@@ -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);
@@ -814,9 +802,9 @@ 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,
    },
+    adaptiveThinking: settings.experimental?.adaptiveThinking,
    fakeResponses: argv.fakeResponses,
    recordResponses: argv.recordResponses,
    retryFetchErrors: settings.general?.retryFetchErrors,
@@ -19,7 +19,7 @@ import {
 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', () => {
@@ -29,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-'),
    );
  });

@@ -85,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: () => ({
@@ -171,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,
@@ -188,10 +188,7 @@ export class ExtensionManager extends ExtensionLoader {
          )
        ) {
          const trustedFolders = loadTrustedFolders();
-          await trustedFolders.setValue(
-            this.workspaceDir,
-            TrustLevel.TRUST_FOLDER,
-          );
+          trustedFolders.setValue(this.workspaceDir, TrustLevel.TRUST_FOLDER);
        } else {
          throw new Error(
            `Could not install extension because the current workspace at ${this.workspaceDir} is not trusted.`,
@@ -730,7 +727,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 +823,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 +875,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 +885,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.
      }
@@ -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) {
@@ -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
@@ -5,20 +5,23 @@
 */

 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import * as path from 'node:path';
+import * as os from 'node:os';
 import * as fs from 'node:fs';
 import { getMissingSettings } from './extensionSettings.js';
 import type { ExtensionConfig } from '../extension.js';
+import { ExtensionStorage } from './storage.js';
 import {
+  KeychainTokenStorage,
  debugLogger,
  type ExtensionInstallMetadata,
  type GeminiCLIExtension,
  coreEvents,
 } from '@google/gemini-cli-core';
+import { EXTENSION_SETTINGS_FILENAME } from './variables.js';
 import { ExtensionManager } from '../extension-manager.js';
 import { createTestMergedSettings } from '../settings.js';

-// --- Mocks ---
-
 vi.mock('node:fs', async (importOriginal) => {
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  const actual = await importOriginal<any>();
@@ -26,23 +29,11 @@ vi.mock('node:fs', async (importOriginal) => {
    ...actual,
    default: {
      ...actual.default,
-      existsSync: vi.fn(),
-      statSync: vi.fn(),
-      lstatSync: vi.fn(),
-      realpathSync: vi.fn((p) => p),
-    },
-    existsSync: vi.fn(),
-    statSync: vi.fn(),
-    lstatSync: vi.fn(),
-    realpathSync: vi.fn((p) => p),
-    promises: {
-      ...actual.promises,
-      mkdir: vi.fn(),
-      writeFile: vi.fn(),
-      rm: vi.fn(),
-      cp: vi.fn(),
-      readFile: vi.fn(),
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      existsSync: vi.fn((...args: any[]) => actual.existsSync(...args)),
    },
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    existsSync: vi.fn((...args: any[]) => actual.existsSync(...args)),
  };
 });

@@ -58,93 +49,183 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
      log: vi.fn(),
    },
    coreEvents: {
-      emitFeedback: vi.fn(),
+      emitFeedback: vi.fn(), // Mock emitFeedback
      on: vi.fn(),
      off: vi.fn(),
-      emitConsoleLog: vi.fn(),
    },
-    loadSkillsFromDir: vi.fn().mockResolvedValue([]),
-    loadAgentsFromDirectory: vi
-      .fn()
-      .mockResolvedValue({ agents: [], errors: [] }),
  };
 });

-vi.mock('./consent.js', () => ({
-  maybeRequestConsentOrFail: vi.fn().mockResolvedValue(undefined),
-}));
-
-vi.mock('./extensionSettings.js', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('./extensionSettings.js')>();
-  return {
-    ...actual,
-    getEnvContents: vi.fn().mockResolvedValue({}),
-    getMissingSettings: vi.fn(), // We will mock this implementation per test
-  };
-});
-
-vi.mock('../trustedFolders.js', () => ({
-  isWorkspaceTrusted: vi.fn().mockReturnValue({ isTrusted: true }), // Default to trusted to simplify flow
-  loadTrustedFolders: vi.fn().mockReturnValue({
-    setValue: vi.fn().mockResolvedValue(undefined),
-  }),
-  TrustLevel: { TRUST_FOLDER: 'TRUST_FOLDER' },
-}));
-
-// Mock ExtensionStorage to avoid real FS paths
-vi.mock('./storage.js', () => ({
-  ExtensionStorage: class {
-    constructor(public name: string) {}
-    getExtensionDir() {
-      return `/mock/extensions/${this.name}`;
-    }
-    static getUserExtensionsDir() {
-      return '/mock/extensions';
-    }
-    static createTmpDir() {
-      return Promise.resolve('/mock/tmp');
-    }
-  },
-}));
-
+// Mock os.homedir because ExtensionStorage uses it
 vi.mock('os', async (importOriginal) => {
-  const mockedOs = await importOriginal<typeof import('node:os')>();
+  const mockedOs = await importOriginal<typeof os>();
  return {
    ...mockedOs,
-    homedir: vi.fn().mockReturnValue('/mock/home'),
+    homedir: vi.fn(),
  };
 });

 describe('extensionUpdates', () => {
+  let tempHomeDir: string;
  let tempWorkspaceDir: string;
+  let extensionDir: string;
+  let mockKeychainData: Record<string, Record<string, string>>;

  beforeEach(() => {
    vi.clearAllMocks();
-    // Default fs mocks
-    vi.mocked(fs.promises.mkdir).mockResolvedValue(undefined);
-    vi.mocked(fs.promises.writeFile).mockResolvedValue(undefined);
-    vi.mocked(fs.promises.rm).mockResolvedValue(undefined);
-    vi.mocked(fs.promises.cp).mockResolvedValue(undefined);
+    mockKeychainData = {};

-    // Allow directories to exist by default to satisfy Config/WorkspaceContext checks
-    vi.mocked(fs.existsSync).mockReturnValue(true);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    vi.mocked(fs.statSync).mockReturnValue({ isDirectory: () => true } as any);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    vi.mocked(fs.lstatSync).mockReturnValue({ isDirectory: () => true } as any);
-    vi.mocked(fs.realpathSync).mockImplementation((p) => p as string);
+    // Mock Keychain
+    vi.mocked(KeychainTokenStorage).mockImplementation(
+      (serviceName: string) => {
+        if (!mockKeychainData[serviceName]) {
+          mockKeychainData[serviceName] = {};
+        }
+        const keychainData = mockKeychainData[serviceName];
+        return {
+          getSecret: vi
+            .fn()
+            .mockImplementation(
+              async (key: string) => keychainData[key] || null,
+            ),
+          setSecret: vi
+            .fn()
+            .mockImplementation(async (key: string, value: string) => {
+              keychainData[key] = value;
+            }),
+          deleteSecret: vi.fn().mockImplementation(async (key: string) => {
+            delete keychainData[key];
+          }),
+          listSecrets: vi
+            .fn()
+            .mockImplementation(async () => Object.keys(keychainData)),
+          isAvailable: vi.fn().mockResolvedValue(true),
+        } as unknown as KeychainTokenStorage;
+      },
+    );

-    tempWorkspaceDir = '/mock/workspace';
+    // Setup Temp Dirs
+    tempHomeDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), 'gemini-cli-test-home-'),
+    );
+    tempWorkspaceDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), 'gemini-cli-test-workspace-'),
+    );
+    extensionDir = path.join(tempHomeDir, '.gemini', 'extensions', 'test-ext');
+
+    // Mock ExtensionStorage to rely on our temp extension dir
+    vi.spyOn(ExtensionStorage.prototype, 'getExtensionDir').mockReturnValue(
+      extensionDir,
+    );
+    // Mock getEnvFilePath is checking extensionDir/variables.env? No, it used ExtensionStorage logic.
+    // getEnvFilePath in extensionSettings.ts:
+    // if workspace, process.cwd()/.env (we need to mock process.cwd or move tempWorkspaceDir there)
+    // if user, ExtensionStorage(name).getEnvFilePath() -> joins extensionDir + '.env'
+
+    fs.mkdirSync(extensionDir, { recursive: true });
+    vi.mocked(os.homedir).mockReturnValue(tempHomeDir);
+    vi.spyOn(process, 'cwd').mockReturnValue(tempWorkspaceDir);
  });

  afterEach(() => {
+    fs.rmSync(tempHomeDir, { recursive: true, force: true });
+    fs.rmSync(tempWorkspaceDir, { recursive: true, force: true });
    vi.restoreAllMocks();
  });

+  describe('getMissingSettings', () => {
+    it('should return empty list if all settings are present', async () => {
+      const config: ExtensionConfig = {
+        name: 'test-ext',
+        version: '1.0.0',
+        settings: [
+          { name: 's1', description: 'd1', envVar: 'VAR1' },
+          { name: 's2', description: 'd2', envVar: 'VAR2', sensitive: true },
+        ],
+      };
+      const extensionId = '12345';
+
+      // Setup User Env
+      const userEnvPath = path.join(extensionDir, EXTENSION_SETTINGS_FILENAME);
+      fs.writeFileSync(userEnvPath, 'VAR1=val1');
+
+      // Setup Keychain
+      const userKeychain = new KeychainTokenStorage(
+        `Gemini CLI Extensions test-ext ${extensionId}`,
+      );
+      await userKeychain.setSecret('VAR2', 'val2');
+
+      const missing = await getMissingSettings(
+        config,
+        extensionId,
+        tempWorkspaceDir,
+      );
+      expect(missing).toEqual([]);
+    });
+
+    it('should identify missing non-sensitive settings', async () => {
+      const config: ExtensionConfig = {
+        name: 'test-ext',
+        version: '1.0.0',
+        settings: [{ name: 's1', description: 'd1', envVar: 'VAR1' }],
+      };
+      const extensionId = '12345';
+
+      const missing = await getMissingSettings(
+        config,
+        extensionId,
+        tempWorkspaceDir,
+      );
+      expect(missing).toHaveLength(1);
+      expect(missing[0].name).toBe('s1');
+    });
+
+    it('should identify missing sensitive settings', async () => {
+      const config: ExtensionConfig = {
+        name: 'test-ext',
+        version: '1.0.0',
+        settings: [
+          { name: 's2', description: 'd2', envVar: 'VAR2', sensitive: true },
+        ],
+      };
+      const extensionId = '12345';
+
+      const missing = await getMissingSettings(
+        config,
+        extensionId,
+        tempWorkspaceDir,
+      );
+      expect(missing).toHaveLength(1);
+      expect(missing[0].name).toBe('s2');
+    });
+
+    it('should respect settings present in workspace', async () => {
+      const config: ExtensionConfig = {
+        name: 'test-ext',
+        version: '1.0.0',
+        settings: [{ name: 's1', description: 'd1', envVar: 'VAR1' }],
+      };
+      const extensionId = '12345';
+
+      // Setup Workspace Env
+      const workspaceEnvPath = path.join(
+        tempWorkspaceDir,
+        EXTENSION_SETTINGS_FILENAME,
+      );
+      fs.writeFileSync(workspaceEnvPath, 'VAR1=val1');
+
+      const missing = await getMissingSettings(
+        config,
+        extensionId,
+        tempWorkspaceDir,
+      );
+      expect(missing).toEqual([]);
+    });
+  });
+
  describe('ExtensionManager integration', () => {
    it('should warn about missing settings after update', async () => {
-      // 1. Setup Data
+      // Mock ExtensionManager methods to avoid FS/Network usage
      const newConfig: ExtensionConfig = {
        name: 'test-ext',
        version: '1.1.0',
@@ -158,30 +239,31 @@ describe('extensionUpdates', () => {
      };

      const installMetadata: ExtensionInstallMetadata = {
-        source: '/mock/source',
+        source: extensionDir,
        type: 'local',
        autoUpdate: true,
      };

-      // 2. Setup Manager
      const manager = new ExtensionManager({
        workspaceDir: tempWorkspaceDir,
+
        settings: createTestMergedSettings({
          telemetry: { enabled: false },
          experimental: { extensionConfig: true },
        }),
        requestConsent: vi.fn().mockResolvedValue(true),
-        requestSetting: null,
+        requestSetting: null, // Simulate non-interactive
      });

-      // 3. Mock Internal Manager Methods
+      // Mock methods called by installOrUpdateExtension
      vi.spyOn(manager, 'loadExtensionConfig').mockResolvedValue(newConfig);
      vi.spyOn(manager, 'getExtensions').mockReturnValue([
        {
          name: 'test-ext',
          version: '1.0.0',
          installMetadata,
-          path: '/mock/extensions/test-ext',
+          path: extensionDir,
+          // Mocks for other required props
          contextFiles: [],
          mcpServers: {},
          hooks: undefined,
@@ -193,28 +275,23 @@ describe('extensionUpdates', () => {
        } as unknown as GeminiCLIExtension,
      ]);
      vi.spyOn(manager, 'uninstallExtension').mockResolvedValue(undefined);
-      // Mock loadExtension to return something so the method doesn't crash at the end
      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      vi.spyOn(manager as any, 'loadExtension').mockResolvedValue({
-        name: 'test-ext',
-        version: '1.1.0',
-      } as GeminiCLIExtension);
+      vi.spyOn(manager as any, 'loadExtension').mockResolvedValue(
+        {} as unknown as GeminiCLIExtension,
+      );
+      vi.spyOn(manager, 'enableExtension').mockResolvedValue(undefined);

-      // 4. Mock External Helpers
-      // This is the key fix: we explicitly mock `getMissingSettings` to return
-      // the result we expect, avoiding any real FS or logic execution during the update.
-      vi.mocked(getMissingSettings).mockResolvedValue([
-        {
-          name: 's1',
-          description: 'd1',
-          envVar: 'VAR1',
-        },
-      ]);
+      // Mock fs.promises for the operations inside installOrUpdateExtension
+      vi.spyOn(fs.promises, 'mkdir').mockResolvedValue(undefined);
+      vi.spyOn(fs.promises, 'writeFile').mockResolvedValue(undefined);
+      vi.spyOn(fs.promises, 'rm').mockResolvedValue(undefined);
+      vi.mocked(fs.existsSync).mockReturnValue(false); // No hooks
+      try {
+        await manager.installOrUpdateExtension(installMetadata, previousConfig);
+      } catch (_) {
+        // Ignore errors from copyExtension or others, we just want to verify the warning
+      }

-      // 5. Execute
-      await manager.installOrUpdateExtension(installMetadata, previousConfig);
-
-      // 6. Assert
      expect(debugLogger.warn).toHaveBeenCalledWith(
        expect.stringContaining(
          'Extension "test-ext" has missing settings: s1',
@@ -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);
        });
      })
@@ -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;
@@ -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.',
@@ -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 (
@@ -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>,
@@ -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: {
@@ -2188,64 +2154,9 @@ describe('Settings Loading and Merging', () => {
      );
    });

-    it('should migrate experimental agent settings in system scope in memory but not save', () => {
-      const systemSettingsContent = {
-        experimental: {
-          codebaseInvestigatorSettings: {
-            enabled: true,
-          },
-        },
-      };
-
-      vi.mocked(fs.existsSync).mockReturnValue(true);
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === getSystemSettingsPath()) {
-            return JSON.stringify(systemSettingsContent);
-          }
-          return '{}';
-        },
-      );
-
-      const feedbackSpy = mockCoreEvents.emitFeedback;
-      const settings = loadSettings(MOCK_WORKSPACE_DIR);
-
-      // Verify it was migrated in memory
-      expect(settings.system.settings.agents?.overrides).toMatchObject({
-        codebase_investigator: {
-          enabled: true,
-        },
-      });
-
-      // Verify it was NOT saved back to disk
-      expect(updateSettingsFilePreservingFormat).not.toHaveBeenCalledWith(
-        getSystemSettingsPath(),
-        expect.anything(),
-      );
-
-      // Verify warnings were shown
-      expect(feedbackSpy).toHaveBeenCalledWith(
-        'warning',
-        expect.stringContaining(
-          'The system configuration contains deprecated settings: [experimental.codebaseInvestigatorSettings]',
-        ),
-      );
-    });
-
-    it('should migrate experimental agent settings to agents overrides', () => {
+    it('should not throw if experimental settings are missing', () => {
      const userSettingsContent = {
-        experimental: {
-          codebaseInvestigatorSettings: {
-            enabled: true,
-            maxNumTurns: 15,
-            maxTimeMinutes: 5,
-            thinkingBudget: 16384,
-            model: 'gemini-1.5-pro',
-          },
-          cliHelpAgentSettings: {
-            enabled: false,
-          },
-        },
+        experimental: {},
      };

      vi.mocked(fs.existsSync).mockReturnValue(true);
@@ -2257,29 +2168,7 @@ describe('Settings Loading and Merging', () => {
        },
      );

-      const settings = loadSettings(MOCK_WORKSPACE_DIR);
-
-      // Verify migration to agents.overrides
-      expect(settings.user.settings.agents?.overrides).toMatchObject({
-        codebase_investigator: {
-          enabled: true,
-          runConfig: {
-            maxTurns: 15,
-            maxTimeMinutes: 5,
-          },
-          modelConfig: {
-            model: 'gemini-1.5-pro',
-            generateContentConfig: {
-              thinkingConfig: {
-                thinkingBudget: 16384,
-              },
-            },
-          },
-        },
-        cli_help: {
-          enabled: false,
-        },
-      });
+      expect(() => loadSettings(MOCK_WORKSPACE_DIR)).not.toThrow();
    });
  });

@@ -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,51 +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,
-      loadedSettings,
-      scope,
-      removeDeprecated,
-      foundDeprecated,
-    );
-
-    if (experimentalModified) {
-      if (!settingsFile.readOnly) {
-        anyModified = true;
-      }
-    }
-
    if (settingsFile.readOnly && foundDeprecated.length > 0) {
      systemWarnings.set(scope, foundDeprecated);
    }
@@ -1020,113 +968,3 @@ export function saveModelChange(
    );
  }
 }
-
-function migrateExperimentalSettings(
-  settings: Settings,
-  loadedSettings: LoadedSettings,
-  scope: LoadableSettingScope,
-  removeDeprecated: boolean,
-  foundDeprecated?: string[],
-): boolean {
-  const experimentalSettings = settings.experimental as
-    | Record<string, unknown>
-    | undefined;
-
-  if (experimentalSettings) {
-    const agentsSettings = {
-      ...(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;
-
-    const migrateExperimental = (
-      oldKey: string,
-      migrateFn: (oldValue: Record<string, unknown>) => void,
-    ) => {
-      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;
-      }
-    };
-
-    // 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),
-      };
-
-      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)
-        runConfig['maxTurns'] = old['maxNumTurns'];
-      if (old['maxTimeMinutes'] !== undefined)
-        runConfig['maxTimeMinutes'] = old['maxTimeMinutes'];
-      if (Object.keys(runConfig).length > 0) override['runConfig'] = runConfig;
-
-      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),
-          };
-          thinkingConfig['thinkingBudget'] = old['thinkingBudget'];
-          generateContentConfig['thinkingConfig'] = thinkingConfig;
-          modelConfig['generateContentConfig'] = generateContentConfig;
-        }
-        override['modelConfig'] = modelConfig;
-      }
-
-      agentsOverrides['codebase_investigator'] = override;
-    });
-
-    // 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'];
-      agentsOverrides['cli_help'] = override;
-    });
-
-    if (modified) {
-      agentsSettings['overrides'] = agentsOverrides;
-      loadedSettings.setValue(scope, 'agents', agentsSettings);
-
-      if (removeDeprecated) {
-        const newExperimental = { ...experimentalSettings };
-        delete newExperimental['codebaseInvestigatorSettings'];
-        delete newExperimental['cliHelpAgentSettings'];
-        loadedSettings.setValue(scope, 'experimental', newExperimental);
-      }
-      return true;
-    }
-  }
-  return false;
-}
@@ -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',
@@ -410,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',
@@ -1101,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',
@@ -1575,6 +1552,37 @@ const SETTINGS_SCHEMA = {
        description: 'Enable planning features (Plan Mode and tools).',
        showInDialog: true,
      },
+      adaptiveThinking: {
+        type: 'object',
+        label: 'Adaptive Thinking Settings',
+        category: 'Experimental',
+        requiresRestart: false,
+        default: {},
+        description: 'Configuration for Adaptive Thinking Budget.',
+        showInDialog: false,
+        properties: {
+          enabled: {
+            type: 'boolean',
+            label: 'Enable Adaptive Thinking',
+            category: 'Experimental',
+            requiresRestart: false,
+            default: false,
+            description:
+              'Enable adaptive thinking budget based on task complexity.',
+            showInDialog: true,
+          },
+          classifierModel: {
+            type: 'string',
+            label: 'Classifier Model',
+            category: 'Experimental',
+            requiresRestart: false,
+            default: 'classifier',
+            description:
+              'The model (or alias) to use for complexity classification.',
+            showInDialog: false,
+          },
+        },
+      },
    },
  },

@@ -6,8 +6,6 @@

 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import * as crypto from 'node:crypto';
-import { lock } from 'proper-lockfile';
 import {
  FatalConfigError,
  getErrorMessage,
@@ -15,14 +13,10 @@ import {
  ideContextStore,
  GEMINI_DIR,
  homedir,
-  isHeadlessMode,
-  coreEvents,
 } from '@google/gemini-cli-core';
 import type { Settings } from './settings.js';
 import stripJsonComments from 'strip-json-comments';

-const { promises: fsPromises } = fs;
-
 export const TRUSTED_FOLDERS_FILENAME = 'trustedFolders.json';

 export function getUserSettingsDir(): string {
@@ -47,7 +41,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)
  );
 }
@@ -74,13 +67,6 @@ export interface TrustResult {

 const realPathCache = new Map<string, string>();

-/**
- * Parses the trusted folders JSON content, stripping comments.
- */
-function parseTrustedFoldersJson(content: string): unknown {
-  return JSON.parse(stripJsonComments(content));
-}
-
 /**
 * FOR TESTING PURPOSES ONLY.
 * Clears the real path cache.
@@ -164,68 +150,19 @@ export class LoadedTrustedFolders {
    return undefined;
  }

-  async setValue(folderPath: string, trustLevel: TrustLevel): Promise<void> {
-    if (this.errors.length > 0) {
-      const errorMessages = this.errors.map(
-        (error) => `Error in ${error.path}: ${error.message}`,
-      );
-      throw new FatalConfigError(
-        `Cannot update trusted folders because the configuration file is invalid:\n${errorMessages.join('\n')}\nPlease fix the file manually before trying to update it.`,
-      );
-    }
-
-    const dirPath = path.dirname(this.user.path);
-    if (!fs.existsSync(dirPath)) {
-      await fsPromises.mkdir(dirPath, { recursive: true });
-    }
-
-    // lockfile requires the file to exist
-    if (!fs.existsSync(this.user.path)) {
-      await fsPromises.writeFile(this.user.path, JSON.stringify({}, null, 2), {
-        mode: 0o600,
-      });
-    }
-
-    const release = await lock(this.user.path, {
-      retries: {
-        retries: 10,
-        minTimeout: 100,
-      },
-    });
-
+  setValue(path: string, trustLevel: TrustLevel): void {
+    const originalTrustLevel = this.user.config[path];
+    this.user.config[path] = trustLevel;
    try {
-      // Re-read the file to handle concurrent updates
-      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(
-          'error',
-          `Failed to parse trusted folders file at ${this.user.path}. The file may be corrupted.`,
-          error,
-        );
-        config = {};
+      saveTrustedFolders(this.user);
+    } catch (e) {
+      // Revert the in-memory change if the save failed.
+      if (originalTrustLevel === undefined) {
+        delete this.user.config[path];
+      } else {
+        this.user.config[path] = originalTrustLevel;
      }
-
-      const originalTrustLevel = config[folderPath];
-      config[folderPath] = trustLevel;
-      this.user.config[folderPath] = trustLevel;
-
-      try {
-        saveTrustedFolders({ ...this.user, config });
-      } catch (e) {
-        // Revert the in-memory change if the save failed.
-        if (originalTrustLevel === undefined) {
-          delete this.user.config[folderPath];
-        } else {
-          this.user.config[folderPath] = originalTrustLevel;
-        }
-        throw e;
-      }
-    } finally {
-      await release();
+      throw e;
    }
  }
 }
@@ -253,8 +190,10 @@ 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>;
+      const parsed = JSON.parse(stripJsonComments(content)) as Record<
+        string,
+        string
+      >;

      if (
        typeof parsed !== 'object' ||
@@ -302,26 +241,11 @@ export function saveTrustedFolders(
    fs.mkdirSync(dirPath, { recursive: true });
  }

-  const content = JSON.stringify(trustedFoldersFile.config, null, 2);
-  const tempPath = `${trustedFoldersFile.path}.tmp.${crypto.randomUUID()}`;
-
-  try {
-    fs.writeFileSync(tempPath, content, {
-      encoding: 'utf-8',
-      mode: 0o600,
-    });
-    fs.renameSync(tempPath, trustedFoldersFile.path);
-  } catch (error) {
-    // Clean up temp file if it was created but rename failed
-    if (fs.existsSync(tempPath)) {
-      try {
-        fs.unlinkSync(tempPath);
-      } catch {
-        // Ignore cleanup errors
-      }
-    }
-    throw error;
-  }
+  fs.writeFileSync(
+    trustedFoldersFile.path,
+    JSON.stringify(trustedFoldersFile.config, null, 2),
+    { encoding: 'utf-8', mode: 0o600 },
+  );
 }

 /** Is folder trust feature enabled per the current applied settings */
@@ -358,10 +282,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 };
  }
@@ -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',
      });
@@ -518,11 +518,11 @@ export async function main() {

    adminControlsListner.setConfig(config);

-    if (config.isInteractive() && settings.merged.general.devtools) {
+    if (config.isInteractive() && config.getDebugMode()) {
      const { registerActivityLogger } = await import(
-        './utils/devtoolsService.js'
+        './utils/activityLogger.js'
      );
-      await registerActivityLogger(config);
+      registerActivityLogger(config);
    }

    // Register config for telemetry shutdown
@@ -819,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;
@@ -39,7 +39,7 @@ import type { LoadedSettings } from './config/settings.js';
 vi.mock('./ui/hooks/atCommandProcessor.js');

 const mockRegisterActivityLogger = vi.hoisted(() => vi.fn());
-vi.mock('./utils/devtoolsService.js', () => ({
+vi.mock('./utils/activityLogger.js', () => ({
  registerActivityLogger: mockRegisterActivityLogger,
 }));

@@ -73,9 +73,9 @@ export async function runNonInteractive({

    if (process.env['GEMINI_CLI_ACTIVITY_LOG_TARGET']) {
      const { registerActivityLogger } = await import(
-        './utils/devtoolsService.js'
+        './utils/activityLogger.js'
      );
-      await registerActivityLogger(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[];
      }

@@ -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(
@@ -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));
      });
    }
  }
@@ -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
@@ -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,
@@ -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: {} },
@@ -1,6 +1,6 @@
 /**
 * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -44,7 +44,6 @@ vi.mock('../ui/utils/terminalUtils.js', () => ({
  isLowColorDepth: vi.fn(() => false),
  getColorDepth: vi.fn(() => 24),
  isITerm2: vi.fn(() => false),
-  shouldUseEmoji: vi.fn(() => true),
 }));

 // Wrapper around ink-testing-library's render that ensures act() is called
@@ -53,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);
@@ -115,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)}`);
@@ -155,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 = {
@@ -210,6 +197,7 @@ const mockUIActions: UIActions = {
  setActiveBackgroundShellPid: vi.fn(),
  setIsBackgroundShellListOpen: vi.fn(),
  setAuthContext: vi.fn(),
+  handleWarning: vi.fn(),
  handleRestart: vi.fn(),
  handleNewAgentsSelect: vi.fn(),
 };
@@ -222,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,
@@ -244,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)}`);
@@ -363,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({
@@ -396,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(() => {
@@ -430,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;
@@ -452,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,
@@ -462,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();
@@ -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];
    }
  }
@@ -1,6 +1,6 @@
 /**
 * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
 * SPDX-License-Identifier: Apache-2.0
 */

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

@@ -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');
@@ -272,7 +255,6 @@ describe('AppContainer State Management', () => {
  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',
@@ -402,10 +384,6 @@ describe('AppContainer State Management', () => {
    });
    mockedUseHookDisplayState.mockReturnValue([]);
    mockedUseTerminalTheme.mockReturnValue(undefined);
-    mockedUseShellInactivityStatus.mockReturnValue({
-      shouldShowFocusHint: false,
-      inactivityStatus: 'none',
-    });

    // Mock Config
    mockConfig = makeFakeConfig();
@@ -972,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!();
    });
@@ -997,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!();
    });
@@ -1268,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(() => {
@@ -2763,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!());
-      },
-    );
-  });
 });
@@ -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';
@@ -107,7 +104,7 @@ 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';
@@ -144,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[]) {
@@ -252,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) =>
@@ -324,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);

@@ -436,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]);

@@ -495,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],
  );
@@ -506,7 +484,7 @@ export const AppContainer = (props: AppContainerProps) => {
    viewport: { height: 10, width: inputWidth },
    stdin,
    setRawMode,
-    escapePastedPaths: true,
+    isValidPath,
    shellModeActive,
    getPreferredEditor,
  });
@@ -866,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) => {
@@ -898,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.'
          }`,
        },
@@ -913,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,
          )}...`,
@@ -1104,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
@@ -1148,7 +1103,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
      isMcpReady,
      streamingState,
      messageQueue.length,
-      config,
    ],
  );

@@ -1183,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]);
@@ -1265,7 +1221,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
      !showPrivacyNotice &&
      geminiClient?.isInitialized?.()
    ) {
-      void handleFinalSubmit(initialPrompt);
+      handleFinalSubmit(initialPrompt);
      initialPromptSubmitted.current = true;
    }
  }, [
@@ -1313,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);
@@ -1329,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) {
@@ -1532,10 +1483,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
        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);
@@ -1575,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;
@@ -1658,7 +1603,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
      setIsBackgroundShellListOpen,
      lastOutputTimeRef,
      tabFocusTimeoutRef,
-      showTransientMessage,
+      handleWarning,
    ],
  );

@@ -1769,7 +1714,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
    adminSettingsChanged ||
    !!commandConfirmationRequest ||
    !!authConsentRequest ||
-    !!permissionConfirmationRequest ||
    !!customDialog ||
    confirmUpdateExtensionRequests.length > 0 ||
    !!loopDetectionConfirmationRequest ||
@@ -1875,7 +1819,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
      authConsentRequest,
      confirmUpdateExtensionRequests,
      loopDetectionConfirmationRequest,
-      permissionConfirmationRequest,
      geminiMdFileCount,
      streamingState,
      initError,
@@ -1910,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,
@@ -1944,7 +1884,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
      showDebugProfiler,
      customDialog,
      copyModeEnabled,
-      transientMessage,
+      warningMessage,
      bannerData,
      bannerVisible,
      terminalBackgroundColor: config.getTerminalBackground(),
@@ -1985,7 +1925,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
      authConsentRequest,
      confirmUpdateExtensionRequests,
      loopDetectionConfirmationRequest,
-      permissionConfirmationRequest,
      geminiMdFileCount,
      streamingState,
      initError,
@@ -2020,7 +1959,6 @@ Logging in with Google... Restarting Gemini CLI to continue.
      queueErrorMessage,
      showApprovalModeIndicator,
      userTier,
-      quotaStats,
      proQuotaRequest,
      validationRequest,
      contextFileNames,
@@ -2055,7 +1993,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
      apiKeyDefaultValue,
      authState,
      copyModeEnabled,
-      transientMessage,
+      warningMessage,
      bannerData,
      bannerVisible,
      config,
@@ -2112,6 +2050,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
      handleApiKeyCancel,
      setBannerVisible,
      setShortcutsHelpVisible,
+      handleWarning,
      setEmbeddedShellFocused,
      dismissBackgroundShell,
      setActiveBackgroundShellPid,
@@ -2188,6 +2127,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
      handleApiKeyCancel,
      setBannerVisible,
      setShortcutsHelpVisible,
+      handleWarning,
      setEmbeddedShellFocused,
      dismissBackgroundShell,
      setActiveBackgroundShellPid,
@@ -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,
@@ -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;
  }

@@ -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(
@@ -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,
@@ -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}`);
    }
  }
@@ -48,7 +48,6 @@ export const initCommand: SlashCommand = {
      );
    }

-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
    return result as SlashCommandActionReturn;
  },
 };
@@ -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) {
@@ -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(),
@@ -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,
    });
  });

@@ -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);
      },
    },
@@ -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,
@@ -6,7 +6,6 @@

 import { Box, Text } from 'ink';
 import { useUIState } from '../contexts/UIStateContext.js';
-import { useSettings } from '../contexts/SettingsContext.js';
 import { AppHeader } from './AppHeader.js';
 import { HistoryItemDisplay } from './HistoryItemDisplay.js';
 import { QuittingDisplay } from './QuittingDisplay.js';
@@ -16,18 +15,15 @@ import { useConfirmingTool } from '../hooks/useConfirmingTool.js';
 import { useConfig } from '../contexts/ConfigContext.js';
 import { ToolStatusIndicator, ToolInfo } from './messages/ToolShared.js';
 import { theme } from '../semantic-colors.js';
-import { getInlineThinkingMode } from '../utils/inlineThinkingMode.js';

 export const AlternateBufferQuittingDisplay = () => {
  const { version } = useAppContext();
  const uiState = useUIState();
-  const settings = useSettings();
  const config = useConfig();

  const confirmingTool = useConfirmingTool();
  const showPromptedTool =
    config.isEventDrivenSchedulerEnabled() && confirmingTool !== null;
-  const inlineThinkingMode = getInlineThinkingMode(settings);

  // We render the entire chat history and header here to ensure that the
  // conversation history is visible to the user after the app quits and the
@@ -51,7 +47,6 @@ export const AlternateBufferQuittingDisplay = () => {
          item={h}
          isPending={false}
          commands={uiState.slashCommands}
-          inlineThinkingMode={inlineThinkingMode}
        />
      ))}
      {uiState.pendingHistoryItems.map((item, i) => (
@@ -64,7 +59,6 @@ export const AlternateBufferQuittingDisplay = () => {
          isFocused={false}
          activeShellPtyId={uiState.activePtyId}
          embeddedShellFocused={uiState.embeddedShellFocused}
-          inlineThinkingMode={inlineThinkingMode}
        />
      ))}
      {showPromptedTool && (
@@ -1,6 +1,6 @@
 /**
 * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -15,8 +15,8 @@ describe('ApprovalModeIndicator', () => {
      <ApprovalModeIndicator approvalMode={ApprovalMode.AUTO_EDIT} />,
    );
    const output = lastFrame();
-    expect(output).toContain('auto-accept edits');
-    expect(output).toContain('shift+tab to manual');
+    expect(output).toContain('auto-edit');
+    expect(output).toContain('shift + tab to enter default mode');
  });

  it('renders correctly for AUTO_EDIT mode with plan enabled', () => {
@@ -27,8 +27,8 @@ describe('ApprovalModeIndicator', () => {
      />,
    );
    const output = lastFrame();
-    expect(output).toContain('auto-accept edits');
-    expect(output).toContain('shift+tab to manual');
+    expect(output).toContain('auto-edit');
+    expect(output).toContain('shift + tab to enter default mode');
  });

  it('renders correctly for PLAN mode', () => {
@@ -37,7 +37,7 @@ describe('ApprovalModeIndicator', () => {
    );
    const output = lastFrame();
    expect(output).toContain('plan');
-    expect(output).toContain('shift+tab to accept edits');
+    expect(output).toContain('shift + tab to enter auto-edit mode');
  });

  it('renders correctly for YOLO mode', () => {
@@ -46,7 +46,7 @@ describe('ApprovalModeIndicator', () => {
    );
    const output = lastFrame();
    expect(output).toContain('YOLO');
-    expect(output).toContain('ctrl+y');
+    expect(output).toContain('shift + tab to enter auto-edit mode');
  });

  it('renders correctly for DEFAULT mode', () => {
@@ -54,7 +54,7 @@ describe('ApprovalModeIndicator', () => {
      <ApprovalModeIndicator approvalMode={ApprovalMode.DEFAULT} />,
    );
    const output = lastFrame();
-    expect(output).toContain('shift+tab to accept edits');
+    expect(output).toContain('shift + tab to enter auto-edit mode');
  });

  it('renders correctly for DEFAULT mode with plan enabled', () => {
@@ -65,6 +65,6 @@ describe('ApprovalModeIndicator', () => {
      />,
    );
    const output = lastFrame();
-    expect(output).toContain('shift+tab to plan');
+    expect(output).toContain('shift + tab to enter plan mode');
  });
 });
@@ -25,26 +25,26 @@ export const ApprovalModeIndicator: React.FC<ApprovalModeIndicatorProps> = ({
  switch (approvalMode) {
    case ApprovalMode.AUTO_EDIT:
      textColor = theme.status.warning;
-      textContent = 'auto-accept edits';
-      subText = 'shift+tab to manual';
+      textContent = 'auto-edit';
+      subText = 'shift + tab to enter default mode';
      break;
    case ApprovalMode.PLAN:
      textColor = theme.status.success;
      textContent = 'plan';
-      subText = 'shift+tab to accept edits';
+      subText = 'shift + tab to enter auto-edit mode';
      break;
    case ApprovalMode.YOLO:
      textColor = theme.status.error;
      textContent = 'YOLO';
-      subText = 'ctrl+y';
+      subText = 'shift + tab to enter auto-edit mode';
      break;
    case ApprovalMode.DEFAULT:
    default:
      textColor = theme.text.accent;
      textContent = '';
      subText = isPlanEnabled
-        ? 'shift+tab to plan'
-        : 'shift+tab to accept edits';
+        ? 'shift + tab to enter plan mode'
+        : 'shift + tab to enter auto-edit mode';
      break;
  }

@@ -285,6 +285,7 @@ const TextQuestionView: React.FC<TextQuestionViewProps> = ({
    initialText: initialAnswer,
    viewport: { width: Math.max(1, bufferWidth), height: 1 },
    singleLine: true,
+    isValidPath: () => false,
  });

  const { text: textValue } = buffer;
@@ -563,6 +564,7 @@ const ChoiceQuestionView: React.FC<ChoiceQuestionViewProps> = ({
    initialText: initialCustomText,
    viewport: { width: Math.max(1, bufferWidth), height: 1 },
    singleLine: true,
+    isValidPath: () => false,
  });

  const customOptionText = customBuffer.text;
@@ -5,7 +5,7 @@
 */

 import { render } from '../../test-utils/render.js';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { BackgroundShellDisplay } from './BackgroundShellDisplay.js';
 import { type BackgroundShell } from '../hooks/shellCommandProcessor.js';
 import { ShellExecutionService } from '@google/gemini-cli-core';
@@ -20,12 +20,16 @@ const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 const mockDismissBackgroundShell = vi.fn();
 const mockSetActiveBackgroundShellPid = vi.fn();
 const mockSetIsBackgroundShellListOpen = vi.fn();
+const mockHandleWarning = vi.fn();
+const mockSetEmbeddedShellFocused = vi.fn();

 vi.mock('../contexts/UIActionsContext.js', () => ({
  useUIActions: () => ({
    dismissBackgroundShell: mockDismissBackgroundShell,
    setActiveBackgroundShellPid: mockSetActiveBackgroundShellPid,
    setIsBackgroundShellListOpen: mockSetIsBackgroundShellListOpen,
+    handleWarning: mockHandleWarning,
+    setEmbeddedShellFocused: mockSetEmbeddedShellFocused,
  }),
 }));

@@ -99,10 +103,6 @@ vi.mock('./shared/ScrollableList.js', () => ({
  ),
 }));

-afterEach(() => {
-  vi.restoreAllMocks();
-});
-
 const createMockKey = (overrides: Partial<Key>): Key => ({
  name: '',
  ctrl: false,
@@ -1,10 +1,10 @@
 /**
 * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
 * SPDX-License-Identifier: Apache-2.0
 */

-import { describe, it, expect, vi, afterEach } from 'vitest';
+import { describe, it, expect, vi } from 'vitest';
 import { render } from '../../test-utils/render.js';
 import { Box, Text } from 'ink';
 import { Composer } from './Composer.js';
@@ -24,41 +24,13 @@ vi.mock('../contexts/VimModeContext.js', () => ({
  })),
 }));
 import { ApprovalMode } from '@google/gemini-cli-core';
-import type { Config } from '@google/gemini-cli-core';
 import { StreamingState, ToolCallStatus } from '../types.js';
-import { TransientMessageType } from '../../utils/events.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import type { SessionMetrics } from '../contexts/SessionContext.js';

 // Mock child components
 vi.mock('./LoadingIndicator.js', () => ({
-  LoadingIndicator: ({
-    thought,
-    thoughtLabel,
-  }: {
-    thought?: { subject?: string } | string;
-    thoughtLabel?: string;
-  }) => {
-    const fallbackText =
-      typeof thought === 'string' ? thought : thought?.subject;
-    const text = thoughtLabel ?? fallbackText;
-    return <Text>LoadingIndicator{text ? `: ${text}` : ''}</Text>;
-  },
-}));
-
-vi.mock('./StatusDisplay.js', () => ({
-  StatusDisplay: () => <Text>StatusDisplay</Text>,
-}));
-
-vi.mock('./ToastDisplay.js', () => ({
-  ToastDisplay: () => <Text>ToastDisplay</Text>,
-  shouldShowToast: (uiState: UIState) =>
-    uiState.ctrlCPressedOnce ||
-    Boolean(uiState.transientMessage) ||
-    uiState.ctrlDPressedOnce ||
-    (uiState.showEscapePrompt &&
-      (uiState.buffer.text.length > 0 || uiState.history.length > 0)) ||
-    Boolean(uiState.queueErrorMessage),
+  LoadingIndicator: ({ thought }: { thought?: string }) => (
+    <Text>LoadingIndicator{thought ? `: ${thought}` : ''}</Text>
+  ),
 }));

 vi.mock('./ContextSummaryDisplay.js', () => ({
@@ -173,12 +145,6 @@ const createMockUIState = (overrides: Partial<UIState> = {}): UIState =>
    activeHooks: [],
    isBackgroundShellVisible: false,
    embeddedShellFocused: false,
-    quota: {
-      userTier: undefined,
-      stats: undefined,
-      proQuotaRequest: null,
-      validationRequest: null,
-    },
    ...overrides,
  }) as UIState;

@@ -189,30 +155,31 @@ const createMockUIActions = (): UIActions =>
    setShellModeActive: vi.fn(),
    onEscapePromptChange: vi.fn(),
    vimHandleInput: vi.fn(),
-  }) as Partial<UIActions> as UIActions;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  }) as any;

-const createMockConfig = (overrides = {}): Config =>
-  ({
-    getModel: vi.fn(() => 'gemini-1.5-pro'),
-    getTargetDir: vi.fn(() => '/test/dir'),
-    getDebugMode: vi.fn(() => false),
-    getAccessibility: vi.fn(() => ({})),
-    getMcpServers: vi.fn(() => ({})),
-    isPlanEnabled: vi.fn(() => false),
-    getToolRegistry: () => ({
-      getTool: vi.fn(),
-    }),
-    getSkillManager: () => ({
-      getSkills: () => [],
-      getDisplayableSkills: () => [],
-    }),
-    getMcpClientManager: () => ({
-      getMcpServers: () => ({}),
-      getBlockedMcpServers: () => [],
-    }),
-    ...overrides,
-  }) as unknown as Config;
+const createMockConfig = (overrides = {}) => ({
+  getModel: vi.fn(() => 'gemini-1.5-pro'),
+  getTargetDir: vi.fn(() => '/test/dir'),
+  getDebugMode: vi.fn(() => false),
+  getAccessibility: vi.fn(() => ({})),
+  getMcpServers: vi.fn(() => ({})),
+  isPlanEnabled: vi.fn(() => false),
+  getToolRegistry: () => ({
+    getTool: vi.fn(),
+  }),
+  getSkillManager: () => ({
+    getSkills: () => [],
+    getDisplayableSkills: () => [],
+  }),
+  getMcpClientManager: () => ({
+    getMcpServers: () => ({}),
+    getBlockedMcpServers: () => [],
+  }),
+  ...overrides,
+});

+/* eslint-disable @typescript-eslint/no-explicit-any */
 const renderComposer = (
  uiState: UIState,
  settings = createMockSettings(),
@@ -220,8 +187,8 @@ const renderComposer = (
  uiActions = createMockUIActions(),
 ) =>
  render(
-    <ConfigContext.Provider value={config as unknown as Config}>
-      <SettingsContext.Provider value={settings as unknown as LoadedSettings}>
+    <ConfigContext.Provider value={config as any}>
+      <SettingsContext.Provider value={settings as any}>
        <UIStateContext.Provider value={uiState}>
          <UIActionsContext.Provider value={uiActions}>
            <Composer />
@@ -230,12 +197,9 @@ const renderComposer = (
      </SettingsContext.Provider>
    </ConfigContext.Provider>,
  );
+/* eslint-enable @typescript-eslint/no-explicit-any */

 describe('Composer', () => {
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
  describe('Footer Display Settings', () => {
    it('renders Footer by default when hideFooter is false', () => {
      const uiState = createMockUIState();
@@ -265,11 +229,8 @@ describe('Composer', () => {
        sessionStats: {
          sessionId: 'test-session',
          sessionStartTime: new Date(),
-          metrics: {
-            models: {},
-            tools: {},
-            files: {},
-          } as SessionMetrics,
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          metrics: {} as any,
          lastPromptTokenCount: 150,
          promptCount: 5,
        },
@@ -290,9 +251,8 @@ describe('Composer', () => {
      vi.mocked(useVimMode).mockReturnValueOnce({
        vimEnabled: true,
        vimMode: 'INSERT',
-        toggleVimEnabled: vi.fn(),
-        setVimMode: vi.fn(),
-      } as unknown as ReturnType<typeof useVimMode>);
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      } as any);

      const { lastFrame } = renderComposer(uiState, settings, config);

@@ -316,25 +276,7 @@ describe('Composer', () => {
      const { lastFrame } = renderComposer(uiState);

      const output = lastFrame();
-      expect(output).toContain('LoadingIndicator: Processing');
-    });
-
-    it('renders generic thinking text in loading indicator when full inline thinking is enabled', () => {
-      const uiState = createMockUIState({
-        streamingState: StreamingState.Responding,
-        thought: {
-          subject: 'Detailed in-history thought',
-          description: 'Full text is already in history',
-        },
-      });
-      const settings = createMockSettings({
-        ui: { inlineThinkingMode: 'full' },
-      });
-
-      const { lastFrame } = renderComposer(uiState, settings);
-
-      const output = lastFrame();
-      expect(output).toContain('LoadingIndicator: Thinking ...');
+      expect(output).toContain('LoadingIndicator');
    });

    it('keeps shortcuts hint visible while loading', () => {
@@ -468,7 +410,7 @@ describe('Composer', () => {
  });

  describe('Context and Status Display', () => {
-    it('shows StatusDisplay and ApprovalModeIndicator in normal state', () => {
+    it('shows ContextSummaryDisplay in normal state', () => {
      const uiState = createMockUIState({
        ctrlCPressedOnce: false,
        ctrlDPressedOnce: false,
@@ -477,38 +419,49 @@ describe('Composer', () => {

      const { lastFrame } = renderComposer(uiState);

-      const output = lastFrame();
-      expect(output).toContain('StatusDisplay');
-      expect(output).toContain('ApprovalModeIndicator');
-      expect(output).not.toContain('ToastDisplay');
+      expect(lastFrame()).toContain('ContextSummaryDisplay');
    });

-    it('shows ToastDisplay and hides ApprovalModeIndicator when a toast is present', () => {
+    it('renders HookStatusDisplay instead of ContextSummaryDisplay with active hooks', () => {
+      const uiState = createMockUIState({
+        activeHooks: [{ name: 'test-hook', eventName: 'before-agent' }],
+      });
+
+      const { lastFrame } = renderComposer(uiState);
+
+      expect(lastFrame()).toContain('HookStatusDisplay');
+      expect(lastFrame()).not.toContain('ContextSummaryDisplay');
+    });
+
+    it('shows Ctrl+C exit prompt when ctrlCPressedOnce is true', () => {
      const uiState = createMockUIState({
        ctrlCPressedOnce: true,
      });

      const { lastFrame } = renderComposer(uiState);

-      const output = lastFrame();
-      expect(output).toContain('ToastDisplay');
-      expect(output).not.toContain('ApprovalModeIndicator');
-      expect(output).toContain('StatusDisplay');
+      expect(lastFrame()).toContain('Press Ctrl+C again to exit');
    });

-    it('shows ToastDisplay for other toast types', () => {
+    it('shows Ctrl+D exit prompt when ctrlDPressedOnce is true', () => {
      const uiState = createMockUIState({
-        transientMessage: {
-          text: 'Warning',
-          type: TransientMessageType.Warning,
-        },
+        ctrlDPressedOnce: true,
      });

      const { lastFrame } = renderComposer(uiState);

-      const output = lastFrame();
-      expect(output).toContain('ToastDisplay');
-      expect(output).not.toContain('ApprovalModeIndicator');
+      expect(lastFrame()).toContain('Press Ctrl+D again to exit');
+    });
+
+    it('shows escape prompt when showEscapePrompt is true', () => {
+      const uiState = createMockUIState({
+        showEscapePrompt: true,
+        history: [{ id: 1, type: 'user', text: 'test' }],
+      });
+
+      const { lastFrame } = renderComposer(uiState);
+
+      expect(lastFrame()).toContain('Press Esc again to rewind');
    });
  });

@@ -588,12 +541,9 @@ describe('Composer', () => {
      const uiState = createMockUIState({
        showErrorDetails: true,
        filteredConsoleMessages: [
-          {
-            type: 'error',
-            content: 'Test error',
-            count: 1,
-          },
-        ],
+          { level: 'error', message: 'Test error', timestamp: new Date() },
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        ] as any,
      });

      const { lastFrame } = renderComposer(uiState);
@@ -1,14 +1,13 @@
 /**
 * @license
- * Copyright 2026 Google LLC
+ * Copyright 2025 Google LLC
 * SPDX-License-Identifier: Apache-2.0
 */

 import { useState } from 'react';
-import { Box, useIsScreenReaderEnabled } from 'ink';
+import { Box, Text, useIsScreenReaderEnabled } from 'ink';
 import { LoadingIndicator } from './LoadingIndicator.js';
 import { StatusDisplay } from './StatusDisplay.js';
-import { ToastDisplay, shouldShowToast } from './ToastDisplay.js';
 import { ApprovalModeIndicator } from './ApprovalModeIndicator.js';
 import { ShellModeIndicator } from './ShellModeIndicator.js';
 import { DetailedMessagesDisplay } from './DetailedMessagesDisplay.js';
@@ -31,7 +30,7 @@ import { useAlternateBuffer } from '../hooks/useAlternateBuffer.js';
 import { StreamingState, ToolCallStatus } from '../types.js';
 import { ConfigInitDisplay } from '../components/ConfigInitDisplay.js';
 import { TodoTray } from './messages/Todo.js';
-import { getInlineThinkingMode } from '../utils/inlineThinkingMode.js';
+import { theme } from '../semantic-colors.js';

 export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
  const config = useConfig();
@@ -40,8 +39,7 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
  const uiState = useUIState();
  const uiActions = useUIActions();
  const { vimEnabled, vimMode } = useVimMode();
-  const inlineThinkingMode = getInlineThinkingMode(settings);
-  const terminalWidth = uiState.terminalWidth;
+  const terminalWidth = process.stdout.columns;
  const isNarrow = isNarrowWidth(terminalWidth);
  const debugConsoleMaxHeight = Math.floor(Math.max(terminalWidth * 0.2, 5));
  const [suggestionsVisible, setSuggestionsVisible] = useState(false);
@@ -62,16 +60,18 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
    Boolean(uiState.authConsentRequest) ||
    (uiState.confirmUpdateExtensionRequests?.length ?? 0) > 0 ||
    Boolean(uiState.loopDetectionConfirmationRequest) ||
-    Boolean(uiState.quota.proQuotaRequest) ||
-    Boolean(uiState.quota.validationRequest) ||
+    Boolean(uiState.proQuotaRequest) ||
+    Boolean(uiState.validationRequest) ||
    Boolean(uiState.customDialog);
-  const hasToast = shouldShowToast(uiState);
  const showLoadingIndicator =
    (!uiState.embeddedShellFocused || uiState.isBackgroundShellVisible) &&
    uiState.streamingState === StreamingState.Responding &&
    !hasPendingActionRequired;
  const showApprovalIndicator = !uiState.shellModeActive;
  const showRawMarkdownIndicator = !uiState.renderMarkdown;
+  const showEscToCancelHint =
+    showLoadingIndicator &&
+    uiState.streamingState !== StreamingState.WaitingForConfirmation;

  return (
    <Box
@@ -93,6 +93,11 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
      <TodoTray />

      <Box marginTop={1} width="100%" flexDirection="column">
+        {showEscToCancelHint && (
+          <Box marginLeft={3}>
+            <Text color={theme.text.secondary}>esc to cancel</Text>
+          </Box>
+        )}
        <Box
          width="100%"
          flexDirection={isNarrow ? 'column' : 'row'}
@@ -121,10 +126,8 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
                    ? undefined
                    : uiState.currentLoadingPhrase
                }
-                thoughtLabel={
-                  inlineThinkingMode === 'full' ? 'Thinking ...' : undefined
-                }
                elapsedTime={uiState.elapsedTime}
+                showCancelAndTimer={false}
              />
            )}
          </Box>
@@ -155,48 +158,44 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
            alignItems="center"
            flexGrow={1}
          >
-            {hasToast ? (
-              <ToastDisplay />
-            ) : (
-              !showLoadingIndicator && (
-                <Box
-                  flexDirection={isNarrow ? 'column' : 'row'}
-                  alignItems={isNarrow ? 'flex-start' : 'center'}
-                >
-                  {showApprovalIndicator && (
-                    <ApprovalModeIndicator
-                      approvalMode={showApprovalModeIndicator}
-                      isPlanEnabled={config.isPlanEnabled()}
-                    />
-                  )}
-                  {uiState.shellModeActive && (
-                    <Box
-                      marginLeft={showApprovalIndicator && !isNarrow ? 1 : 0}
-                      marginTop={showApprovalIndicator && isNarrow ? 1 : 0}
-                    >
-                      <ShellModeIndicator />
-                    </Box>
-                  )}
-                  {showRawMarkdownIndicator && (
-                    <Box
-                      marginLeft={
-                        (showApprovalIndicator || uiState.shellModeActive) &&
-                        !isNarrow
-                          ? 1
-                          : 0
-                      }
-                      marginTop={
-                        (showApprovalIndicator || uiState.shellModeActive) &&
-                        isNarrow
-                          ? 1
-                          : 0
-                      }
-                    >
-                      <RawMarkdownIndicator />
-                    </Box>
-                  )}
-                </Box>
-              )
+            {!showLoadingIndicator && (
+              <Box
+                flexDirection={isNarrow ? 'column' : 'row'}
+                alignItems={isNarrow ? 'flex-start' : 'center'}
+              >
+                {showApprovalIndicator && (
+                  <ApprovalModeIndicator
+                    approvalMode={showApprovalModeIndicator}
+                    isPlanEnabled={config.isPlanEnabled()}
+                  />
+                )}
+                {uiState.shellModeActive && (
+                  <Box
+                    marginLeft={showApprovalIndicator && !isNarrow ? 1 : 0}
+                    marginTop={showApprovalIndicator && isNarrow ? 1 : 0}
+                  >
+                    <ShellModeIndicator />
+                  </Box>
+                )}
+                {showRawMarkdownIndicator && (
+                  <Box
+                    marginLeft={
+                      (showApprovalIndicator || uiState.shellModeActive) &&
+                      !isNarrow
+                        ? 1
+                        : 0
+                    }
+                    marginTop={
+                      (showApprovalIndicator || uiState.shellModeActive) &&
+                      isNarrow
+                        ? 1
+                        : 0
+                    }
+                  >
+                    <RawMarkdownIndicator />
+                  </Box>
+                )}
+              </Box>
            )}
          </Box>

@@ -70,7 +70,7 @@ export const ConfigExtensionDialog: React.FC<ConfigExtensionDialogProps> = ({
    initialText: '',
    viewport: { width: 80, height: 1 },
    singleLine: true,
-    escapePastedPaths: true,
+    isValidPath: () => true,
  });

  const mounted = useRef(true);
@@ -67,7 +67,7 @@ describe('ConsentPrompt', () => {
    unmount();
  });

-  it('calls onConfirm with true when "Yes" is selected', async () => {
+  it('calls onConfirm with true when "Yes" is selected', () => {
    const prompt = 'Are you sure?';
    const { unmount } = render(
      <ConsentPrompt
@@ -78,7 +78,7 @@ describe('ConsentPrompt', () => {
    );

    const onSelect = MockedRadioButtonSelect.mock.calls[0][0].onSelect;
-    await act(async () => {
+    act(() => {
      onSelect(true);
    });

@@ -86,7 +86,7 @@ describe('ConsentPrompt', () => {
    unmount();
  });

-  it('calls onConfirm with false when "No" is selected', async () => {
+  it('calls onConfirm with false when "No" is selected', () => {
    const prompt = 'Are you sure?';
    const { unmount } = render(
      <ConsentPrompt
@@ -97,7 +97,7 @@ describe('ConsentPrompt', () => {
    );

    const onSelect = MockedRadioButtonSelect.mock.calls[0][0].onSelect;
-    await act(async () => {
+    act(() => {
      onSelect(false);
    });

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Adam Weidman	b82b98e71b	fix: resolve TS4111 build error by using bracket notation for index signatures	2026-02-11 18:32:45 -05:00
Adam Weidman	b269464df2	feat: refine adaptive thinking budget (stickiness, context-awareness, recursion prevention)	2026-02-10 14:43:18 -05:00
Adam Weidman	5eeddaef52	feat: instrument adaptive thinking metrics in telemetry and chat logs	2026-02-09 14:49:40 -05:00
Adam Weidman	1de614f38e	chore: cleanup branch, remove discontinued subagent settings and docs	2026-02-09 13:35:58 -05:00
Adam Weidman	9f7a3d30ea	fix: resolve build errors after merge with main	2026-02-09 13:24:17 -05:00
Adam Weidman	dd4df1bd11	Merge main into adaptiveThinkingBudget and resolve conflicts	2026-02-09 11:13:45 -05:00
Adam Weidman	2404e4fae8	feat: implement adaptive thinking budget	2026-01-06 15:54:07 -08:00