fix(core): add getTelemetryLogPromptsEnabled to mock config

Merge remote-tracking branch 'origin/main' into 23290-memory-bloat
fix(core): remove noAutoEnd from loggingContentGenerator tests
2026-07-29 03:00:58 -07:00 · 2026-03-23 18:48:25 +00:00 · 2026-03-23 18:30:21 +00:00 · 2026-03-23 16:20:15 +00:00 · 2026-03-20 18:33:46 -04:00 · 2026-03-20 17:21:37 -04:00
32 changed files with 439 additions and 859 deletions
@@ -7,15 +7,5 @@
  },
  "general": {
    "devtools": true
-  },
-  "agents": {
-    "overrides": {
-      "browser_agent": { "enabled": true }
-    },
-    "browser": {
-      "headless": true,
-      "sessionMode": "isolated",
-      "allowedDomains": ["*.com"]
-    }
  }
 }
@@ -34,20 +34,16 @@ describe('extension install', () => {
    writeFileSync(testServerPath, extension);
    try {
      const result = await rig.runCommand(
-        ['--debug', 'extensions', 'install', `${rig.testDir!}`],
+        ['extensions', 'install', `${rig.testDir!}`],
        { stdin: 'y\n' },
      );
      expect(result).toContain('test-extension-install');

-      const listResult = await rig.runCommand([
-        '--debug',
-        'extensions',
-        'list',
-      ]);
+      const listResult = await rig.runCommand(['extensions', 'list']);
      expect(listResult).toContain('test-extension-install');
      writeFileSync(testServerPath, extensionUpdate);
      const updateResult = await rig.runCommand(
-        ['--debug', 'extensions', 'update', `test-extension-install`],
+        ['extensions', 'update', `test-extension-install`],
        { stdin: 'y\n' },
      );
      expect(updateResult).toContain('0.0.2');
@@ -66,7 +66,7 @@ describe('extension reloading', () => {
      }

      const result = await rig.runCommand(
-        ['--debug', 'extensions', 'install', `${rig.testDir!}`],
+        ['extensions', 'install', `${rig.testDir!}`],
        { stdin: 'y\n' },
      );
      expect(result).toContain('test-extension');
@@ -32,7 +32,6 @@ import {
  ValidationRequiredError,
  type AdminControlsSettings,
  debugLogger,
-  isHeadlessMode,
 } from '@google/gemini-cli-core';

 import { loadCliConfig, parseArguments } from './config/config.js';
@@ -297,7 +296,6 @@ export async function main() {
  const isDebugMode = cliConfig.isDebugMode(argv);
  const consolePatcher = new ConsolePatcher({
    stderr: true,
-    interactive: isHeadlessMode() ? false : true,
    debugMode: isDebugMode,
    onNewMessage: (msg) => {
      coreEvents.emitConsoleLog(msg.type, msg.content);
@@ -65,7 +65,6 @@ export async function runNonInteractive({
  return promptIdContext.run(prompt_id, async () => {
    const consolePatcher = new ConsolePatcher({
      stderr: true,
-      interactive: false,
      debugMode: config.getDebugMode(),
      onNewMessage: (msg) => {
        coreEvents.emitConsoleLog(msg.type, msg.content);
@@ -11,11 +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,
-  persistentStateMock,
-} from './render.js';
+import { renderWithProviders, type RenderInstance } from './render.js';
 import {
  makeFakeConfig,
  type Config,
@@ -184,11 +180,6 @@ export class AppRig {
  }

  async initialize() {
-    persistentStateMock.setData({
-      terminalSetupPromptShown: true,
-      tipsShown: 10,
-    });
-
    this.setupEnvironment();
    resetSettingsCacheForTesting();
    this.settings = this.createRigSettings();
@@ -235,8 +226,6 @@ export class AppRig {
  private setupEnvironment() {
    // Stub environment variables to avoid interference from developer's machine
    vi.stubEnv('GEMINI_CLI_HOME', this.testDir);
-    vi.stubEnv('TERM_PROGRAM', 'other');
-    vi.stubEnv('VSCODE_GIT_IPC_HANDLE', '');
    if (this.options.fakeResponsesPath) {
      vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
      MockShellExecutionService.setPassthrough(false);
@@ -302,6 +291,7 @@ export class AppRig {

      const newContentGeneratorConfig = {
        authType: authMethod,
+
        proxy: gcConfig.getProxy(),
        apiKey: process.env['GEMINI_API_KEY'] || 'test-api-key',
      };
@@ -2,13 +2,10 @@

 exports[`App > Snapshots > renders default layout correctly 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v1.2.3
-
+  ▝▜▄     Gemini CLI v1.2.3
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    


 Tips for getting started:
@@ -34,6 +31,9 @@ Tips for getting started:



+
+
+



@@ -47,13 +47,10 @@ exports[`App > Snapshots > renders screen reader layout correctly 1`] = `
 "Notifications
 Footer

- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v1.2.3
-
+  ▝▜▄     Gemini CLI v1.2.3
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    


 Tips for getting started:
@@ -67,12 +64,12 @@ Composer

 exports[`App > Snapshots > renders with dialogs visible 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
+  ▝▜▄     Gemini CLI v1.2.3
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    
+

- Gemini CLI v1.2.3



@@ -110,13 +107,10 @@ DialogManager

 exports[`App > should render ToolConfirmationQueue along with Composer when tool is confirming and experiment is on 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v1.2.3
-
+  ▝▜▄     Gemini CLI v1.2.3
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    


 Tips for getting started:
@@ -146,6 +140,9 @@ HistoryItemDisplay



+
+
+
 Notifications
 Composer
 "
@@ -10,7 +10,6 @@ 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', () => ({
@@ -241,27 +240,4 @@ describe('<AppHeader />', () => {
    expect(session2.lastFrame()).not.toContain('Tips');
    session2.unmount();
  });
-
-  it('should render the full logo when logged out', async () => {
-    const mockConfig = makeFakeConfig();
-    vi.spyOn(mockConfig, 'getContentGeneratorConfig').mockReturnValue({
-      authType: undefined,
-    } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
-
-    const { lastFrame, waitUntilReady, unmount } = await renderWithProviders(
-      <AppHeader version="1.0.0" />,
-      {
-        config: mockConfig,
-        uiState: {
-          terminalWidth: 120,
-        },
-      },
-    );
-    await waitUntilReady();
-
-    // Check for block characters from the logo
-    expect(lastFrame()).toContain('▗█▀▀▜▙');
-    expect(lastFrame()).toMatchSnapshot();
-    unmount();
-  });
 });
@@ -19,9 +19,6 @@ import { CliSpinner } from './CliSpinner.js';

 import { isAppleTerminal } from '@google/gemini-cli-core';

-import { longAsciiLogoCompactText } from './AsciiArt.js';
-import { getAsciiArtWidth } from '../utils/textUtils.js';
-
 interface AppHeaderProps {
  version: string;
  showDetails?: boolean;
@@ -44,18 +41,6 @@ const MAC_TERMINAL_ICON = `▝▜▄
  ▗▟▀
 ▗▟▀  `;

-/**
- * The horizontal padding (in columns) required for metadata (version, identity, etc.)
- * when rendered alongside the ASCII logo.
- */
-const LOGO_METADATA_PADDING = 20;
-
-/**
- * The terminal width below which we switch to a narrow/column layout to prevent
- * UI elements from wrapping or overlapping.
- */
-const NARROW_TERMINAL_BREAKPOINT = 60;
-
 export const AppHeader = ({ version, showDetails = true }: AppHeaderProps) => {
  const settings = useSettings();
  const config = useConfig();
@@ -64,90 +49,70 @@ export const AppHeader = ({ version, showDetails = true }: AppHeaderProps) => {
  const { bannerText } = useBanner(bannerData);
  const { showTips } = useTips();

-  const authType = config.getContentGeneratorConfig()?.authType;
-  const loggedOut = !authType;
-
  const showHeader = !(
    settings.merged.ui.hideBanner || config.getScreenReader()
  );

  const ICON = isAppleTerminal() ? MAC_TERMINAL_ICON : DEFAULT_ICON;

-  let logoTextArt = '';
-  if (loggedOut) {
-    const widthOfLongLogo =
-      getAsciiArtWidth(longAsciiLogoCompactText) + LOGO_METADATA_PADDING;
-
-    if (terminalWidth >= widthOfLongLogo) {
-      logoTextArt = longAsciiLogoCompactText.trim();
-    }
-  }
-
-  // If the terminal is too narrow to fit the icon and metadata (especially long nightly versions)
-  // side-by-side, we switch to column mode to prevent wrapping.
-  const isNarrow = terminalWidth < NARROW_TERMINAL_BREAKPOINT;
-
-  const renderLogo = () => (
-    <Box flexDirection="row">
-      <Box flexShrink={0}>
-        <ThemedGradient>{ICON}</ThemedGradient>
-      </Box>
-      {logoTextArt && (
-        <Box marginLeft={3}>
-          <Text color={theme.text.primary}>{logoTextArt}</Text>
-        </Box>
-      )}
-    </Box>
-  );
-
-  const renderMetadata = (isBelow = false) => (
-    <Box marginLeft={isBelow ? 0 : 2} flexDirection="column">
-      {/* Line 1: Gemini CLI vVersion [Updating] */}
-      <Box>
-        <Text bold color={theme.text.primary}>
-          Gemini CLI
-        </Text>
-        <Text color={theme.text.secondary}> v{version}</Text>
-        {updateInfo && (
-          <Box marginLeft={2}>
-            <Text color={theme.text.secondary}>
-              <CliSpinner /> Updating
-            </Text>
+  if (!showDetails) {
+    return (
+      <Box flexDirection="column">
+        {showHeader && (
+          <Box
+            flexDirection="row"
+            marginTop={1}
+            marginBottom={1}
+            paddingLeft={2}
+          >
+            <Box flexShrink={0}>
+              <ThemedGradient>{ICON}</ThemedGradient>
+            </Box>
+            <Box marginLeft={2} flexDirection="column">
+              <Box>
+                <Text bold color={theme.text.primary}>
+                  Gemini CLI
+                </Text>
+                <Text color={theme.text.secondary}> v{version}</Text>
+              </Box>
+            </Box>
          </Box>
        )}
      </Box>
-
-      {showDetails && (
-        <>
-          {/* Line 2: Blank */}
-          <Box height={1} />
-
-          {/* Lines 3 & 4: User Identity info (Email /auth and Plan /upgrade) */}
-          {settings.merged.ui.showUserIdentity !== false && (
-            <UserIdentity config={config} />
-          )}
-        </>
-      )}
-    </Box>
-  );
-
-  const useColumnLayout = !!logoTextArt || isNarrow;
+    );
+  }

  return (
    <Box flexDirection="column">
      {showHeader && (
-        <Box
-          flexDirection={useColumnLayout ? 'column' : 'row'}
-          marginTop={1}
-          marginBottom={1}
-          paddingLeft={1}
-        >
-          {renderLogo()}
-          {useColumnLayout ? (
-            <Box marginTop={1}>{renderMetadata(true)}</Box>
-          ) : (
-            renderMetadata(false)
-          )}
+        <Box flexDirection="row" marginTop={1} marginBottom={1} paddingLeft={2}>
+          <Box flexShrink={0}>
+            <ThemedGradient>{ICON}</ThemedGradient>
+          </Box>
+          <Box marginLeft={2} flexDirection="column">
+            {/* Line 1: Gemini CLI vVersion [Updating] */}
+            <Box>
+              <Text bold color={theme.text.primary}>
+                Gemini CLI
+              </Text>
+              <Text color={theme.text.secondary}> v{version}</Text>
+              {updateInfo && (
+                <Box marginLeft={2}>
+                  <Text color={theme.text.secondary}>
+                    <CliSpinner /> Updating
+                  </Text>
+                </Box>
+              )}
+            </Box>
+
+            {/* Line 2: Blank */}
+            <Box height={1} />
+
+            {/* Lines 3 & 4: User Identity info (Email /auth and Plan /upgrade) */}
+            {settings.merged.ui.showUserIdentity !== false && (
+              <UserIdentity config={config} />
+            )}
+          </Box>
        </Box>
      )}

@@ -16,14 +16,14 @@ export const shortAsciiLogo = `
 `;

 export const longAsciiLogo = `
- █████████  ██████████ ██████   ██████ █████ ██████   █████ █████ 
-███░░░░░███░░███░░░░░█░░██████ █████ ░░███░░██████ ░░███ ░░███  
-███ ░░░░░░░  ░███  █ ░  ░███░█████░███  ░███ ░███░███ ░███  ░███  
-░███          ░██████    ░███░░███ ░███  ░███ ░███░░███░███  ░███  
-░███    █████ ░███░░█    ░███ ░░░  ░███  ░███ ░███ ░░██████  ░███  
-░░███  ░░███  ░███ ░   █ ░███      ░███  ░███ ░███  ░░█████  ░███  
- ░░█████████  ██████████ █████     █████ █████ █████  ░░████ █████ 
-  ░░░░░░░░░  ░░░░░░░░░░ ░░░░░     ░░░░░ ░░░░░ ░░░░░    ░░░░ ░░░░░  
+ ███            █████████  ██████████ ██████   ██████ █████ ██████   █████ █████
+░░░███         ███░░░░░███░░███░░░░░█░░██████ ██████ ░░███ ░░██████ ░░███ ░░███
+  ░░░███      ███     ░░░  ░███  █ ░  ░███░█████░███  ░███  ░███░███ ░███  ░███
+    ░░░███   ░███          ░██████    ░███░░███ ░███  ░███  ░███░░███░███  ░███
+     ███░    ░███    █████ ░███░░█    ░███ ░░░  ░███  ░███  ░███ ░░██████  ░███
+   ███░      ░░███  ░░███  ░███ ░   █ ░███      ░███  ░███  ░███  ░░█████  ░███
+ ███░         ░░█████████  ██████████ █████     █████ █████ █████  ░░█████ █████
+░░░            ░░░░░░░░░  ░░░░░░░░░░ ░░░░░     ░░░░░ ░░░░░ ░░░░░    ░░░░░ ░░░░░
 `;

 export const tinyAsciiLogo = `
@@ -36,24 +36,3 @@ export const tinyAsciiLogo = `
 ███░      ░░█████████ 
 ░░░         ░░░░░░░░░  
 `;
-
-export const shortAsciiLogoCompactText = `
-▟▛▀▀█▖▜█▀▀▜▝██▙▗██▛▝█▛▝██▙ ▜█▘▜█▘
-▐█     ▐█▄▌  █▌▜█▘█▌ █▌ █▌▜▙▐█ ▐█ 
-▝█▖ ▜█▘▐█ ▘▗ █▌   █▌ █▌ █▌ ▜██ ▐█ 
- ▝▀▀▀▀ ▀▀▀▀▀▝▀▀  ▝▀▀▝▀▀▝▀▀  ▀▀▘▀▀▘
-`;
-
-export const longAsciiLogoCompactText = `
-▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-█▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-`;
-
-export const tinyAsciiLogoCompactText = `
-▟▛▀▀█▖
-▐█     
-▝█▖ ▜█▘
- ▝▀▀▀▀ 
-`;
@@ -10,7 +10,7 @@ import * as SessionContext from '../contexts/SessionContext.js';
 import { type SessionStatsState } from '../contexts/SessionContext.js';
 import { Banner } from './Banner.js';
 import { Footer } from './Footer.js';
-import { AppHeader } from './AppHeader.js';
+import { Header } from './Header.js';
 import { ModelDialog } from './ModelDialog.js';
 import { StatsDisplay } from './StatsDisplay.js';

@@ -71,9 +71,9 @@ useSessionStatsMock.mockReturnValue({
 });

 describe('Gradient Crash Regression Tests', () => {
-  it('<AppHeader /> should not crash when theme.ui.gradient is empty', async () => {
+  it('<Header /> should not crash when theme.ui.gradient is empty', async () => {
    const { lastFrame, unmount } = await renderWithProviders(
-      <AppHeader version="1.0.0" />,
+      <Header version="1.0.0" nightly={false} />,
      {
        width: 120,
      },
@@ -2,13 +2,10 @@

 exports[`AlternateBufferQuittingDisplay > renders with a tool awaiting confirmation > with_confirming_tool 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v0.10.0
-
+  ▝▜▄     Gemini CLI v0.10.0
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    


 Tips for getting started:
@@ -25,13 +22,10 @@ Action Required (was prompted):

 exports[`AlternateBufferQuittingDisplay > renders with active and pending tool messages > with_history_and_pending 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v0.10.0
-
+  ▝▜▄     Gemini CLI v0.10.0
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    


 Tips for getting started:
@@ -56,13 +50,10 @@ Tips for getting started:

 exports[`AlternateBufferQuittingDisplay > renders with empty history and no pending items > empty 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v0.10.0
-
+  ▝▜▄     Gemini CLI v0.10.0
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    


 Tips for getting started:
@@ -75,13 +66,10 @@ Tips for getting started:

 exports[`AlternateBufferQuittingDisplay > renders with history but no pending items > with_history_no_pending 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v0.10.0
-
+  ▝▜▄     Gemini CLI v0.10.0
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    


 Tips for getting started:
@@ -102,13 +90,10 @@ Tips for getting started:

 exports[`AlternateBufferQuittingDisplay > renders with pending items but no history > with_pending_no_history 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v0.10.0
-
+  ▝▜▄     Gemini CLI v0.10.0
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    


 Tips for getting started:
@@ -125,13 +110,10 @@ Tips for getting started:

 exports[`AlternateBufferQuittingDisplay > renders with user and gemini messages > with_user_gemini_messages 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v0.10.0
-
+  ▝▜▄     Gemini CLI v0.10.0
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    


 Tips for getting started:
@@ -2,13 +2,10 @@

 exports[`<AppHeader /> > should not render the banner when no flags are set 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v1.0.0
-
+  ▝▜▄     Gemini CLI v1.0.0
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    


 Tips for getting started:
@@ -21,13 +18,10 @@ Tips for getting started:

 exports[`<AppHeader /> > should not render the default banner if shown count is 5 or more 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v1.0.0
-
+  ▝▜▄     Gemini CLI v1.0.0
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    


 Tips for getting started:
@@ -40,13 +34,10 @@ Tips for getting started:

 exports[`<AppHeader /> > should render the banner with default text 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v1.0.0
-
+  ▝▜▄     Gemini CLI v1.0.0
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    

 ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
 │ This is the default banner                                                                       │
@@ -62,13 +53,10 @@ Tips for getting started:

 exports[`<AppHeader /> > should render the banner with warning text 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v1.0.0
-
+  ▝▜▄     Gemini CLI v1.0.0
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    

 ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
 │ There are capacity issues                                                                        │
@@ -81,14 +69,3 @@ Tips for getting started:
 4. Be specific for the best results
 "
 `;
-
-exports[`<AppHeader /> > should render the full logo when logged out 1`] = `
-"
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v1.0.0
-"
-`;
@@ -1,34 +1,30 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="275" viewBox="0 0 920 275">
+<svg xmlns="http://www.w3.org/2000/svg" width="920" height="224" viewBox="0 0 920 224">
  <style>
    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
  </style>
-  <rect width="920" height="275" fill="#000000" />
+  <rect width="920" height="224" fill="#000000" />
  <g transform="translate(10, 10)">
-    <text x="9" y="19" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
-    <text x="18" y="19" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
-    <text x="27" y="19" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
-    <text x="90" y="19" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛</text>
-    <text x="27" y="36" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
-    <text x="36" y="36" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
-    <text x="45" y="36" fill="#c3677f" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
-    <text x="90" y="36" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">█▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌</text>
-    <text x="18" y="53" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▗</text>
-    <text x="27" y="53" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▟</text>
-    <text x="36" y="53" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
-    <text x="90" y="53" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌</text>
-    <text x="9" y="70" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
-    <text x="18" y="70" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
-    <text x="90" y="70" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs"> ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀</text>
-    <text x="9" y="104" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs" font-weight="bold">Gemini CLI</text>
-    <text x="99" y="104" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs"> v1.0.0</text>
-    <text x="0" y="172" fill="#ffffff" textLength="225" lengthAdjust="spacingAndGlyphs">Tips for getting started:</text>
-    <text x="0" y="189" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">1. Create </text>
-    <text x="90" y="189" fill="#ffffff" textLength="81" lengthAdjust="spacingAndGlyphs" font-weight="bold">GEMINI.md</text>
-    <text x="171" y="189" fill="#ffffff" textLength="333" lengthAdjust="spacingAndGlyphs"> files to customize your interactions</text>
-    <text x="0" y="206" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">2. </text>
-    <text x="27" y="206" fill="#afafaf" textLength="45" lengthAdjust="spacingAndGlyphs">/help</text>
-    <text x="72" y="206" fill="#ffffff" textLength="189" lengthAdjust="spacingAndGlyphs"> for more information</text>
-    <text x="0" y="223" fill="#ffffff" textLength="450" lengthAdjust="spacingAndGlyphs">3. Ask coding questions, edit code or run commands</text>
-    <text x="0" y="240" fill="#ffffff" textLength="315" lengthAdjust="spacingAndGlyphs">4. Be specific for the best results</text>
+    <text x="18" y="19" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="27" y="19" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
+    <text x="36" y="19" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
+    <text x="90" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs" font-weight="bold">Gemini CLI</text>
+    <text x="180" y="19" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs"> v1.0.0</text>
+    <text x="36" y="36" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="45" y="36" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
+    <text x="54" y="36" fill="#c3677f" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
+    <text x="27" y="53" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▗</text>
+    <text x="36" y="53" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▟</text>
+    <text x="45" y="53" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
+    <text x="18" y="70" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="27" y="70" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
+    <text x="0" y="121" fill="#ffffff" textLength="225" lengthAdjust="spacingAndGlyphs">Tips for getting started:</text>
+    <text x="0" y="138" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">1. Create </text>
+    <text x="90" y="138" fill="#ffffff" textLength="81" lengthAdjust="spacingAndGlyphs" font-weight="bold">GEMINI.md</text>
+    <text x="171" y="138" fill="#ffffff" textLength="333" lengthAdjust="spacingAndGlyphs"> files to customize your interactions</text>
+    <text x="0" y="155" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">2. </text>
+    <text x="27" y="155" fill="#afafaf" textLength="45" lengthAdjust="spacingAndGlyphs">/help</text>
+    <text x="72" y="155" fill="#ffffff" textLength="189" lengthAdjust="spacingAndGlyphs"> for more information</text>
+    <text x="0" y="172" fill="#ffffff" textLength="450" lengthAdjust="spacingAndGlyphs">3. Ask coding questions, edit code or run commands</text>
+    <text x="0" y="189" fill="#ffffff" textLength="315" lengthAdjust="spacingAndGlyphs">4. Be specific for the best results</text>
  </g>
 </svg>
@@ -1,35 +1,31 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="275" viewBox="0 0 920 275">
+<svg xmlns="http://www.w3.org/2000/svg" width="920" height="224" viewBox="0 0 920 224">
  <style>
    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
  </style>
-  <rect width="920" height="275" fill="#000000" />
+  <rect width="920" height="224" fill="#000000" />
  <g transform="translate(10, 10)">
-    <text x="9" y="19" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
-    <text x="18" y="19" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
-    <text x="27" y="19" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
-    <text x="81" y="19" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛</text>
-    <text x="27" y="36" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
-    <text x="36" y="36" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
-    <text x="45" y="36" fill="#c3677f" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
-    <text x="81" y="36" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">█▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌</text>
-    <text x="27" y="53" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▗</text>
-    <text x="36" y="53" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▟</text>
-    <text x="45" y="53" fill="#c3677f" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
-    <text x="81" y="53" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌</text>
-    <text x="9" y="70" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▗</text>
-    <text x="18" y="70" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▟</text>
-    <text x="27" y="70" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
-    <text x="81" y="70" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs"> ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀</text>
-    <text x="9" y="104" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs" font-weight="bold">Gemini CLI</text>
-    <text x="99" y="104" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs"> v1.0.0</text>
-    <text x="0" y="172" fill="#ffffff" textLength="225" lengthAdjust="spacingAndGlyphs">Tips for getting started:</text>
-    <text x="0" y="189" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">1. Create </text>
-    <text x="90" y="189" fill="#ffffff" textLength="81" lengthAdjust="spacingAndGlyphs" font-weight="bold">GEMINI.md</text>
-    <text x="171" y="189" fill="#ffffff" textLength="333" lengthAdjust="spacingAndGlyphs"> files to customize your interactions</text>
-    <text x="0" y="206" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">2. </text>
-    <text x="27" y="206" fill="#afafaf" textLength="45" lengthAdjust="spacingAndGlyphs">/help</text>
-    <text x="72" y="206" fill="#ffffff" textLength="189" lengthAdjust="spacingAndGlyphs"> for more information</text>
-    <text x="0" y="223" fill="#ffffff" textLength="450" lengthAdjust="spacingAndGlyphs">3. Ask coding questions, edit code or run commands</text>
-    <text x="0" y="240" fill="#ffffff" textLength="315" lengthAdjust="spacingAndGlyphs">4. Be specific for the best results</text>
+    <text x="18" y="19" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="27" y="19" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
+    <text x="36" y="19" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
+    <text x="81" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs" font-weight="bold">Gemini CLI</text>
+    <text x="171" y="19" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs"> v1.0.0</text>
+    <text x="36" y="36" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="45" y="36" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
+    <text x="54" y="36" fill="#c3677f" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
+    <text x="36" y="53" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▗</text>
+    <text x="45" y="53" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▟</text>
+    <text x="54" y="53" fill="#c3677f" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
+    <text x="18" y="70" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▗</text>
+    <text x="27" y="70" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▟</text>
+    <text x="36" y="70" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
+    <text x="0" y="121" fill="#ffffff" textLength="225" lengthAdjust="spacingAndGlyphs">Tips for getting started:</text>
+    <text x="0" y="138" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">1. Create </text>
+    <text x="90" y="138" fill="#ffffff" textLength="81" lengthAdjust="spacingAndGlyphs" font-weight="bold">GEMINI.md</text>
+    <text x="171" y="138" fill="#ffffff" textLength="333" lengthAdjust="spacingAndGlyphs"> files to customize your interactions</text>
+    <text x="0" y="155" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">2. </text>
+    <text x="27" y="155" fill="#afafaf" textLength="45" lengthAdjust="spacingAndGlyphs">/help</text>
+    <text x="72" y="155" fill="#ffffff" textLength="189" lengthAdjust="spacingAndGlyphs"> for more information</text>
+    <text x="0" y="172" fill="#ffffff" textLength="450" lengthAdjust="spacingAndGlyphs">3. Ask coding questions, edit code or run commands</text>
+    <text x="0" y="189" fill="#ffffff" textLength="315" lengthAdjust="spacingAndGlyphs">4. Be specific for the best results</text>
  </g>
 </svg>
@@ -2,13 +2,10 @@

 exports[`AppHeader Icon Rendering > renders the default icon in standard terminals 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v1.0.0
-
+  ▝▜▄     Gemini CLI v1.0.0
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    


 Tips for getting started:
@@ -20,13 +17,10 @@ Tips for getting started:

 exports[`AppHeader Icon Rendering > renders the symmetric icon in Apple Terminal 1`] = `
 "
- ▝▜▄     ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄   █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-   ▗▟▀   ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▗▟▀      ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
-
- Gemini CLI v1.0.0
-
+  ▝▜▄    Gemini CLI v1.0.0
+    ▝▜▄
+    ▗▟▀
+  ▗▟▀  


 Tips for getting started:
@@ -14,12 +14,24 @@ Spinner Initializing...

 exports[`ConfigInitDisplay > truncates list of waiting servers if too many 1`] = `
 "
-Spinner Initializing...
+Spinner Connecting to MCP servers... (0/5) - Waiting for: s1, s2, s3, +2 more
+"
+`;
+
+exports[`ConfigInitDisplay > truncates list of waiting servers if too many 2`] = `
+"
+Spinner Connecting to MCP servers... (0/5) - Waiting for: s1, s2, s3, +2 more
 "
 `;

 exports[`ConfigInitDisplay > updates message on McpClientUpdate event 1`] = `
 "
-Spinner Initializing...
+Spinner Connecting to MCP servers... (1/2) - Waiting for: server2
+"
+`;
+
+exports[`ConfigInitDisplay > updates message on McpClientUpdate event 2`] = `
+"
+Spinner Connecting to MCP servers... (1/2) - Waiting for: server2
 "
 `;
@@ -1,236 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* eslint-disable no-console */
-
-import { describe, it, expect, vi, afterEach } from 'vitest';
-import { ConsolePatcher } from './ConsolePatcher.js';
-
-describe('ConsolePatcher', () => {
-  let patcher: ConsolePatcher;
-  const onNewMessage = vi.fn();
-
-  afterEach(() => {
-    if (patcher) {
-      patcher.cleanup();
-    }
-    vi.restoreAllMocks();
-    vi.clearAllMocks();
-  });
-
-  it('should patch and restore console methods', () => {
-    const beforeLog = console.log;
-    const beforeWarn = console.warn;
-    const beforeError = console.error;
-    const beforeDebug = console.debug;
-    const beforeInfo = console.info;
-
-    patcher = new ConsolePatcher({ onNewMessage, debugMode: false });
-    patcher.patch();
-
-    expect(console.log).not.toBe(beforeLog);
-    expect(console.warn).not.toBe(beforeWarn);
-    expect(console.error).not.toBe(beforeError);
-    expect(console.debug).not.toBe(beforeDebug);
-    expect(console.info).not.toBe(beforeInfo);
-
-    patcher.cleanup();
-
-    expect(console.log).toBe(beforeLog);
-    expect(console.warn).toBe(beforeWarn);
-    expect(console.error).toBe(beforeError);
-    expect(console.debug).toBe(beforeDebug);
-    expect(console.info).toBe(beforeInfo);
-  });
-
-  describe('Interactive mode', () => {
-    it('should ignore log and info when it is not interactive and debugMode is false', () => {
-      patcher = new ConsolePatcher({
-        onNewMessage,
-        debugMode: false,
-        interactive: false,
-      });
-      patcher.patch();
-
-      console.log('test log');
-      console.info('test info');
-      expect(onNewMessage).not.toHaveBeenCalled();
-    });
-
-    it('should not ignore log and info when it is not interactive and debugMode is true', () => {
-      patcher = new ConsolePatcher({
-        onNewMessage,
-        debugMode: true,
-        interactive: false,
-      });
-      patcher.patch();
-
-      console.log('test log');
-      expect(onNewMessage).toHaveBeenCalledWith({
-        type: 'log',
-        content: 'test log',
-        count: 1,
-      });
-
-      console.info('test info');
-      expect(onNewMessage).toHaveBeenCalledWith({
-        type: 'info',
-        content: 'test info',
-        count: 1,
-      });
-    });
-
-    it('should not ignore log and info when it is interactive', () => {
-      patcher = new ConsolePatcher({
-        onNewMessage,
-        debugMode: false,
-        interactive: true,
-      });
-      patcher.patch();
-
-      console.log('test log');
-      expect(onNewMessage).toHaveBeenCalledWith({
-        type: 'log',
-        content: 'test log',
-        count: 1,
-      });
-
-      console.info('test info');
-      expect(onNewMessage).toHaveBeenCalledWith({
-        type: 'info',
-        content: 'test info',
-        count: 1,
-      });
-    });
-  });
-
-  describe('when stderr is false', () => {
-    it('should call onNewMessage for log, warn, error, and info', () => {
-      patcher = new ConsolePatcher({
-        onNewMessage,
-        debugMode: false,
-        stderr: false,
-      });
-      patcher.patch();
-
-      console.log('test log');
-      expect(onNewMessage).toHaveBeenCalledWith({
-        type: 'log',
-        content: 'test log',
-        count: 1,
-      });
-
-      console.warn('test warn');
-      expect(onNewMessage).toHaveBeenCalledWith({
-        type: 'warn',
-        content: 'test warn',
-        count: 1,
-      });
-
-      console.error('test error');
-      expect(onNewMessage).toHaveBeenCalledWith({
-        type: 'error',
-        content: 'test error',
-        count: 1,
-      });
-
-      console.info('test info');
-      expect(onNewMessage).toHaveBeenCalledWith({
-        type: 'info',
-        content: 'test info',
-        count: 1,
-      });
-    });
-
-    it('should not call onNewMessage for debug when debugMode is false', () => {
-      patcher = new ConsolePatcher({
-        onNewMessage,
-        debugMode: false,
-        stderr: false,
-      });
-      patcher.patch();
-
-      console.debug('test debug');
-      expect(onNewMessage).not.toHaveBeenCalled();
-    });
-
-    it('should call onNewMessage for debug when debugMode is true', () => {
-      patcher = new ConsolePatcher({
-        onNewMessage,
-        debugMode: true,
-        stderr: false,
-      });
-      patcher.patch();
-
-      console.debug('test debug');
-      expect(onNewMessage).toHaveBeenCalledWith({
-        type: 'debug',
-        content: 'test debug',
-        count: 1,
-      });
-    });
-
-    it('should format multiple arguments using util.format', () => {
-      patcher = new ConsolePatcher({
-        onNewMessage,
-        debugMode: false,
-        stderr: false,
-      });
-      patcher.patch();
-
-      console.log('test %s %d', 'string', 123);
-      expect(onNewMessage).toHaveBeenCalledWith({
-        type: 'log',
-        content: 'test string 123',
-        count: 1,
-      });
-    });
-  });
-
-  describe('when stderr is true', () => {
-    it('should redirect warn and error to originalConsoleError', () => {
-      const spyError = vi.spyOn(console, 'error').mockImplementation(() => {});
-      patcher = new ConsolePatcher({ debugMode: false, stderr: true });
-      patcher.patch();
-
-      console.warn('test warn');
-      expect(spyError).toHaveBeenCalledWith('test warn');
-
-      console.error('test error');
-      expect(spyError).toHaveBeenCalledWith('test error');
-    });
-
-    it('should redirect log and info to originalConsoleError when debugMode is true', () => {
-      const spyError = vi.spyOn(console, 'error').mockImplementation(() => {});
-      patcher = new ConsolePatcher({ debugMode: true, stderr: true });
-      patcher.patch();
-
-      console.log('test log');
-      expect(spyError).toHaveBeenCalledWith('test log');
-
-      console.info('test info');
-      expect(spyError).toHaveBeenCalledWith('test info');
-    });
-
-    it('should ignore debug when debugMode is false', () => {
-      const spyError = vi.spyOn(console, 'error').mockImplementation(() => {});
-      patcher = new ConsolePatcher({ debugMode: false, stderr: true });
-      patcher.patch();
-
-      console.debug('test debug');
-      expect(spyError).not.toHaveBeenCalled();
-    });
-
-    it('should redirect debug to originalConsoleError when debugMode is true', () => {
-      const spyError = vi.spyOn(console, 'error').mockImplementation(() => {});
-      patcher = new ConsolePatcher({ debugMode: true, stderr: true });
-      patcher.patch();
-
-      console.debug('test debug');
-      expect(spyError).toHaveBeenCalledWith('test debug');
-    });
-  });
-});
@@ -13,7 +13,6 @@ interface ConsolePatcherParams {
  onNewMessage?: (message: Omit<ConsoleMessageItem, 'id'>) => void;
  debugMode: boolean;
  stderr?: boolean;
-  interactive?: boolean;
 }

 export class ConsolePatcher {
@@ -50,19 +49,12 @@ export class ConsolePatcher {
  private patchConsoleMethod =
    (type: 'log' | 'warn' | 'error' | 'debug' | 'info') =>
    (...args: unknown[]) => {
-      // When it is non interactive mode, do not show info logging unless
-      // it is debug mode. default to true if it is undefined.
-      if (this.params.interactive === false) {
-        if ((type === 'info' || type === 'log') && !this.params.debugMode) {
-          return;
-        }
-      }
-      // When it is in the debug mode, redirect console output to stderr
-      // depending on if it is stderr only mode.
-      if (type !== 'debug' || this.params.debugMode) {
-        if (this.params.stderr) {
+      if (this.params.stderr) {
+        if (type !== 'debug' || this.params.debugMode) {
          this.originalConsoleError(this.formatArgs(args));
-        } else {
+        }
+      } else {
+        if (type !== 'debug' || this.params.debugMode) {
          this.params.onNewMessage?.({
            type,
            content: this.formatArgs(args),
@@ -1,45 +1,32 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="343" viewBox="0 0 920 343">
+<svg xmlns="http://www.w3.org/2000/svg" width="920" height="207" viewBox="0 0 920 207">
  <style>
    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
  </style>
-  <rect width="920" height="343" fill="#000000" />
+  <rect width="920" height="207" fill="#000000" />
  <g transform="translate(10, 10)">
-    <text x="9" y="19" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
-    <text x="18" y="19" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
-    <text x="27" y="19" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
-    <text x="90" y="19" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛</text>
-    <text x="27" y="36" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
-    <text x="36" y="36" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
-    <text x="45" y="36" fill="#c3677f" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
-    <text x="90" y="36" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">█▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌</text>
-    <text x="18" y="53" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▗</text>
-    <text x="27" y="53" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▟</text>
-    <text x="36" y="53" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
-    <text x="90" y="53" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌</text>
-    <text x="9" y="70" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
-    <text x="18" y="70" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
-    <text x="90" y="70" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs"> ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀</text>
-    <text x="9" y="104" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs" font-weight="bold">Gemini CLI</text>
-    <text x="99" y="104" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs"> v1.2.3</text>
-    <text x="0" y="155" fill="#ffffff" textLength="225" lengthAdjust="spacingAndGlyphs">Tips for getting started:</text>
-    <text x="0" y="172" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">1. Create </text>
-    <text x="90" y="172" fill="#ffffff" textLength="81" lengthAdjust="spacingAndGlyphs" font-weight="bold">GEMINI.md</text>
-    <text x="171" y="172" fill="#ffffff" textLength="333" lengthAdjust="spacingAndGlyphs"> files to customize your interactions</text>
-    <text x="0" y="189" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">2. </text>
-    <text x="27" y="189" fill="#afafaf" textLength="45" lengthAdjust="spacingAndGlyphs">/help</text>
-    <text x="72" y="189" fill="#ffffff" textLength="189" lengthAdjust="spacingAndGlyphs"> for more information</text>
-    <text x="0" y="206" fill="#ffffff" textLength="450" lengthAdjust="spacingAndGlyphs">3. Ask coding questions, edit code or run commands</text>
-    <text x="0" y="223" fill="#ffffff" textLength="315" lengthAdjust="spacingAndGlyphs">4. Be specific for the best results</text>
-    <text x="0" y="240" fill="#ffffaf" textLength="864" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────────────────────╮</text>
-    <text x="0" y="257" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="257" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">⊶</text>
-    <text x="45" y="257" fill="#ffffff" textLength="153" lengthAdjust="spacingAndGlyphs" font-weight="bold">google_web_search</text>
-    <text x="855" y="257" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="274" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="855" y="274" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="291" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="291" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs">Searching...</text>
-    <text x="855" y="291" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="308" fill="#ffffaf" textLength="864" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────╯</text>
+    <text x="18" y="19" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="27" y="19" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
+    <text x="36" y="19" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
+    <text x="90" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs" font-weight="bold">Gemini CLI</text>
+    <text x="180" y="19" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs"> v1.2.3</text>
+    <text x="36" y="36" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="45" y="36" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
+    <text x="54" y="36" fill="#c3677f" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
+    <text x="27" y="53" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▗</text>
+    <text x="36" y="53" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▟</text>
+    <text x="45" y="53" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
+    <text x="18" y="70" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="27" y="70" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
+    <text x="0" y="104" fill="#ffffaf" textLength="864" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────────────────────╮</text>
+    <text x="0" y="121" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="18" y="121" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">⊶</text>
+    <text x="45" y="121" fill="#ffffff" textLength="153" lengthAdjust="spacingAndGlyphs" font-weight="bold">google_web_search</text>
+    <text x="855" y="121" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="138" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="855" y="138" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="155" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="18" y="155" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs">Searching...</text>
+    <text x="855" y="155" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="172" fill="#ffffaf" textLength="864" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────╯</text>
  </g>
 </svg>
@@ -1,45 +1,32 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="343" viewBox="0 0 920 343">
+<svg xmlns="http://www.w3.org/2000/svg" width="920" height="207" viewBox="0 0 920 207">
  <style>
    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
  </style>
-  <rect width="920" height="343" fill="#000000" />
+  <rect width="920" height="207" fill="#000000" />
  <g transform="translate(10, 10)">
-    <text x="9" y="19" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
-    <text x="18" y="19" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
-    <text x="27" y="19" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
-    <text x="90" y="19" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛</text>
-    <text x="27" y="36" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
-    <text x="36" y="36" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
-    <text x="45" y="36" fill="#c3677f" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
-    <text x="90" y="36" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">█▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌</text>
-    <text x="18" y="53" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▗</text>
-    <text x="27" y="53" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▟</text>
-    <text x="36" y="53" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
-    <text x="90" y="53" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌</text>
-    <text x="9" y="70" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
-    <text x="18" y="70" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
-    <text x="90" y="70" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs"> ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀</text>
-    <text x="9" y="104" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs" font-weight="bold">Gemini CLI</text>
-    <text x="99" y="104" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs"> v1.2.3</text>
-    <text x="0" y="155" fill="#ffffff" textLength="225" lengthAdjust="spacingAndGlyphs">Tips for getting started:</text>
-    <text x="0" y="172" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">1. Create </text>
-    <text x="90" y="172" fill="#ffffff" textLength="81" lengthAdjust="spacingAndGlyphs" font-weight="bold">GEMINI.md</text>
-    <text x="171" y="172" fill="#ffffff" textLength="333" lengthAdjust="spacingAndGlyphs"> files to customize your interactions</text>
-    <text x="0" y="189" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">2. </text>
-    <text x="27" y="189" fill="#afafaf" textLength="45" lengthAdjust="spacingAndGlyphs">/help</text>
-    <text x="72" y="189" fill="#ffffff" textLength="189" lengthAdjust="spacingAndGlyphs"> for more information</text>
-    <text x="0" y="206" fill="#ffffff" textLength="450" lengthAdjust="spacingAndGlyphs">3. Ask coding questions, edit code or run commands</text>
-    <text x="0" y="223" fill="#ffffff" textLength="315" lengthAdjust="spacingAndGlyphs">4. Be specific for the best results</text>
-    <text x="0" y="240" fill="#87afff" textLength="864" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────────────────────╮</text>
-    <text x="0" y="257" fill="#87afff" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="257" fill="#87afff" textLength="9" lengthAdjust="spacingAndGlyphs">⊶</text>
-    <text x="45" y="257" fill="#ffffff" textLength="153" lengthAdjust="spacingAndGlyphs" font-weight="bold">run_shell_command</text>
-    <text x="855" y="257" fill="#87afff" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="274" fill="#87afff" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="855" y="274" fill="#87afff" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="291" fill="#87afff" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="291" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Running command...</text>
-    <text x="855" y="291" fill="#87afff" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="308" fill="#87afff" textLength="864" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────╯</text>
+    <text x="18" y="19" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="27" y="19" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
+    <text x="36" y="19" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
+    <text x="90" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs" font-weight="bold">Gemini CLI</text>
+    <text x="180" y="19" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs"> v1.2.3</text>
+    <text x="36" y="36" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="45" y="36" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
+    <text x="54" y="36" fill="#c3677f" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
+    <text x="27" y="53" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▗</text>
+    <text x="36" y="53" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▟</text>
+    <text x="45" y="53" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
+    <text x="18" y="70" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="27" y="70" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
+    <text x="0" y="104" fill="#87afff" textLength="864" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────────────────────╮</text>
+    <text x="0" y="121" fill="#87afff" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="18" y="121" fill="#87afff" textLength="9" lengthAdjust="spacingAndGlyphs">⊶</text>
+    <text x="45" y="121" fill="#ffffff" textLength="153" lengthAdjust="spacingAndGlyphs" font-weight="bold">run_shell_command</text>
+    <text x="855" y="121" fill="#87afff" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="138" fill="#87afff" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="855" y="138" fill="#87afff" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="155" fill="#87afff" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="18" y="155" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Running command...</text>
+    <text x="855" y="155" fill="#87afff" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="172" fill="#87afff" textLength="864" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────╯</text>
  </g>
 </svg>
@@ -1,45 +1,32 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="920" height="343" viewBox="0 0 920 343">
+<svg xmlns="http://www.w3.org/2000/svg" width="920" height="207" viewBox="0 0 920 207">
  <style>
    text { font-family: Consolas, "Courier New", monospace; font-size: 14px; dominant-baseline: text-before-edge; white-space: pre; }
  </style>
-  <rect width="920" height="343" fill="#000000" />
+  <rect width="920" height="207" fill="#000000" />
  <g transform="translate(10, 10)">
-    <text x="9" y="19" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
-    <text x="18" y="19" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
-    <text x="27" y="19" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
-    <text x="90" y="19" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛</text>
-    <text x="27" y="36" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
-    <text x="36" y="36" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
-    <text x="45" y="36" fill="#c3677f" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
-    <text x="90" y="36" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">█▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌</text>
-    <text x="18" y="53" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▗</text>
-    <text x="27" y="53" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▟</text>
-    <text x="36" y="53" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
-    <text x="90" y="53" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs">▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌</text>
-    <text x="9" y="70" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
-    <text x="18" y="70" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
-    <text x="90" y="70" fill="#ffffff" textLength="297" lengthAdjust="spacingAndGlyphs"> ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀</text>
-    <text x="9" y="104" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs" font-weight="bold">Gemini CLI</text>
-    <text x="99" y="104" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs"> v1.2.3</text>
-    <text x="0" y="155" fill="#ffffff" textLength="225" lengthAdjust="spacingAndGlyphs">Tips for getting started:</text>
-    <text x="0" y="172" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">1. Create </text>
-    <text x="90" y="172" fill="#ffffff" textLength="81" lengthAdjust="spacingAndGlyphs" font-weight="bold">GEMINI.md</text>
-    <text x="171" y="172" fill="#ffffff" textLength="333" lengthAdjust="spacingAndGlyphs"> files to customize your interactions</text>
-    <text x="0" y="189" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">2. </text>
-    <text x="27" y="189" fill="#afafaf" textLength="45" lengthAdjust="spacingAndGlyphs">/help</text>
-    <text x="72" y="189" fill="#ffffff" textLength="189" lengthAdjust="spacingAndGlyphs"> for more information</text>
-    <text x="0" y="206" fill="#ffffff" textLength="450" lengthAdjust="spacingAndGlyphs">3. Ask coding questions, edit code or run commands</text>
-    <text x="0" y="223" fill="#ffffff" textLength="315" lengthAdjust="spacingAndGlyphs">4. Be specific for the best results</text>
-    <text x="0" y="240" fill="#ffffaf" textLength="864" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────────────────────╮</text>
-    <text x="0" y="257" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="257" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">⊶</text>
-    <text x="45" y="257" fill="#ffffff" textLength="153" lengthAdjust="spacingAndGlyphs" font-weight="bold">google_web_search</text>
-    <text x="855" y="257" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="274" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="855" y="274" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="291" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="291" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs">Searching...</text>
-    <text x="855" y="291" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="308" fill="#ffffaf" textLength="864" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────╯</text>
+    <text x="18" y="19" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="27" y="19" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
+    <text x="36" y="19" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
+    <text x="90" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs" font-weight="bold">Gemini CLI</text>
+    <text x="180" y="19" fill="#afafaf" textLength="63" lengthAdjust="spacingAndGlyphs"> v1.2.3</text>
+    <text x="36" y="36" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="45" y="36" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▜</text>
+    <text x="54" y="36" fill="#c3677f" textLength="9" lengthAdjust="spacingAndGlyphs">▄</text>
+    <text x="27" y="53" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▗</text>
+    <text x="36" y="53" fill="#847ace" textLength="9" lengthAdjust="spacingAndGlyphs">▟</text>
+    <text x="45" y="53" fill="#a471a7" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
+    <text x="18" y="70" fill="#4796e4" textLength="9" lengthAdjust="spacingAndGlyphs">▝</text>
+    <text x="27" y="70" fill="#6688d9" textLength="9" lengthAdjust="spacingAndGlyphs">▀</text>
+    <text x="0" y="104" fill="#ffffaf" textLength="864" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────────────────────╮</text>
+    <text x="0" y="121" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="18" y="121" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">⊶</text>
+    <text x="45" y="121" fill="#ffffff" textLength="153" lengthAdjust="spacingAndGlyphs" font-weight="bold">google_web_search</text>
+    <text x="855" y="121" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="138" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="855" y="138" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="155" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="18" y="155" fill="#ffffff" textLength="108" lengthAdjust="spacingAndGlyphs">Searching...</text>
+    <text x="855" y="155" fill="#ffffaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="0" y="172" fill="#ffffaf" textLength="864" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────╯</text>
  </g>
 </svg>
@@ -2,19 +2,11 @@

 exports[`MainContent tool group border SVG snapshots > should render SVG snapshot for a pending search dialog (google_web_search) 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
+  ▝▜▄     Gemini CLI v1.2.3
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    

- Gemini CLI v1.2.3
-
-
-Tips for getting started:
-1. Create GEMINI.md files to customize your interactions
-2. /help for more information
-3. Ask coding questions, edit code or run commands
-4. Be specific for the best results
 ╭──────────────────────────────────────────────────────────────────────────────────────────────╮
 │ ⊶  google_web_search                                                                         │
 │                                                                                              │
@@ -24,19 +16,11 @@ Tips for getting started:

 exports[`MainContent tool group border SVG snapshots > should render SVG snapshot for a shell tool 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
+  ▝▜▄     Gemini CLI v1.2.3
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    

- Gemini CLI v1.2.3
-
-
-Tips for getting started:
-1. Create GEMINI.md files to customize your interactions
-2. /help for more information
-3. Ask coding questions, edit code or run commands
-4. Be specific for the best results
 ╭──────────────────────────────────────────────────────────────────────────────────────────────╮
 │ ⊶  run_shell_command                                                                         │
 │                                                                                              │
@@ -46,19 +30,11 @@ Tips for getting started:

 exports[`MainContent tool group border SVG snapshots > should render SVG snapshot for an empty slice following a search tool 1`] = `
 "
- ▝▜▄      ▗█▀▀▜▙▝█▛▀▀▌▜██▖▟██▘▜█▘▜██▖▝█▛▝█▛
-   ▝▜▄    █▌     █▙▟  ▐█▝█▛▐█ ▐█ ▐█▝█▖█▌ █▌
-  ▗▟▀     ▜▙ ▝█▛ █▌▝ ▖▐█   ▐█ ▐█ ▐█ ▝██▌ █▌
- ▝▀        ▀▀▀▀▘▝▀▀▀▀▘▀▀▘  ▀▀▘▀▀▘▀▀▘ ▝▀▀▝▀▀
+  ▝▜▄     Gemini CLI v1.2.3
+    ▝▜▄
+   ▗▟▀ 
+  ▝▀    

- Gemini CLI v1.2.3
-
-
-Tips for getting started:
-1. Create GEMINI.md files to customize your interactions
-2. /help for more information
-3. Ask coding questions, edit code or run commands
-4. Be specific for the best results
 ╭──────────────────────────────────────────────────────────────────────────────────────────────╮
 │ ⊶  google_web_search                                                                         │
 │                                                                                              │
@@ -502,6 +502,7 @@ export function useTerminalSetupPrompt({
    if (hasBeenPrompted) {
      return;
    }
+
    let cancelled = false;

    // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -83,55 +83,18 @@ async function bundle() {
      }
      fs.cpSync(srcThirdParty, destThirdParty, {
        recursive: true,
+        filter: (src) => {
+          // Skip large/unnecessary bundles that are either explicitly excluded
+          // or not required for the browser agent functionality.
+          return (
+            !src.includes('lighthouse-devtools-mcp-bundle.js') &&
+            !src.includes('devtools-formatter-worker.js')
+          );
+        },
      });
    } else {
      console.warn(`Warning: third_party assets not found at ${srcThirdParty}`);
    }
-
-    // Copy watchdog scripts and dependencies
-    const srcTelemetry = path.resolve(
-      __dirname,
-      '../../../node_modules/chrome-devtools-mcp/build/src/telemetry',
-    );
-    const destWatchdog = path.resolve(
-      __dirname,
-      '../dist/bundled/watchdog',
-    );
-    if (fs.existsSync(srcTelemetry)) {
-      fs.mkdirSync(destWatchdog, { recursive: true });
-      // Copy main watchdog directory
-      fs.cpSync(path.join(srcTelemetry, 'watchdog'), destWatchdog, { recursive: true });
-      // Copy shared types needed by watchdog
-      fs.copyFileSync(
-        path.join(srcTelemetry, 'types.js'),
-        path.resolve(__dirname, '../dist/bundled/types.js')
-      );
-      // Copy logger needed by watchdog
-      fs.copyFileSync(
-        path.join(srcTelemetry, '../logger.js'),
-        path.resolve(__dirname, '../dist/bundled/logger.js')
-      );
-
-      // Patch imports in watchdog files to reflect the flattened structure in dist/bundled/
-      const watchdogFiles = fs.readdirSync(destWatchdog);
-      for (const file of watchdogFiles) {
-        if (file.endsWith('.js')) {
-          const filePath = path.join(destWatchdog, file);
-          let content = fs.readFileSync(filePath, 'utf-8');
-          content = content.replace(/\.\.\/\.\.\/logger\.js/g, '../logger.js');
-          content = content.replace(/\.\.\/types\.js/g, '../types.js');
-          fs.writeFileSync(filePath, content);
-        }
-      }
-    } else {
-      console.warn(`Warning: telemetry directory not found at ${srcTelemetry}`);
-    }
-
-    // Patch the bundled file to point to the correct watchdog path
-    // The original code uses new URL("./watchdog/main.js", import.meta.url)
-    // which resolves relative to the bundled file.
-    // Our bundling script copies the watchdog to ./watchdog/main.js relative to the bundle.
-    // So the original code should work IF esbuild doesn't mangle import.meta.url.
  } catch (error) {
    console.error('Error bundling chrome-devtools-mcp:', error);
    process.exit(1);
@@ -386,7 +386,7 @@ export class BrowserManager {
        })
        .join(', ');
      mcpArgs.push(
-        `--chromeArg=--host-rules=MAP * 127.0.0.1, ${exclusionRules}, EXCLUDE 127.0.0.1`,
+        `--chromeArg="--host-rules=MAP * 127.0.0.1, ${exclusionRules}, EXCLUDE 127.0.0.1"`,
      );
    }

@@ -427,12 +427,10 @@ export class BrowserManager {
    }

    this.mcpTransport.onclose = () => {
-      if (this.rawMcpClient) {
-        debugLogger.error(
-          'chrome-devtools-mcp transport closed unexpectedly. ' +
-            'The MCP server process may have crashed.',
-        );
-      }
+      debugLogger.error(
+        'chrome-devtools-mcp transport closed unexpectedly. ' +
+          'The MCP server process may have crashed.',
+      );
      this.rawMcpClient = undefined;
    };
    this.mcpTransport.onerror = (error: Error) => {
@@ -38,6 +38,7 @@ function createMockConfig(overrides: Partial<Config> = {}): Config {
  const baseConfig = {
    getSessionId: () => 'test-session-id',
    getUsageStatisticsEnabled: () => true,
+    getTelemetryLogPromptsEnabled: () => false,
    getDebugMode: () => false,
    isInteractive: () => true,
    getApprovalMode: () => ApprovalMode.DEFAULT,
@@ -407,7 +407,6 @@ describe('LoggingContentGenerator', () => {
      expect(runInDevTraceSpan).toHaveBeenCalledWith(
        expect.objectContaining({
          operation: GeminiCliOperation.LLMCall,
-          noAutoEnd: true,
          attributes: expect.objectContaining({
            [GEN_AI_REQUEST_MODEL]: 'gemini-pro',
            [GEN_AI_PROMPT_NAME]: userPromptId,
@@ -438,7 +438,6 @@ export class LoggingContentGenerator implements ContentGenerator {
    return runInDevTraceSpan(
      {
        operation: GeminiCliOperation.LLMCall,
-        noAutoEnd: true,
        attributes: {
          [GEN_AI_REQUEST_MODEL]: req.model,
          [GEN_AI_PROMPT_NAME]: userPromptId,
@@ -448,7 +447,7 @@ export class LoggingContentGenerator implements ContentGenerator {
          [GEN_AI_TOOL_DEFINITIONS]: safeJsonStringify(req.config?.tools ?? []),
        },
      },
-      async ({ metadata: spanMetadata, endSpan }) => {
+      async ({ metadata: spanMetadata }) => {
        spanMetadata.input = req.contents;

        const startTime = Date.now();
@@ -504,7 +503,6 @@ export class LoggingContentGenerator implements ContentGenerator {
          userPromptId,
          role,
          spanMetadata,
-          endSpan,
        );
      },
    );
@@ -517,7 +515,6 @@ export class LoggingContentGenerator implements ContentGenerator {
    userPromptId: string,
    role: LlmRole,
    spanMetadata: SpanMetadata,
-    endSpan: () => void,
  ): AsyncGenerator<GenerateContentResponse> {
    const responses: GenerateContentResponse[] = [];

@@ -581,8 +578,6 @@ export class LoggingContentGenerator implements ContentGenerator {
        serverDetails,
      );
      throw error;
-    } finally {
-      endSpan();
    }
  }

@@ -133,33 +133,44 @@ describe('runInDevTraceSpan', () => {
    expect(mockSpan.end).toHaveBeenCalled();
  });

-  it('should respect noAutoEnd option', async () => {
-    let capturedEndSpan: () => void = () => {};
-    const result = await runInDevTraceSpan(
-      { operation: GeminiCliOperation.LLMCall, noAutoEnd: true },
-      async ({ endSpan }) => {
-        capturedEndSpan = endSpan;
-        return 'streaming';
-      },
-    );
+  it('should auto-wrap AsyncGenerators to end span only on completion', async () => {
+    const asyncGen = async function* () {
+      yield 'part1';
+      yield 'part2';
+    };
+
+    const result = (await runInDevTraceSpan(
+      { operation: GeminiCliOperation.LLMCall },
+      async () => asyncGen(),
+    )) as unknown as AsyncGenerator<string>;

-    expect(result).toBe('streaming');
    expect(mockSpan.end).not.toHaveBeenCalled();

-    capturedEndSpan();
+    const parts = [];
+    for await (const part of result) {
+      parts.push(part);
+    }
+    expect(parts).toEqual(['part1', 'part2']);
    expect(mockSpan.end).toHaveBeenCalled();
  });

-  it('should automatically end span on error even if noAutoEnd is true', async () => {
+  it('should automatically end span on error even if it is an AsyncGenerator', async () => {
    const error = new Error('streaming error');
-    await expect(
-      runInDevTraceSpan(
-        { operation: GeminiCliOperation.LLMCall, noAutoEnd: true },
-        async () => {
-          throw error;
-        },
-      ),
-    ).rejects.toThrow(error);
+    const asyncGen = async function* () {
+      yield 'part1';
+      throw error;
+    };
+
+    const result = (await runInDevTraceSpan(
+      { operation: GeminiCliOperation.LLMCall },
+      async () => asyncGen(),
+    )) as unknown as AsyncGenerator<string>;
+
+    await expect(async () => {
+      for await (const _ of result) {
+        // Wait for throw
+      }
+    }).rejects.toThrow(error);

    expect(mockSpan.end).toHaveBeenCalled();
  });
@@ -11,6 +11,7 @@ import {
  type AttributeValue,
  type SpanOptions,
 } from '@opentelemetry/api';
+import { truncateForTelemetry } from './truncate.js';
 import { safeJsonStringify } from '../utils/safeJsonStringify.js';
 import {
  type GeminiCliOperation,
@@ -63,7 +64,7 @@ export interface SpanMetadata {
 * @returns The result of the function.
 */
 export async function runInDevTraceSpan<R>(
-  opts: SpanOptions & { operation: GeminiCliOperation; noAutoEnd?: boolean },
+  opts: SpanOptions & { operation: GeminiCliOperation },
  fn: ({
    metadata,
  }: {
@@ -71,7 +72,7 @@ export async function runInDevTraceSpan<R>(
    endSpan: () => void;
  }) => Promise<R>,
 ): Promise<R> {
-  const { operation, noAutoEnd, ...restOfSpanOpts } = opts;
+  const { operation, ...restOfSpanOpts } = opts;

  const tracer = trace.getTracer(TRACER_NAME, TRACER_VERSION);
  return tracer.startActiveSpan(operation, restOfSpanOpts, async (span) => {
@@ -84,22 +85,28 @@ export async function runInDevTraceSpan<R>(
        [GEN_AI_CONVERSATION_ID]: sessionId,
      },
    };
+    let spanEnded = false;
    const endSpan = () => {
+      if (spanEnded) return;
+      spanEnded = true;
      try {
        if (meta.input !== undefined) {
-          span.setAttribute(
-            GEN_AI_INPUT_MESSAGES,
-            safeJsonStringify(meta.input),
-          );
+          const truncatedInput = truncateForTelemetry(meta.input);
+          if (truncatedInput !== undefined) {
+            span.setAttribute(GEN_AI_INPUT_MESSAGES, truncatedInput);
+          }
        }
        if (meta.output !== undefined) {
-          span.setAttribute(
-            GEN_AI_OUTPUT_MESSAGES,
-            safeJsonStringify(meta.output),
-          );
+          const truncatedOutput = truncateForTelemetry(meta.output);
+          if (truncatedOutput !== undefined) {
+            span.setAttribute(GEN_AI_OUTPUT_MESSAGES, truncatedOutput);
+          }
        }
        for (const [key, value] of Object.entries(meta.attributes)) {
-          span.setAttribute(key, value);
+          const truncatedValue = truncateForTelemetry(value);
+          if (truncatedValue !== undefined) {
+            span.setAttribute(key, truncatedValue);
+          }
        }
        if (meta.error) {
          span.setStatus({
@@ -123,23 +130,40 @@ export async function runInDevTraceSpan<R>(
        span.end();
      }
    };
+
+    let result: R;
    try {
-      return await fn({ metadata: meta, endSpan });
+      result = await fn({ metadata: meta, endSpan });
    } catch (e) {
      meta.error = e;
-      if (noAutoEnd) {
-        // For streaming operations, the delegated endSpan call will not be reached
-        // on an exception, so we must end the span here to prevent a leak.
-        endSpan();
-      }
+      endSpan();
      throw e;
-    } finally {
-      if (!noAutoEnd) {
-        // For non-streaming operations, this ensures the span is always closed,
-        // and if an error occurred, it will be recorded correctly by endSpan.
-        endSpan();
-      }
    }
+
+    // Auto-detect AsyncGenerators and wrap them to ensure endSpan is called
+    // when iteration finishes or fails.
+    if (
+      result != null &&
+      typeof result === 'object' &&
+      Symbol.asyncIterator in result
+    ) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+      const asyncIterable = result as unknown as AsyncIterable<unknown>;
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+      return (async function* () {
+        try {
+          yield* asyncIterable;
+        } catch (e) {
+          meta.error = e;
+          throw e;
+        } finally {
+          endSpan();
+        }
+      })() as unknown as R;
+    }
+
+    endSpan();
+    return result;
  });
 }

@@ -0,0 +1,48 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { safeJsonStringify } from '../utils/safeJsonStringify.js';
+import type { AttributeValue } from '@opentelemetry/api';
+
+/**
+ * Truncates values for telemetry to prevent massive strings (e.g., LLM prompts, tool arguments)
+ * from being attached to spans and causing memory leaks.
+ *
+ * @param value The value to truncate
+ * @param maxLength The maximum length of the string representation (default: 1000)
+ */
+export function truncateForTelemetry(
+  value: unknown,
+  maxLength: number = 1000,
+): AttributeValue | undefined {
+  if (value === null || value === undefined) {
+    return undefined;
+  }
+
+  let stringValue: string;
+  if (typeof value === 'string') {
+    stringValue = value;
+  } else if (typeof value === 'object' || Array.isArray(value)) {
+    try {
+      stringValue = safeJsonStringify(value);
+    } catch (_e) {
+      stringValue = String(value);
+    }
+  } else if (typeof value === 'number' || typeof value === 'boolean') {
+    return value;
+  } else {
+    stringValue = String(value);
+  }
+
+  if (stringValue && stringValue.length > maxLength) {
+    return (
+      stringValue.substring(0, maxLength) +
+      `...[TRUNCATED: original length ${stringValue.length}]`
+    );
+  }
+
+  return stringValue;
+}
Author	SHA1	Message	Date
Spencer	e5d7f0efd2	fix(core): add getTelemetryLogPromptsEnabled to mock config	2026-03-23 18:48:25 +00:00
Spencer	dc8e86f169	Merge remote-tracking branch 'origin/main' into 23290-memory-bloat	2026-03-23 18:30:21 +00:00
Spencer	8740007d90	fix(core): remove noAutoEnd from loggingContentGenerator tests	2026-03-23 16:20:15 +00:00
Spencer	b438621855	Merge branch 'main' into 23290-memory-bloat	2026-03-20 18:33:46 -04:00
Spencer	6086e3e652	Merge branch 'main' into 23290-memory-bloat	2026-03-20 17:21:37 -04:00
Spencer	ab355ac7f0	fix(core): prevent OOM by truncating massive open telemetry attributes and fixing span leaks - Implements `truncateForTelemetry` to prevent massive strings (like LLM prompts) from staying in memory. - Fixes `runInDevTraceSpan` leaking unclosed spans on aborted or errored async iterators by automatically capturing generator returns.	2026-03-20 20:46:25 +00:00