chore(cli): increase user simulator tick interval to 3s and update design doc

refactor(cli): optimize prompt caching for user simulator screen output
fix(cli): compress multiple empty lines in simulator screen output
2026-07-23 08:10:57 -07:00 · 2026-03-20 10:37:07 -07:00 · 2026-03-20 10:21:58 -07:00 · 2026-03-20 10:12:58 -07:00 · 2026-03-20 10:02:34 -07:00 · 2026-03-20 09:27:12 -07:00
205 changed files with 2613 additions and 3161 deletions
@@ -1,5 +0,0 @@
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"I'll help you with that."},{"functionCall":{"name":"browser_agent","args":{"task":"Open https://example.com and check if there is a heading"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"new_page","args":{"url":"https://example.com"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"take_snapshot","args":{}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"functionCall":{"name":"complete_task","args":{"success":true,"summary":"SUCCESS_POLICY_TEST_COMPLETED"}}}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":100,"candidatesTokenCount":50,"totalTokenCount":150}}]}
-{"method":"generateContentStream","response":[{"candidates":[{"content":{"parts":[{"text":"Task completed successfully. The page has the heading \"Example Domain\"."}],"role":"model"},"finishReason":"STOP","index":0}],"usageMetadata":{"promptTokenCount":200,"candidatesTokenCount":50,"totalTokenCount":250}}]}
@@ -1,178 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { TestRig, poll } from './test-helper.js';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { execSync } from 'node:child_process';
-import { existsSync, writeFileSync, readFileSync, mkdirSync } from 'node:fs';
-import stripAnsi from 'strip-ansi';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-const chromeAvailable = (() => {
-  try {
-    if (process.platform === 'darwin') {
-      execSync(
-        'test -d "/Applications/Google Chrome.app"  || test -d "/Applications/Chromium.app"',
-        {
-          stdio: 'ignore',
-        },
-      );
-    } else if (process.platform === 'linux') {
-      execSync(
-        'which google-chrome || which chromium-browser || which chromium',
-        { stdio: 'ignore' },
-      );
-    } else if (process.platform === 'win32') {
-      const chromePaths = [
-        'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe',
-        'C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe',
-        `${process.env['LOCALAPPDATA'] ?? ''}\\Google\\Chrome\\Application\\chrome.exe`,
-      ];
-      const found = chromePaths.some((p) => existsSync(p));
-      if (!found) {
-        execSync('where chrome || where chromium', { stdio: 'ignore' });
-      }
-    } else {
-      return false;
-    }
-    return true;
-  } catch {
-    return false;
-  }
-})();
-
-describe.skipIf(!chromeAvailable)('browser-policy', () => {
-  let rig: TestRig;
-
-  beforeEach(() => {
-    rig = new TestRig();
-  });
-
-  afterEach(async () => {
-    await rig.cleanup();
-  });
-
-  it('should skip confirmation when "Allow all server tools for this session" is chosen', async () => {
-    rig.setup('browser-policy-skip-confirmation', {
-      fakeResponsesPath: join(__dirname, 'browser-policy.responses'),
-      settings: {
-        agents: {
-          overrides: {
-            browser_agent: {
-              enabled: true,
-            },
-          },
-          browser: {
-            headless: true,
-            sessionMode: 'isolated',
-            allowedDomains: ['example.com'],
-          },
-        },
-      },
-    });
-
-    // Manually trust the folder to avoid the dialog and enable option 3
-    const geminiDir = join(rig.homeDir!, '.gemini');
-    mkdirSync(geminiDir, { recursive: true });
-
-    // Write to trustedFolders.json
-    const trustedFoldersPath = join(geminiDir, 'trustedFolders.json');
-    const trustedFolders = {
-      [rig.testDir!]: 'TRUST_FOLDER',
-    };
-    writeFileSync(trustedFoldersPath, JSON.stringify(trustedFolders, null, 2));
-
-    // Force confirmation for browser agent.
-    // NOTE: We don't force confirm browser tools here because "Allow all server tools"
-    // adds a rule with ALWAYS_ALLOW_PRIORITY (3.9x) which would be overshadowed by
-    // a rule in the user tier (4.x) like the one from this TOML.
-    // By removing the explicit mcp rule, the first MCP tool will still prompt
-    // due to default approvalMode = 'default', and then "Allow all" will correctly
-    // bypass subsequent tools.
-    const policyFile = join(rig.testDir!, 'force-confirm.toml');
-    writeFileSync(
-      policyFile,
-      `
-[[rule]]
-name = "Force confirm browser_agent"
-toolName = "browser_agent"
-decision = "ask_user"
-priority = 200
-`,
-    );
-
-    // Update settings.json in both project and home directories to point to the policy file
-    for (const baseDir of [rig.testDir!, rig.homeDir!]) {
-      const settingsPath = join(baseDir, '.gemini', 'settings.json');
-      if (existsSync(settingsPath)) {
-        const settings = JSON.parse(readFileSync(settingsPath, 'utf-8'));
-        settings.policyPaths = [policyFile];
-        // Ensure folder trust is enabled
-        settings.security = settings.security || {};
-        settings.security.folderTrust = settings.security.folderTrust || {};
-        settings.security.folderTrust.enabled = true;
-        writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
-      }
-    }
-
-    const run = await rig.runInteractive({
-      approvalMode: 'default',
-      env: {
-        GEMINI_CLI_INTEGRATION_TEST: 'true',
-      },
-    });
-
-    await run.sendKeys(
-      'Open https://example.com and check if there is a heading\r',
-    );
-    await run.sendKeys('\r');
-
-    // Handle confirmations.
-    // 1. Initial browser_agent delegation (likely only 3 options, so use option 1: Allow once)
-    await poll(
-      () => stripAnsi(run.output).toLowerCase().includes('action required'),
-      60000,
-      1000,
-    );
-    await run.sendKeys('1\r');
-    await new Promise((r) => setTimeout(r, 2000));
-
-    // Handle privacy notice
-    await poll(
-      () => stripAnsi(run.output).toLowerCase().includes('privacy notice'),
-      5000,
-      100,
-    );
-    await run.sendKeys('1\r');
-    await new Promise((r) => setTimeout(r, 5000));
-
-    // new_page (MCP tool, should have 4 options, use option 3: Allow all server tools)
-    await poll(
-      () => {
-        const stripped = stripAnsi(run.output).toLowerCase();
-        return (
-          stripped.includes('new_page') &&
-          stripped.includes('allow all server tools for this session')
-        );
-      },
-      60000,
-      1000,
-    );
-
-    // Select "Allow all server tools for this session" (option 3)
-    await run.sendKeys('3\r');
-    await new Promise((r) => setTimeout(r, 30000));
-
-    const output = stripAnsi(run.output).toLowerCase();
-
-    expect(output).toContain('browser_agent');
-    expect(output).toContain('completed successfully');
-  });
-});
@@ -80,7 +80,7 @@
        "@lydell/node-pty-win32-arm64": "1.1.0",
        "@lydell/node-pty-win32-x64": "1.1.0",
        "keytar": "^7.9.0",
-        "node-pty": "^1.0.0"
+        "node-pty": "^1.1.0"
      }
    },
    "node_modules/@agentclientprotocol/sdk": {
@@ -4906,53 +4906,6 @@
        "url": "https://opencollective.com/vitest"
      }
    },
-    "node_modules/@vscode/vsce": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-3.6.0.tgz",
-      "integrity": "sha512-u2ZoMfymRNJb14aHNawnXJtXHLXDVKc1oKZaH4VELKT/9iWKRVgtQOdwxCgtwSxJoqYvuK4hGlBWQJ05wxADhg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@azure/identity": "^4.1.0",
-        "@secretlint/node": "^10.1.1",
-        "@secretlint/secretlint-formatter-sarif": "^10.1.1",
-        "@secretlint/secretlint-rule-no-dotenv": "^10.1.1",
-        "@secretlint/secretlint-rule-preset-recommend": "^10.1.1",
-        "@vscode/vsce-sign": "^2.0.0",
-        "azure-devops-node-api": "^12.5.0",
-        "chalk": "^4.1.2",
-        "cheerio": "^1.0.0-rc.9",
-        "cockatiel": "^3.1.2",
-        "commander": "^12.1.0",
-        "form-data": "^4.0.0",
-        "glob": "^11.0.0",
-        "hosted-git-info": "^4.0.2",
-        "jsonc-parser": "^3.2.0",
-        "leven": "^3.1.0",
-        "markdown-it": "^14.1.0",
-        "mime": "^1.3.4",
-        "minimatch": "^3.0.3",
-        "parse-semver": "^1.1.1",
-        "read": "^1.0.7",
-        "secretlint": "^10.1.1",
-        "semver": "^7.5.2",
-        "tmp": "^0.2.3",
-        "typed-rest-client": "^1.8.4",
-        "url-join": "^4.0.1",
-        "xml2js": "^0.5.0",
-        "yauzl": "^2.3.1",
-        "yazl": "^2.2.2"
-      },
-      "bin": {
-        "vsce": "vsce"
-      },
-      "engines": {
-        "node": ">= 20"
-      },
-      "optionalDependencies": {
-        "keytar": "^7.7.0"
-      }
-    },
    "node_modules/@vscode/vsce-sign": {
      "version": "2.0.6",
      "resolved": "https://registry.npmjs.org/@vscode/vsce-sign/-/vsce-sign-2.0.6.tgz",
@@ -5098,52 +5051,6 @@
        "win32"
      ]
    },
-    "node_modules/@vscode/vsce/node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@vscode/vsce/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@vscode/vsce/node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@vscode/vsce/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true,
-      "license": "ISC"
-    },
    "node_modules/@vue/compiler-core": {
      "version": "3.5.26",
      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.26.tgz",
@@ -6655,6 +6562,13 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true,
+      "license": "MIT"
+    },
    "node_modules/config-chain": {
      "version": "1.1.13",
      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
@@ -12193,13 +12107,6 @@
        "node": "^18.17.0 || >=20.5.0"
      }
    },
-    "node_modules/nan": {
-      "version": "2.23.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.23.0.tgz",
-      "integrity": "sha512-1UxuyYGdoQHcGg87Lkqm3FzefucTa0NAiOcuRsDmysep3c1LVCRK2krrUDafMWtjSG04htvAmvg96+SDknOmgQ==",
-      "license": "MIT",
-      "optional": true
-    },
    "node_modules/nano-spawn": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/nano-spawn/-/nano-spawn-1.0.3.tgz",
@@ -12343,16 +12250,23 @@
      }
    },
    "node_modules/node-pty": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.0.0.tgz",
-      "integrity": "sha512-wtBMWWS7dFZm/VgqElrTvtfMq4GzJ6+edFI0Y0zyzygUSZMgZdraDUMUhCIvkjhJjme15qWmbyJbtAx4ot4uZA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0.tgz",
+      "integrity": "sha512-20JqtutY6JPXTUnL0ij1uad7Qe1baT46lyolh2sSENDd4sTzKZ4nmAFkeAARDKwmlLjPx6XKRlwRUxwjOy+lUg==",
      "hasInstallScript": true,
      "license": "MIT",
      "optional": true,
      "dependencies": {
-        "nan": "^2.17.0"
+        "node-addon-api": "^7.1.0"
      }
    },
+    "node_modules/node-pty/node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "license": "MIT",
+      "optional": true
+    },
    "node_modules/node-sarif-builder": {
      "version": "3.2.0",
      "resolved": "https://registry.npmjs.org/node-sarif-builder/-/node-sarif-builder-3.2.0.tgz",
@@ -17996,6 +17910,23 @@
        "node": ">=20"
      }
    },
+    "packages/snake-game": {
+      "name": "@google/gemini-cli-snake-game",
+      "version": "0.1.0",
+      "extraneous": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "lucide-react": "^0.471.0"
+      },
+      "devDependencies": {
+        "@types/react": "^19.2.0",
+        "@types/react-dom": "^19.2.0",
+        "esbuild": "^0.25.0",
+        "react": "^19.2.0",
+        "react-dom": "^19.2.0",
+        "typescript": "^5.7.3"
+      }
+    },
    "packages/test-utils": {
      "name": "@google/gemini-cli-test-utils",
      "version": "0.36.0-nightly.20260317.2f90b4653",
@@ -18030,7 +17961,7 @@
        "@types/vscode": "^1.99.0",
        "@typescript-eslint/eslint-plugin": "^8.31.1",
        "@typescript-eslint/parser": "^8.31.1",
-        "@vscode/vsce": "^3.6.0",
+        "@vscode/vsce": "^3.7.1",
        "esbuild": "^0.25.3",
        "eslint": "^9.25.1",
        "npm-run-all2": "^8.0.2",
@@ -18047,6 +17978,155 @@
      "integrity": "sha512-30sjmas1hQ0gVbX68LAWlm/YYlEqUErunPJJKLpEl+xhK0mKn+jyzlCOpsdTwfkZfPy4U6CDkmygBLC3AB8W9Q==",
      "dev": true,
      "license": "MIT"
+    },
+    "packages/vscode-ide-companion/node_modules/@vscode/vsce": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/@vscode/vsce/-/vsce-3.7.1.tgz",
+      "integrity": "sha512-OTm2XdMt2YkpSn2Nx7z2EJtSuhRHsTPYsSK59hr3v8jRArK+2UEoju4Jumn1CmpgoBLGI6ReHLJ/czYltNUW3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@azure/identity": "^4.1.0",
+        "@secretlint/node": "^10.1.2",
+        "@secretlint/secretlint-formatter-sarif": "^10.1.2",
+        "@secretlint/secretlint-rule-no-dotenv": "^10.1.2",
+        "@secretlint/secretlint-rule-preset-recommend": "^10.1.2",
+        "@vscode/vsce-sign": "^2.0.0",
+        "azure-devops-node-api": "^12.5.0",
+        "chalk": "^4.1.2",
+        "cheerio": "^1.0.0-rc.9",
+        "cockatiel": "^3.1.2",
+        "commander": "^12.1.0",
+        "form-data": "^4.0.0",
+        "glob": "^11.0.0",
+        "hosted-git-info": "^4.0.2",
+        "jsonc-parser": "^3.2.0",
+        "leven": "^3.1.0",
+        "markdown-it": "^14.1.0",
+        "mime": "^1.3.4",
+        "minimatch": "^3.0.3",
+        "parse-semver": "^1.1.1",
+        "read": "^1.0.7",
+        "secretlint": "^10.1.2",
+        "semver": "^7.5.2",
+        "tmp": "^0.2.3",
+        "typed-rest-client": "^1.8.4",
+        "url-join": "^4.0.1",
+        "xml2js": "^0.5.0",
+        "yauzl": "^2.3.1",
+        "yazl": "^2.2.2"
+      },
+      "bin": {
+        "vsce": "vsce"
+      },
+      "engines": {
+        "node": ">= 20"
+      },
+      "optionalDependencies": {
+        "keytar": "^7.7.0"
+      }
+    },
+    "packages/vscode-ide-companion/node_modules/@vscode/vsce/node_modules/minimatch": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "packages/vscode-ide-companion/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "packages/vscode-ide-companion/node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "packages/vscode-ide-companion/node_modules/glob": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz",
+      "integrity": "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "foreground-child": "^3.3.1",
+        "jackspeak": "^4.1.1",
+        "minimatch": "^10.1.1",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^2.0.0"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "packages/vscode-ide-companion/node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "packages/vscode-ide-companion/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "packages/vscode-ide-companion/node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "packages/vscode-ide-companion/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true,
+      "license": "ISC"
    }
  }
 }
@@ -150,7 +150,7 @@
    "@lydell/node-pty-win32-arm64": "1.1.0",
    "@lydell/node-pty-win32-x64": "1.1.0",
    "keytar": "^7.9.0",
-    "node-pty": "^1.0.0"
+    "node-pty": "^1.1.0"
  },
  "lint-staged": {
    "*.{js,jsx,ts,tsx}": [
@@ -177,9 +177,6 @@ describe('GeminiAgent', () => {
      getHasAccessToPreviewModel: vi.fn().mockReturnValue(false),
      getCheckpointingEnabled: vi.fn().mockReturnValue(false),
      getDisableAlwaysAllow: vi.fn().mockReturnValue(false),
-      get config() {
-        return this;
-      },
    } as unknown as Mocked<Awaited<ReturnType<typeof loadCliConfig>>>;
    mockSettings = {
      merged: {
@@ -659,12 +656,6 @@ describe('Session', () => {
      getGitService: vi.fn().mockResolvedValue({} as GitService),
      waitForMcpInit: vi.fn(),
      getDisableAlwaysAllow: vi.fn().mockReturnValue(false),
-      get config() {
-        return this;
-      },
-      get toolRegistry() {
-        return mockToolRegistry;
-      },
    } as unknown as Mocked<Config>;
    mockConnection = {
      sessionUpdate: vi.fn(),
@@ -47,7 +47,6 @@ import {
  DEFAULT_GEMINI_MODEL_AUTO,
  PREVIEW_GEMINI_MODEL_AUTO,
  getDisplayString,
-  type AgentLoopContext,
 } from '@google/gemini-cli-core';
 import * as acp from '@agentclientprotocol/sdk';
 import { AcpFileSystemService } from './fileSystemService.js';
@@ -105,7 +104,7 @@ export class GeminiAgent {
  private customHeaders: Record<string, string> | undefined;

  constructor(
-    private context: AgentLoopContext,
+    private config: Config,
    private settings: LoadedSettings,
    private argv: CliArgs,
    private connection: acp.AgentSideConnection,
@@ -149,7 +148,7 @@ export class GeminiAgent {
      },
    ];

-    await this.context.config.initialize();
+    await this.config.initialize();
    const version = await getVersion();
    return {
      protocolVersion: acp.PROTOCOL_VERSION,
@@ -221,7 +220,7 @@ export class GeminiAgent {
      this.baseUrl = baseUrl;
      this.customHeaders = headers;

-      await this.context.config.refreshAuth(
+      await this.config.refreshAuth(
        method,
        apiKey ?? this.apiKey,
        baseUrl,
@@ -538,7 +537,7 @@ export class Session {
  constructor(
    private readonly id: string,
    private readonly chat: GeminiChat,
-    private readonly context: AgentLoopContext,
+    private readonly config: Config,
    private readonly connection: acp.AgentSideConnection,
    private readonly settings: LoadedSettings,
  ) {}
@@ -553,15 +552,13 @@ export class Session {
  }

  setMode(modeId: acp.SessionModeId): acp.SetSessionModeResponse {
-    const availableModes = buildAvailableModes(
-      this.context.config.isPlanEnabled(),
-    );
+    const availableModes = buildAvailableModes(this.config.isPlanEnabled());
    const mode = availableModes.find((m) => m.id === modeId);
    if (!mode) {
      throw new Error(`Invalid or unavailable mode: ${modeId}`);
    }
    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-    this.context.config.setApprovalMode(mode.id as ApprovalMode);
+    this.config.setApprovalMode(mode.id as ApprovalMode);
    return {};
  }

@@ -582,7 +579,7 @@ export class Session {
  }

  setModel(modelId: acp.ModelId): acp.SetSessionModelResponse {
-    this.context.config.setModel(modelId);
+    this.config.setModel(modelId);
    return {};
  }

@@ -637,7 +634,7 @@ export class Session {
              }
            }

-            const tool = this.context.toolRegistry.getTool(toolCall.name);
+            const tool = this.config.getToolRegistry().getTool(toolCall.name);

            await this.sendUpdate({
              sessionUpdate: 'tool_call',
@@ -661,7 +658,7 @@ export class Session {
    const pendingSend = new AbortController();
    this.pendingPrompt = pendingSend;

-    await this.context.config.waitForMcpInit();
+    await this.config.waitForMcpInit();

    const promptId = Math.random().toString(16).slice(2);
    const chat = this.chat;
@@ -715,8 +712,8 @@ export class Session {

      try {
        const model = resolveModel(
-          this.context.config.getModel(),
-          (await this.context.config.getGemini31Launched?.()) ?? false,
+          this.config.getModel(),
+          (await this.config.getGemini31Launched?.()) ?? false,
        );
        const responseStream = await chat.sendMessageStream(
          { model },
@@ -807,9 +804,9 @@ export class Session {
    // eslint-disable-next-line @typescript-eslint/no-unused-vars
    parts: Part[],
  ): Promise<boolean> {
-    const gitService = await this.context.config.getGitService();
+    const gitService = await this.config.getGitService();
    const commandContext = {
-      agentContext: this.context,
+      config: this.config,
      settings: this.settings,
      git: gitService,
      sendMessage: async (text: string) => {
@@ -845,7 +842,7 @@ export class Session {
    const errorResponse = (error: Error) => {
      const durationMs = Date.now() - startTime;
      logToolCall(
-        this.context.config,
+        this.config,
        new ToolCallEvent(
          undefined,
          fc.name ?? '',
@@ -875,7 +872,7 @@ export class Session {
      return errorResponse(new Error('Missing function name'));
    }

-    const toolRegistry = this.context.toolRegistry;
+    const toolRegistry = this.config.getToolRegistry();
    const tool = toolRegistry.getTool(fc.name);

    if (!tool) {
@@ -911,10 +908,7 @@ export class Session {

        const params: acp.RequestPermissionRequest = {
          sessionId: this.id,
-          options: toPermissionOptions(
-            confirmationDetails,
-            this.context.config,
-          ),
+          options: toPermissionOptions(confirmationDetails, this.config),
          toolCall: {
            toolCallId: callId,
            status: 'pending',
@@ -980,7 +974,7 @@ export class Session {

      const durationMs = Date.now() - startTime;
      logToolCall(
-        this.context.config,
+        this.config,
        new ToolCallEvent(
          undefined,
          fc.name ?? '',
@@ -994,7 +988,7 @@ export class Session {
        ),
      );

-      this.chat.recordCompletedToolCalls(this.context.config.getActiveModel(), [
+      this.chat.recordCompletedToolCalls(this.config.getActiveModel(), [
        {
          status: CoreToolCallStatus.Success,
          request: {
@@ -1012,8 +1006,8 @@ export class Session {
              fc.name,
              callId,
              toolResult.llmContent,
-              this.context.config.getActiveModel(),
-              this.context.config,
+              this.config.getActiveModel(),
+              this.config,
            ),
            resultDisplay: toolResult.returnDisplay,
            error: undefined,
@@ -1026,8 +1020,8 @@ export class Session {
        fc.name,
        callId,
        toolResult.llmContent,
-        this.context.config.getActiveModel(),
-        this.context.config,
+        this.config.getActiveModel(),
+        this.config,
      );
    } catch (e) {
      const error = e instanceof Error ? e : new Error(String(e));
@@ -1042,7 +1036,7 @@ export class Session {
        kind: toAcpToolKind(tool.kind),
      });

-      this.chat.recordCompletedToolCalls(this.context.config.getActiveModel(), [
+      this.chat.recordCompletedToolCalls(this.config.getActiveModel(), [
        {
          status: CoreToolCallStatus.Error,
          request: {
@@ -1128,18 +1122,18 @@ export class Session {
    const atPathToResolvedSpecMap = new Map<string, string>();

    // Get centralized file discovery service
-    const fileDiscovery = this.context.config.getFileService();
+    const fileDiscovery = this.config.getFileService();
    const fileFilteringOptions: FilterFilesOptions =
-      this.context.config.getFileFilteringOptions();
+      this.config.getFileFilteringOptions();

    const pathSpecsToRead: string[] = [];
    const contentLabelsForDisplay: string[] = [];
    const ignoredPaths: string[] = [];

-    const toolRegistry = this.context.toolRegistry;
+    const toolRegistry = this.config.getToolRegistry();
    const readManyFilesTool = new ReadManyFilesTool(
-      this.context.config,
-      this.context.messageBus,
+      this.config,
+      this.config.getMessageBus(),
    );
    const globTool = toolRegistry.getTool('glob');

@@ -1158,11 +1152,8 @@ export class Session {
      let currentPathSpec = pathName;
      let resolvedSuccessfully = false;
      try {
-        const absolutePath = path.resolve(
-          this.context.config.getTargetDir(),
-          pathName,
-        );
-        if (isWithinRoot(absolutePath, this.context.config.getTargetDir())) {
+        const absolutePath = path.resolve(this.config.getTargetDir(), pathName);
+        if (isWithinRoot(absolutePath, this.config.getTargetDir())) {
          const stats = await fs.stat(absolutePath);
          if (stats.isDirectory()) {
            currentPathSpec = pathName.endsWith('/')
@@ -1182,7 +1173,7 @@ export class Session {
        }
      } catch (error) {
        if (isNodeError(error) && error.code === 'ENOENT') {
-          if (this.context.config.getEnableRecursiveFileSearch() && globTool) {
+          if (this.config.getEnableRecursiveFileSearch() && globTool) {
            this.debug(
              `Path ${pathName} not found directly, attempting glob search.`,
            );
@@ -1190,7 +1181,7 @@ export class Session {
              const globResult = await globTool.buildAndExecute(
                {
                  pattern: `**/*${pathName}*`,
-                  path: this.context.config.getTargetDir(),
+                  path: this.config.getTargetDir(),
                },
                abortSignal,
              );
@@ -1204,7 +1195,7 @@ export class Session {
                if (lines.length > 1 && lines[1]) {
                  const firstMatchAbsolute = lines[1].trim();
                  currentPathSpec = path.relative(
-                    this.context.config.getTargetDir(),
+                    this.config.getTargetDir(),
                    firstMatchAbsolute,
                  );
                  this.debug(
@@ -1419,7 +1410,7 @@ export class Session {
  }

  debug(msg: string) {
-    if (this.context.config.getDebugMode()) {
+    if (this.config.getDebugMode()) {
      debugLogger.warn(msg);
    }
  }
@@ -97,9 +97,6 @@ describe('GeminiAgent Session Resume', () => {
      getHasAccessToPreviewModel: vi.fn().mockReturnValue(false),
      getGemini31LaunchedSync: vi.fn().mockReturnValue(false),
      getCheckpointingEnabled: vi.fn().mockReturnValue(false),
-      get config() {
-        return this;
-      },
    } as unknown as Mocked<Config>;
    mockSettings = {
      merged: {
@@ -161,10 +158,9 @@ describe('GeminiAgent Session Resume', () => {
      ],
    };

-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (mockConfig as any).toolRegistry = {
+    mockConfig.getToolRegistry = vi.fn().mockReturnValue({
      getTool: vi.fn().mockReturnValue({ kind: 'read' }),
-    };
+    });

    (SessionSelector as unknown as Mock).mockImplementation(() => ({
      resolveSession: vi.fn().mockResolvedValue({
@@ -53,7 +53,7 @@ export class ListExtensionsCommand implements Command {
    context: CommandContext,
    _: string[],
  ): Promise<CommandExecutionResponse> {
-    const extensions = listExtensions(context.agentContext.config);
+    const extensions = listExtensions(context.config);
    const data = extensions.length ? extensions : 'No extensions installed.';

    return { name: this.name, data };
@@ -134,7 +134,7 @@ export class EnableExtensionCommand implements Command {
    args: string[],
  ): Promise<CommandExecutionResponse> {
    const enableContext = getEnableDisableContext(
-      context.agentContext.config,
+      context.config,
      args,
      'enable',
    );
@@ -156,8 +156,7 @@ export class EnableExtensionCommand implements Command {

        if (extension?.mcpServers) {
          const mcpEnablementManager = McpServerEnablementManager.getInstance();
-          const mcpClientManager =
-            context.agentContext.config.getMcpClientManager();
+          const mcpClientManager = context.config.getMcpClientManager();
          const enabledServers = await mcpEnablementManager.autoEnableServers(
            Object.keys(extension.mcpServers),
          );
@@ -192,7 +191,7 @@ export class DisableExtensionCommand implements Command {
    args: string[],
  ): Promise<CommandExecutionResponse> {
    const enableContext = getEnableDisableContext(
-      context.agentContext.config,
+      context.config,
      args,
      'disable',
    );
@@ -224,7 +223,7 @@ export class InstallExtensionCommand implements Command {
    context: CommandContext,
    args: string[],
  ): Promise<CommandExecutionResponse> {
-    const extensionLoader = context.agentContext.config.getExtensionLoader();
+    const extensionLoader = context.config.getExtensionLoader();
    if (!(extensionLoader instanceof ExtensionManager)) {
      return {
        name: this.name,
@@ -269,7 +268,7 @@ export class LinkExtensionCommand implements Command {
    context: CommandContext,
    args: string[],
  ): Promise<CommandExecutionResponse> {
-    const extensionLoader = context.agentContext.config.getExtensionLoader();
+    const extensionLoader = context.config.getExtensionLoader();
    if (!(extensionLoader instanceof ExtensionManager)) {
      return {
        name: this.name,
@@ -314,7 +313,7 @@ export class UninstallExtensionCommand implements Command {
    context: CommandContext,
    args: string[],
  ): Promise<CommandExecutionResponse> {
-    const extensionLoader = context.agentContext.config.getExtensionLoader();
+    const extensionLoader = context.config.getExtensionLoader();
    if (!(extensionLoader instanceof ExtensionManager)) {
      return {
        name: this.name,
@@ -370,7 +369,7 @@ export class RestartExtensionCommand implements Command {
    context: CommandContext,
    args: string[],
  ): Promise<CommandExecutionResponse> {
-    const extensionLoader = context.agentContext.config.getExtensionLoader();
+    const extensionLoader = context.config.getExtensionLoader();
    if (!(extensionLoader instanceof ExtensionManager)) {
      return { name: this.name, data: 'Cannot restart extensions.' };
    }
@@ -425,7 +424,7 @@ export class UpdateExtensionCommand implements Command {
    context: CommandContext,
    args: string[],
  ): Promise<CommandExecutionResponse> {
-    const extensionLoader = context.agentContext.config.getExtensionLoader();
+    const extensionLoader = context.config.getExtensionLoader();
    if (!(extensionLoader instanceof ExtensionManager)) {
      return { name: this.name, data: 'Cannot update extensions.' };
    }
@@ -22,7 +22,7 @@ export class InitCommand implements Command {
    context: CommandContext,
    _args: string[] = [],
  ): Promise<CommandExecutionResponse> {
-    const targetDir = context.agentContext.config.getTargetDir();
+    const targetDir = context.config.getTargetDir();
    if (!targetDir) {
      throw new Error('Command requires a workspace.');
    }
@@ -49,7 +49,7 @@ export class ShowMemoryCommand implements Command {
    context: CommandContext,
    _: string[],
  ): Promise<CommandExecutionResponse> {
-    const result = showMemory(context.agentContext.config);
+    const result = showMemory(context.config);
    return { name: this.name, data: result.content };
  }
 }
@@ -63,7 +63,7 @@ export class RefreshMemoryCommand implements Command {
    context: CommandContext,
    _: string[],
  ): Promise<CommandExecutionResponse> {
-    const result = await refreshMemory(context.agentContext.config);
+    const result = await refreshMemory(context.config);
    return { name: this.name, data: result.content };
  }
 }
@@ -76,7 +76,7 @@ export class ListMemoryCommand implements Command {
    context: CommandContext,
    _: string[],
  ): Promise<CommandExecutionResponse> {
-    const result = listMemoryFiles(context.agentContext.config);
+    const result = listMemoryFiles(context.config);
    return { name: this.name, data: result.content };
  }
 }
@@ -95,7 +95,7 @@ export class AddMemoryCommand implements Command {
      return { name: this.name, data: result.content };
    }

-    const toolRegistry = context.agentContext.toolRegistry;
+    const toolRegistry = context.config.getToolRegistry();
    const tool = toolRegistry.getTool(result.toolName);
    if (tool) {
      const abortController = new AbortController();
@@ -106,10 +106,10 @@ export class AddMemoryCommand implements Command {
      await tool.buildAndExecute(result.toolArgs, signal, undefined, {
        shellExecutionConfig: {
          sanitizationConfig: DEFAULT_SANITIZATION_CONFIG,
-          sandboxManager: context.agentContext.sandboxManager,
+          sandboxManager: context.config.sandboxManager,
        },
      });
-      await refreshMemory(context.agentContext.config);
+      await refreshMemory(context.config);
      return {
        name: this.name,
        data: `Added memory: "${textToAdd}"`,
@@ -29,8 +29,7 @@ export class RestoreCommand implements Command {
    context: CommandContext,
    args: string[],
  ): Promise<CommandExecutionResponse> {
-    const { agentContext: agentContext, git: gitService } = context;
-    const { config } = agentContext;
+    const { config, git: gitService } = context;
    const argsStr = args.join(' ');

    try {
@@ -117,7 +116,7 @@ export class ListCheckpointsCommand implements Command {
  readonly description = 'Lists all available checkpoints.';

  async execute(context: CommandContext): Promise<CommandExecutionResponse> {
-    const { config } = context.agentContext;
+    const { config } = context;

    try {
      if (!config.getCheckpointingEnabled()) {
@@ -4,11 +4,11 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import type { AgentLoopContext, GitService } from '@google/gemini-cli-core';
+import type { Config, GitService } from '@google/gemini-cli-core';
 import type { LoadedSettings } from '../../config/settings.js';

 export interface CommandContext {
-  agentContext: AgentLoopContext;
+  config: Config;
  settings: LoadedSettings;
  git?: GitService;
  sendMessage: (text: string) => Promise<void>;
@@ -97,6 +97,7 @@ export interface CliArgs {
  rawOutput: boolean | undefined;
  acceptRawOutputRisk: boolean | undefined;
  isCommand: boolean | undefined;
+  simulateUser: boolean | undefined;
 }

 /**
@@ -298,6 +299,11 @@ export async function parseArguments(
        .option('accept-raw-output-risk', {
          type: 'boolean',
          description: 'Suppress the security warning when using --raw-output.',
+        })
+        .option('simulate-user', {
+          type: 'boolean',
+          description:
+            'Run the user simulation agent in the background for evaluation purposes.',
        }),
    )
    // Register MCP subcommands
@@ -799,6 +805,7 @@ export async function loadCliConfig(
    approvalMode,
    disableYoloMode:
      settings.security?.disableYoloMode || settings.admin?.secureModeEnabled,
+    simulateUser: !!argv.simulateUser,
    disableAlwaysAllow:
      settings.security?.disableAlwaysAllow ||
      settings.admin?.secureModeEnabled,
@@ -513,6 +513,7 @@ describe('gemini.tsx main function kitty protocol', () => {
      rawOutput: undefined,
      acceptRawOutputRisk: undefined,
      isCommand: undefined,
+      simulateUser: undefined,
    });

    await act(async () => {
@@ -419,14 +419,6 @@ export async function main() {
    }
  }

-  if (settings.merged.advanced.autoConfigureMemory) {
-    const heapStats = v8.getHeapStatistics();
-    const currentMaxOldSpaceSizeMb = Math.floor(
-      heapStats.heap_size_limit / 1024 / 1024,
-    );
-    writeToStderr(`Allocated memory: ${currentMaxOldSpaceSizeMb} MB\n`);
-  }
-
  // We are now past the logic handling potentially launching a child process
  // to run Gemini CLI. It is now safe to perform expensive initialization that
  // may have side effects.
@@ -29,7 +29,7 @@ describe('Model Steering Integration', () => {
      configOverrides: { modelSteering: true },
    });
    await rig.initialize();
-    await rig.render();
+    rig.render();
    await rig.waitForIdle();

    rig.setToolPolicy('list_directory', PolicyDecision.ASK_USER);
@@ -9,7 +9,15 @@ import { render } from 'ink';
 import { basename } from 'node:path';
 import { AppContainer } from './ui/AppContainer.js';
 import { ConsolePatcher } from './ui/utils/ConsolePatcher.js';
+import { UserSimulator } from './services/UserSimulator.js';
 import { registerCleanup, setupTtyCheck } from './utils/cleanup.js';
+import { PassThrough } from 'node:stream';
+
+interface RenderMetrics {
+  renderTime: number;
+  output: string;
+  staticOutput?: string;
+}
 import {
  type StartupWarning,
  type Config,
@@ -132,6 +140,11 @@ export async function startInteractiveUI(
    await new Promise((resolve) => setTimeout(resolve, 100));
  }

+  const simulateUser = config.getSimulateUser();
+  const simulatedStdin = new PassThrough({ encoding: 'utf8' });
+
+  let lastFrame: string | undefined;
+  const staticHistory: string[] = [];
  const instance = render(
    process.env['DEBUG'] ? (
      <React.StrictMode>
@@ -143,12 +156,20 @@ export async function startInteractiveUI(
    {
      stdout: inkStdout,
      stderr: inkStderr,
-      stdin: process.stdin,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion, @typescript-eslint/no-unsafe-assignment
+      stdin: (simulateUser ? simulatedStdin : process.stdin) as any,
      exitOnCtrlC: false,
      isScreenReaderEnabled: config.getScreenReader(),
-      onRender: ({ renderTime }: { renderTime: number }) => {
-        if (renderTime > SLOW_RENDER_MS) {
-          recordSlowRender(config, renderTime);
+      onRender: (metrics: RenderMetrics) => {
+        lastFrame = metrics.output;
+        if (metrics.staticOutput) {
+          staticHistory.push(metrics.staticOutput);
+          if (staticHistory.length > 50) {
+            staticHistory.shift();
+          }
+        }
+        if (metrics.renderTime > SLOW_RENDER_MS) {
+          recordSlowRender(config, metrics.renderTime);
        }
        profiler.reportFrameRendered();
      },
@@ -179,6 +200,21 @@ export async function startInteractiveUI(
      }
    });

+  if (simulateUser) {
+    const simulator = new UserSimulator(
+      config,
+      () => {
+        if (lastFrame === undefined) return undefined;
+        // Combine history with latest frame for the simulator
+        const historyText = staticHistory.join('\n');
+        return historyText ? `${historyText}\n${lastFrame}` : lastFrame;
+      },
+      simulatedStdin,
+    );
+    simulator.start();
+    registerCleanup(() => simulator.stop());
+  }
+
  registerCleanup(() => instance.unmount());

  registerCleanup(setupTtyCheck());
@@ -65,9 +65,9 @@ export const handleSlashCommand = async (

      const logger = new Logger(config?.getSessionId() || '', config?.storage);

-      const commandContext: CommandContext = {
+      const context: CommandContext = {
        services: {
-          agentContext: config,
+          config,
          settings,
          git: undefined,
          logger,
@@ -84,7 +84,7 @@ export const handleSlashCommand = async (
        },
      };

-      const result = await commandToExecute.action(commandContext, args);
+      const result = await commandToExecute.action(context, args);

      if (result) {
        switch (result.type) {
@@ -0,0 +1,213 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { Config } from '@google/gemini-cli-core';
+import {
+  debugLogger,
+  LlmRole,
+  PREVIEW_GEMINI_FLASH_MODEL,
+  resolveModel,
+} from '@google/gemini-cli-core';
+import type { Writable } from 'node:stream';
+import * as fs from 'node:fs';
+
+export class UserSimulator {
+  private isRunning = false;
+  private timer: NodeJS.Timeout | null = null;
+  private lastScreenContent = '';
+  private isProcessing = false;
+  private interactionsFile: string | null = null;
+  private actionHistory: string[] = [];
+
+  constructor(
+    private readonly config: Config,
+    private readonly getScreen: () => string | undefined,
+    private readonly stdinBuffer: Writable,
+  ) {}
+
+  start() {
+    if (!this.config.getSimulateUser()) {
+      return;
+    }
+    this.interactionsFile = `interactions_${Date.now()}.txt`;
+    this.isRunning = true;
+    this.timer = setInterval(() => this.tick(), 3000);
+  }
+
+  stop() {
+    this.isRunning = false;
+    if (this.timer) {
+      clearInterval(this.timer);
+      this.timer = null;
+    }
+    debugLogger.log('User simulator stopped');
+  }
+
+  private async tick() {
+    if (!this.isRunning || this.isProcessing) return;
+
+    try {
+      this.isProcessing = true;
+      const screen = this.getScreen();
+      if (!screen) return;
+
+      const strippedScreen = screen
+        .replace(
+          // eslint-disable-next-line no-control-regex
+          /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
+          '',
+        )
+        .replace(/\n([ \t]*\n)+/g, '\n\n');
+
+      const normalizedScreen = strippedScreen
+        .replace(/[⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏]/g, '')
+        .replace(/\[?\s*\b\d+(\.\d+)?s\b\s*\]?/g, '')
+        .trim();
+
+      if (normalizedScreen === this.lastScreenContent) return;
+
+      debugLogger.log(
+        `[SIMULATOR] Screen Content Seen:\n---\n${strippedScreen}\n---`,
+      );
+      if (this.interactionsFile) {
+        fs.appendFileSync(
+          this.interactionsFile,
+          `[LOG] [SIMULATOR] Screen Content Seen:\n---\n${strippedScreen}\n---\n\n`,
+        );
+      }
+
+      const contentGenerator = this.config.getContentGenerator();
+      if (!contentGenerator) return;
+
+      const originalGoal = this.config.getQuestion();
+      const goalInstruction = originalGoal
+        ? `\nThe original goal was: "${originalGoal}"\n`
+        : '';
+
+      const historyInstruction =
+        this.actionHistory.length > 0
+          ? `\nYou have previously taken the following actions (in order):\n${this.actionHistory.map((a, i) => `${i + 1}. ${JSON.stringify(a)}`).join('\n')}\nPay close attention to whether you have already asked for the original goal. If you have already submitted the original goal, DO NOT repeat it verbatim. If the UI shows your typed text but hasn't submitted it yet, just output \\r to press Enter.\n`
+          : '';
+
+      const prompt = `You are evaluating a CLI agent by simulating a user sitting at the terminal.
+Look carefully at the screen and determine the CLI's current state:
+
+STATE 1: The agent is busy (e.g., streaming a response, showing a spinner, running a tool, or displaying a timer like "7s"). It is actively working and NOT waiting for text input.
+- In this case, you MUST output exactly: <WAIT>
+
+STATE 2: The agent is waiting for you to authorize a tool, confirm an action, or answer a specific multi-choice question (e.g., "Action Required", "Allow execution", numbered options).
+- In this case, you MUST output the exact raw characters to select the option and submit it (e.g., 1\\r, 2\\r, y\\r, n\\r, or just \\r if the default option is acceptable). Do NOT output <DONE> or "Thank you". You must unblock the agent and allow it to run the tool.
+
+STATE 3: The agent has finished its current thought process AND is idle, waiting for a NEW general text prompt (usually indicated by a "> Type your message" prompt).
+- First, verify that the ACTUAL task is fully complete based on your original goal. Do not stop at intermediate steps like planning or syntax checking.
+- If the task is indeed fully complete, output "Thank you\\r" to graciously finish the simulation.
+- If you have already said thank you, output exactly: <DONE>
+- If the agent is waiting at a general text prompt but the original task is NOT complete, provide text instructions to continue what is missing. DO NOT repeat the original goal if it has already been provided once. Ask it to continue or provide feedback based on the current state or send <DONE> if you think the task is completed.
+
+STATE 4: Any other situation where the agent is waiting for text input or needs to press Enter.
+- Output the raw characters you would type, followed by \\r. For just an Enter key press, output \\r.
+
+CRITICAL RULES:
+- RULE 1: If there is ANY active spinner (e.g., ⠋, ⠙, ⠹, ⠸, ⠼, ⠴, ⠧) or an elapsed time indicator (e.g., "0s", "7s") anywhere on the screen, the agent is STILL WORKING. You MUST output <WAIT>. Do NOT issue commands, even if a text prompt is visible below it.
+- RULE 2: If there is an "Action Required" or confirmation prompt on the screen, YOU MUST HANDLE IT (State 2). This takes precedence over everything else.
+- RULE 3: Output ONLY the raw characters to send, <WAIT>, or <DONE>.
+- RULE 4: Do NOT output markdown, explanations of your thought process, or quotes.
+${goalInstruction}${historyInstruction}
+
+Here is the current terminal screen output:
+
+<screen>
+${strippedScreen}
+</screen>`;
+
+      if (this.interactionsFile) {
+        fs.appendFileSync(
+          this.interactionsFile,
+          `[LOG] [SIMULATOR] Prompt Used:\n---\n${prompt}\n---\n\n`,
+        );
+      }
+
+      const model = resolveModel(
+        PREVIEW_GEMINI_FLASH_MODEL,
+        false, // useGemini3_1
+        false, // useCustomToolModel
+        this.config.getHasAccessToPreviewModel?.() ?? true,
+        this.config,
+      );
+
+      const response = await contentGenerator.generateContent(
+        {
+          model,
+          contents: [
+            {
+              role: 'user',
+              parts: [{ text: prompt }],
+            },
+          ],
+        },
+        'simulator-prompt',
+        LlmRole.UTILITY_SIMULATOR,
+      );
+
+      const responseText = (response.text || '').replace(
+        /^[`"']+|[`"']+$/g,
+        '',
+      );
+      const trimmedResponse = responseText.trim();
+
+      debugLogger.log(
+        `[SIMULATOR] Raw model response: ${JSON.stringify(response.text)}`,
+      );
+      if (this.interactionsFile) {
+        fs.appendFileSync(
+          this.interactionsFile,
+          `[LOG] [SIMULATOR] Raw model response: ${JSON.stringify(response.text)}\n\n`,
+        );
+      }
+      debugLogger.log(
+        `[SIMULATOR] Processed response: ${JSON.stringify(responseText)}`,
+      );
+
+      if (trimmedResponse === '<DONE>') {
+        const msg = '[SIMULATOR] Terminating simulation: Task is completed.';
+        debugLogger.log(msg);
+        if (this.interactionsFile) {
+          fs.appendFileSync(this.interactionsFile, `[LOG] ${msg}\n\n`);
+        }
+        // eslint-disable-next-line no-console
+        console.log(`\n${msg}`);
+        this.stop();
+        process.exit(0);
+      }
+
+      if (trimmedResponse === '<WAIT>') {
+        debugLogger.log(
+          '[SIMULATOR] Skipping action (model decided to <WAIT>)',
+        );
+        this.lastScreenContent = normalizedScreen;
+        return;
+      }
+
+      if (responseText) {
+        const keys = responseText.replace(/\\n/g, '\r').replace(/\\r/g, '\r');
+        const readableAction = trimmedResponse.replace(/\\r/g, '[ENTER]');
+        this.actionHistory.push(readableAction);
+
+        debugLogger.log(
+          `[SIMULATOR] Sending to stdin: ${JSON.stringify(keys)}`,
+        );
+        this.stdinBuffer.write(keys);
+        this.lastScreenContent = normalizedScreen;
+      } else {
+        debugLogger.log('[SIMULATOR] Skipping (empty response)');
+        this.lastScreenContent = normalizedScreen;
+      }
+    } catch (e: unknown) {
+      debugLogger.error('UserSimulator tick failed', e);
+    } finally {
+      this.isProcessing = false;
+    }
+  }
+}
@@ -31,14 +31,11 @@ describe('AtFileProcessor', () => {

    mockConfig = {
      // The processor only passes the config through, so we don't need a full mock.
-      get config() {
-        return this;
-      },
    } as unknown as Config;

    context = createMockCommandContext({
      services: {
-        agentContext: mockConfig,
+        config: mockConfig,
      },
    });

@@ -63,7 +60,7 @@ describe('AtFileProcessor', () => {
    const prompt: PartUnion[] = [{ text: 'Analyze @{file.txt}' }];
    const contextWithoutConfig = createMockCommandContext({
      services: {
-        agentContext: null,
+        config: null,
      },
    });
    const result = await processor.process(prompt, contextWithoutConfig);
@@ -25,7 +25,7 @@ export class AtFileProcessor implements IPromptProcessor {
    input: PromptPipelineContent,
    context: CommandContext,
  ): Promise<PromptPipelineContent> {
-    const config = context.services.agentContext?.config;
+    const config = context.services.config;
    if (!config) {
      return input;
    }
@@ -89,9 +89,6 @@ describe('ShellProcessor', () => {
      getPolicyEngine: vi.fn().mockReturnValue({
        check: mockPolicyEngineCheck,
      }),
-      get config() {
-        return this as unknown as Config;
-      },
    };

    context = createMockCommandContext({
@@ -101,7 +98,7 @@ describe('ShellProcessor', () => {
        args: 'default args',
      },
      services: {
-        agentContext: mockConfig as Config,
+        config: mockConfig as Config,
      },
      session: {
        sessionShellAllowlist: new Set(),
@@ -123,7 +120,7 @@ describe('ShellProcessor', () => {
    const prompt: PromptPipelineContent = createPromptPipelineContent('!{ls}');
    const contextWithoutConfig = createMockCommandContext({
      services: {
-        agentContext: null,
+        config: null,
      },
    });

@@ -74,7 +74,7 @@ export class ShellProcessor implements IPromptProcessor {
      ];
    }

-    const config = context.services.agentContext?.config;
+    const config = context.services.config;
    if (!config) {
      throw new Error(
        `Security configuration not loaded. Cannot verify shell command permissions for '${this.commandName}'. Aborting.`,
@@ -5,6 +5,7 @@
 */

 import { describe, it, afterEach, expect } from 'vitest';
+import { act } from 'react';
 import { AppRig } from './AppRig.js';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -30,7 +31,7 @@ describe('AppRig', () => {
      configOverrides: { modelSteering: true },
    });
    await rig.initialize();
-    await rig.render();
+    rig.render();
    await rig.waitForIdle();

    // Set breakpoints on the canonical tool names
@@ -68,7 +69,12 @@ describe('AppRig', () => {
    );
    rig = new AppRig({ fakeResponsesPath });
    await rig.initialize();
-    await rig.render();
+    await act(async () => {
+      rig!.render();
+      // Allow async initializations (like banners) to settle within the act boundary
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    });
+
    // Wait for initial render
    await rig.waitForIdle();

@@ -11,7 +11,7 @@ import os from 'node:os';
 import path from 'node:path';
 import fs from 'node:fs';
 import { AppContainer } from '../ui/AppContainer.js';
-import { renderWithProviders, type RenderInstance } from './render.js';
+import { renderWithProviders } from './render.js';
 import {
  makeFakeConfig,
  type Config,
@@ -155,7 +155,7 @@ export interface PendingConfirmation {
 }

 export class AppRig {
-  private renderResult: RenderInstance | undefined;
+  private renderResult: ReturnType<typeof renderWithProviders> | undefined;
  private config: Config | undefined;
  private settings: LoadedSettings | undefined;
  private testDir: string;
@@ -393,12 +393,12 @@ export class AppRig {
    return isAnyToolActive || isAwaitingConfirmation;
  }

-  async render() {
+  render() {
    if (!this.config || !this.settings)
      throw new Error('AppRig not initialized');

-    await act(async () => {
-      this.renderResult = await renderWithProviders(
+    act(() => {
+      this.renderResult = renderWithProviders(
        <AppContainer
          config={this.config!}
          version="test-version"
@@ -46,19 +46,15 @@ describe('createMockCommandContext', () => {

    const overrides = {
      services: {
-        agentContext: { config: mockConfig },
+        config: mockConfig,
      },
    };

    const context = createMockCommandContext(overrides);

-    expect(context.services.agentContext).toBeDefined();
-    expect(context.services.agentContext?.config?.getModel()).toBe(
-      'gemini-pro',
-    );
-    expect(context.services.agentContext?.config?.getProjectRoot()).toBe(
-      '/test/project',
-    );
+    expect(context.services.config).toBeDefined();
+    expect(context.services.config?.getModel()).toBe('gemini-pro');
+    expect(context.services.config?.getProjectRoot()).toBe('/test/project');

    // Verify a default property on the same nested object is still there
    expect(context.services.logger).toBeDefined();
@@ -36,7 +36,7 @@ export const createMockCommandContext = (
      args: '',
    },
    services: {
-      agentContext: null,
+      config: null,

      settings: {
        merged: defaultMergedSettings,
@@ -62,6 +62,7 @@ export const createMockConfig = (overrides: Partial<Config> = {}): Config =>
    getGeminiMdFileCount: vi.fn(() => 0),
    getDeferredCommand: vi.fn(() => undefined),
    getFileSystemService: vi.fn(() => ({})),
+    getSimulateUser: vi.fn(() => false),
    clientVersion: '1.0.0',
    getModel: vi.fn().mockReturnValue('gemini-pro'),
    getWorkingDir: vi.fn().mockReturnValue('/mock/cwd'),
@@ -16,6 +16,8 @@ import { vi } from 'vitest';
 import stripAnsi from 'strip-ansi';
 import type React from 'react';
 import { act, useState } from 'react';
+import os from 'node:os';
+import path from 'node:path';
 import type { LoadedSettings } from '../config/settings.js';
 import { KeypressProvider } from '../ui/contexts/KeypressContext.js';
 import { SettingsContext } from '../ui/contexts/SettingsContext.js';
@@ -42,7 +44,7 @@ import {
  type OverflowState,
 } from '../ui/contexts/OverflowContext.js';

-import { type Config } from '@google/gemini-cli-core';
+import { makeFakeConfig, type Config } from '@google/gemini-cli-core';
 import { FakePersistentState } from './persistentStateFake.js';
 import { AppContext, type AppState } from '../ui/contexts/AppContext.js';
 import { createMockSettings } from './settings.js';
@@ -51,7 +53,6 @@ import { themeManager, DEFAULT_THEME } from '../ui/themes/theme-manager.js';
 import { DefaultLight } from '../ui/themes/builtin/light/default-light.js';
 import { pickDefaultThemeName } from '../ui/themes/theme.js';
 import { generateSvgForTerminal } from './svg.js';
-import { loadCliConfig, type CliArgs } from '../config/config.js';

 export const persistentStateMock = new FakePersistentState();

@@ -65,9 +66,7 @@ if (process.env['NODE_ENV'] === 'test') {
 }

 vi.mock('../utils/persistentState.js', () => ({
-  get persistentState() {
-    return persistentStateMock;
-  },
+  persistentState: persistentStateMock,
 }));

 vi.mock('../ui/utils/terminalUtils.js', () => ({
@@ -487,6 +486,50 @@ export const simulateClick = async (
  });
 };

+let mockConfigInternal: Config | undefined;
+
+const getMockConfigInternal = (): Config => {
+  if (!mockConfigInternal) {
+    mockConfigInternal = makeFakeConfig({
+      targetDir: os.tmpdir(),
+      enableEventDrivenScheduler: true,
+    });
+  }
+  return mockConfigInternal;
+};
+
+const configProxy = new Proxy({} as Config, {
+  get(_target, prop) {
+    if (prop === 'getTargetDir') {
+      return () =>
+        path.join(
+          path.parse(process.cwd()).root,
+          '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) {
+      return internal[prop as keyof typeof internal];
+    }
+    throw new Error(`mockConfig does not have property ${String(prop)}`);
+  },
+});
+
 export const mockSettings = createMockSettings();

 // A minimal mock UIState to satisfy the context provider.
@@ -596,7 +639,7 @@ const ContextCapture: React.FC<{ children: React.ReactNode }> = ({
  return <>{children}</>;
 };

-export const renderWithProviders = async (
+export const renderWithProviders = (
  component: React.ReactElement,
  {
    shellFocus = true,
@@ -604,7 +647,8 @@ export const renderWithProviders = async (
    uiState: providedUiState,
    width,
    mouseEventsEnabled = false,
-    config,
+
+    config = configProxy as unknown as Config,
    uiActions,
    persistentState,
    appState = mockAppState,
@@ -622,15 +666,13 @@ export const renderWithProviders = async (
    };
    appState?: AppState;
  } = {},
-): Promise<
-  RenderInstance & {
-    simulateClick: (
-      col: number,
-      row: number,
-      button?: 0 | 1 | 2,
-    ) => Promise<void>;
-  }
-> => {
+): RenderInstance & {
+  simulateClick: (
+    col: number,
+    row: number,
+    button?: 0 | 1 | 2,
+  ) => Promise<void>;
+} => {
  const baseState: UIState = new Proxy(
    { ...baseMockUiState, ...providedUiState },
    {
@@ -659,15 +701,8 @@ export const renderWithProviders = async (
  persistentStateMock.mockClear();

  const terminalWidth = width ?? baseState.terminalWidth;
-
-  if (!config) {
-    config = await loadCliConfig(
-      settings.merged,
-      'random-session-id',
-      {} as unknown as CliArgs,
-      { cwd: '/' },
-    );
-  }
+  const finalSettings = settings;
+  const finalConfig = config;

  const mainAreaWidth = terminalWidth;

@@ -697,8 +732,8 @@ export const renderWithProviders = async (

  const wrapWithProviders = (comp: React.ReactElement) => (
    <AppContext.Provider value={appState}>
-      <ConfigContext.Provider value={config}>
-        <SettingsContext.Provider value={settings}>
+      <ConfigContext.Provider value={finalConfig}>
+        <SettingsContext.Provider value={finalSettings}>
          <UIStateContext.Provider value={finalUiState}>
            <VimModeProvider>
              <ShellFocusContext.Provider value={shellFocus}>
@@ -709,7 +744,7 @@ export const renderWithProviders = async (
                    <UIActionsContext.Provider value={finalUIActions}>
                      <OverflowProvider>
                        <ToolActionsProvider
-                          config={config}
+                          config={finalConfig}
                          toolCalls={allToolCalls}
                        >
                          <AskUserActionsProvider
@@ -828,7 +863,7 @@ export function renderHook<Result, Props>(
  return { result, rerender, unmount, waitUntilReady, generateSvg };
 }

-export async function renderHookWithProviders<Result, Props>(
+export function renderHookWithProviders<Result, Props>(
  renderCallback: (props: Props) => Result,
  options: {
    initialProps?: Props;
@@ -841,13 +876,13 @@ export async function renderHookWithProviders<Result, Props>(
    mouseEventsEnabled?: boolean;
    config?: Config;
  } = {},
-): Promise<{
+): {
  result: { current: Result };
  rerender: (props?: Props) => void;
  unmount: () => void;
  waitUntilReady: () => Promise<void>;
  generateSvg: () => string;
-}> {
+} {
  const result = { current: undefined as unknown as Result };

  let setPropsFn: ((props: Props) => void) | undefined;
@@ -866,8 +901,8 @@ export async function renderHookWithProviders<Result, Props>(

  let renderResult: ReturnType<typeof render>;

-  await act(async () => {
-    renderResult = await renderWithProviders(
+  act(() => {
+    renderResult = renderWithProviders(
      <Wrapper>
        {}
        <TestComponent initialProps={options.initialProps as Props} />
@@ -94,10 +94,11 @@ describe('App', () => {
  };

  it('should render main content and composer when not quitting', async () => {
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <App />,
      {
        uiState: mockUIState,
+        config: makeFakeConfig({ useAlternateBuffer: false }),
        settings: createMockSettings({ ui: { useAlternateBuffer: false } }),
      },
    );
@@ -115,10 +116,11 @@ describe('App', () => {
      quittingMessages: [{ id: 1, type: 'user', text: 'test' }],
    } as UIState;

-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <App />,
      {
        uiState: quittingUIState,
+        config: makeFakeConfig({ useAlternateBuffer: false }),
        settings: createMockSettings({ ui: { useAlternateBuffer: false } }),
      },
    );
@@ -136,10 +138,11 @@ describe('App', () => {
      pendingHistoryItems: [{ type: 'user', text: 'pending item' }],
    } as UIState;

-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <App />,
      {
        uiState: quittingUIState,
+        config: makeFakeConfig({ useAlternateBuffer: true }),
        settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
      },
    );
@@ -156,10 +159,11 @@ describe('App', () => {
      dialogsVisible: true,
    } as UIState;

-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <App />,
      {
        uiState: dialogUIState,
+        config: makeFakeConfig({ useAlternateBuffer: true }),
        settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
      },
    );
@@ -183,10 +187,11 @@ describe('App', () => {
        [stateKey]: true,
      } as UIState;

-      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
        <App />,
        {
          uiState,
+          config: makeFakeConfig({ useAlternateBuffer: true }),
          settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
        },
      );
@@ -200,10 +205,11 @@ describe('App', () => {
  it('should render ScreenReaderAppLayout when screen reader is enabled', async () => {
    (useIsScreenReaderEnabled as Mock).mockReturnValue(true);

-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <App />,
      {
        uiState: mockUIState,
+        config: makeFakeConfig({ useAlternateBuffer: true }),
        settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
      },
    );
@@ -219,10 +225,11 @@ describe('App', () => {
  it('should render DefaultAppLayout when screen reader is not enabled', async () => {
    (useIsScreenReaderEnabled as Mock).mockReturnValue(false);

-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <App />,
      {
        uiState: mockUIState,
+        config: makeFakeConfig({ useAlternateBuffer: true }),
        settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
      },
    );
@@ -274,7 +281,7 @@ describe('App', () => {
    vi.spyOn(configWithExperiment, 'isTrustedFolder').mockReturnValue(true);
    vi.spyOn(configWithExperiment, 'getIdeMode').mockReturnValue(false);

-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <App />,
      {
        uiState: stateWithConfirmingTool,
@@ -295,10 +302,11 @@ describe('App', () => {
  describe('Snapshots', () => {
    it('renders default layout correctly', async () => {
      (useIsScreenReaderEnabled as Mock).mockReturnValue(false);
-      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
        <App />,
        {
          uiState: mockUIState,
+          config: makeFakeConfig({ useAlternateBuffer: true }),
          settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
        },
      );
@@ -309,10 +317,11 @@ describe('App', () => {

    it('renders screen reader layout correctly', async () => {
      (useIsScreenReaderEnabled as Mock).mockReturnValue(true);
-      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
        <App />,
        {
          uiState: mockUIState,
+          config: makeFakeConfig({ useAlternateBuffer: true }),
          settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
        },
      );
@@ -326,10 +335,11 @@ describe('App', () => {
        ...mockUIState,
        dialogsVisible: true,
      } as UIState;
-      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
        <App />,
        {
          uiState: dialogUIState,
+          config: makeFakeConfig({ useAlternateBuffer: true }),
          settings: createMockSettings({ ui: { useAlternateBuffer: true } }),
        },
      );
@@ -212,7 +212,7 @@ import { useEditorSettings } from './hooks/useEditorSettings.js';
 import { useSettingsCommand } from './hooks/useSettingsCommand.js';
 import { useModelCommand } from './hooks/useModelCommand.js';
 import { useSlashCommandProcessor } from './hooks/slashCommandProcessor.js';
-import { useErrorCount } from './hooks/useConsoleMessages.js';
+import { useConsoleMessages } from './hooks/useConsoleMessages.js';
 import { useGeminiStream } from './hooks/useGeminiStream.js';
 import { useVim } from './hooks/vim.js';
 import { useFolderTrust } from './hooks/useFolderTrust.js';
@@ -294,7 +294,7 @@ describe('AppContainer State Management', () => {
  const mockedUseSettingsCommand = useSettingsCommand as Mock;
  const mockedUseModelCommand = useModelCommand as Mock;
  const mockedUseSlashCommandProcessor = useSlashCommandProcessor as Mock;
-  const mockedUseConsoleMessages = useErrorCount as Mock;
+  const mockedUseConsoleMessages = useConsoleMessages as Mock;
  const mockedUseGeminiStream = useGeminiStream as Mock;
  const mockedUseVim = useVim as Mock;
  const mockedUseFolderTrust = useFolderTrust as Mock;
@@ -396,9 +396,9 @@ describe('AppContainer State Management', () => {
      confirmationRequest: null,
    });
    mockedUseConsoleMessages.mockReturnValue({
-      errorCount: 0,
+      consoleMessages: [],
      handleNewMessage: vi.fn(),
-      clearErrorCount: vi.fn(),
+      clearConsoleMessages: vi.fn(),
    });
    mockedUseGeminiStream.mockReturnValue(DEFAULT_GEMINI_STREAM_MOCK);
    mockedUseVim.mockReturnValue({ handleInput: vi.fn() });
@@ -103,7 +103,7 @@ import {
  useOverflowActions,
  useOverflowState,
 } from './contexts/OverflowContext.js';
-import { useErrorCount } from './hooks/useConsoleMessages.js';
+import { useConsoleMessages } from './hooks/useConsoleMessages.js';
 import { useTerminalSize } from './hooks/useTerminalSize.js';
 import { calculatePromptWidths } from './components/InputPrompt.js';
 import { calculateMainAreaWidth } from './utils/ui-sizing.js';
@@ -552,7 +552,8 @@ export const AppContainer = (props: AppContainerProps) => {
    };
  }, [settings]);

-  const { errorCount, clearErrorCount } = useErrorCount();
+  const { consoleMessages, clearConsoleMessages: clearConsoleMessagesState } =
+    useConsoleMessages();

  const mainAreaWidth = calculateMainAreaWidth(terminalWidth, config);
  // Derive widths for InputPrompt using shared helper
@@ -1371,11 +1372,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
    // Explicitly hide the expansion hint and clear its x-second timer when clearing the screen.
    triggerExpandHint(null);
    historyManager.clearItems();
-    clearErrorCount();
+    clearConsoleMessagesState();
    refreshStatic();
  }, [
    historyManager,
-    clearErrorCount,
+    clearConsoleMessagesState,
    refreshStatic,
    reset,
    triggerExpandHint,
@@ -1982,6 +1983,22 @@ Logging in with Google... Restarting Gemini CLI to continue.
    };
  }, [historyManager]);

+  const filteredConsoleMessages = useMemo(() => {
+    if (config.getDebugMode()) {
+      return consoleMessages;
+    }
+    return consoleMessages.filter((msg) => msg.type !== 'debug');
+  }, [consoleMessages, config]);
+
+  // Computed values
+  const errorCount = useMemo(
+    () =>
+      filteredConsoleMessages
+        .filter((msg) => msg.type === 'error')
+        .reduce((total, msg) => total + msg.count, 0),
+    [filteredConsoleMessages],
+  );
+
  const nightly = props.version.includes('nightly');

  const dialogsVisible =
@@ -2216,6 +2233,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
      constrainHeight,
      showErrorDetails,
      showFullTodos,
+      filteredConsoleMessages,
      ideContextState,
      renderMarkdown,
      ctrlCPressedOnce: ctrlCPressCount >= 1,
@@ -2343,6 +2361,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
      constrainHeight,
      showErrorDetails,
      showFullTodos,
+      filteredConsoleMessages,
      ideContextState,
      renderMarkdown,
      ctrlCPressCount,
@@ -53,7 +53,7 @@ describe('IdeIntegrationNudge', () => {
  });

  it('renders correctly with default options', async () => {
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <IdeIntegrationNudge {...defaultProps} />,
    );
    await waitUntilReady();
@@ -68,7 +68,7 @@ describe('IdeIntegrationNudge', () => {

  it('handles "Yes" selection', async () => {
    const onComplete = vi.fn();
-    const { stdin, waitUntilReady, unmount } = await renderWithProviders(
+    const { stdin, waitUntilReady, unmount } = renderWithProviders(
      <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
    );

@@ -89,7 +89,7 @@ describe('IdeIntegrationNudge', () => {

  it('handles "No" selection', async () => {
    const onComplete = vi.fn();
-    const { stdin, waitUntilReady, unmount } = await renderWithProviders(
+    const { stdin, waitUntilReady, unmount } = renderWithProviders(
      <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
    );

@@ -115,7 +115,7 @@ describe('IdeIntegrationNudge', () => {

  it('handles "Dismiss" selection', async () => {
    const onComplete = vi.fn();
-    const { stdin, waitUntilReady, unmount } = await renderWithProviders(
+    const { stdin, waitUntilReady, unmount } = renderWithProviders(
      <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
    );

@@ -146,7 +146,7 @@ describe('IdeIntegrationNudge', () => {

  it('handles Escape key press', async () => {
    const onComplete = vi.fn();
-    const { stdin, waitUntilReady, unmount } = await renderWithProviders(
+    const { stdin, waitUntilReady, unmount } = renderWithProviders(
      <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
    );

@@ -173,10 +173,9 @@ describe('IdeIntegrationNudge', () => {
    vi.stubEnv('GEMINI_CLI_IDE_WORKSPACE_PATH', '/tmp');

    const onComplete = vi.fn();
-    const { lastFrame, stdin, waitUntilReady, unmount } =
-      await renderWithProviders(
-        <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
-      );
+    const { lastFrame, stdin, waitUntilReady, unmount } = renderWithProviders(
+      <IdeIntegrationNudge {...defaultProps} onComplete={onComplete} />,
+    );

    await waitUntilReady();

@@ -143,7 +143,7 @@ describe('AuthDialog', () => {
        for (const [key, value] of Object.entries(env)) {
          vi.stubEnv(key, value as string);
        }
-        const { waitUntilReady, unmount } = await renderWithProviders(
+        const { waitUntilReady, unmount } = renderWithProviders(
          <AuthDialog {...props} />,
        );
        await waitUntilReady();
@@ -161,7 +161,7 @@ describe('AuthDialog', () => {

  it('filters auth types when enforcedType is set', async () => {
    props.settings.merged.security.auth.enforcedType = AuthType.USE_GEMINI;
-    const { waitUntilReady, unmount } = await renderWithProviders(
+    const { waitUntilReady, unmount } = renderWithProviders(
      <AuthDialog {...props} />,
    );
    await waitUntilReady();
@@ -173,7 +173,7 @@ describe('AuthDialog', () => {

  it('sets initial index to 0 when enforcedType is set', async () => {
    props.settings.merged.security.auth.enforcedType = AuthType.USE_GEMINI;
-    const { waitUntilReady, unmount } = await renderWithProviders(
+    const { waitUntilReady, unmount } = renderWithProviders(
      <AuthDialog {...props} />,
    );
    await waitUntilReady();
@@ -213,7 +213,7 @@ describe('AuthDialog', () => {
      },
    ])('selects initial auth type $desc', async ({ setup, expected }) => {
      setup();
-      const { waitUntilReady, unmount } = await renderWithProviders(
+      const { waitUntilReady, unmount } = renderWithProviders(
        <AuthDialog {...props} />,
      );
      await waitUntilReady();
@@ -226,7 +226,7 @@ describe('AuthDialog', () => {
  describe('handleAuthSelect', () => {
    it('calls onAuthError if validation fails', async () => {
      mockedValidateAuthMethod.mockReturnValue('Invalid method');
-      const { waitUntilReady, unmount } = await renderWithProviders(
+      const { waitUntilReady, unmount } = renderWithProviders(
        <AuthDialog {...props} />,
      );
      await waitUntilReady();
@@ -245,7 +245,7 @@ describe('AuthDialog', () => {

    it('sets auth context with requiresRestart: true for LOGIN_WITH_GOOGLE', async () => {
      mockedValidateAuthMethod.mockReturnValue(null);
-      const { waitUntilReady, unmount } = await renderWithProviders(
+      const { waitUntilReady, unmount } = renderWithProviders(
        <AuthDialog {...props} />,
      );
      await waitUntilReady();
@@ -261,7 +261,7 @@ describe('AuthDialog', () => {

    it('sets auth context with empty object for other auth types', async () => {
      mockedValidateAuthMethod.mockReturnValue(null);
-      const { waitUntilReady, unmount } = await renderWithProviders(
+      const { waitUntilReady, unmount } = renderWithProviders(
        <AuthDialog {...props} />,
      );
      await waitUntilReady();
@@ -278,7 +278,7 @@ describe('AuthDialog', () => {
      vi.stubEnv('GEMINI_API_KEY', 'test-key-from-env');
      // props.settings.merged.security.auth.selectedType is undefined here, simulating initial setup

-      const { waitUntilReady, unmount } = await renderWithProviders(
+      const { waitUntilReady, unmount } = renderWithProviders(
        <AuthDialog {...props} />,
      );
      await waitUntilReady();
@@ -297,7 +297,7 @@ describe('AuthDialog', () => {
      vi.stubEnv('GEMINI_API_KEY', ''); // Empty string
      // props.settings.merged.security.auth.selectedType is undefined here

-      const { waitUntilReady, unmount } = await renderWithProviders(
+      const { waitUntilReady, unmount } = renderWithProviders(
        <AuthDialog {...props} />,
      );
      await waitUntilReady();
@@ -316,7 +316,7 @@ describe('AuthDialog', () => {
      // process.env['GEMINI_API_KEY'] is not set
      // props.settings.merged.security.auth.selectedType is undefined here, simulating initial setup

-      const { waitUntilReady, unmount } = await renderWithProviders(
+      const { waitUntilReady, unmount } = renderWithProviders(
        <AuthDialog {...props} />,
      );
      await waitUntilReady();
@@ -337,7 +337,7 @@ describe('AuthDialog', () => {
      props.settings.merged.security.auth.selectedType =
        AuthType.LOGIN_WITH_GOOGLE;

-      const { waitUntilReady, unmount } = await renderWithProviders(
+      const { waitUntilReady, unmount } = renderWithProviders(
        <AuthDialog {...props} />,
      );
      await waitUntilReady();
@@ -360,7 +360,7 @@ describe('AuthDialog', () => {
      vi.mocked(props.config.isBrowserLaunchSuppressed).mockReturnValue(true);
      mockedValidateAuthMethod.mockReturnValue(null);

-      const { waitUntilReady, unmount } = await renderWithProviders(
+      const { waitUntilReady, unmount } = renderWithProviders(
        <AuthDialog {...props} />,
      );
      await waitUntilReady();
@@ -383,7 +383,7 @@ describe('AuthDialog', () => {

  it('displays authError when provided', async () => {
    props.authError = 'Something went wrong';
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AuthDialog {...props} />,
    );
    await waitUntilReady();
@@ -429,7 +429,7 @@ describe('AuthDialog', () => {
      },
    ])('$desc', async ({ setup, expectations }) => {
      setup();
-      const { waitUntilReady, unmount } = await renderWithProviders(
+      const { waitUntilReady, unmount } = renderWithProviders(
        <AuthDialog {...props} />,
      );
      await waitUntilReady();
@@ -442,7 +442,7 @@ describe('AuthDialog', () => {

  describe('Snapshots', () => {
    it('renders correctly with default props', async () => {
-      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
        <AuthDialog {...props} />,
      );
      await waitUntilReady();
@@ -452,7 +452,7 @@ describe('AuthDialog', () => {

    it('renders correctly with auth error', async () => {
      props.authError = 'Something went wrong';
-      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
        <AuthDialog {...props} />,
      );
      await waitUntilReady();
@@ -462,7 +462,7 @@ describe('AuthDialog', () => {

    it('renders correctly with enforced auth type', async () => {
      props.settings.merged.security.auth.enforcedType = AuthType.USE_GEMINI;
-      const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+      const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
        <AuthDialog {...props} />,
      );
      await waitUntilReady();
@@ -73,7 +73,7 @@ describe('BannedAccountDialog', () => {
  });

  it('renders the suspension message from accountSuspensionInfo', async () => {
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <BannedAccountDialog
        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
        onExit={onExit}
@@ -89,7 +89,7 @@ describe('BannedAccountDialog', () => {
  });

  it('renders menu options with appeal link text from response', async () => {
-    const { waitUntilReady, unmount } = await renderWithProviders(
+    const { waitUntilReady, unmount } = renderWithProviders(
      <BannedAccountDialog
        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
        onExit={onExit}
@@ -109,7 +109,7 @@ describe('BannedAccountDialog', () => {
    const infoWithoutUrl: AccountSuspensionInfo = {
      message: 'Account suspended.',
    };
-    const { waitUntilReady, unmount } = await renderWithProviders(
+    const { waitUntilReady, unmount } = renderWithProviders(
      <BannedAccountDialog
        accountSuspensionInfo={infoWithoutUrl}
        onExit={onExit}
@@ -129,7 +129,7 @@ describe('BannedAccountDialog', () => {
      message: 'Account suspended.',
      appealUrl: 'https://example.com/appeal',
    };
-    const { waitUntilReady, unmount } = await renderWithProviders(
+    const { waitUntilReady, unmount } = renderWithProviders(
      <BannedAccountDialog
        accountSuspensionInfo={infoWithoutLinkText}
        onExit={onExit}
@@ -143,7 +143,7 @@ describe('BannedAccountDialog', () => {
  });

  it('opens browser when appeal option is selected', async () => {
-    const { waitUntilReady, unmount } = await renderWithProviders(
+    const { waitUntilReady, unmount } = renderWithProviders(
      <BannedAccountDialog
        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
        onExit={onExit}
@@ -162,7 +162,7 @@ describe('BannedAccountDialog', () => {

  it('shows URL when browser cannot be launched', async () => {
    mockedShouldLaunchBrowser.mockReturnValue(false);
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <BannedAccountDialog
        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
        onExit={onExit}
@@ -180,7 +180,7 @@ describe('BannedAccountDialog', () => {
  });

  it('calls onExit when "Exit" is selected', async () => {
-    const { waitUntilReady, unmount } = await renderWithProviders(
+    const { waitUntilReady, unmount } = renderWithProviders(
      <BannedAccountDialog
        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
        onExit={onExit}
@@ -196,7 +196,7 @@ describe('BannedAccountDialog', () => {
  });

  it('calls onChangeAuth when "Change authentication" is selected', async () => {
-    const { waitUntilReady, unmount } = await renderWithProviders(
+    const { waitUntilReady, unmount } = renderWithProviders(
      <BannedAccountDialog
        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
        onExit={onExit}
@@ -212,7 +212,7 @@ describe('BannedAccountDialog', () => {
  });

  it('exits on escape key', async () => {
-    const { waitUntilReady, unmount } = await renderWithProviders(
+    const { waitUntilReady, unmount } = renderWithProviders(
      <BannedAccountDialog
        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
        onExit={onExit}
@@ -227,7 +227,7 @@ describe('BannedAccountDialog', () => {
  });

  it('renders snapshot correctly', async () => {
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <BannedAccountDialog
        accountSuspensionInfo={DEFAULT_SUSPENSION_INFO}
        onExit={onExit}
@@ -36,12 +36,10 @@ describe('aboutCommand', () => {
  beforeEach(() => {
    mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          config: {
-            getModel: vi.fn(),
-            getIdeMode: vi.fn().mockReturnValue(true),
-            getUserTierName: vi.fn().mockReturnValue(undefined),
-          },
+        config: {
+          getModel: vi.fn(),
+          getIdeMode: vi.fn().mockReturnValue(true),
+          getUserTierName: vi.fn().mockReturnValue(undefined),
        },
        settings: {
          merged: {
@@ -59,10 +57,9 @@ describe('aboutCommand', () => {
    } as unknown as CommandContext);

    vi.mocked(getVersion).mockResolvedValue('test-version');
-    vi.spyOn(
-      mockContext.services.agentContext!.config,
-      'getModel',
-    ).mockReturnValue('test-model');
+    vi.spyOn(mockContext.services.config!, 'getModel').mockReturnValue(
+      'test-model',
+    );
    process.env['GOOGLE_CLOUD_PROJECT'] = 'test-gcp-project';
    Object.defineProperty(process, 'platform', {
      value: 'test-os',
@@ -163,9 +160,9 @@ describe('aboutCommand', () => {
  });

  it('should display the tier when getUserTierName returns a value', async () => {
-    vi.mocked(
-      mockContext.services.agentContext!.config.getUserTierName,
-    ).mockReturnValue('Enterprise Tier');
+    vi.mocked(mockContext.services.config!.getUserTierName).mockReturnValue(
+      'Enterprise Tier',
+    );
    if (!aboutCommand.action) {
      throw new Error('The about command must have an action.');
    }
@@ -34,8 +34,7 @@ export const aboutCommand: SlashCommand = {
        process.env['SEATBELT_PROFILE'] || 'unknown'
      })`;
    }
-    const modelVersion =
-      context.services.agentContext?.config.getModel() || 'Unknown';
+    const modelVersion = context.services.config?.getModel() || 'Unknown';
    const cliVersion = await getVersion();
    const selectedAuthType =
      context.services.settings.merged.security.auth.selectedType || '';
@@ -49,7 +48,7 @@ export const aboutCommand: SlashCommand = {
    });
    const userEmail = cachedAccount ?? undefined;

-    const tier = context.services.agentContext?.config.getUserTierName();
+    const tier = context.services.config?.getUserTierName();

    const aboutItem: Omit<HistoryItemAbout, 'id'> = {
      type: MessageType.ABOUT,
@@ -69,7 +68,7 @@ export const aboutCommand: SlashCommand = {
 };

 async function getIdeClientName(context: CommandContext) {
-  if (!context.services.agentContext?.config.getIdeMode()) {
+  if (!context.services.config?.getIdeMode()) {
    return '';
  }
  const ideClient = await IdeClient.getInstance();
@@ -26,7 +26,6 @@ describe('agentsCommand', () => {
  let mockContext: ReturnType<typeof createMockCommandContext>;
  let mockConfig: {
    getAgentRegistry: ReturnType<typeof vi.fn>;
-    config: Config;
  };

  beforeEach(() => {
@@ -38,14 +37,11 @@ describe('agentsCommand', () => {
        getAllAgentNames: vi.fn().mockReturnValue([]),
        reload: vi.fn(),
      }),
-      get config() {
-        return this as unknown as Config;
-      },
    };

    mockContext = createMockCommandContext({
      services: {
-        agentContext: mockConfig as unknown as Config,
+        config: mockConfig as unknown as Config,
        settings: {
          workspace: { path: '/mock/path' },
          merged: { agents: { overrides: {} } },
@@ -57,7 +53,7 @@ describe('agentsCommand', () => {
  it('should show an error if config is not available', async () => {
    const contextWithoutConfig = createMockCommandContext({
      services: {
-        agentContext: null,
+        config: null,
      },
    });

@@ -230,7 +226,7 @@ describe('agentsCommand', () => {

  it('should show an error if config is not available for enable', async () => {
    const contextWithoutConfig = createMockCommandContext({
-      services: { agentContext: null },
+      services: { config: null },
    });
    const enableCommand = agentsCommand.subCommands?.find(
      (cmd) => cmd.name === 'enable',
@@ -336,7 +332,7 @@ describe('agentsCommand', () => {

  it('should show an error if config is not available for disable', async () => {
    const contextWithoutConfig = createMockCommandContext({
-      services: { agentContext: null },
+      services: { config: null },
    });
    const disableCommand = agentsCommand.subCommands?.find(
      (cmd) => cmd.name === 'disable',
@@ -437,7 +433,7 @@ describe('agentsCommand', () => {

    it('should show an error if config is not available', async () => {
      const contextWithoutConfig = createMockCommandContext({
-        services: { agentContext: null },
+        services: { config: null },
      });
      const configCommand = agentsCommand.subCommands?.find(
        (cmd) => cmd.name === 'config',
@@ -21,7 +21,7 @@ const agentsListCommand: SlashCommand = {
  kind: CommandKind.BUILT_IN,
  autoExecute: true,
  action: async (context: CommandContext) => {
-    const config = context.services.agentContext?.config;
+    const { config } = context.services;
    if (!config) {
      return {
        type: 'message',
@@ -61,8 +61,7 @@ async function enableAction(
  context: CommandContext,
  args: string,
 ): Promise<SlashCommandActionReturn | void> {
-  const config = context.services.agentContext?.config;
-  const { settings } = context.services;
+  const { config, settings } = context.services;
  if (!config) {
    return {
      type: 'message',
@@ -138,8 +137,7 @@ async function disableAction(
  context: CommandContext,
  args: string,
 ): Promise<SlashCommandActionReturn | void> {
-  const config = context.services.agentContext?.config;
-  const { settings } = context.services;
+  const { config, settings } = context.services;
  if (!config) {
    return {
      type: 'message',
@@ -218,7 +216,7 @@ async function configAction(
  context: CommandContext,
  args: string,
 ): Promise<SlashCommandActionReturn | void> {
-  const config = context.services.agentContext?.config;
+  const { config } = context.services;
  if (!config) {
    return {
      type: 'message',
@@ -268,8 +266,7 @@ async function configAction(
 }

 function completeAgentsToEnable(context: CommandContext, partialArg: string) {
-  const config = context.services.agentContext?.config;
-  const { settings } = context.services;
+  const { config, settings } = context.services;
  if (!config) return [];

  const overrides = settings.merged.agents.overrides;
@@ -281,7 +278,7 @@ function completeAgentsToEnable(context: CommandContext, partialArg: string) {
 }

 function completeAgentsToDisable(context: CommandContext, partialArg: string) {
-  const config = context.services.agentContext?.config;
+  const { config } = context.services;
  if (!config) return [];

  const agentRegistry = config.getAgentRegistry();
@@ -290,7 +287,7 @@ function completeAgentsToDisable(context: CommandContext, partialArg: string) {
 }

 function completeAllAgents(context: CommandContext, partialArg: string) {
-  const config = context.services.agentContext?.config;
+  const { config } = context.services;
  if (!config) return [];

  const agentRegistry = config.getAgentRegistry();
@@ -331,7 +328,7 @@ const agentsReloadCommand: SlashCommand = {
  description: 'Reload the agent registry',
  kind: CommandKind.BUILT_IN,
  action: async (context: CommandContext) => {
-    const config = context.services.agentContext?.config;
+    const { config } = context.services;
    const agentRegistry = config?.getAgentRegistry();
    if (!agentRegistry) {
      return {
@@ -9,7 +9,6 @@ import { authCommand } from './authCommand.js';
 import { type CommandContext } from './types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
 import { SettingScope } from '../../config/settings.js';
-import type { GeminiClient } from '@google/gemini-cli-core';

 vi.mock('@google/gemini-cli-core', async () => {
  const actual = await vi.importActual('@google/gemini-cli-core');
@@ -25,10 +24,8 @@ describe('authCommand', () => {
  beforeEach(() => {
    mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          geminiClient: {
-            stripThoughtsFromHistory: vi.fn(),
-          },
+        config: {
+          getGeminiClient: vi.fn(),
        },
      },
    });
@@ -104,19 +101,17 @@ describe('authCommand', () => {
      const mockStripThoughts = vi.fn();
      const mockClient = {
        stripThoughtsFromHistory: mockStripThoughts,
-      } as unknown as GeminiClient;
-      if (mockContext.services.agentContext?.config) {
-        mockContext.services.agentContext.config.getGeminiClient = vi.fn(
-          () => mockClient,
-        );
+      } as unknown as ReturnType<
+        NonNullable<typeof mockContext.services.config>['getGeminiClient']
+      >;
+
+      if (mockContext.services.config) {
+        mockContext.services.config.getGeminiClient = vi.fn(() => mockClient);
      }

      await logoutCommand!.action!(mockContext, '');

-      expect(
-        mockContext.services.agentContext?.geminiClient
-          .stripThoughtsFromHistory,
-      ).toHaveBeenCalled();
+      expect(mockStripThoughts).toHaveBeenCalled();
    });

    it('should return logout action to signal explicit state change', async () => {
@@ -128,7 +123,7 @@ describe('authCommand', () => {

    it('should handle missing config gracefully', async () => {
      const logoutCommand = authCommand.subCommands?.[1];
-      mockContext.services.agentContext = null;
+      mockContext.services.config = null;

      const result = await logoutCommand!.action!(mockContext, '');

@@ -39,7 +39,7 @@ const authLogoutCommand: SlashCommand = {
      undefined,
    );
    // Strip thoughts from history instead of clearing completely
-    context.services.agentContext?.geminiClient.stripThoughtsFromHistory();
+    context.services.config?.getGeminiClient()?.stripThoughtsFromHistory();
    // Return logout action to signal explicit state change
    return {
      type: 'logout',
@@ -83,18 +83,16 @@ describe('bugCommand', () => {
  it('should generate the default GitHub issue URL', async () => {
    const mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          config: {
-            getModel: () => 'gemini-pro',
-            getBugCommand: () => undefined,
-            getIdeMode: () => true,
-            getContentGeneratorConfig: () => ({ authType: 'oauth-personal' }),
-          },
-          geminiClient: {
+        config: {
+          getModel: () => 'gemini-pro',
+          getBugCommand: () => undefined,
+          getIdeMode: () => true,
+          getGeminiClient: () => ({
            getChat: () => ({
              getHistory: () => [],
            }),
-          },
+          }),
+          getContentGeneratorConfig: () => ({ authType: 'oauth-personal' }),
        },
      },
    });
@@ -128,20 +126,18 @@ describe('bugCommand', () => {
    ];
    const mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          config: {
-            getModel: () => 'gemini-pro',
-            getBugCommand: () => undefined,
-            getIdeMode: () => true,
-            getContentGeneratorConfig: () => ({ authType: 'vertex-ai' }),
-            storage: {
-              getProjectTempDir: () => '/tmp/gemini',
-            },
-          },
-          geminiClient: {
+        config: {
+          getModel: () => 'gemini-pro',
+          getBugCommand: () => undefined,
+          getIdeMode: () => true,
+          getGeminiClient: () => ({
            getChat: () => ({
              getHistory: () => history,
            }),
+          }),
+          getContentGeneratorConfig: () => ({ authType: 'vertex-ai' }),
+          storage: {
+            getProjectTempDir: () => '/tmp/gemini',
          },
        },
      },
@@ -176,18 +172,16 @@ describe('bugCommand', () => {
      'https://internal.bug-tracker.com/new?desc={title}&details={info}';
    const mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          config: {
-            getModel: () => 'gemini-pro',
-            getBugCommand: () => ({ urlTemplate: customTemplate }),
-            getIdeMode: () => true,
-            getContentGeneratorConfig: () => ({ authType: 'vertex-ai' }),
-          },
-          geminiClient: {
+        config: {
+          getModel: () => 'gemini-pro',
+          getBugCommand: () => ({ urlTemplate: customTemplate }),
+          getIdeMode: () => true,
+          getGeminiClient: () => ({
            getChat: () => ({
              getHistory: () => [],
            }),
-          },
+          }),
+          getContentGeneratorConfig: () => ({ authType: 'vertex-ai' }),
        },
      },
    });
@@ -32,8 +32,8 @@ export const bugCommand: SlashCommand = {
  autoExecute: false,
  action: async (context: CommandContext, args?: string): Promise<void> => {
    const bugDescription = (args || '').trim();
-    const agentContext = context.services.agentContext;
-    const config = agentContext?.config;
+    const { config } = context.services;
+
    const osVersion = `${process.platform} ${process.version}`;
    let sandboxEnv = 'no sandbox';
    if (process.env['SANDBOX'] && process.env['SANDBOX'] !== 'sandbox-exec') {
@@ -73,7 +73,7 @@ export const bugCommand: SlashCommand = {
      info += `* **IDE Client:** ${ideClient}\n`;
    }

-    const chat = agentContext?.geminiClient?.getChat();
+    const chat = config?.getGeminiClient()?.getChat();
    const history = chat?.getHistory() || [];
    let historyFileMessage = '';
    let problemValue = bugDescription;
@@ -134,7 +134,7 @@ export const bugCommand: SlashCommand = {
 };

 async function getIdeClientName(context: CommandContext) {
-  if (!context.services.agentContext?.config.getIdeMode()) {
+  if (!context.services.config?.getIdeMode()) {
    return '';
  }
  const ideClient = await IdeClient.getInstance();
@@ -70,19 +70,18 @@ describe('chatCommand', () => {

    mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          config: {
-            getProjectRoot: () => '/project/root',
-            getContentGeneratorConfig: () => ({
-              authType: AuthType.LOGIN_WITH_GOOGLE,
-            }),
-            storage: {
-              getProjectTempDir: () => '/project/root/.gemini/tmp/mockhash',
-            },
+        config: {
+          getProjectRoot: () => '/project/root',
+          getGeminiClient: () =>
+            ({
+              getChat: mockGetChat,
+            }) as unknown as GeminiClient,
+          storage: {
+            getProjectTempDir: () => '/project/root/.gemini/tmp/mockhash',
          },
-          geminiClient: {
-            getChat: mockGetChat,
-          } as unknown as GeminiClient,
+          getContentGeneratorConfig: () => ({
+            authType: AuthType.LOGIN_WITH_GOOGLE,
+          }),
        },
        logger: {
          saveCheckpoint: mockSaveCheckpoint,
@@ -699,11 +698,7 @@ Hi there!`;

      beforeEach(() => {
        mockGetLatestApiRequest = vi.fn();
-        if (!mockContext.services.agentContext!.config) {
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          (mockContext.services.agentContext!.config as any) = {};
-        }
-        mockContext.services.agentContext!.config.getLatestApiRequest =
+        mockContext.services.config!.getLatestApiRequest =
          mockGetLatestApiRequest;
        vi.spyOn(process, 'cwd').mockReturnValue('/project/root');
        vi.spyOn(Date, 'now').mockReturnValue(1234567890);
@@ -35,7 +35,7 @@ const getSavedChatTags = async (
  context: CommandContext,
  mtSortDesc: boolean,
 ): Promise<ChatDetail[]> => {
-  const cfg = context.services.agentContext?.config;
+  const cfg = context.services.config;
  const geminiDir = cfg?.storage?.getProjectTempDir();
  if (!geminiDir) {
    return [];
@@ -103,8 +103,7 @@ const saveCommand: SlashCommand = {
      };
    }

-    const { logger } = context.services;
-    const config = context.services.agentContext?.config;
+    const { logger, config } = context.services;
    await logger.initialize();

    if (!context.overwriteConfirmed) {
@@ -126,7 +125,7 @@ const saveCommand: SlashCommand = {
      }
    }

-    const chat = context.services.agentContext?.geminiClient?.getChat();
+    const chat = config?.getGeminiClient()?.getChat();
    if (!chat) {
      return {
        type: 'message',
@@ -173,8 +172,7 @@ const resumeCheckpointCommand: SlashCommand = {
      };
    }

-    const { logger } = context.services;
-    const config = context.services.agentContext?.config;
+    const { logger, config } = context.services;
    await logger.initialize();
    const checkpoint = await logger.loadCheckpoint(tag);
    const conversation = checkpoint.history;
@@ -300,7 +298,7 @@ const shareCommand: SlashCommand = {
      };
    }

-    const chat = context.services.agentContext?.geminiClient?.getChat();
+    const chat = context.services.config?.getGeminiClient()?.getChat();
    if (!chat) {
      return {
        type: 'message',
@@ -346,7 +344,7 @@ export const debugCommand: SlashCommand = {
  kind: CommandKind.BUILT_IN,
  autoExecute: true,
  action: async (context): Promise<MessageActionReturn> => {
-    const req = context.services.agentContext?.config.getLatestApiRequest();
+    const req = context.services.config?.getLatestApiRequest();
    if (!req) {
      return {
        type: 'message',
@@ -36,25 +36,24 @@ describe('clearCommand', () => {

    mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          config: {
-            getEnableHooks: vi.fn().mockReturnValue(false),
-            setSessionId: vi.fn(),
-            getMessageBus: vi.fn().mockReturnValue(undefined),
-            getHookSystem: vi.fn().mockReturnValue({
-              fireSessionEndEvent: vi.fn().mockResolvedValue(undefined),
-              fireSessionStartEvent: vi.fn().mockResolvedValue(undefined),
-            }),
-            injectionService: {
-              clear: mockHintClear,
-            },
+        config: {
+          getGeminiClient: () =>
+            ({
+              resetChat: mockResetChat,
+              getChat: () => ({
+                getChatRecordingService: mockGetChatRecordingService,
+              }),
+            }) as unknown as GeminiClient,
+          setSessionId: vi.fn(),
+          getEnableHooks: vi.fn().mockReturnValue(false),
+          getMessageBus: vi.fn().mockReturnValue(undefined),
+          getHookSystem: vi.fn().mockReturnValue({
+            fireSessionEndEvent: vi.fn().mockResolvedValue(undefined),
+            fireSessionStartEvent: vi.fn().mockResolvedValue(undefined),
+          }),
+          injectionService: {
+            clear: mockHintClear,
          },
-          geminiClient: {
-            resetChat: mockResetChat,
-            getChat: () => ({
-              getChatRecordingService: mockGetChatRecordingService,
-            }),
-          } as unknown as GeminiClient,
        },
      },
    });
@@ -99,7 +98,7 @@ describe('clearCommand', () => {

    const nullConfigContext = createMockCommandContext({
      services: {
-        agentContext: null,
+        config: null,
      },
    });

@@ -20,8 +20,8 @@ export const clearCommand: SlashCommand = {
  kind: CommandKind.BUILT_IN,
  autoExecute: true,
  action: async (context, _args) => {
-    const geminiClient = context.services.agentContext?.geminiClient;
-    const config = context.services.agentContext?.config;
+    const geminiClient = context.services.config?.getGeminiClient();
+    const config = context.services.config;

    // Fire SessionEnd hook before clearing
    const hookSystem = config?.getHookSystem();
@@ -22,10 +22,11 @@ describe('compressCommand', () => {
    mockTryCompressChat = vi.fn();
    context = createMockCommandContext({
      services: {
-        agentContext: {
-          geminiClient: {
-            tryCompressChat: mockTryCompressChat,
-          } as unknown as GeminiClient,
+        config: {
+          getGeminiClient: () =>
+            ({
+              tryCompressChat: mockTryCompressChat,
+            }) as unknown as GeminiClient,
        },
      },
    });
@@ -39,11 +39,9 @@ export const compressCommand: SlashCommand = {
    try {
      ui.setPendingItem(pendingMessage);
      const promptId = `compress-${Date.now()}`;
-      const compressed =
-        await context.services.agentContext?.geminiClient?.tryCompressChat(
-          promptId,
-          true,
-        );
+      const compressed = await context.services.config
+        ?.getGeminiClient()
+        ?.tryCompressChat(promptId, true);
      if (compressed) {
        ui.addItem(
          {
@@ -29,10 +29,10 @@ describe('copyCommand', () => {

    mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          geminiClient: {
+        config: {
+          getGeminiClient: () => ({
            getChat: mockGetChat,
-          },
+          }),
        },
      },
    });
@@ -301,7 +301,7 @@ describe('copyCommand', () => {
    if (!copyCommand.action) throw new Error('Command has no action');

    const nullConfigContext = createMockCommandContext({
-      services: { agentContext: null },
+      services: { config: null },
    });

    const result = await copyCommand.action(nullConfigContext, '');
@@ -18,7 +18,7 @@ export const copyCommand: SlashCommand = {
  kind: CommandKind.BUILT_IN,
  autoExecute: true,
  action: async (context, _args): Promise<SlashCommandActionReturn | void> => {
-    const chat = context.services.agentContext?.geminiClient?.getChat();
+    const chat = context.services.config?.getGeminiClient()?.getChat();
    const history = chat?.getHistory();

    // Get the last message from the AI (model role)
@@ -85,14 +85,11 @@ describe('directoryCommand', () => {
      getFileFilteringOptions: () => ({ ignore: [], include: [] }),
      setUserMemory: vi.fn(),
      setGeminiMdFileCount: vi.fn(),
-      get config() {
-        return this;
-      },
    } as unknown as Config;

    mockContext = {
      services: {
-        agentContext: mockConfig,
+        config: mockConfig,
        settings: {
          merged: {
            memoryDiscoveryMaxDirs: 1000,
@@ -60,7 +60,7 @@ async function finishAddingDirectories(
  }

  if (added.length > 0) {
-    const gemini = config.geminiClient;
+    const gemini = config.getGeminiClient();
    if (gemini) {
      await gemini.addDirectoryContext();

@@ -110,9 +110,9 @@ export const directoryCommand: SlashCommand = {

        // Filter out existing directories
        let filteredSuggestions = suggestions;
-        if (context.services.agentContext?.config) {
+        if (context.services.config) {
          const workspaceContext =
-            context.services.agentContext.config.getWorkspaceContext();
+            context.services.config.getWorkspaceContext();
          const existingDirs = new Set(
            workspaceContext.getDirectories().map((dir) => path.resolve(dir)),
          );
@@ -144,11 +144,11 @@ export const directoryCommand: SlashCommand = {
      action: async (context: CommandContext, args: string) => {
        const {
          ui: { addItem },
-          services: { agentContext, settings },
+          services: { config, settings },
        } = context;
        const [...rest] = args.split(' ');

-        if (!agentContext) {
+        if (!config) {
          addItem({
            type: MessageType.ERROR,
            text: 'Configuration is not available.',
@@ -156,7 +156,7 @@ export const directoryCommand: SlashCommand = {
          return;
        }

-        if (agentContext.config.isRestrictiveSandbox()) {
+        if (config.isRestrictiveSandbox()) {
          return {
            type: 'message' as const,
            messageType: 'error' as const,
@@ -181,7 +181,7 @@ export const directoryCommand: SlashCommand = {
        const errors: string[] = [];
        const alreadyAdded: string[] = [];

-        const workspaceContext = agentContext.config.getWorkspaceContext();
+        const workspaceContext = config.getWorkspaceContext();
        const currentWorkspaceDirs = workspaceContext.getDirectories();
        const pathsToProcess: string[] = [];

@@ -252,7 +252,7 @@ export const directoryCommand: SlashCommand = {
                  trustedDirs={added}
                  errors={errors}
                  finishAddingDirectories={finishAddingDirectories}
-                  config={agentContext.config}
+                  config={config}
                  addItem={addItem}
                />
              ),
@@ -264,12 +264,7 @@ export const directoryCommand: SlashCommand = {
          errors.push(...result.errors);
        }

-        await finishAddingDirectories(
-          agentContext.config,
-          addItem,
-          added,
-          errors,
-        );
+        await finishAddingDirectories(config, addItem, added, errors);
        return;
      },
    },
@@ -280,16 +275,16 @@ export const directoryCommand: SlashCommand = {
      action: async (context: CommandContext) => {
        const {
          ui: { addItem },
-          services: { agentContext },
+          services: { config },
        } = context;
-        if (!agentContext) {
+        if (!config) {
          addItem({
            type: MessageType.ERROR,
            text: 'Configuration is not available.',
          });
          return;
        }
-        const workspaceContext = agentContext.config.getWorkspaceContext();
+        const workspaceContext = config.getWorkspaceContext();
        const directories = workspaceContext.getDirectories();
        const directoryList = directories.map((dir) => `- ${dir}`).join('\n');
        addItem({
@@ -161,16 +161,14 @@ describe('extensionsCommand', () => {

    mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          config: {
-            getExtensions: mockGetExtensions,
-            getExtensionLoader: vi.fn().mockReturnValue(mockExtensionLoader),
-            getWorkingDir: () => '/test/dir',
-            reloadSkills: mockReloadSkills,
-            getAgentRegistry: vi.fn().mockReturnValue({
-              reload: mockReloadAgents,
-            }),
-          },
+        config: {
+          getExtensions: mockGetExtensions,
+          getExtensionLoader: vi.fn().mockReturnValue(mockExtensionLoader),
+          getWorkingDir: () => '/test/dir',
+          reloadSkills: mockReloadSkills,
+          getAgentRegistry: vi.fn().mockReturnValue({
+            reload: mockReloadAgents,
+          }),
        },
      },
      ui: {
@@ -919,7 +917,7 @@ describe('extensionsCommand', () => {
      expect(restartAction).not.toBeNull();

      mockRestartExtension = vi.fn();
-      mockContext.services.agentContext!.config.getExtensionLoader = vi
+      mockContext.services.config!.getExtensionLoader = vi
        .fn()
        .mockImplementation(() => ({
          getExtensions: mockGetExtensions,
@@ -929,7 +927,7 @@ describe('extensionsCommand', () => {
    });

    it('should show a message if no extensions are installed', async () => {
-      mockContext.services.agentContext!.config.getExtensionLoader = vi
+      mockContext.services.config!.getExtensionLoader = vi
        .fn()
        .mockImplementation(() => ({
          getExtensions: () => [],
@@ -1019,7 +1017,7 @@ describe('extensionsCommand', () => {
    });

    it('shows an error if no extension loader is available', async () => {
-      mockContext.services.agentContext!.config.getExtensionLoader = vi.fn();
+      mockContext.services.config!.getExtensionLoader = vi.fn();

      await restartAction!(mockContext, '--all');

@@ -54,8 +54,8 @@ function showMessageIfNoExtensions(
 }

 async function listAction(context: CommandContext) {
-  const extensions = context.services.agentContext?.config
-    ? listExtensions(context.services.agentContext.config)
+  const extensions = context.services.config
+    ? listExtensions(context.services.config)
    : [];

  if (showMessageIfNoExtensions(context, extensions)) {
@@ -88,8 +88,8 @@ function updateAction(context: CommandContext, args: string): Promise<void> {
    (resolve) => (resolveUpdateComplete = resolve),
  );

-  const extensions = context.services.agentContext?.config
-    ? listExtensions(context.services.agentContext.config)
+  const extensions = context.services.config
+    ? listExtensions(context.services.config)
    : [];

  if (showMessageIfNoExtensions(context, extensions)) {
@@ -128,7 +128,7 @@ function updateAction(context: CommandContext, args: string): Promise<void> {
      },
    });
    if (names?.length) {
-      const extensions = listExtensions(context.services.agentContext!.config);
+      const extensions = listExtensions(context.services.config!);
      for (const name of names) {
        const extension = extensions.find(
          (extension) => extension.name === name,
@@ -156,8 +156,7 @@ async function restartAction(
  context: CommandContext,
  args: string,
 ): Promise<void> {
-  const extensionLoader =
-    context.services.agentContext?.config.getExtensionLoader();
+  const extensionLoader = context.services.config?.getExtensionLoader();
  if (!extensionLoader) {
    context.ui.addItem({
      type: MessageType.ERROR,
@@ -236,8 +235,8 @@ async function restartAction(

  if (failures.length < extensionsToRestart.length) {
    try {
-      await context.services.agentContext?.config.reloadSkills();
-      await context.services.agentContext?.config.getAgentRegistry()?.reload();
+      await context.services.config?.reloadSkills();
+      await context.services.config?.getAgentRegistry()?.reload();
    } catch (error) {
      context.ui.addItem({
        type: MessageType.ERROR,
@@ -275,8 +274,7 @@ async function exploreAction(
  const useRegistryUI = settings.experimental?.extensionRegistry;

  if (useRegistryUI) {
-    const extensionManager =
-      context.services.agentContext?.config.getExtensionLoader();
+    const extensionManager = context.services.config?.getExtensionLoader();
    if (extensionManager instanceof ExtensionManager) {
      return {
        type: 'custom_dialog' as const,
@@ -333,8 +331,7 @@ function getEnableDisableContext(
  names: string[];
  scope: SettingScope;
 } | null {
-  const extensionLoader =
-    context.services.agentContext?.config.getExtensionLoader();
+  const extensionLoader = context.services.config?.getExtensionLoader();
  if (!(extensionLoader instanceof ExtensionManager)) {
    debugLogger.error(
      `Cannot ${context.invocation?.name} extensions in this environment`,
@@ -434,8 +431,7 @@ async function enableAction(context: CommandContext, args: string) {

    if (extension?.mcpServers) {
      const mcpEnablementManager = McpServerEnablementManager.getInstance();
-      const mcpClientManager =
-        context.services.agentContext?.config.getMcpClientManager();
+      const mcpClientManager = context.services.config?.getMcpClientManager();
      const enabledServers = await mcpEnablementManager.autoEnableServers(
        Object.keys(extension.mcpServers ?? {}),
      );
@@ -467,8 +463,7 @@ async function installAction(
  args: string,
  requestConsentOverride?: (consent: string) => Promise<boolean>,
 ) {
-  const extensionLoader =
-    context.services.agentContext?.config.getExtensionLoader();
+  const extensionLoader = context.services.config?.getExtensionLoader();
  if (!(extensionLoader instanceof ExtensionManager)) {
    debugLogger.error(
      `Cannot ${context.invocation?.name} extensions in this environment`,
@@ -534,8 +529,7 @@ async function installAction(
 }

 async function linkAction(context: CommandContext, args: string) {
-  const extensionLoader =
-    context.services.agentContext?.config.getExtensionLoader();
+  const extensionLoader = context.services.config?.getExtensionLoader();
  if (!(extensionLoader instanceof ExtensionManager)) {
    debugLogger.error(
      `Cannot ${context.invocation?.name} extensions in this environment`,
@@ -599,8 +593,7 @@ async function linkAction(context: CommandContext, args: string) {
 }

 async function uninstallAction(context: CommandContext, args: string) {
-  const extensionLoader =
-    context.services.agentContext?.config.getExtensionLoader();
+  const extensionLoader = context.services.config?.getExtensionLoader();
  if (!(extensionLoader instanceof ExtensionManager)) {
    debugLogger.error(
      `Cannot ${context.invocation?.name} extensions in this environment`,
@@ -699,8 +692,7 @@ async function configAction(context: CommandContext, args: string) {
    }
  }

-  const extensionManager =
-    context.services.agentContext?.config.getExtensionLoader();
+  const extensionManager = context.services.config?.getExtensionLoader();
  if (!(extensionManager instanceof ExtensionManager)) {
    debugLogger.error(
      `Cannot ${context.invocation?.name} extensions in this environment`,
@@ -737,7 +729,7 @@ export function completeExtensions(
  context: CommandContext,
  partialArg: string,
 ) {
-  let extensions = context.services.agentContext?.config.getExtensions() ?? [];
+  let extensions = context.services.config?.getExtensions() ?? [];

  if (context.invocation?.name === 'enable') {
    extensions = extensions.filter((ext) => !ext.isActive);
@@ -93,7 +93,7 @@ describe('hooksCommand', () => {
    // Create mock context with config and settings
    mockContext = createMockCommandContext({
      services: {
-        agentContext: { config: mockConfig },
+        config: mockConfig,
        settings: mockSettings,
      },
    });
@@ -141,7 +141,7 @@ describe('hooksCommand', () => {
    it('should return error when config is not loaded', async () => {
      const contextWithoutConfig = createMockCommandContext({
        services: {
-          agentContext: null,
+          config: null,
        },
      });

@@ -225,7 +225,7 @@ describe('hooksCommand', () => {
    it('should return error when config is not loaded', async () => {
      const contextWithoutConfig = createMockCommandContext({
        services: {
-          agentContext: null,
+          config: null,
        },
      });

@@ -338,7 +338,7 @@ describe('hooksCommand', () => {
    it('should return error when config is not loaded', async () => {
      const contextWithoutConfig = createMockCommandContext({
        services: {
-          agentContext: null,
+          config: null,
        },
      });

@@ -470,7 +470,7 @@ describe('hooksCommand', () => {
    it('should return empty array when config is not available', () => {
      const contextWithoutConfig = createMockCommandContext({
        services: {
-          agentContext: null,
+          config: null,
        },
      });

@@ -567,7 +567,7 @@ describe('hooksCommand', () => {
    it('should return error when config is not loaded', async () => {
      const contextWithoutConfig = createMockCommandContext({
        services: {
-          agentContext: null,
+          config: null,
        },
      });

@@ -691,7 +691,7 @@ describe('hooksCommand', () => {
    it('should return error when config is not loaded', async () => {
      const contextWithoutConfig = createMockCommandContext({
        services: {
-          agentContext: null,
+          config: null,
        },
      });

@@ -27,8 +27,7 @@ import { HooksDialog } from '../components/HooksDialog.js';
 function panelAction(
  context: CommandContext,
 ): MessageActionReturn | OpenCustomDialogActionReturn {
-  const agentContext = context.services.agentContext;
-  const config = agentContext?.config;
+  const { config } = context.services;
  if (!config) {
    return {
      type: 'message',
@@ -56,8 +55,7 @@ async function enableAction(
  context: CommandContext,
  args: string,
 ): Promise<void | MessageActionReturn> {
-  const agentContext = context.services.agentContext;
-  const config = agentContext?.config;
+  const { config } = context.services;
  if (!config) {
    return {
      type: 'message',
@@ -110,8 +108,7 @@ async function disableAction(
  context: CommandContext,
  args: string,
 ): Promise<void | MessageActionReturn> {
-  const agentContext = context.services.agentContext;
-  const config = agentContext?.config;
+  const { config } = context.services;
  if (!config) {
    return {
      type: 'message',
@@ -166,8 +163,7 @@ function completeEnabledHookNames(
  context: CommandContext,
  partialArg: string,
 ): string[] {
-  const agentContext = context.services.agentContext;
-  const config = agentContext?.config;
+  const { config } = context.services;
  if (!config) return [];

  const hookSystem = config.getHookSystem();
@@ -187,8 +183,7 @@ function completeDisabledHookNames(
  context: CommandContext,
  partialArg: string,
 ): string[] {
-  const agentContext = context.services.agentContext;
-  const config = agentContext?.config;
+  const { config } = context.services;
  if (!config) return [];

  const hookSystem = config.getHookSystem();
@@ -214,8 +209,7 @@ function getHookDisplayName(hook: HookRegistryEntry): string {
 async function enableAllAction(
  context: CommandContext,
 ): Promise<void | MessageActionReturn> {
-  const agentContext = context.services.agentContext;
-  const config = agentContext?.config;
+  const { config } = context.services;
  if (!config) {
    return {
      type: 'message',
@@ -286,8 +280,7 @@ async function enableAllAction(
 async function disableAllAction(
  context: CommandContext,
 ): Promise<void | MessageActionReturn> {
-  const agentContext = context.services.agentContext;
-  const config = agentContext?.config;
+  const { config } = context.services;
  if (!config) {
    return {
      type: 'message',
@@ -60,12 +60,10 @@ describe('ideCommand', () => {
        settings: {
          setValue: vi.fn(),
        },
-        agentContext: {
-          config: {
-            getIdeMode: vi.fn(),
-            setIdeMode: vi.fn(),
-            getUsageStatisticsEnabled: vi.fn().mockReturnValue(false),
-          },
+        config: {
+          getIdeMode: vi.fn(),
+          setIdeMode: vi.fn(),
+          getUsageStatisticsEnabled: vi.fn().mockReturnValue(false),
        },
      },
    } as unknown as CommandContext;
@@ -217,13 +217,9 @@ export const ideCommand = async (): Promise<SlashCommand> => {
        );
        // Poll for up to 5 seconds for the extension to activate.
        for (let i = 0; i < 10; i++) {
-          await setIdeModeAndSyncConnection(
-            context.services.agentContext!.config,
-            true,
-            {
-              logToConsole: false,
-            },
-          );
+          await setIdeModeAndSyncConnection(context.services.config!, true, {
+            logToConsole: false,
+          });
          if (
            ideClient.getConnectionStatus().status ===
            IDEConnectionStatus.Connected
@@ -266,10 +262,7 @@ export const ideCommand = async (): Promise<SlashCommand> => {
        'ide.enabled',
        true,
      );
-      await setIdeModeAndSyncConnection(
-        context.services.agentContext!.config,
-        true,
-      );
+      await setIdeModeAndSyncConnection(context.services.config!, true);
      const { messageType, content } = getIdeStatusMessage(ideClient);
      context.ui.addItem(
        {
@@ -292,10 +285,7 @@ export const ideCommand = async (): Promise<SlashCommand> => {
        'ide.enabled',
        false,
      );
-      await setIdeModeAndSyncConnection(
-        context.services.agentContext!.config,
-        false,
-      );
+      await setIdeModeAndSyncConnection(context.services.config!, false);
      const { messageType, content } = getIdeStatusMessage(ideClient);
      context.ui.addItem(
        {
@@ -31,10 +31,8 @@ describe('initCommand', () => {
    // Create a fresh mock context for each test
    mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          config: {
-            getTargetDir: () => targetDir,
-          },
+        config: {
+          getTargetDir: () => targetDir,
        },
      },
    });
@@ -96,7 +94,7 @@ describe('initCommand', () => {
    // Arrange: Create a context without config
    const noConfigContext = createMockCommandContext();
    if (noConfigContext.services) {
-      noConfigContext.services.agentContext = null;
+      noConfigContext.services.config = null;
    }

    // Act: Run the command's action
@@ -23,14 +23,14 @@ export const initCommand: SlashCommand = {
    context: CommandContext,
    _args: string,
  ): Promise<SlashCommandActionReturn> => {
-    if (!context.services.agentContext?.config) {
+    if (!context.services.config) {
      return {
        type: 'message',
        messageType: 'error',
        content: 'Configuration not available.',
      };
    }
-    const targetDir = context.services.agentContext.config.getTargetDir();
+    const targetDir = context.services.config.getTargetDir();
    const geminiMdPath = path.join(targetDir, 'GEMINI.md');

    const result = performInit(fs.existsSync(geminiMdPath));
@@ -119,10 +119,7 @@ describe('mcpCommand', () => {

    mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          config: mockConfig,
-          toolRegistry: mockConfig.getToolRegistry(),
-        },
+        config: mockConfig,
      },
    });
  });
@@ -135,7 +132,7 @@ describe('mcpCommand', () => {
    it('should show an error if config is not available', async () => {
      const contextWithoutConfig = createMockCommandContext({
        services: {
-          agentContext: null,
+          config: null,
        },
      });

@@ -149,8 +146,7 @@ describe('mcpCommand', () => {
    });

    it('should show an error if tool registry is not available', async () => {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (mockContext.services.agentContext as any).toolRegistry = undefined;
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue(undefined);

      const result = await mcpCommand.action!(mockContext, '');

@@ -200,13 +196,9 @@ describe('mcpCommand', () => {
        ...mockServer3Tools,
      ];

-      const mockToolRegistry = {
+      mockConfig.getToolRegistry = vi.fn().mockReturnValue({
        getAllTools: vi.fn().mockReturnValue(allTools),
-      };
-      mockConfig.getToolRegistry = vi.fn().mockReturnValue(mockToolRegistry);
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (mockContext.services.agentContext as any).toolRegistry =
-        mockToolRegistry;
+      });

      const resourcesByServer: Record<
        string,
@@ -42,8 +42,8 @@ const authCommand: SlashCommand = {
    args: string,
  ): Promise<MessageActionReturn> => {
    const serverName = args.trim();
-    const agentContext = context.services.agentContext;
-    const config = agentContext?.config;
+    const { config } = context.services;
+
    if (!config) {
      return {
        type: 'message',
@@ -138,7 +138,7 @@ const authCommand: SlashCommand = {
        await mcpClientManager.restartServer(serverName);
      }
      // Update the client with the new tools
-      const geminiClient = context.services.agentContext?.geminiClient;
+      const geminiClient = config.getGeminiClient();
      if (geminiClient?.isInitialized()) {
        await geminiClient.setTools();
      }
@@ -162,8 +162,7 @@ const authCommand: SlashCommand = {
    }
  },
  completion: async (context: CommandContext, partialArg: string) => {
-    const agentContext = context.services.agentContext;
-    const config = agentContext?.config;
+    const { config } = context.services;
    if (!config) return [];

    const mcpServers = config.getMcpClientManager()?.getMcpServers() || {};
@@ -178,8 +177,7 @@ const listAction = async (
  showDescriptions = false,
  showSchema = false,
 ): Promise<void | MessageActionReturn> => {
-  const agentContext = context.services.agentContext;
-  const config = agentContext?.config;
+  const { config } = context.services;
  if (!config) {
    return {
      type: 'message',
@@ -190,7 +188,7 @@ const listAction = async (

  config.setUserInteractedWithMcp();

-  const toolRegistry = agentContext.toolRegistry;
+  const toolRegistry = config.getToolRegistry();
  if (!toolRegistry) {
    return {
      type: 'message',
@@ -336,8 +334,7 @@ const reloadCommand: SlashCommand = {
  action: async (
    context: CommandContext,
  ): Promise<void | SlashCommandActionReturn> => {
-    const agentContext = context.services.agentContext;
-    const config = agentContext?.config;
+    const { config } = context.services;
    if (!config) {
      return {
        type: 'message',
@@ -363,7 +360,7 @@ const reloadCommand: SlashCommand = {
    await mcpClientManager.restart();

    // Update the client with the new tools
-    const geminiClient = agentContext.geminiClient;
+    const geminiClient = config.getGeminiClient();
    if (geminiClient?.isInitialized()) {
      await geminiClient.setTools();
    }
@@ -380,8 +377,7 @@ async function handleEnableDisable(
  args: string,
  enable: boolean,
 ): Promise<MessageActionReturn> {
-  const agentContext = context.services.agentContext;
-  const config = agentContext?.config;
+  const { config } = context.services;
  if (!config) {
    return {
      type: 'message',
@@ -469,8 +465,8 @@ async function handleEnableDisable(
    );
    await mcpClientManager.restart();
  }
-  if (agentContext.geminiClient?.isInitialized())
-    await agentContext.geminiClient.setTools();
+  if (config.getGeminiClient()?.isInitialized())
+    await config.getGeminiClient().setTools();
  context.ui.reloadCommands();

  return { type: 'message', messageType: 'info', content: msg };
@@ -481,8 +477,7 @@ async function getEnablementCompletion(
  partialArg: string,
  showEnabled: boolean,
 ): Promise<string[]> {
-  const agentContext = context.services.agentContext;
-  const config = agentContext?.config;
+  const { config } = context.services;
  if (!config) return [];
  const servers = Object.keys(
    config.getMcpClientManager()?.getMcpServers() || {},
@@ -102,12 +102,10 @@ describe('memoryCommand', () => {

      mockContext = createMockCommandContext({
        services: {
-          agentContext: {
-            config: {
-              getUserMemory: mockGetUserMemory,
-              getGeminiMdFileCount: mockGetGeminiMdFileCount,
-              getExtensionLoader: () => new SimpleExtensionLoader([]),
-            },
+          config: {
+            getUserMemory: mockGetUserMemory,
+            getGeminiMdFileCount: mockGetGeminiMdFileCount,
+            getExtensionLoader: () => new SimpleExtensionLoader([]),
          },
        },
      });
@@ -252,7 +250,7 @@ describe('memoryCommand', () => {

      mockContext = createMockCommandContext({
        services: {
-          agentContext: { config: mockConfig },
+          config: mockConfig,
          settings: {
            merged: {
              memoryDiscoveryMaxDirs: 1000,
@@ -270,7 +268,7 @@ describe('memoryCommand', () => {
      if (!reloadCommand.action) throw new Error('Command has no action');

      // Enable JIT in mock config
-      const config = mockContext.services.agentContext?.config;
+      const config = mockContext.services.config;
      if (!config) throw new Error('Config is undefined');

      vi.mocked(config.isJitContextEnabled).mockReturnValue(true);
@@ -372,7 +370,7 @@ describe('memoryCommand', () => {
      if (!reloadCommand.action) throw new Error('Command has no action');

      const nullConfigContext = createMockCommandContext({
-        services: { agentContext: null },
+        services: { config: null },
      });

      await expect(
@@ -415,10 +413,8 @@ describe('memoryCommand', () => {
      });
      mockContext = createMockCommandContext({
        services: {
-          agentContext: {
-            config: {
-              getGeminiMdFilePaths: mockGetGeminiMdfilePaths,
-            },
+          config: {
+            getGeminiMdFilePaths: mockGetGeminiMdfilePaths,
          },
        },
      });
@@ -29,7 +29,7 @@ export const memoryCommand: SlashCommand = {
      kind: CommandKind.BUILT_IN,
      autoExecute: true,
      action: async (context) => {
-        const config = context.services.agentContext?.config;
+        const config = context.services.config;
        if (!config) return;
        const result = showMemory(config);

@@ -81,7 +81,7 @@ export const memoryCommand: SlashCommand = {
        );

        try {
-          const config = context.services.agentContext?.config;
+          const config = context.services.config;
          if (config) {
            const result = await refreshMemory(config);

@@ -111,7 +111,7 @@ export const memoryCommand: SlashCommand = {
      kind: CommandKind.BUILT_IN,
      autoExecute: true,
      action: async (context) => {
-        const config = context.services.agentContext?.config;
+        const config = context.services.config;
        if (!config) return;
        const result = listMemoryFiles(config);

@@ -37,11 +37,8 @@ describe('modelCommand', () => {
    }

    const mockRefreshUserQuota = vi.fn();
-    mockContext.services.agentContext = {
+    mockContext.services.config = {
      refreshUserQuota: mockRefreshUserQuota,
-      get config() {
-        return this;
-      },
    } as unknown as Config;

    await modelCommand.action(mockContext, '');
@@ -69,11 +66,8 @@ describe('modelCommand', () => {
        (c) => c.name === 'manage',
      );
      const mockRefreshUserQuota = vi.fn();
-      mockContext.services.agentContext = {
+      mockContext.services.config = {
        refreshUserQuota: mockRefreshUserQuota,
-        get config() {
-          return this;
-        },
      } as unknown as Config;

      await manageCommand!.action!(mockContext, '');
@@ -90,7 +84,7 @@ describe('modelCommand', () => {
      expect(setCommand).toBeDefined();

      const mockSetModel = vi.fn();
-      mockContext.services.agentContext = {
+      mockContext.services.config = {
        setModel: mockSetModel,
        getHasAccessToPreviewModel: vi.fn().mockReturnValue(true),
        getUserId: vi.fn().mockReturnValue('test-user'),
@@ -104,9 +98,6 @@ describe('modelCommand', () => {
        getPolicyEngine: vi.fn().mockReturnValue({
          getApprovalMode: vi.fn().mockReturnValue('auto'),
        }),
-        get config() {
-          return this;
-        },
      } as unknown as Config;

      await setCommand!.action!(mockContext, 'gemini-pro');
@@ -125,7 +116,7 @@ describe('modelCommand', () => {
        (c) => c.name === 'set',
      );
      const mockSetModel = vi.fn();
-      mockContext.services.agentContext = {
+      mockContext.services.config = {
        setModel: mockSetModel,
        getHasAccessToPreviewModel: vi.fn().mockReturnValue(true),
        getUserId: vi.fn().mockReturnValue('test-user'),
@@ -139,9 +130,6 @@ describe('modelCommand', () => {
        getPolicyEngine: vi.fn().mockReturnValue({
          getApprovalMode: vi.fn().mockReturnValue('auto'),
        }),
-        get config() {
-          return this;
-        },
      } as unknown as Config;

      await setCommand!.action!(mockContext, 'gemini-pro --persist');
@@ -34,10 +34,10 @@ const setModelCommand: SlashCommand = {
    const modelName = parts[0];
    const persist = parts.includes('--persist');

-    if (context.services.agentContext?.config) {
-      context.services.agentContext.config.setModel(modelName, !persist);
+    if (context.services.config) {
+      context.services.config.setModel(modelName, !persist);
      const event = new ModelSlashCommandEvent(modelName);
-      logModelSlashCommand(context.services.agentContext.config, event);
+      logModelSlashCommand(context.services.config, event);

      context.ui.addItem({
        type: MessageType.INFO,
@@ -53,8 +53,8 @@ const manageModelCommand: SlashCommand = {
  kind: CommandKind.BUILT_IN,
  autoExecute: true,
  action: async (context: CommandContext) => {
-    if (context.services.agentContext?.config) {
-      await context.services.agentContext.config.refreshUserQuota();
+    if (context.services.config) {
+      await context.services.config.refreshUserQuota();
    }
    return {
      type: 'dialog',
@@ -24,8 +24,7 @@ export const oncallCommand: SlashCommand = {
      kind: CommandKind.BUILT_IN,
      autoExecute: true,
      action: async (context, args): Promise<OpenCustomDialogActionReturn> => {
-        const agentContext = context.services.agentContext;
-        const config = agentContext?.config;
+        const { config } = context.services;
        if (!config) {
          throw new Error('Config not available');
        }
@@ -57,8 +56,7 @@ export const oncallCommand: SlashCommand = {
      kind: CommandKind.BUILT_IN,
      autoExecute: true,
      action: async (context, args): Promise<OpenCustomDialogActionReturn> => {
-        const agentContext = context.services.agentContext;
-        const config = agentContext?.config;
+        const { config } = context.services;
        if (!config) {
          throw new Error('Config not available');
        }
@@ -52,16 +52,14 @@ describe('planCommand', () => {
  beforeEach(() => {
    mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          config: {
-            isPlanEnabled: vi.fn(),
-            setApprovalMode: vi.fn(),
-            getApprovedPlanPath: vi.fn(),
-            getApprovalMode: vi.fn(),
-            getFileSystemService: vi.fn(),
-            storage: {
-              getPlansDir: vi.fn().mockReturnValue('/mock/plans/dir'),
-            },
+        config: {
+          isPlanEnabled: vi.fn(),
+          setApprovalMode: vi.fn(),
+          getApprovedPlanPath: vi.fn(),
+          getApprovalMode: vi.fn(),
+          getFileSystemService: vi.fn(),
+          storage: {
+            getPlansDir: vi.fn().mockReturnValue('/mock/plans/dir'),
          },
        },
      },
@@ -85,19 +83,17 @@ describe('planCommand', () => {
  });

  it('should switch to plan mode if enabled', async () => {
-    vi.mocked(
-      mockContext.services.agentContext!.config.isPlanEnabled,
-    ).mockReturnValue(true);
-    vi.mocked(
-      mockContext.services.agentContext!.config.getApprovedPlanPath,
-    ).mockReturnValue(undefined);
+    vi.mocked(mockContext.services.config!.isPlanEnabled).mockReturnValue(true);
+    vi.mocked(mockContext.services.config!.getApprovedPlanPath).mockReturnValue(
+      undefined,
+    );

    if (!planCommand.action) throw new Error('Action missing');
    await planCommand.action(mockContext, '');

-    expect(
-      mockContext.services.agentContext!.config.setApprovalMode,
-    ).toHaveBeenCalledWith(ApprovalMode.PLAN);
+    expect(mockContext.services.config!.setApprovalMode).toHaveBeenCalledWith(
+      ApprovalMode.PLAN,
+    );
    expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
      'info',
      'Switched to Plan Mode.',
@@ -106,12 +102,10 @@ describe('planCommand', () => {

  it('should display the approved plan from config', async () => {
    const mockPlanPath = '/mock/plans/dir/approved-plan.md';
-    vi.mocked(
-      mockContext.services.agentContext!.config.isPlanEnabled,
-    ).mockReturnValue(true);
-    vi.mocked(
-      mockContext.services.agentContext!.config.getApprovedPlanPath,
-    ).mockReturnValue(mockPlanPath);
+    vi.mocked(mockContext.services.config!.isPlanEnabled).mockReturnValue(true);
+    vi.mocked(mockContext.services.config!.getApprovedPlanPath).mockReturnValue(
+      mockPlanPath,
+    );
    vi.mocked(processSingleFileContent).mockResolvedValue({
      llmContent: '# Approved Plan Content',
      returnDisplay: '# Approved Plan Content',
@@ -134,7 +128,7 @@ describe('planCommand', () => {
    it('should copy the approved plan to clipboard', async () => {
      const mockPlanPath = '/mock/plans/dir/approved-plan.md';
      vi.mocked(
-        mockContext.services.agentContext!.config.getApprovedPlanPath,
+        mockContext.services.config!.getApprovedPlanPath,
      ).mockReturnValue(mockPlanPath);
      vi.mocked(readFileWithEncoding).mockResolvedValue('# Plan Content');

@@ -155,7 +149,7 @@ describe('planCommand', () => {

    it('should warn if no approved plan is found', async () => {
      vi.mocked(
-        mockContext.services.agentContext!.config.getApprovedPlanPath,
+        mockContext.services.config!.getApprovedPlanPath,
      ).mockReturnValue(undefined);

      const copySubCommand = planCommand.subCommands?.find(
@@ -22,7 +22,7 @@ import * as path from 'node:path';
 import { copyToClipboard } from '../utils/commandUtils.js';

 async function copyAction(context: CommandContext) {
-  const config = context.services.agentContext?.config;
+  const config = context.services.config;
  if (!config) {
    debugLogger.debug('Plan copy command: config is not available in context');
    return;
@@ -53,7 +53,7 @@ export const planCommand: SlashCommand = {
  kind: CommandKind.BUILT_IN,
  autoExecute: false,
  action: async (context) => {
-    const config = context.services.agentContext?.config;
+    const config = context.services.config;
    if (!config) {
      debugLogger.debug('Plan command: config is not available in context');
      return;
@@ -32,7 +32,7 @@ describe('policiesCommand', () => {

  describe('list subcommand', () => {
    it('should show error if config is missing', async () => {
-      mockContext.services.agentContext = null;
+      mockContext.services.config = null;
      const listCommand = policiesCommand.subCommands![0];

      await listCommand.action!(mockContext, '');
@@ -50,11 +50,8 @@ describe('policiesCommand', () => {
      const mockPolicyEngine = {
        getRules: vi.fn().mockReturnValue([]),
      };
-      mockContext.services.agentContext = {
+      mockContext.services.config = {
        getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
-        get config() {
-          return this;
-        },
      } as unknown as Config;

      const listCommand = policiesCommand.subCommands![0];
@@ -88,11 +85,8 @@ describe('policiesCommand', () => {
      const mockPolicyEngine = {
        getRules: vi.fn().mockReturnValue(mockRules),
      };
-      mockContext.services.agentContext = {
+      mockContext.services.config = {
        getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
-        get config() {
-          return this;
-        },
      } as unknown as Config;

      const listCommand = policiesCommand.subCommands![0];
@@ -148,11 +142,8 @@ describe('policiesCommand', () => {
      const mockPolicyEngine = {
        getRules: vi.fn().mockReturnValue(mockRules),
      };
-      mockContext.services.agentContext = {
+      mockContext.services.config = {
        getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
-        get config() {
-          return this;
-        },
      } as unknown as Config;

      const listCommand = policiesCommand.subCommands![0];
@@ -51,8 +51,7 @@ const listPoliciesCommand: SlashCommand = {
  kind: CommandKind.BUILT_IN,
  autoExecute: true,
  action: async (context) => {
-    const agentContext = context.services.agentContext;
-    const config = agentContext?.config;
+    const { config } = context.services;
    if (!config) {
      context.ui.addItem(
        {
@@ -47,17 +47,14 @@ describe('restoreCommand', () => {
        getProjectTempCheckpointsDir: vi.fn().mockReturnValue(checkpointsDir),
        getProjectTempDir: vi.fn().mockReturnValue(geminiTempDir),
      },
-      geminiClient: {
+      getGeminiClient: vi.fn().mockReturnValue({
        setHistory: mockSetHistory,
-      },
-      get config() {
-        return this;
-      },
+      }),
    } as unknown as Config;

    mockContext = createMockCommandContext({
      services: {
-        agentContext: mockConfig,
+        config: mockConfig,
        git: mockGitService,
      },
    });
@@ -37,11 +37,10 @@ async function restoreAction(
  args: string,
 ): Promise<void | SlashCommandActionReturn> {
  const { services, ui } = context;
-  const { agentContext, git: gitService } = services;
+  const { config, git: gitService } = services;
  const { addItem, loadHistory } = ui;

-  const checkpointDir =
-    agentContext?.config.storage.getProjectTempCheckpointsDir();
+  const checkpointDir = config?.storage.getProjectTempCheckpointsDir();

  if (!checkpointDir) {
    return {
@@ -117,7 +116,7 @@ async function restoreAction(
      } else if (action.type === 'load_history' && loadHistory) {
        loadHistory(action.history);
        if (action.clientHistory) {
-          agentContext!.geminiClient?.setHistory(action.clientHistory);
+          config?.getGeminiClient()?.setHistory(action.clientHistory);
        }
      }
    }
@@ -141,9 +140,8 @@ async function completion(
  _partialArg: string,
 ): Promise<string[]> {
  const { services } = context;
-  const { agentContext } = services;
-  const checkpointDir =
-    agentContext?.config.storage.getProjectTempCheckpointsDir();
+  const { config } = services;
+  const checkpointDir = config?.storage.getProjectTempCheckpointsDir();
  if (!checkpointDir) {
    return [];
  }
@@ -97,17 +97,15 @@ describe('rewindCommand', () => {

    mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          geminiClient: {
+        config: {
+          getGeminiClient: () => ({
            getChatRecordingService: mockGetChatRecordingService,
            setHistory: mockSetHistory,
            sendMessageStream: mockSendMessageStream,
-          },
-          config: {
-            getSessionId: () => 'test-session-id',
-            getContextManager: () => ({ refresh: mockResetContext }),
-            getProjectRoot: mockGetProjectRoot,
-          },
+          }),
+          getSessionId: () => 'test-session-id',
+          getContextManager: () => ({ refresh: mockResetContext }),
+          getProjectRoot: mockGetProjectRoot,
        },
      },
      ui: {
@@ -295,12 +293,7 @@ describe('rewindCommand', () => {
  it('should fail if client is not initialized', () => {
    const context = createMockCommandContext({
      services: {
-        agentContext: {
-          geminiClient: undefined,
-          get config() {
-            return this;
-          },
-        },
+        config: { getGeminiClient: () => undefined },
      },
    }) as unknown as CommandContext;

@@ -316,11 +309,8 @@ describe('rewindCommand', () => {
  it('should fail if recording service is unavailable', () => {
    const context = createMockCommandContext({
      services: {
-        agentContext: {
-          geminiClient: { getChatRecordingService: () => undefined },
-          get config() {
-            return this;
-          },
+        config: {
+          getGeminiClient: () => ({ getChatRecordingService: () => undefined }),
        },
      },
    }) as unknown as CommandContext;
@@ -61,7 +61,7 @@ async function rewindConversation(
    client.setHistory(clientHistory as Content[]);

    // Reset context manager as we are rewinding history
-    await context.services.agentContext?.config.getContextManager()?.refresh();
+    await context.services.config?.getContextManager()?.refresh();

    // Update UI History
    // We generate IDs based on index for the rewind history
@@ -94,8 +94,7 @@ export const rewindCommand: SlashCommand = {
  description: 'Jump back to a specific message and restart the conversation',
  kind: CommandKind.BUILT_IN,
  action: (context) => {
-    const agentContext = context.services.agentContext;
-    const config = agentContext?.config;
+    const config = context.services.config;
    if (!config)
      return {
        type: 'message',
@@ -103,7 +102,7 @@ export const rewindCommand: SlashCommand = {
        content: 'Config not found',
      };

-    const client = agentContext.geminiClient;
+    const client = config.getGeminiClient();
    if (!client)
      return {
        type: 'message',
@@ -230,7 +230,7 @@ export const setupGithubCommand: SlashCommand = {
    }

    // Get the latest release tag from GitHub
-    const proxy = context?.services?.agentContext?.config.getProxy();
+    const proxy = context?.services?.config?.getProxy();
    const releaseTag = await getLatestGitHubRelease(proxy);
    const readmeUrl = `https://github.com/google-github-actions/run-gemini-cli/blob/${releaseTag}/README.md#quick-start`;

@@ -68,7 +68,7 @@ describe('skillsCommand', () => {
    ];
    context = createMockCommandContext({
      services: {
-        agentContext: {
+        config: {
          getSkillManager: vi.fn().mockReturnValue({
            getAllSkills: vi.fn().mockReturnValue(skills),
            getSkills: vi.fn().mockReturnValue(skills),
@@ -80,9 +80,6 @@ describe('skillsCommand', () => {
              ),
          }),
          getContentGenerator: vi.fn(),
-          get config() {
-            return this;
-          },
        } as unknown as Config,
        settings: {
          merged: createTestMergedSettings({ skills: { disabled: [] } }),
@@ -165,8 +162,7 @@ describe('skillsCommand', () => {
  });

  it('should filter built-in skills by default and show them with "all"', async () => {
-    const skillManager =
-      context.services.agentContext!.config.getSkillManager();
+    const skillManager = context.services.config!.getSkillManager();
    const mockSkills = [
      {
        name: 'regular',
@@ -456,8 +452,7 @@ describe('skillsCommand', () => {
    });

    it('should show error if skills are disabled by admin during disable', async () => {
-      const skillManager =
-        context.services.agentContext!.config.getSkillManager();
+      const skillManager = context.services.config!.getSkillManager();
      vi.mocked(skillManager.isAdminEnabled).mockReturnValue(false);

      const disableCmd = skillsCommand.subCommands!.find(
@@ -475,8 +470,7 @@ describe('skillsCommand', () => {
    });

    it('should show error if skills are disabled by admin during enable', async () => {
-      const skillManager =
-        context.services.agentContext!.config.getSkillManager();
+      const skillManager = context.services.config!.getSkillManager();
      vi.mocked(skillManager.isAdminEnabled).mockReturnValue(false);

      const enableCmd = skillsCommand.subCommands!.find(
@@ -503,7 +497,8 @@ describe('skillsCommand', () => {
      const reloadSkillsMock = vi.fn().mockImplementation(async () => {
        await new Promise((resolve) => setTimeout(resolve, 200));
      });
-      context.services.agentContext!.config.reloadSkills = reloadSkillsMock;
+      // @ts-expect-error Mocking reloadSkills
+      context.services.config.reloadSkills = reloadSkillsMock;

      const actionPromise = reloadCmd.action!(context, '');

@@ -542,15 +537,15 @@ describe('skillsCommand', () => {
        (s) => s.name === 'reload',
      )!;
      const reloadSkillsMock = vi.fn().mockImplementation(async () => {
-        const skillManager =
-          context.services.agentContext!.config.getSkillManager();
+        const skillManager = context.services.config!.getSkillManager();
        vi.mocked(skillManager.getSkills).mockReturnValue([
          { name: 'skill1' },
          { name: 'skill2' },
          { name: 'skill3' },
        ] as SkillDefinition[]);
      });
-      context.services.agentContext!.config.reloadSkills = reloadSkillsMock;
+      // @ts-expect-error Mocking reloadSkills
+      context.services.config.reloadSkills = reloadSkillsMock;

      await reloadCmd.action!(context, '');

@@ -567,13 +562,13 @@ describe('skillsCommand', () => {
        (s) => s.name === 'reload',
      )!;
      const reloadSkillsMock = vi.fn().mockImplementation(async () => {
-        const skillManager =
-          context.services.agentContext!.config.getSkillManager();
+        const skillManager = context.services.config!.getSkillManager();
        vi.mocked(skillManager.getSkills).mockReturnValue([
          { name: 'skill1' },
        ] as SkillDefinition[]);
      });
-      context.services.agentContext!.config.reloadSkills = reloadSkillsMock;
+      // @ts-expect-error Mocking reloadSkills
+      context.services.config.reloadSkills = reloadSkillsMock;

      await reloadCmd.action!(context, '');

@@ -590,14 +585,14 @@ describe('skillsCommand', () => {
        (s) => s.name === 'reload',
      )!;
      const reloadSkillsMock = vi.fn().mockImplementation(async () => {
-        const skillManager =
-          context.services.agentContext!.config.getSkillManager();
+        const skillManager = context.services.config!.getSkillManager();
        vi.mocked(skillManager.getSkills).mockReturnValue([
          { name: 'skill2' }, // skill1 removed, skill3 added
          { name: 'skill3' },
        ] as SkillDefinition[]);
      });
-      context.services.agentContext!.config.reloadSkills = reloadSkillsMock;
+      // @ts-expect-error Mocking reloadSkills
+      context.services.config.reloadSkills = reloadSkillsMock;

      await reloadCmd.action!(context, '');

@@ -613,7 +608,7 @@ describe('skillsCommand', () => {
      const reloadCmd = skillsCommand.subCommands!.find(
        (s) => s.name === 'reload',
      )!;
-      context.services.agentContext = null;
+      context.services.config = null;

      await reloadCmd.action!(context, '');

@@ -633,7 +628,8 @@ describe('skillsCommand', () => {
      const reloadSkillsMock = vi.fn().mockImplementation(async () => {
        await new Promise((_, reject) => setTimeout(() => reject(error), 200));
      });
-      context.services.agentContext!.config.reloadSkills = reloadSkillsMock;
+      // @ts-expect-error Mocking reloadSkills
+      context.services.config.reloadSkills = reloadSkillsMock;

      const actionPromise = reloadCmd.action!(context, '');
      await vi.advanceTimersByTimeAsync(100);
@@ -655,8 +651,7 @@ describe('skillsCommand', () => {
      const disableCmd = skillsCommand.subCommands!.find(
        (s) => s.name === 'disable',
      )!;
-      const skillManager =
-        context.services.agentContext!.config.getSkillManager();
+      const skillManager = context.services.config!.getSkillManager();
      const mockSkills = [
        {
          name: 'skill1',
@@ -686,8 +681,7 @@ describe('skillsCommand', () => {
      const enableCmd = skillsCommand.subCommands!.find(
        (s) => s.name === 'enable',
      )!;
-      const skillManager =
-        context.services.agentContext!.config.getSkillManager();
+      const skillManager = context.services.config!.getSkillManager();
      const mockSkills = [
        {
          name: 'skill1',
@@ -46,7 +46,7 @@ async function listAction(
    }
  }

-  const skillManager = context.services.agentContext?.config.getSkillManager();
+  const skillManager = context.services.config?.getSkillManager();
  if (!skillManager) {
    context.ui.addItem({
      type: MessageType.ERROR,
@@ -127,8 +127,8 @@ async function linkAction(
      text: `Successfully linked skills from "${sourcePath}" (${scope}).`,
    });

-    if (context.services.agentContext?.config) {
-      await context.services.agentContext.config.reloadSkills();
+    if (context.services.config) {
+      await context.services.config.reloadSkills();
    }
  } catch (error) {
    context.ui.addItem({
@@ -150,14 +150,14 @@ async function disableAction(
    });
    return;
  }
-  const skillManager = context.services.agentContext?.config.getSkillManager();
+  const skillManager = context.services.config?.getSkillManager();
  if (skillManager?.isAdminEnabled() === false) {
    context.ui.addItem(
      {
        type: MessageType.ERROR,
        text: getAdminErrorMessage(
          'Agent skills',
-          context.services.agentContext?.config ?? undefined,
+          context.services.config ?? undefined,
        ),
      },
      Date.now(),
@@ -211,14 +211,14 @@ async function enableAction(
    return;
  }

-  const skillManager = context.services.agentContext?.config.getSkillManager();
+  const skillManager = context.services.config?.getSkillManager();
  if (skillManager?.isAdminEnabled() === false) {
    context.ui.addItem(
      {
        type: MessageType.ERROR,
        text: getAdminErrorMessage(
          'Agent skills',
-          context.services.agentContext?.config ?? undefined,
+          context.services.config ?? undefined,
        ),
      },
      Date.now(),
@@ -246,7 +246,7 @@ async function enableAction(
 async function reloadAction(
  context: CommandContext,
 ): Promise<void | SlashCommandActionReturn> {
-  const config = context.services.agentContext?.config;
+  const config = context.services.config;
  if (!config) {
    context.ui.addItem({
      type: MessageType.ERROR,
@@ -333,7 +333,7 @@ function disableCompletion(
  context: CommandContext,
  partialArg: string,
 ): string[] {
-  const skillManager = context.services.agentContext?.config.getSkillManager();
+  const skillManager = context.services.config?.getSkillManager();
  if (!skillManager) {
    return [];
  }
@@ -347,7 +347,7 @@ function enableCompletion(
  context: CommandContext,
  partialArg: string,
 ): string[] {
-  const skillManager = context.services.agentContext?.config.getSkillManager();
+  const skillManager = context.services.config?.getSkillManager();
  if (!skillManager) {
    return [];
  }
@@ -43,15 +43,12 @@ describe('statsCommand', () => {
  it('should display general session stats when run with no subcommand', async () => {
    if (!statsCommand.action) throw new Error('Command has no action');

-    mockContext.services.agentContext = {
+    mockContext.services.config = {
      refreshUserQuota: vi.fn(),
      refreshAvailableCredits: vi.fn(),
      getUserTierName: vi.fn(),
      getUserPaidTier: vi.fn(),
      getModel: vi.fn(),
-      get config() {
-        return this;
-      },
    } as unknown as Config;

    await statsCommand.action(mockContext, '');
@@ -83,7 +80,7 @@ describe('statsCommand', () => {
      .fn()
      .mockReturnValue('2025-01-01T12:00:00Z');

-    mockContext.services.agentContext = {
+    mockContext.services.config = {
      refreshUserQuota: mockRefreshUserQuota,
      getUserTierName: mockGetUserTierName,
      getModel: mockGetModel,
@@ -92,9 +89,6 @@ describe('statsCommand', () => {
      getQuotaResetTime: mockGetQuotaResetTime,
      getUserPaidTier: vi.fn(),
      refreshAvailableCredits: vi.fn(),
-      get config() {
-        return this;
-      },
    } as unknown as Config;

    await statsCommand.action(mockContext, '');
@@ -29,8 +29,8 @@ function getUserIdentity(context: CommandContext) {
  const cachedAccount = userAccountManager.getCachedGoogleAccount();
  const userEmail = cachedAccount ?? undefined;

-  const tier = context.services.agentContext?.config.getUserTierName();
-  const paidTier = context.services.agentContext?.config.getUserPaidTier();
+  const tier = context.services.config?.getUserTierName();
+  const paidTier = context.services.config?.getUserPaidTier();
  const creditBalance = getG1CreditBalance(paidTier) ?? undefined;

  return { selectedAuthType, userEmail, tier, creditBalance };
@@ -50,7 +50,7 @@ async function defaultSessionView(context: CommandContext) {

  const { selectedAuthType, userEmail, tier, creditBalance } =
    getUserIdentity(context);
-  const currentModel = context.services.agentContext?.config.getModel();
+  const currentModel = context.services.config?.getModel();

  const statsItem: HistoryItemStats = {
    type: MessageType.STATS,
@@ -62,19 +62,16 @@ async function defaultSessionView(context: CommandContext) {
    creditBalance,
  };

-  if (context.services.agentContext?.config) {
+  if (context.services.config) {
    const [quota] = await Promise.all([
-      context.services.agentContext.config.refreshUserQuota(),
-      context.services.agentContext.config.refreshAvailableCredits(),
+      context.services.config.refreshUserQuota(),
+      context.services.config.refreshAvailableCredits(),
    ]);
    if (quota) {
      statsItem.quotas = quota;
-      statsItem.pooledRemaining =
-        context.services.agentContext.config.getQuotaRemaining();
-      statsItem.pooledLimit =
-        context.services.agentContext.config.getQuotaLimit();
-      statsItem.pooledResetTime =
-        context.services.agentContext.config.getQuotaResetTime();
+      statsItem.pooledRemaining = context.services.config.getQuotaRemaining();
+      statsItem.pooledLimit = context.services.config.getQuotaLimit();
+      statsItem.pooledResetTime = context.services.config.getQuotaResetTime();
    }
  }

@@ -110,13 +107,10 @@ export const statsCommand: SlashCommand = {
      isSafeConcurrent: true,
      action: (context: CommandContext) => {
        const { selectedAuthType, userEmail, tier } = getUserIdentity(context);
-        const currentModel = context.services.agentContext?.config.getModel();
-        const pooledRemaining =
-          context.services.agentContext?.config.getQuotaRemaining();
-        const pooledLimit =
-          context.services.agentContext?.config.getQuotaLimit();
-        const pooledResetTime =
-          context.services.agentContext?.config.getQuotaResetTime();
+        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,
@@ -30,8 +30,8 @@ describe('toolsCommand', () => {
  it('should display an error if the tool registry is unavailable', async () => {
    const mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          toolRegistry: undefined,
+        config: {
+          getToolRegistry: () => undefined,
        },
      },
    });
@@ -48,10 +48,10 @@ describe('toolsCommand', () => {
  it('should display "No tools available" when none are found', async () => {
    const mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          toolRegistry: {
+        config: {
+          getToolRegistry: () => ({
            getAllTools: () => [] as Array<ToolBuilder<object, ToolResult>>,
-          },
+          }),
        },
      },
    });
@@ -69,8 +69,8 @@ describe('toolsCommand', () => {
  it('should list tools without descriptions by default (no args)', async () => {
    const mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          toolRegistry: { getAllTools: () => mockTools },
+        config: {
+          getToolRegistry: () => ({ getAllTools: () => mockTools }),
        },
      },
    });
@@ -90,8 +90,8 @@ describe('toolsCommand', () => {
  it('should list tools without descriptions when "list" arg is passed', async () => {
    const mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          toolRegistry: { getAllTools: () => mockTools },
+        config: {
+          getToolRegistry: () => ({ getAllTools: () => mockTools }),
        },
      },
    });
@@ -111,8 +111,8 @@ describe('toolsCommand', () => {
  it('should list tools with descriptions when "desc" arg is passed', async () => {
    const mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          toolRegistry: { getAllTools: () => mockTools },
+        config: {
+          getToolRegistry: () => ({ getAllTools: () => mockTools }),
        },
      },
    });
@@ -144,8 +144,8 @@ describe('toolsCommand', () => {
  it('subcommand "list" should display tools without descriptions', async () => {
    const mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          toolRegistry: { getAllTools: () => mockTools },
+        config: {
+          getToolRegistry: () => ({ getAllTools: () => mockTools }),
        },
      },
    });
@@ -165,8 +165,8 @@ describe('toolsCommand', () => {
  it('subcommand "desc" should display tools with descriptions', async () => {
    const mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          toolRegistry: { getAllTools: () => mockTools },
+        config: {
+          getToolRegistry: () => ({ getAllTools: () => mockTools }),
        },
      },
    });
@@ -196,8 +196,8 @@ describe('toolsCommand', () => {

    const mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          toolRegistry: { getAllTools: () => mockTools },
+        config: {
+          getToolRegistry: () => ({ getAllTools: () => mockTools }),
        },
      },
    });
@@ -15,7 +15,7 @@ async function listTools(
  context: CommandContext,
  showDescriptions: boolean,
 ): Promise<void> {
-  const toolRegistry = context.services.agentContext?.toolRegistry;
+  const toolRegistry = context.services.config?.getToolRegistry();
  if (!toolRegistry) {
    context.ui.addItem({
      type: MessageType.ERROR,
@@ -11,11 +11,11 @@ import type {
  ConfirmationRequest,
 } from '../types.js';
 import type {
+  Config,
  GitService,
  Logger,
  CommandActionReturn,
  AgentDefinition,
-  AgentLoopContext,
 } from '@google/gemini-cli-core';
 import type { LoadedSettings } from '../../config/settings.js';
 import type { UseHistoryManagerReturn } from '../hooks/useHistoryManager.js';
@@ -39,7 +39,7 @@ export interface CommandContext {
  // Core services and configuration
  services: {
    // TODO(abhipatel12): Ensure that config is never null.
-    agentContext: AgentLoopContext | null;
+    config: Config | null;
    settings: LoadedSettings;
    git: GitService | undefined;
    logger: Logger;
@@ -33,13 +33,11 @@ describe('upgradeCommand', () => {
    vi.clearAllMocks();
    mockContext = createMockCommandContext({
      services: {
-        agentContext: {
-          config: {
-            getContentGeneratorConfig: vi.fn().mockReturnValue({
-              authType: AuthType.LOGIN_WITH_GOOGLE,
-            }),
-            getUserTierName: vi.fn().mockReturnValue(undefined),
-          },
+        config: {
+          getContentGeneratorConfig: vi.fn().mockReturnValue({
+            authType: AuthType.LOGIN_WITH_GOOGLE,
+          }),
+          getUserTierName: vi.fn().mockReturnValue(undefined),
        },
      },
    } as unknown as CommandContext);
@@ -64,7 +62,7 @@ describe('upgradeCommand', () => {

  it('should return an error message when NOT logged in with Google', async () => {
    vi.mocked(
-      mockContext.services.agentContext!.config.getContentGeneratorConfig,
+      mockContext.services.config!.getContentGeneratorConfig,
    ).mockReturnValue({
      authType: AuthType.USE_GEMINI,
    });
@@ -120,9 +118,9 @@ describe('upgradeCommand', () => {
  });

  it('should return info message for ultra tiers', async () => {
-    vi.mocked(
-      mockContext.services.agentContext!.config.getUserTierName,
-    ).mockReturnValue('Advanced Ultra');
+    vi.mocked(mockContext.services.config!.getUserTierName).mockReturnValue(
+      'Advanced Ultra',
+    );

    if (!upgradeCommand.action) {
      throw new Error('The upgrade command must have an action.');
@@ -23,8 +23,8 @@ export const upgradeCommand: SlashCommand = {
  description: 'Upgrade your Gemini Code Assist tier for higher limits',
  autoExecute: true,
  action: async (context) => {
-    const config = context.services.agentContext?.config;
-    const authType = config?.getContentGeneratorConfig()?.authType;
+    const authType =
+      context.services.config?.getContentGeneratorConfig()?.authType;
    if (authType !== AuthType.LOGIN_WITH_GOOGLE) {
      // This command should ideally be hidden if not logged in with Google,
      // but we add a safety check here just in case.
@@ -36,7 +36,7 @@ export const upgradeCommand: SlashCommand = {
      };
    }

-    const tierName = config?.getUserTierName();
+    const tierName = context.services.config?.getUserTierName();
    if (isUltraTier(tierName)) {
      return {
        type: 'message',
@@ -25,7 +25,7 @@ describe('AboutBox', () => {
  };

  it('renders with required props', async () => {
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AboutBox {...defaultProps} />,
    );
    await waitUntilReady();
@@ -46,7 +46,7 @@ describe('AboutBox', () => {
    ['tier', 'Enterprise', 'Tier'],
  ])('renders optional prop %s', async (prop, value, label) => {
    const props = { ...defaultProps, [prop]: value };
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AboutBox {...props} />,
    );
    await waitUntilReady();
@@ -58,7 +58,7 @@ describe('AboutBox', () => {

  it('renders Auth Method with email when userEmail is provided', async () => {
    const props = { ...defaultProps, userEmail: 'test@example.com' };
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AboutBox {...props} />,
    );
    await waitUntilReady();
@@ -69,7 +69,7 @@ describe('AboutBox', () => {

  it('renders Auth Method correctly when not oauth', async () => {
    const props = { ...defaultProps, selectedAuthType: 'api-key' };
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AboutBox {...props} />,
    );
    await waitUntilReady();
@@ -17,7 +17,7 @@ describe('AdminSettingsChangedDialog', () => {
  });

  it('renders correctly', async () => {
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
+    const { lastFrame, waitUntilReady } = renderWithProviders(
      <AdminSettingsChangedDialog />,
    );
    await waitUntilReady();
@@ -25,7 +25,7 @@ describe('AdminSettingsChangedDialog', () => {
  });

  it('restarts on "r" key press', async () => {
-    const { stdin, waitUntilReady } = await renderWithProviders(
+    const { stdin, waitUntilReady } = renderWithProviders(
      <AdminSettingsChangedDialog />,
      {
        uiActions: {
@@ -43,7 +43,7 @@ describe('AdminSettingsChangedDialog', () => {
  });

  it.each(['r', 'R'])('restarts on "%s" key press', async (key) => {
-    const { stdin, waitUntilReady } = await renderWithProviders(
+    const { stdin, waitUntilReady } = renderWithProviders(
      <AdminSettingsChangedDialog />,
      {
        uiActions: {
@@ -115,7 +115,7 @@ describe('AgentConfigDialog', () => {
    settings: LoadedSettings,
    definition: AgentDefinition = createMockAgentDefinition(),
  ) => {
-    const result = await renderWithProviders(
+    const result = renderWithProviders(
      <AgentConfigDialog
        agentName="test-agent"
        displayName="Test Agent"
@@ -323,7 +323,7 @@ describe('AgentConfigDialog', () => {
      const settings = createMockSettings();
      // Agent config has about 6 base items + 2 per tool
      // Render with very small height (20)
-      const { lastFrame, unmount } = await renderWithProviders(
+      const { lastFrame, unmount } = renderWithProviders(
        <AgentConfigDialog
          agentName="test-agent"
          displayName="Test Agent"
@@ -108,7 +108,7 @@ describe('AlternateBufferQuittingDisplay', () => {

  it('renders with active and pending tool messages', async () => {
    persistentStateMock.setData({ tipsShown: 0 });
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AlternateBufferQuittingDisplay />,
      {
        uiState: {
@@ -125,7 +125,7 @@ describe('AlternateBufferQuittingDisplay', () => {

  it('renders with empty history and no pending items', async () => {
    persistentStateMock.setData({ tipsShown: 0 });
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AlternateBufferQuittingDisplay />,
      {
        uiState: {
@@ -142,7 +142,7 @@ describe('AlternateBufferQuittingDisplay', () => {

  it('renders with history but no pending items', async () => {
    persistentStateMock.setData({ tipsShown: 0 });
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AlternateBufferQuittingDisplay />,
      {
        uiState: {
@@ -159,7 +159,7 @@ describe('AlternateBufferQuittingDisplay', () => {

  it('renders with pending items but no history', async () => {
    persistentStateMock.setData({ tipsShown: 0 });
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AlternateBufferQuittingDisplay />,
      {
        uiState: {
@@ -195,7 +195,7 @@ describe('AlternateBufferQuittingDisplay', () => {
        ],
      },
    ];
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AlternateBufferQuittingDisplay />,
      {
        uiState: {
@@ -220,7 +220,7 @@ describe('AlternateBufferQuittingDisplay', () => {
      { id: 1, type: 'user', text: 'Hello Gemini' },
      { id: 2, type: 'gemini', text: 'Hello User!' },
    ];
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AlternateBufferQuittingDisplay />,
      {
        uiState: {
@@ -10,6 +10,7 @@ import {
 } from '../../test-utils/render.js';
 import { AppHeader } from './AppHeader.js';
 import { describe, it, expect, vi } from 'vitest';
+import { makeFakeConfig } from '@google/gemini-cli-core';
 import crypto from 'node:crypto';

 vi.mock('../utils/terminalSetup.js', () => ({
@@ -18,6 +19,7 @@ vi.mock('../utils/terminalSetup.js', () => ({

 describe('<AppHeader />', () => {
  it('should render the banner with default text', async () => {
+    const mockConfig = makeFakeConfig();
    const uiState = {
      history: [],
      bannerData: {
@@ -27,9 +29,10 @@ describe('<AppHeader />', () => {
      bannerVisible: true,
    };

-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AppHeader version="1.0.0" />,
      {
+        config: mockConfig,
        uiState,
      },
    );
@@ -41,6 +44,7 @@ describe('<AppHeader />', () => {
  });

  it('should render the banner with warning text', async () => {
+    const mockConfig = makeFakeConfig();
    const uiState = {
      history: [],
      bannerData: {
@@ -50,9 +54,10 @@ describe('<AppHeader />', () => {
      bannerVisible: true,
    };

-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AppHeader version="1.0.0" />,
      {
+        config: mockConfig,
        uiState,
      },
    );
@@ -64,6 +69,7 @@ describe('<AppHeader />', () => {
  });

  it('should not render the banner when no flags are set', async () => {
+    const mockConfig = makeFakeConfig();
    const uiState = {
      history: [],
      bannerData: {
@@ -72,9 +78,10 @@ describe('<AppHeader />', () => {
      },
    };

-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AppHeader version="1.0.0" />,
      {
+        config: mockConfig,
        uiState,
      },
    );
@@ -86,6 +93,7 @@ describe('<AppHeader />', () => {
  });

  it('should not render the default banner if shown count is 5 or more', async () => {
+    const mockConfig = makeFakeConfig();
    const uiState = {
      history: [],
      bannerData: {
@@ -103,9 +111,10 @@ describe('<AppHeader />', () => {
      },
    });

-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AppHeader version="1.0.0" />,
      {
+        config: mockConfig,
        uiState,
      },
    );
@@ -117,6 +126,7 @@ describe('<AppHeader />', () => {
  });

  it('should increment the version count when default banner is displayed', async () => {
+    const mockConfig = makeFakeConfig();
    const uiState = {
      history: [],
      bannerData: {
@@ -129,9 +139,10 @@ describe('<AppHeader />', () => {
    // and interfering with the expected persistentState.set call.
    persistentStateMock.setData({ tipsShown: 10 });

-    const { waitUntilReady, unmount } = await renderWithProviders(
+    const { waitUntilReady, unmount } = renderWithProviders(
      <AppHeader version="1.0.0" />,
      {
+        config: mockConfig,
        uiState,
      },
    );
@@ -150,6 +161,7 @@ describe('<AppHeader />', () => {
  });

  it('should render banner text with unescaped newlines', async () => {
+    const mockConfig = makeFakeConfig();
    const uiState = {
      history: [],
      bannerData: {
@@ -159,9 +171,10 @@ describe('<AppHeader />', () => {
      bannerVisible: true,
    };

-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AppHeader version="1.0.0" />,
      {
+        config: mockConfig,
        uiState,
      },
    );
@@ -172,6 +185,7 @@ describe('<AppHeader />', () => {
  });

  it('should render Tips when tipsShown is less than 10', async () => {
+    const mockConfig = makeFakeConfig();
    const uiState = {
      history: [],
      bannerData: {
@@ -183,9 +197,10 @@ describe('<AppHeader />', () => {

    persistentStateMock.setData({ tipsShown: 5 });

-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AppHeader version="1.0.0" />,
      {
+        config: mockConfig,
        uiState,
      },
    );
@@ -197,6 +212,7 @@ describe('<AppHeader />', () => {
  });

  it('should NOT render Tips when tipsShown is 10 or more', async () => {
+    const mockConfig = makeFakeConfig();
    const uiState = {
      bannerData: {
        defaultText: '',
@@ -206,9 +222,10 @@ describe('<AppHeader />', () => {

    persistentStateMock.setData({ tipsShown: 10 });

-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <AppHeader version="1.0.0" />,
      {
+        config: mockConfig,
        uiState,
      },
    );
@@ -221,6 +238,7 @@ describe('<AppHeader />', () => {
  it('should show tips until they have been shown 10 times (persistence flow)', async () => {
    persistentStateMock.setData({ tipsShown: 9 });

+    const mockConfig = makeFakeConfig();
    const uiState = {
      history: [],
      bannerData: {
@@ -231,7 +249,8 @@ describe('<AppHeader />', () => {
    };

    // First session
-    const session1 = await renderWithProviders(<AppHeader version="1.0.0" />, {
+    const session1 = renderWithProviders(<AppHeader version="1.0.0" />, {
+      config: mockConfig,
      uiState,
    });
    await session1.waitUntilReady();
@@ -241,10 +260,9 @@ describe('<AppHeader />', () => {
    session1.unmount();

    // Second session - state is persisted in the fake
-    const session2 = await renderWithProviders(
-      <AppHeader version="1.0.0" />,
-      {},
-    );
+    const session2 = renderWithProviders(<AppHeader version="1.0.0" />, {
+      config: mockConfig,
+    });
    await session2.waitUntilReady();

    expect(session2.lastFrame()).not.toContain('Tips');
@@ -32,7 +32,7 @@ describe('AppHeader Icon Rendering', () => {
  it('renders the default icon in standard terminals', async () => {
    vi.mocked(isAppleTerminal).mockReturnValue(false);

-    const result = await renderWithProviders(<AppHeader version="1.0.0" />);
+    const result = renderWithProviders(<AppHeader version="1.0.0" />);
    await result.waitUntilReady();

    await expect(result).toMatchSvgSnapshot();
@@ -41,7 +41,7 @@ describe('AppHeader Icon Rendering', () => {
  it('renders the symmetric icon in Apple Terminal', async () => {
    vi.mocked(isAppleTerminal).mockReturnValue(true);

-    const result = await renderWithProviders(<AppHeader version="1.0.0" />);
+    const result = renderWithProviders(<AppHeader version="1.0.0" />);
    await result.waitUntilReady();

    await expect(result).toMatchSvgSnapshot();
@@ -48,7 +48,7 @@ describe('AskUserDialog', () => {
  ];

  it('renders question and options', async () => {
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
+    const { lastFrame, waitUntilReady } = renderWithProviders(
      <AskUserDialog
        questions={authQuestion}
        onSubmit={vi.fn()}
@@ -140,7 +140,7 @@ describe('AskUserDialog', () => {
  ])('Submission: $name', ({ name, questions, actions, expectedSubmit }) => {
    it(`submits correct values for ${name}`, async () => {
      const onSubmit = vi.fn();
-      const { stdin } = await renderWithProviders(
+      const { stdin } = renderWithProviders(
        <AskUserDialog
          questions={questions}
          onSubmit={onSubmit}
@@ -172,7 +172,7 @@ describe('AskUserDialog', () => {
      },
    ] as Question[];

-    const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+    const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
      <AskUserDialog
        questions={questions}
        onSubmit={vi.fn()}
@@ -196,7 +196,7 @@ describe('AskUserDialog', () => {

  it('handles custom option in single select with inline typing', async () => {
    const onSubmit = vi.fn();
-    const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+    const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
      <AskUserDialog
        questions={authQuestion}
        onSubmit={onSubmit}
@@ -245,7 +245,7 @@ describe('AskUserDialog', () => {
    ];

    const onSubmit = vi.fn();
-    const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+    const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
      <AskUserDialog
        questions={authQuestionWithOther}
        onSubmit={onSubmit}
@@ -307,7 +307,7 @@ describe('AskUserDialog', () => {
          },
        ];

-        const { lastFrame, waitUntilReady } = await renderWithProviders(
+        const { lastFrame, waitUntilReady } = renderWithProviders(
          <AskUserDialog
            questions={questions}
            onSubmit={vi.fn()}
@@ -341,7 +341,7 @@ describe('AskUserDialog', () => {
  );

  it('navigates to custom option when typing unbound characters (Type-to-Jump)', async () => {
-    const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+    const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
      <AskUserDialog
        questions={authQuestion}
        onSubmit={vi.fn()}
@@ -397,7 +397,7 @@ describe('AskUserDialog', () => {
      },
    ];

-    const { lastFrame, waitUntilReady } = await renderWithProviders(
+    const { lastFrame, waitUntilReady } = renderWithProviders(
      <AskUserDialog
        questions={multiQuestions}
        onSubmit={vi.fn()}
@@ -412,7 +412,7 @@ describe('AskUserDialog', () => {
  });

  it('hides progress header for single question', async () => {
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
+    const { lastFrame, waitUntilReady } = renderWithProviders(
      <AskUserDialog
        questions={authQuestion}
        onSubmit={vi.fn()}
@@ -427,7 +427,7 @@ describe('AskUserDialog', () => {
  });

  it('shows keyboard hints', async () => {
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
+    const { lastFrame, waitUntilReady } = renderWithProviders(
      <AskUserDialog
        questions={authQuestion}
        onSubmit={vi.fn()}
@@ -461,7 +461,7 @@ describe('AskUserDialog', () => {
      },
    ];

-    const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+    const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
      <AskUserDialog
        questions={multiQuestions}
        onSubmit={vi.fn()}
@@ -508,7 +508,7 @@ describe('AskUserDialog', () => {
    ];

    const onSubmit = vi.fn();
-    const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+    const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
      <AskUserDialog
        questions={multiQuestions}
        onSubmit={onSubmit}
@@ -582,7 +582,7 @@ describe('AskUserDialog', () => {
      },
    ];

-    const { lastFrame, waitUntilReady } = await renderWithProviders(
+    const { lastFrame, waitUntilReady } = renderWithProviders(
      <AskUserDialog
        questions={multiQuestions}
        onSubmit={vi.fn()}
@@ -614,7 +614,7 @@ describe('AskUserDialog', () => {
      },
    ];

-    const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+    const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
      <AskUserDialog
        questions={multiQuestions}
        onSubmit={vi.fn()}
@@ -664,7 +664,7 @@ describe('AskUserDialog', () => {
      },
    ];

-    const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+    const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
      <AskUserDialog
        questions={multiQuestions}
        onSubmit={vi.fn()}
@@ -703,7 +703,7 @@ describe('AskUserDialog', () => {
    ];

    const onSubmit = vi.fn();
-    const { stdin } = await renderWithProviders(
+    const { stdin } = renderWithProviders(
      <AskUserDialog
        questions={multiQuestions}
        onSubmit={onSubmit}
@@ -736,7 +736,7 @@ describe('AskUserDialog', () => {
        },
      ];

-      const { lastFrame, waitUntilReady } = await renderWithProviders(
+      const { lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={textQuestion}
          onSubmit={vi.fn()}
@@ -759,7 +759,7 @@ describe('AskUserDialog', () => {
        },
      ];

-      const { lastFrame, waitUntilReady } = await renderWithProviders(
+      const { lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={textQuestion}
          onSubmit={vi.fn()}
@@ -782,7 +782,7 @@ describe('AskUserDialog', () => {
        },
      ];

-      const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+      const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={textQuestion}
          onSubmit={vi.fn()}
@@ -820,7 +820,7 @@ describe('AskUserDialog', () => {
        },
      ];

-      const { lastFrame, waitUntilReady } = await renderWithProviders(
+      const { lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={textQuestion}
          onSubmit={vi.fn()}
@@ -853,7 +853,7 @@ describe('AskUserDialog', () => {
        },
      ];

-      const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+      const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={mixedQuestions}
          onSubmit={vi.fn()}
@@ -903,7 +903,7 @@ describe('AskUserDialog', () => {
      ];

      const onSubmit = vi.fn();
-      const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+      const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={mixedQuestions}
          onSubmit={onSubmit}
@@ -959,7 +959,7 @@ describe('AskUserDialog', () => {
      ];

      const onSubmit = vi.fn();
-      const { stdin } = await renderWithProviders(
+      const { stdin } = renderWithProviders(
        <AskUserDialog
          questions={textQuestion}
          onSubmit={onSubmit}
@@ -986,7 +986,7 @@ describe('AskUserDialog', () => {
      ];

      const onCancel = vi.fn();
-      const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+      const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={textQuestion}
          onSubmit={vi.fn()}
@@ -1036,7 +1036,7 @@ describe('AskUserDialog', () => {
        },
      ];

-      const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+      const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={multiQuestions}
          onSubmit={vi.fn()}
@@ -1102,7 +1102,7 @@ describe('AskUserDialog', () => {
      ];

      const onSubmit = vi.fn();
-      const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+      const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={multiQuestions}
          onSubmit={onSubmit}
@@ -1154,7 +1154,7 @@ describe('AskUserDialog', () => {
        },
      ];

-      const { lastFrame, waitUntilReady } = await renderWithProviders(
+      const { lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={questions}
          onSubmit={vi.fn()}
@@ -1184,7 +1184,7 @@ describe('AskUserDialog', () => {
        },
      ];

-      const { lastFrame, waitUntilReady } = await renderWithProviders(
+      const { lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={questions}
          onSubmit={vi.fn()}
@@ -1217,7 +1217,7 @@ describe('AskUserDialog', () => {
        },
      ];

-      const { lastFrame, waitUntilReady } = await renderWithProviders(
+      const { lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={questions}
          onSubmit={vi.fn()}
@@ -1248,7 +1248,7 @@ describe('AskUserDialog', () => {
        },
      ];

-      const { lastFrame, waitUntilReady } = await renderWithProviders(
+      const { lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={questions}
          onSubmit={vi.fn()}
@@ -1287,7 +1287,7 @@ describe('AskUserDialog', () => {
      availableTerminalHeight: 5, // Small height to force scroll arrows
    } as UIState;

-    const { lastFrame, waitUntilReady } = await renderWithProviders(
+    const { lastFrame, waitUntilReady } = renderWithProviders(
      <UIStateContext.Provider value={mockUIState}>
        <AskUserDialog
          questions={questions}
@@ -1326,7 +1326,7 @@ describe('AskUserDialog', () => {
      availableTerminalHeight: 5,
    } as UIState;

-    const { lastFrame, waitUntilReady } = await renderWithProviders(
+    const { lastFrame, waitUntilReady } = renderWithProviders(
      <UIStateContext.Provider value={mockUIState}>
        <AskUserDialog
          questions={questions}
@@ -1365,7 +1365,7 @@ describe('AskUserDialog', () => {
        },
      ];

-      const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+      const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={questions}
          onSubmit={vi.fn()}
@@ -1399,7 +1399,7 @@ describe('AskUserDialog', () => {
        },
      ];

-      const { stdin, lastFrame, waitUntilReady } = await renderWithProviders(
+      const { stdin, lastFrame, waitUntilReady } = renderWithProviders(
        <AskUserDialog
          questions={questions}
          onSubmit={vi.fn()}
@@ -1432,7 +1432,7 @@ describe('AskUserDialog', () => {
    ];

    const onSubmit = vi.fn();
-    const { stdin } = await renderWithProviders(
+    const { stdin } = renderWithProviders(
      <AskUserDialog
        questions={questions}
        onSubmit={onSubmit}
@@ -14,7 +14,7 @@ describe('Banner', () => {
    ['info mode', false, 'Info Message'],
    ['multi-line warning', true, 'Title Line\\nBody Line 1\\nBody Line 2'],
  ])('renders in %s', async (_, isWarning, text) => {
-    const renderResult = await renderWithProviders(
+    const renderResult = renderWithProviders(
      <Banner bannerText={text} isWarning={isWarning} width={80} />,
    );
    await renderResult.waitUntilReady();
@@ -24,7 +24,7 @@ describe('Banner', () => {

  it('handles newlines in text', async () => {
    const text = 'Line 1\\nLine 2';
-    const renderResult = await renderWithProviders(
+    const renderResult = renderWithProviders(
      <Banner bannerText={text} isWarning={false} width={80} />,
    );
    await renderResult.waitUntilReady();
@@ -30,7 +30,7 @@ describe('Key Bubbling Regression', () => {
  ];

  it('does not navigate when pressing "j" or "k" in a focused text input', async () => {
-    const { stdin, lastFrame } = await renderWithProviders(
+    const { stdin, lastFrame } = renderWithProviders(
      <AskUserDialog
        questions={choiceQuestion}
        onSubmit={vi.fn()}
@@ -17,9 +17,7 @@ describe('<CliSpinner />', () => {

  it('should increment debugNumAnimatedComponents on mount and decrement on unmount', async () => {
    expect(debugState.debugNumAnimatedComponents).toBe(0);
-    const { waitUntilReady, unmount } = await renderWithProviders(
-      <CliSpinner />,
-    );
+    const { waitUntilReady, unmount } = renderWithProviders(<CliSpinner />);
    await waitUntilReady();
    expect(debugState.debugNumAnimatedComponents).toBe(1);
    unmount();
@@ -28,7 +26,7 @@ describe('<CliSpinner />', () => {

  it('should not render when showSpinner is false', async () => {
    const settings = createMockSettings({ ui: { showSpinner: false } });
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <CliSpinner />,
      { settings },
    );
@@ -96,7 +96,7 @@ describe('ColorsDisplay', () => {

  it('renders correctly', async () => {
    const mockTheme = themeManager.getActiveTheme();
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
+    const { lastFrame, waitUntilReady, unmount } = renderWithProviders(
      <ColorsDisplay activeTheme={mockTheme} />,
    );
    await waitUntilReady();
@@ -183,6 +183,7 @@ const createMockUIState = (overrides: Partial<UIState> = {}): UIState =>
    ideContextState: null,
    geminiMdFileCount: 0,
    renderMarkdown: true,
+    filteredConsoleMessages: [],
    history: [],
    sessionStats: {
      sessionId: 'test-session',
@@ -756,6 +757,13 @@ describe('Composer', () => {
    it('shows DetailedMessagesDisplay when showErrorDetails is true', async () => {
      const uiState = createMockUIState({
        showErrorDetails: true,
+        filteredConsoleMessages: [
+          {
+            type: 'error',
+            content: 'Test error',
+            count: 1,
+          },
+        ],
      });

      const { lastFrame } = await renderComposer(uiState);
@@ -422,6 +422,7 @@ export const Composer = ({ isFocused = true }: { isFocused?: boolean }) => {
        <OverflowProvider>
          <Box flexDirection="column">
            <DetailedMessagesDisplay
+              messages={uiState.filteredConsoleMessages}
              maxHeight={
                uiState.constrainHeight ? debugConsoleMaxHeight : undefined
              }
@@ -43,7 +43,7 @@ describe('ConfigInitDisplay', () => {
  });

  it('renders initial state', async () => {
-    const { lastFrame, waitUntilReady } = await renderWithProviders(
+    const { lastFrame, waitUntilReady } = renderWithProviders(
      <ConfigInitDisplay />,
    );
    await waitUntilReady();
@@ -59,7 +59,7 @@ describe('ConfigInitDisplay', () => {
      return coreEvents;
    });

-    const { lastFrame } = await renderWithProviders(<ConfigInitDisplay />);
+    const { lastFrame } = renderWithProviders(<ConfigInitDisplay />);

    // Wait for listener to be registered
    await waitFor(() => {
@@ -97,7 +97,7 @@ describe('ConfigInitDisplay', () => {
      return coreEvents;
    });

-    const { lastFrame } = await renderWithProviders(<ConfigInitDisplay />);
+    const { lastFrame } = renderWithProviders(<ConfigInitDisplay />);

    await waitFor(() => {
      if (!listener) throw new Error('Listener not registered yet');
@@ -133,7 +133,7 @@ describe('ConfigInitDisplay', () => {
      return coreEvents;
    });

-    const { lastFrame } = await renderWithProviders(<ConfigInitDisplay />);
+    const { lastFrame } = renderWithProviders(<ConfigInitDisplay />);

    await waitFor(() => {
      if (!listener) throw new Error('Listener not registered yet');
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hadi Minooei	06d019e8c9	chore(cli): increase user simulator tick interval to 3s and update design doc	2026-03-20 10:37:07 -07:00
Hadi Minooei	acebeea129	refactor(cli): optimize prompt caching for user simulator screen output	2026-03-20 10:21:58 -07:00
Hadi Minooei	38d2c7a409	fix(cli): compress multiple empty lines in simulator screen output	2026-03-20 10:12:58 -07:00
Hadi Minooei	0f0cc3da8d	fix(simulator): use proper newlines and full static history for getScreen	2026-03-20 10:02:34 -07:00
Hadi Minooei	6f975fb955	fix(cli): explicitly log simulator termination and remove loop detection	2026-03-20 09:27:12 -07:00
Hadi Minooei	be33cdc896	fix(cli): context loop fix and test mock update	2026-03-19 22:50:39 -07:00
Hadi Minooei	844127130b	feat(simulator): use gemini-3-flash-preview with thinking for simulation	2026-03-19 20:47:49 -07:00
Hadi Minooei	f57d436d5b	feat(cli): enhance user simulator with loop detection and logging	2026-03-19 15:27:55 -07:00
Hadi Minooei	0af62ba23d	feat(cli): enhance UserSimulator logging and stop condition	2026-03-19 15:19:17 -07:00
Hadi Minooei	ca59603fb6	feat(cli): add task completion detection to user simulator	2026-03-19 14:42:15 -07:00
Hadi Minooei	b8c1dfad51	feat(cli): first working version of user simulator	2026-03-19 08:57:55 -07:00
Hadi Minooei	483193257e	feat: add user simulator and integrate into CLI	2026-03-19 08:43:02 -07:00